diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ea203c82830f7a4a0bc84b740a44b403b9d30f7e..ca22a6ef3c12f6011a7cc223447581ddd2685a73 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,9 +21,9 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.kuschku.quasseldroid_ng">
+          package="de.kuschku.quasseldroid_ng">
 
-    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
         android:name=".QuasselDroidNG"
@@ -32,7 +32,7 @@
         android:label="@string/appName"
         android:supportsRtl="true">
 
-        <service android:name=".service.QuasselService" />
+        <service android:name=".service.QuasselService"/>
 
         <activity
             android:name=".ui.LoginActivity"
@@ -40,9 +40,9 @@
             android:launchMode="singleTask"
             android:theme="@style/AppTheme.Light">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
@@ -51,56 +51,56 @@
             android:label="@string/appName"
             android:launchMode="singleTask"
             android:parentActivityName=".ui.LoginActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/AppTheme.Light"/>
 
         <activity
             android:name=".ui.chat.ChannelDetailActivity"
             android:label="@string/channeldetails"
             android:launchMode="singleTask"
             android:parentActivityName=".ui.chat.MainActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/AppTheme.Light"/>
 
         <activity
             android:name=".ui.coresettings.chatlist.ChatListListActivity"
             android:label="@string/editchatlists"
             android:launchMode="singleTask"
             android:parentActivityName=".ui.chat.MainActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/AppTheme.Light"/>
 
         <activity
             android:name=".ui.coresettings.chatlist.ChatListEditActivity"
             android:label="@string/editchatlist"
             android:launchMode="singleTask"
             android:parentActivityName=".ui.coresettings.chatlist.ChatListListActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/AppTheme.Light"/>
 
         <activity
             android:name=".ui.coresettings.chatlist.ChatListCreateActivity"
             android:label="@string/createchatlist"
             android:launchMode="singleTask"
             android:parentActivityName=".ui.coresettings.chatlist.ChatListListActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/AppTheme.Light"/>
 
         <activity
             android:name=".ui.coresettings.network.NetworkListActivity"
             android:label="@string/editnetworks"
             android:launchMode="singleTask"
             android:parentActivityName=".ui.chat.MainActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/AppTheme.Light"/>
 
         <activity
             android:name=".ui.coresettings.network.NetworkEditActivity"
             android:label="@string/editnetwork"
             android:launchMode="singleTask"
             android:parentActivityName=".ui.coresettings.network.NetworkListActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/AppTheme.Light"/>
 
         <activity
             android:name=".ui.coresettings.network.NetworkCreateActivity"
             android:label="@string/createnetwork"
             android:launchMode="singleTask"
             android:parentActivityName=".ui.coresettings.network.NetworkListActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/AppTheme.Light"/>
 
         <activity
             android:name=".ui.coresettings.network.server.NetworkServerListActivity"
@@ -149,28 +149,28 @@
             android:label="@string/accountsetup"
             android:launchMode="singleTask"
             android:parentActivityName=".ui.setup.AccountSelectActivity"
-            android:theme="@style/SetupTheme" />
+            android:theme="@style/SetupTheme"/>
 
         <activity
             android:name=".ui.setup.AccountSelectActivity"
             android:label="@string/accountselection"
             android:launchMode="singleTask"
             android:parentActivityName=".ui.LoginActivity"
-            android:theme="@style/SetupTheme" />
+            android:theme="@style/SetupTheme"/>
 
         <activity
             android:name=".ui.setup.CoreSetupActivity"
             android:label="@string/coresetup"
             android:launchMode="singleTask"
             android:parentActivityName=".ui.chat.MainActivity"
-            android:theme="@style/SetupTheme" />
+            android:theme="@style/SetupTheme"/>
 
         <activity
             android:name=".ui.settings.SettingsActivity"
             android:label="@string/settings"
             android:launchMode="singleTask"
             android:parentActivityName=".ui.chat.MainActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/AppTheme.Light"/>
 
     </application>
 
diff --git a/app/src/main/java/de/kuschku/libquassel/localtypes/BacklogFilter.java b/app/src/main/java/de/kuschku/libquassel/localtypes/BacklogFilter.java
index a2f3b8c10c1737662037970b517a9f25eb1f1bab..c671d95cf692217139d6296bdbbc6fda86b35ba5 100644
--- a/app/src/main/java/de/kuschku/libquassel/localtypes/BacklogFilter.java
+++ b/app/src/main/java/de/kuschku/libquassel/localtypes/BacklogFilter.java
@@ -28,6 +28,10 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import de.kuschku.libquassel.client.Client;
 import de.kuschku.libquassel.message.Message;
 import de.kuschku.libquassel.primitives.types.BufferInfo;
@@ -48,9 +52,24 @@ public class BacklogFilter implements UICallback {
     private final ObservableComparableSortedList<Message> filtered;
 
     private final EventBus bus = new EventBus();
+    ElementCallback<Message.Type> typeCallback = new ElementCallback<Message.Type>() {
+        @Override
+        public void notifyItemInserted(Message.Type element) {
+            bus.post(new UpdateRemoveEvent());
+        }
+
+        @Override
+        public void notifyItemRemoved(Message.Type element) {
+            bus.post(new UpdateAddEvent());
+        }
+
+        @Override
+        public void notifyItemChanged(Message.Type element) {
+
+        }
+    };
     @Nullable
     private CharSequence searchQuery;
-
     private Message markerlineMessage;
 
     public BacklogFilter(@NonNull Client client, int bufferId, @NonNull ObservableComparableSortedList<Message> unfiltered, @NonNull ObservableComparableSortedList<Message> filtered) {
@@ -59,22 +78,7 @@ public class BacklogFilter implements UICallback {
         this.unfiltered = unfiltered;
         this.filtered = filtered;
         this.bus.register(this);
-        client.bufferSyncer().getFilteredTypes(bufferId).addCallback(new ElementCallback<Message.Type>() {
-            @Override
-            public void notifyItemInserted(Message.Type element) {
-                bus.post(new UpdateRemoveEvent());
-            }
-
-            @Override
-            public void notifyItemRemoved(Message.Type element) {
-                bus.post(new UpdateAddEvent());
-            }
-
-            @Override
-            public void notifyItemChanged(Message.Type element) {
-
-            }
-        });
+        client.bufferSyncer().getFilteredTypes(bufferId).addCallback(typeCallback);
         updateDayChangeMessages();
     }
 
@@ -207,12 +211,18 @@ public class BacklogFilter implements UICallback {
 
     @Subscribe(threadMode = ThreadMode.ASYNC)
     public void onEventAsync(@NonNull MessageFilterEvent event) {
-        if (!filterItem(event.msg)) bus.post(new MessageInsertEvent(event.msg));
+        List<Message> filteredMessages = new ArrayList<>();
+        for (Message message : event.msgs) {
+            if (!filterItem(message))
+                filteredMessages.add(message);
+        }
+
+        bus.post(new MessageInsertEvent(filteredMessages));
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(@NonNull MessageInsertEvent event) {
-        filtered.add(event.msg);
+        filtered.addAll(event.msgs);
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -222,12 +232,14 @@ public class BacklogFilter implements UICallback {
 
     @Override
     public void notifyItemChanged(int position) {
-        filtered.notifyItemChanged(position);
+        int position1 = filtered.indexOf(unfiltered.get(position));
+        if (position1 != -1)
+            filtered.notifyItemChanged(position1);
     }
 
     @Override
     public void notifyItemRemoved(int position) {
-        filtered.remove(position);
+        bus.post(new MessageRemoveEvent(unfiltered.get(position)));
     }
 
     @Override
@@ -237,9 +249,8 @@ public class BacklogFilter implements UICallback {
 
     @Override
     public void notifyItemRangeInserted(int position, int count) {
-        for (int i = position; i < position + count; i++) {
-            notifyItemInserted(i);
-        }
+        List<Message> message = unfiltered.subList(position, position + count);
+        bus.post(new MessageFilterEvent(message));
     }
 
     @Override
@@ -256,11 +267,21 @@ public class BacklogFilter implements UICallback {
         }
     }
 
+    public void onDestroy() {
+        bus.unregister(this);
+        client.bufferSyncer().getFilteredTypes(bufferId).removeCallback(typeCallback);
+        typeCallback = null;
+    }
+
     private class MessageInsertEvent {
-        public final Message msg;
+        public final List<Message> msgs;
 
         public MessageInsertEvent(Message msg) {
-            this.msg = msg;
+            this.msgs = Collections.singletonList(msg);
+        }
+
+        public MessageInsertEvent(List<Message> msgs) {
+            this.msgs = msgs;
         }
     }
 
@@ -273,10 +294,14 @@ public class BacklogFilter implements UICallback {
     }
 
     private class MessageFilterEvent {
-        public final Message msg;
+        public final List<Message> msgs;
 
         public MessageFilterEvent(Message msg) {
-            this.msg = msg;
+            this.msgs = Collections.singletonList(msg);
+        }
+
+        public MessageFilterEvent(List<Message> msgs) {
+            this.msgs = msgs;
         }
     }
 
diff --git a/app/src/main/java/de/kuschku/libquassel/localtypes/backlogstorage/HybridBacklogStorage.java b/app/src/main/java/de/kuschku/libquassel/localtypes/backlogstorage/HybridBacklogStorage.java
index 61612c57ef6618f06d22ca474452cbc85bd8b8aa..d9514a2bef4cf3370939bf3d448b07398574e5af 100644
--- a/app/src/main/java/de/kuschku/libquassel/localtypes/backlogstorage/HybridBacklogStorage.java
+++ b/app/src/main/java/de/kuschku/libquassel/localtypes/backlogstorage/HybridBacklogStorage.java
@@ -29,6 +29,7 @@ import android.util.SparseArray;
 import com.raizlabs.android.dbflow.config.FlowManager;
 import com.raizlabs.android.dbflow.sql.language.SQLite;
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -88,14 +89,17 @@ public class HybridBacklogStorage implements BacklogStorage {
             for (Message message : messages) {
                 client.unbufferBuffer(message.bufferInfo);
                 synchronized (backlogs) {
-                    if (backlogs.get(bufferId) != null)
-                        backlogs.get(bufferId).add(message);
                     client.bufferSyncer().addActivity(message);
                     message.save();
                     message.bufferInfo.save();
                 }
                 updateLatest(message);
             }
+
+            synchronized (backlogs) {
+                if (backlogs.get(bufferId) != null)
+                    backlogs.get(bufferId).addAll(Arrays.asList(messages));
+            }
         });
     }
 
@@ -113,6 +117,11 @@ public class HybridBacklogStorage implements BacklogStorage {
                 }
                 updateLatest(message);
             }
+
+            synchronized (backlogs) {
+                if (backlogs.get(bufferId) != null)
+                    backlogs.get(bufferId).addAll(messages);
+            }
         });
     }
 
@@ -130,7 +139,8 @@ public class HybridBacklogStorage implements BacklogStorage {
                 synchronized (backlogs) {
                     if (backlogs.get(message.bufferInfo.id) != null)
                         backlogs.get(message.bufferInfo.id).add(message);
-                    client.bufferSyncer().addActivity(message);
+                    if (client.bufferSyncer() != null)
+                        client.bufferSyncer().addActivity(message);
                     message.save();
                     message.bufferInfo.save();
                 }
@@ -163,13 +173,18 @@ public class HybridBacklogStorage implements BacklogStorage {
     @Override
     public void markBufferUnused(@IntRange(from = 0) int bufferid) {
         synchronized (backlogs) {
-            if (backlogs.get(bufferid) != null && filters.get(bufferid) != null)
-                backlogs.get(bufferid).removeCallback(filters.get(bufferid));
+            BacklogFilter filter = filters.get(bufferid);
+            if (backlogs.get(bufferid) != null && filter != null)
+                backlogs.get(bufferid).removeCallbacks();
             backlogs.remove(bufferid);
-            filteredBacklogs.remove(bufferid);
+            if (filter != null)
+                filter.onDestroy();
+            if (filteredBacklogs.get(bufferid) != null)
+                filteredBacklogs.get(bufferid).removeCallbacks();
+            filteredBacklogs.delete(bufferid);
             synchronized (filterSet) {
-                filterSet.remove(filters.get(bufferid));
-                filters.remove(bufferid);
+                filterSet.remove(filter);
+                filters.delete(bufferid);
             }
         }
     }
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/BacklogManager.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/BacklogManager.java
index fa128a1a7f3ae3410cff52d67a55379801d74a3b..f5748dfaa3a7de16cfd8a36d2146b81ea36fe9ef 100644
--- a/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/BacklogManager.java
+++ b/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/BacklogManager.java
@@ -179,12 +179,13 @@ public class BacklogManager extends ABacklogManager {
         assertNotNull(provider);
 
         int oldBuffer = open();
-        setOpen(bufferId);
-        if (bufferId != -1 && client.bufferSyncer() != null)
-            client.bufferSyncer().requestMarkBufferAsRead(bufferId);
-        provider.sendEvent(new BufferChangeEvent());
-        if (oldBuffer != bufferId)
+        if (oldBuffer != bufferId) {
+            setOpen(bufferId);
+            if (bufferId != -1 && client.bufferSyncer() != null)
+                client.bufferSyncer().requestMarkBufferAsRead(bufferId);
+            provider.sendEvent(new BufferChangeEvent());
             client.backlogStorage().markBufferUnused(oldBuffer);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/util/SlidingPanelHandler.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/util/SlidingPanelHandler.java
index 167c308d68b82445e59c705eb6e15f4d34e32080..f1405818ee5d1fe847e65c08620ddf8369fef7a3 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/util/SlidingPanelHandler.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/util/SlidingPanelHandler.java
@@ -115,42 +115,106 @@ public class SlidingPanelHandler {
                 case R.id.fill_clear:
                     editor.toggleBackground(-1);
                     return true;
-                case R.id.fill_mircColor0: editor.toggleBackground(0x0); return true;
-                case R.id.fill_mircColor1: editor.toggleBackground(0x1); return true;
-                case R.id.fill_mircColor2: editor.toggleBackground(0x2); return true;
-                case R.id.fill_mircColor3: editor.toggleBackground(0x3); return true;
-                case R.id.fill_mircColor4: editor.toggleBackground(0x4); return true;
-                case R.id.fill_mircColor5: editor.toggleBackground(0x5); return true;
-                case R.id.fill_mircColor6: editor.toggleBackground(0x6); return true;
-                case R.id.fill_mircColor7: editor.toggleBackground(0x7); return true;
-                case R.id.fill_mircColor8: editor.toggleBackground(0x8); return true;
-                case R.id.fill_mircColor9: editor.toggleBackground(0x9); return true;
-                case R.id.fill_mircColorA: editor.toggleBackground(0xA); return true;
-                case R.id.fill_mircColorB: editor.toggleBackground(0xB); return true;
-                case R.id.fill_mircColorC: editor.toggleBackground(0xC); return true;
-                case R.id.fill_mircColorD: editor.toggleBackground(0xD); return true;
-                case R.id.fill_mircColorE: editor.toggleBackground(0xE); return true;
-                case R.id.fill_mircColorF: editor.toggleBackground(0xF); return true;
+                case R.id.fill_mircColor0:
+                    editor.toggleBackground(0x0);
+                    return true;
+                case R.id.fill_mircColor1:
+                    editor.toggleBackground(0x1);
+                    return true;
+                case R.id.fill_mircColor2:
+                    editor.toggleBackground(0x2);
+                    return true;
+                case R.id.fill_mircColor3:
+                    editor.toggleBackground(0x3);
+                    return true;
+                case R.id.fill_mircColor4:
+                    editor.toggleBackground(0x4);
+                    return true;
+                case R.id.fill_mircColor5:
+                    editor.toggleBackground(0x5);
+                    return true;
+                case R.id.fill_mircColor6:
+                    editor.toggleBackground(0x6);
+                    return true;
+                case R.id.fill_mircColor7:
+                    editor.toggleBackground(0x7);
+                    return true;
+                case R.id.fill_mircColor8:
+                    editor.toggleBackground(0x8);
+                    return true;
+                case R.id.fill_mircColor9:
+                    editor.toggleBackground(0x9);
+                    return true;
+                case R.id.fill_mircColorA:
+                    editor.toggleBackground(0xA);
+                    return true;
+                case R.id.fill_mircColorB:
+                    editor.toggleBackground(0xB);
+                    return true;
+                case R.id.fill_mircColorC:
+                    editor.toggleBackground(0xC);
+                    return true;
+                case R.id.fill_mircColorD:
+                    editor.toggleBackground(0xD);
+                    return true;
+                case R.id.fill_mircColorE:
+                    editor.toggleBackground(0xE);
+                    return true;
+                case R.id.fill_mircColorF:
+                    editor.toggleBackground(0xF);
+                    return true;
 
                 case R.id.paint_clear:
                     editor.toggleForeground(-1);
                     return true;
-                case R.id.paint_mircColor0: editor.toggleForeground(0x0); return true;
-                case R.id.paint_mircColor1: editor.toggleForeground(0x1); return true;
-                case R.id.paint_mircColor2: editor.toggleForeground(0x2); return true;
-                case R.id.paint_mircColor3: editor.toggleForeground(0x3); return true;
-                case R.id.paint_mircColor4: editor.toggleForeground(0x4); return true;
-                case R.id.paint_mircColor5: editor.toggleForeground(0x5); return true;
-                case R.id.paint_mircColor6: editor.toggleForeground(0x6); return true;
-                case R.id.paint_mircColor7: editor.toggleForeground(0x7); return true;
-                case R.id.paint_mircColor8: editor.toggleForeground(0x8); return true;
-                case R.id.paint_mircColor9: editor.toggleForeground(0x9); return true;
-                case R.id.paint_mircColorA: editor.toggleForeground(0xA); return true;
-                case R.id.paint_mircColorB: editor.toggleForeground(0xB); return true;
-                case R.id.paint_mircColorC: editor.toggleForeground(0xC); return true;
-                case R.id.paint_mircColorD: editor.toggleForeground(0xD); return true;
-                case R.id.paint_mircColorE: editor.toggleForeground(0xE); return true;
-                case R.id.paint_mircColorF: editor.toggleForeground(0xF); return true;
+                case R.id.paint_mircColor0:
+                    editor.toggleForeground(0x0);
+                    return true;
+                case R.id.paint_mircColor1:
+                    editor.toggleForeground(0x1);
+                    return true;
+                case R.id.paint_mircColor2:
+                    editor.toggleForeground(0x2);
+                    return true;
+                case R.id.paint_mircColor3:
+                    editor.toggleForeground(0x3);
+                    return true;
+                case R.id.paint_mircColor4:
+                    editor.toggleForeground(0x4);
+                    return true;
+                case R.id.paint_mircColor5:
+                    editor.toggleForeground(0x5);
+                    return true;
+                case R.id.paint_mircColor6:
+                    editor.toggleForeground(0x6);
+                    return true;
+                case R.id.paint_mircColor7:
+                    editor.toggleForeground(0x7);
+                    return true;
+                case R.id.paint_mircColor8:
+                    editor.toggleForeground(0x8);
+                    return true;
+                case R.id.paint_mircColor9:
+                    editor.toggleForeground(0x9);
+                    return true;
+                case R.id.paint_mircColorA:
+                    editor.toggleForeground(0xA);
+                    return true;
+                case R.id.paint_mircColorB:
+                    editor.toggleForeground(0xB);
+                    return true;
+                case R.id.paint_mircColorC:
+                    editor.toggleForeground(0xC);
+                    return true;
+                case R.id.paint_mircColorD:
+                    editor.toggleForeground(0xD);
+                    return true;
+                case R.id.paint_mircColorE:
+                    editor.toggleForeground(0xE);
+                    return true;
+                case R.id.paint_mircColorF:
+                    editor.toggleForeground(0xF);
+                    return true;
 
                 default:
                     return false;
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/chatlist/ChatListEditActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/chatlist/ChatListEditActivity.java
index e7a98fa7ec92c681924c418bc2f0b4678d21295f..af795c0a6267a4260b3492036a44c38d1b6af2f1 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/chatlist/ChatListEditActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/chatlist/ChatListEditActivity.java
@@ -147,7 +147,8 @@ public class ChatListEditActivity extends BoundActivity {
                         })
                         .build()
                         .show();
-            } return true;
+            }
+            return true;
             case R.id.action_confirm: {
                 save();
                 finish();
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityCreateActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityCreateActivity.java
index aaeef76c601da135517824d6e49bddfbccb99189..8eb5b4fb6daa6d781989934f9b20c7b5dd6f187d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityCreateActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityCreateActivity.java
@@ -167,7 +167,8 @@ public class IdentityCreateActivity extends BoundActivity {
 
                     finish();
                 }
-            } return true;
+            }
+            return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityEditActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityEditActivity.java
index 4f7c39ccd98258cfa738e4e175db90aeb414b43f..698c6a668bd33f52fb666057176afab88ffad160 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityEditActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityEditActivity.java
@@ -181,11 +181,13 @@ public class IdentityEditActivity extends BoundActivity {
                         })
                         .build()
                         .show();
-            } return true;
+            }
+            return true;
             case R.id.action_confirm: {
                 save();
                 finish();
-            } return true;
+            }
+            return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/nick/IdentityNickListActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/nick/IdentityNickListActivity.java
index 92df9f1bc9f88ecc88af2029b1603287646778d0..b7660b67ff84090c5394b448dbc967796061784a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/nick/IdentityNickListActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/nick/IdentityNickListActivity.java
@@ -143,7 +143,8 @@ public class IdentityNickListActivity extends BoundActivity implements OnStartDr
                 intent.putStringArrayListExtra("nicks", nicks);
                 setResult(RESULT_OK, intent);
                 finish();
-            } return true;
+            }
+            return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkCreateActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkCreateActivity.java
index db46e411447f612bbab9d3799c355e9476cab808..779312e4de25a4ddfb00f249cf2c24a7f2a75712 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkCreateActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkCreateActivity.java
@@ -164,13 +164,15 @@ public class NetworkCreateActivity extends BoundActivity {
             switch (requestCode) {
                 case REQUEST_PERFORM: {
 
-                } break;
+                }
+                break;
                 case REQUEST_SERVER_LIST: {
                     Parcelable[] servers = data.getParcelableArrayExtra("servers");
                     if (servers != null) {
                         serverList = NetworkServerSerializeHelper.deserialize(servers);
                     }
-                } break;
+                }
+                break;
             }
         }
     }
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkEditActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkEditActivity.java
index 3f81a5d275491ce285f1b35010325cc5febdb323..2c55f80a0f6d7f138b643735bfe57e3dce59533d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkEditActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkEditActivity.java
@@ -256,11 +256,13 @@ public class NetworkEditActivity extends BoundActivity {
                         })
                         .build()
                         .show();
-            } return true;
+            }
+            return true;
             case R.id.action_confirm: {
                 save();
                 finish();
-            } return true;
+            }
+            return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/server/NetworkServerEditActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/server/NetworkServerEditActivity.java
index d3f7800a008b7f756cb1c4e011c2c2c820c32f5b..808af7c19d3add840b99831dc9eddb52108b71ee 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/server/NetworkServerEditActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/server/NetworkServerEditActivity.java
@@ -183,7 +183,8 @@ public class NetworkServerEditActivity extends BoundActivity {
                 intent.putExtra("id", id);
                 setResult(RESULT_OK, intent);
                 finish();
-            } return true;
+            }
+            return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/server/NetworkServerListActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/server/NetworkServerListActivity.java
index 79722cd81396a69cbbe1b6bb267a2416cb92d7f5..816adac5cd81f5fce4c403a526db522f2ad08b94 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/server/NetworkServerListActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/server/NetworkServerListActivity.java
@@ -117,7 +117,8 @@ public class NetworkServerListActivity extends BoundActivity implements OnStartD
                 intent.putExtra("servers", NetworkServerSerializeHelper.serialize(servers));
                 setResult(RESULT_OK, intent);
                 finish();
-            } return true;
+            }
+            return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/AccountSelectActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/AccountSelectActivity.java
index 850bf5a5dfec20599fe7493c86f613ccc2b02fdf..7b2f8060940d73e8bbc3d4a38374238bfd3b0187 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/AccountSelectActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/AccountSelectActivity.java
@@ -42,6 +42,7 @@ public class AccountSelectActivity extends AppCompatActivity {
     static {
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
     }
+
     @Bind(R.id.view_pager)
     ViewPager viewPager;
     @Bind(R.id.btn)
diff --git a/app/src/main/java/de/kuschku/util/observables/IObservable.java b/app/src/main/java/de/kuschku/util/observables/IObservable.java
index 2ddd5fdfe93da5401edf97359f4bb3bc775af031..3ac3faf3e0bf0656a288870de6f6db0331768727 100644
--- a/app/src/main/java/de/kuschku/util/observables/IObservable.java
+++ b/app/src/main/java/de/kuschku/util/observables/IObservable.java
@@ -25,4 +25,6 @@ public interface IObservable<T> {
     void addCallback(T callback);
 
     void removeCallback(T callback);
+
+    void removeCallbacks();
 }
diff --git a/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiDrawerItemCallback.java b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiDrawerItemCallback.java
index 83b3b49d50f09ffdd3abe5341987088d7431865c..a47b30b37a3019a1c14016625f2e1dae36fbdd2f 100644
--- a/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiDrawerItemCallback.java
+++ b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiDrawerItemCallback.java
@@ -62,4 +62,9 @@ public class MultiDrawerItemCallback implements DrawerItemCallback, IObservable<
     public void removeCallback(DrawerItemCallback callback) {
         callbacks.remove(callback);
     }
+
+    @Override
+    public void removeCallbacks() {
+        callbacks.clear();
+    }
 }
diff --git a/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiElementCallbackWrapper.java b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiElementCallbackWrapper.java
index 706884a1bbdeb275cdfd06e8e3f830e533af0021..4d3e767bd982b9d5a5efdd6503cf271a0b2eee01 100644
--- a/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiElementCallbackWrapper.java
+++ b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiElementCallbackWrapper.java
@@ -75,4 +75,8 @@ public class MultiElementCallbackWrapper<T> implements ElementCallback<T> {
             callback.notifyItemChanged(element);
         }
     }
+
+    public void removeCallbacks() {
+        callbacks.clear();
+    }
 }
diff --git a/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiGeneralCallback.java b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiGeneralCallback.java
index e8e420fcd99b9c11f22442dfb90cf798414ec62a..e631589c3f3689f03818c9be0c96df7d1986534d 100644
--- a/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiGeneralCallback.java
+++ b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiGeneralCallback.java
@@ -61,4 +61,9 @@ public class MultiGeneralCallback<T> implements IObservable<GeneralCallback<T>>,
     public void removeCallback(GeneralCallback<T> callback) {
         callbacks.remove(callback);
     }
+
+    @Override
+    public void removeCallbacks() {
+        callbacks.clear();
+    }
 }
diff --git a/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUICallbackWrapper.java b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUICallbackWrapper.java
index c17076187db53a9c7dd59d8f1633f3ebe783b566..acca32cb8dbb17f0722d405a1ba9978624c465b6 100644
--- a/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUICallbackWrapper.java
+++ b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUICallbackWrapper.java
@@ -101,4 +101,8 @@ public class MultiUICallbackWrapper implements UICallback {
             callback.notifyItemRangeRemoved(position, count);
         }
     }
+
+    public void removeCallbacks() {
+        callbacks.clear();
+    }
 }
diff --git a/app/src/main/java/de/kuschku/util/observables/lists/ObservableElementList.java b/app/src/main/java/de/kuschku/util/observables/lists/ObservableElementList.java
index e06a1d3d1d087b21cf93df42e888a42537257752..dc45cae95896d68d3b9e0c9037c58bd0b1ffa5a4 100644
--- a/app/src/main/java/de/kuschku/util/observables/lists/ObservableElementList.java
+++ b/app/src/main/java/de/kuschku/util/observables/lists/ObservableElementList.java
@@ -55,6 +55,11 @@ public class ObservableElementList<T> extends ArrayList<T> implements IObservabl
         this.callback.removeCallback(callback);
     }
 
+    @Override
+    public void removeCallbacks() {
+        callback.removeCallbacks();
+    }
+
     private int getPosition() {
         return isEmpty() ? 0 : size() - 1;
     }
diff --git a/app/src/main/java/de/kuschku/util/observables/lists/ObservableList.java b/app/src/main/java/de/kuschku/util/observables/lists/ObservableList.java
index 1a2935c3b7797014ee194c95eb2354a808ace365..d11b287806582570af196fe971b908ecba0915f6 100644
--- a/app/src/main/java/de/kuschku/util/observables/lists/ObservableList.java
+++ b/app/src/main/java/de/kuschku/util/observables/lists/ObservableList.java
@@ -54,6 +54,11 @@ public class ObservableList<T> extends ArrayList<T> implements IObservableList<U
         this.callback.removeCallback(callback);
     }
 
+    @Override
+    public void removeCallbacks() {
+        callback.removeCallbacks();
+    }
+
     private int getPosition() {
         return isEmpty() ? 0 : size() - 1;
     }
diff --git a/app/src/main/java/de/kuschku/util/observables/lists/ObservableSet.java b/app/src/main/java/de/kuschku/util/observables/lists/ObservableSet.java
index 8efa231a938327e096c1b85b67cf9b3e618d2315..a0832a1fb83b1227179b4fb8e6350bcc46cee17f 100644
--- a/app/src/main/java/de/kuschku/util/observables/lists/ObservableSet.java
+++ b/app/src/main/java/de/kuschku/util/observables/lists/ObservableSet.java
@@ -66,6 +66,11 @@ public class ObservableSet<T> extends HashSet<T> implements IObservableSet<Eleme
         this.callback.removeCallback(callback);
     }
 
+    @Override
+    public void removeCallbacks() {
+        callback.removeCallbacks();
+    }
+
     @Override
     public boolean add(T object) {
         assertNotNull(this.callback);
diff --git a/app/src/main/java/de/kuschku/util/observables/lists/ObservableSortedList.java b/app/src/main/java/de/kuschku/util/observables/lists/ObservableSortedList.java
index c26dfea1905260e97cc9b2710d7365f700fba5f6..3ce351543a23f011c741a23a11ecb1740569a185 100644
--- a/app/src/main/java/de/kuschku/util/observables/lists/ObservableSortedList.java
+++ b/app/src/main/java/de/kuschku/util/observables/lists/ObservableSortedList.java
@@ -71,6 +71,11 @@ public class ObservableSortedList<T> implements IObservableList<UICallback, T> {
         this.callback.removeCallback(callback);
     }
 
+    @Override
+    public void removeCallbacks() {
+        callback.removeCallbacks();
+    }
+
     public void setComparator(@NonNull ItemComparator<T> comparator) {
         this.comparator = comparator;
     }
diff --git a/app/src/main/res/drawable/badge.xml b/app/src/main/res/drawable/badge.xml
index 568414bec386401a7649b5de5cde3326f17689f8..8d3a3640f612de1dd1394ce1aeb7763885ce7983 100644
--- a/app/src/main/res/drawable/badge.xml
+++ b/app/src/main/res/drawable/badge.xml
@@ -20,11 +20,11 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/md_red_500" />
+    <solid android:color="@color/md_red_500"/>
     <padding
         android:bottom="10dp"
         android:left="10dp"
         android:right="10dp"
-        android:top="10dp" />
-    <corners android:radius="6dp" />
+        android:top="10dp"/>
+    <corners android:radius="6dp"/>
 </shape>
diff --git a/app/src/main/res/layout-sw600dp-land/activity_setup.xml b/app/src/main/res/layout-sw600dp-land/activity_setup.xml
index 6dd588f4632f0bea23457ac7b270f5f2be42a95a..646a6c6affdfa9b5f8773b4fbe32daf1accab4d3 100644
--- a/app/src/main/res/layout-sw600dp-land/activity_setup.xml
+++ b/app/src/main/res/layout-sw600dp-land/activity_setup.xml
@@ -29,7 +29,7 @@
     <android.support.v4.view.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"/>
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/btn"
diff --git a/app/src/main/res/layout-sw600dp-land/slide.xml b/app/src/main/res/layout-sw600dp-land/slide.xml
index 811bd333df95796835f0ecd79a70ac263237aee3..917c81a2a893152d2bd8d4465801882bd3b0f6c2 100644
--- a/app/src/main/res/layout-sw600dp-land/slide.xml
+++ b/app/src/main/res/layout-sw600dp-land/slide.xml
@@ -20,25 +20,25 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="64dp"
-    android:paddingRight="64dp">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="64dp"
+                android:paddingRight="64dp">
 
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/view"
-        android:layout_toLeftOf="@+id/scrollView2"
-        android:layout_toStartOf="@+id/scrollView2"
-        android:gravity="end"
-        android:paddingEnd="64dp"
-        android:paddingRight="64dp"
-        android:text="@string/slideAccountcoreTitle"
-        android:textColor="@android:color/white"
-        android:textSize="28sp"
-        android:textStyle="bold" />
+              android:id="@+id/title"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_above="@+id/view"
+              android:layout_toLeftOf="@+id/scrollView2"
+              android:layout_toStartOf="@+id/scrollView2"
+              android:gravity="end"
+              android:paddingEnd="64dp"
+              android:paddingRight="64dp"
+              android:text="@string/slideAccountcoreTitle"
+              android:textColor="@android:color/white"
+              android:textSize="28sp"
+              android:textStyle="bold"/>
 
     <android.support.v4.widget.Space
         android:id="@+id/view"
@@ -46,21 +46,21 @@
         android:layout_height="32dp"
         android:layout_centerVertical="true"
         android:layout_toLeftOf="@+id/scrollView2"
-        android:layout_toStartOf="@+id/scrollView2" />
+        android:layout_toStartOf="@+id/scrollView2"/>
 
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/description"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/view"
-        android:layout_toLeftOf="@+id/scrollView2"
-        android:layout_toStartOf="@+id/scrollView2"
-        android:gravity="end"
-        android:paddingEnd="64dp"
-        android:paddingRight="64dp"
-        android:text="@string/slideAccountcoreDescription"
-        android:textColor="@android:color/white"
-        android:textSize="16sp" />
+              android:id="@+id/description"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_below="@+id/view"
+              android:layout_toLeftOf="@+id/scrollView2"
+              android:layout_toStartOf="@+id/scrollView2"
+              android:gravity="end"
+              android:paddingEnd="64dp"
+              android:paddingRight="64dp"
+              android:text="@string/slideAccountcoreDescription"
+              android:textColor="@android:color/white"
+              android:textSize="16sp"/>
 
     <ScrollView
         android:id="@+id/scrollView2"
@@ -75,7 +75,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/md_light_cards"
-            android:minHeight="400dp" />
+            android:minHeight="400dp"/>
 
     </ScrollView>
 
diff --git a/app/src/main/res/layout-sw600dp/activity_setup.xml b/app/src/main/res/layout-sw600dp/activity_setup.xml
index b24493cf596519656dd2f05b1f352821f8065cad..cccdf4bfe5e32a676e8b166bf24def69bda53cf6 100644
--- a/app/src/main/res/layout-sw600dp/activity_setup.xml
+++ b/app/src/main/res/layout-sw600dp/activity_setup.xml
@@ -29,7 +29,7 @@
     <android.support.v4.view.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"/>
 
     <FrameLayout
         android:layout_width="400dp"
diff --git a/app/src/main/res/layout/activity_channel_detail.xml b/app/src/main/res/layout/activity_channel_detail.xml
index 564f036e32156e2811453ba1a547b2a927755ff5..6f456c8a7e6f915990fbc382640b999061903c1f 100644
--- a/app/src/main/res/layout/activity_channel_detail.xml
+++ b/app/src/main/res/layout/activity_channel_detail.xml
@@ -20,9 +20,9 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <android.support.design.widget.AppBarLayout
         android:id="@+id/appBar"
@@ -33,7 +33,7 @@
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
+            android:layout_height="?attr/actionBarSize"/>
 
     </android.support.design.widget.AppBarLayout>
 
@@ -45,6 +45,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
+
             <TextView
                 style="@style/TextAppearance.AppCompat.Button"
                 android:layout_width="match_parent"
@@ -53,7 +54,7 @@
                 android:layout_marginRight="16dp"
                 android:gravity="fill_vertical"
                 android:text="@string/topic"
-                android:textColor="?attr/colorAccent" />
+                android:textColor="?attr/colorAccent"/>
 
             <TextView
                 android:id="@+id/topic"
@@ -62,7 +63,7 @@
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead"
-                android:textColor="?attr/colorForeground" />
+                android:textColor="?attr/colorForeground"/>
 
             <android.support.v7.widget.AppCompatButton
                 android:id="@+id/edit_topic"
@@ -78,7 +79,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_marginTop="16dp"
-                android:background="?attr/colorDivider" />
+                android:background="?attr/colorDivider"/>
 
             <TextView
                 style="@style/TextAppearance.AppCompat.Button"
@@ -88,7 +89,7 @@
                 android:layout_marginRight="16dp"
                 android:gravity="fill_vertical"
                 android:text="@string/channel_modes"
-                android:textColor="?attr/colorAccent" />
+                android:textColor="?attr/colorAccent"/>
 
             <LinearLayout
                 android:id="@+id/modes"
@@ -97,7 +98,7 @@
                 android:orientation="vertical"
                 android:paddingBottom="8dp"
                 android:paddingLeft="8dp"
-                android:paddingRight="8dp" />
+                android:paddingRight="8dp"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index e56a9a9853dd74a773828e7f4483d8f37ac91c7d..799cfa876f7f71f238347d44571ffd13fcec11e2 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -20,27 +20,27 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="?attr/actionBarTheme">
+                                                xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                android:layout_width="match_parent"
+                                                android:layout_height="wrap_content"
+                                                android:theme="?attr/actionBarTheme">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
     </android.support.design.widget.AppBarLayout>
 
     <FrameLayout
         android:id="@+id/content_host"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 70aadb377d3fb71c6547cd4fe9c06628d26ea29a..af00b261764b4c8b1cae6b4f4f3f488f579f2dbc 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -29,7 +29,7 @@
     <android.support.v4.view.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"/>
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/btn"
diff --git a/app/src/main/res/layout/dialog_login.xml b/app/src/main/res/layout/dialog_login.xml
index d9cc2ea0de4cda70b14177b6e1c3ef59836eb731..0812a14267f47c2255d1998521fbf03cf9c8f73c 100644
--- a/app/src/main/res/layout/dialog_login.xml
+++ b/app/src/main/res/layout/dialog_login.xml
@@ -29,25 +29,28 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin">
+
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <android.support.v7.widget.AppCompatEditText
             android:id="@+id/username"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/labelUsername"
-            android:inputType="text" />
+            android:inputType="text"/>
     </android.support.design.widget.TextInputLayout>
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <android.support.v7.widget.AppCompatEditText
             android:id="@+id/password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/labelPassword"
-            android:inputType="textPassword" />
+            android:inputType="textPassword"/>
     </android.support.design.widget.TextInputLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_chat.xml b/app/src/main/res/layout/fragment_chat.xml
index 002c1ebe1f35f71ec3dc08987df19b038b799bf2..e1f899f015ca1faae71baf59c167342fa38c037f 100644
--- a/app/src/main/res/layout/fragment_chat.xml
+++ b/app/src/main/res/layout/fragment_chat.xml
@@ -42,7 +42,7 @@
             android:id="@+id/messages"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:clickable="true" />
+            android:clickable="true"/>
 
         <android.support.design.widget.FloatingActionButton
             android:id="@+id/scroll_down"
@@ -62,6 +62,6 @@
 
     </FrameLayout>
 
-    <include layout="@layout/widget_slider" />
+    <include layout="@layout/widget_slider"/>
 
 </com.sothree.slidinguppanel.SlidingUpPanelLayout>
diff --git a/app/src/main/res/layout/seek_bar_preference.xml b/app/src/main/res/layout/seek_bar_preference.xml
index f95ee3aa5b2cdb1da038ccb1de15f9e2778b37f8..0be9ccbb4d47a04526a0670b1e45f5686be39a29 100644
--- a/app/src/main/res/layout/seek_bar_preference.xml
+++ b/app/src/main/res/layout/seek_bar_preference.xml
@@ -20,11 +20,11 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@android:id/widget_frame"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:padding="4dp">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:id="@android:id/widget_frame"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:padding="4dp">
 
     <android.support.v7.widget.AppCompatSeekBar
         android:id="@+id/seekBarPrefSeekBar"
@@ -35,7 +35,7 @@
         android:layout_centerVertical="true"
         android:layout_margin="4dp"
         android:layout_toEndOf="@+id/seekBarPrefValue"
-        android:layout_toRightOf="@+id/seekBarPrefValue" />
+        android:layout_toRightOf="@+id/seekBarPrefValue"/>
 
     <TextView
         android:id="@+id/seekBarPrefValue"
@@ -46,6 +46,6 @@
         android:layout_centerVertical="true"
         android:layout_margin="4dp"
         android:gravity="end"
-        tools:text="16" />
+        tools:text="16"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/slide.xml b/app/src/main/res/layout/slide.xml
index 17b39ffe7205c1192cee2fe1fb6586381f732c7d..37f850a7ce763802ae6bb9ab3433c5ca6cc8f05b 100644
--- a/app/src/main/res/layout/slide.xml
+++ b/app/src/main/res/layout/slide.xml
@@ -24,7 +24,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/md_light_cards" >
+    android:background="@color/md_light_cards">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -39,29 +39,29 @@
             android:padding="32dp">
 
             <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="32dp"
-                android:text="@string/slideAccountcoreTitle"
-                android:textColor="@android:color/white"
-                android:textSize="28sp"
-                android:textStyle="bold" />
+                      android:id="@+id/title"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_marginBottom="32dp"
+                      android:text="@string/slideAccountcoreTitle"
+                      android:textColor="@android:color/white"
+                      android:textSize="28sp"
+                      android:textStyle="bold"/>
 
             <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/slideAccountcoreDescription"
-                android:textColor="@android:color/white"
-                android:textSize="16sp" />
+                      android:id="@+id/description"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:text="@string/slideAccountcoreDescription"
+                      android:textColor="@android:color/white"
+                      android:textSize="16sp"/>
 
         </LinearLayout>
 
         <FrameLayout
             android:id="@+id/content_host"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/slide_account_core.xml b/app/src/main/res/layout/slide_account_core.xml
index 7918dd1e2677cfacc8317fb0426cdf1709e23371..0f0dc4dc305f7cc1b55445b79bf860b22d12fe6b 100644
--- a/app/src/main/res/layout/slide_account_core.xml
+++ b/app/src/main/res/layout/slide_account_core.xml
@@ -22,26 +22,28 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     android:padding="32dp">
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/labelHostname">
+
         <android.support.design.widget.TextInputEditText
             android:id="@+id/host"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="textUri" />
+            android:inputType="textUri"/>
     </android.support.design.widget.TextInputLayout>
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/labelPort">
+
         <android.support.design.widget.TextInputEditText
             android:id="@+id/port"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/slide_account_name.xml b/app/src/main/res/layout/slide_account_name.xml
index 2d4a66a89715d99478765d16a9d68f2508297890..f1a174113820c454b50e49d475ae55594649d537 100644
--- a/app/src/main/res/layout/slide_account_name.xml
+++ b/app/src/main/res/layout/slide_account_name.xml
@@ -31,6 +31,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/account_name">
+
         <android.support.design.widget.TextInputEditText
             android:id="@+id/name"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/slide_account_user.xml b/app/src/main/res/layout/slide_account_user.xml
index d20320cc3ad3ca660171330caa21a02d694bc68c..506fa70b276eaaf00d89670a49b98b0a1be6c6c1 100644
--- a/app/src/main/res/layout/slide_account_user.xml
+++ b/app/src/main/res/layout/slide_account_user.xml
@@ -31,22 +31,24 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/username">
+
         <android.support.design.widget.TextInputEditText
             android:id="@+id/user"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="textVisiblePassword" />
+            android:inputType="textVisiblePassword"/>
     </android.support.design.widget.TextInputLayout>
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/password">
+
         <android.support.design.widget.TextInputEditText
             android:id="@+id/pass"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="textPassword" />
+            android:inputType="textPassword"/>
     </android.support.design.widget.TextInputLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/slide_core_setup_backend.xml b/app/src/main/res/layout/slide_core_setup_backend.xml
index d58df4afafc983d923a60827647a96668b30babd..c74f19d5f00b1d45fc4984f6b5ded2064bdf4466 100644
--- a/app/src/main/res/layout/slide_core_setup_backend.xml
+++ b/app/src/main/res/layout/slide_core_setup_backend.xml
@@ -25,9 +25,10 @@
     android:layout_width="match_parent"
     android:layout_height="400dp"
     android:padding="32dp">
+
     <LinearLayout
         android:id="@+id/container"
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:orientation="vertical"/>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/slide_select.xml b/app/src/main/res/layout/slide_select.xml
index 9cd2f7aa6b8cde3d0acf9f822a39def3a54d3256..baecf3099bbb08cbcdcb3940218f4eff2a876151 100644
--- a/app/src/main/res/layout/slide_select.xml
+++ b/app/src/main/res/layout/slide_select.xml
@@ -23,4 +23,4 @@
 <android.support.v7.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="400dp" />
+    android:layout_height="400dp"/>
diff --git a/app/src/main/res/layout/widget_actionbar.xml b/app/src/main/res/layout/widget_actionbar.xml
index 8ef7e3e080ecb4751d7bc1fb361e41be74d1b4bd..f8f3e6b0d43fae0a7c71f8e516b11c394a84c725 100644
--- a/app/src/main/res/layout/widget_actionbar.xml
+++ b/app/src/main/res/layout/widget_actionbar.xml
@@ -35,16 +35,16 @@
         app:popupTheme="@style/AppTheme.PopupOverlay">
 
         <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/toolbar_action_area"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:clickable="true"
-            android:gravity="center_vertical|start"
-            android:minHeight="?attr/actionBarSize"
-            android:orientation="vertical"
-            android:paddingLeft="@dimen/action_bar_default_padding_start_material"
-            android:paddingStart="@dimen/action_bar_default_padding_start_material">
+                      android:id="@+id/toolbar_action_area"
+                      android:layout_width="fill_parent"
+                      android:layout_height="fill_parent"
+                      android:background="?attr/selectableItemBackgroundBorderless"
+                      android:clickable="true"
+                      android:gravity="center_vertical|start"
+                      android:minHeight="?attr/actionBarSize"
+                      android:orientation="vertical"
+                      android:paddingLeft="@dimen/action_bar_default_padding_start_material"
+                      android:paddingStart="@dimen/action_bar_default_padding_start_material">
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -64,7 +64,7 @@
                     android:layout_marginTop="2dp"
                     android:gravity="center"
                     android:textSize="16sp"
-                    android:visibility="gone" />
+                    android:visibility="gone"/>
 
                 <TextView
                     android:id="@+id/toolbar_title"
@@ -74,7 +74,7 @@
                     android:ellipsize="end"
                     android:gravity="center_vertical"
                     android:singleLine="true"
-                    android:text="@string/appName" />
+                    android:text="@string/appName"/>
 
             </LinearLayout>
 
@@ -86,7 +86,7 @@
                 android:layout_marginTop="-3dp"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:visibility="gone" />
+                android:visibility="gone"/>
         </LinearLayout>
 
     </android.support.v7.widget.Toolbar>
diff --git a/app/src/main/res/layout/widget_buffer.xml b/app/src/main/res/layout/widget_buffer.xml
index 11744dd70d8d2862de3183745f496cb0bb5d1bfa..a1dc8d429c243ac0aaf4399b349dfd1388bb91eb 100644
--- a/app/src/main/res/layout/widget_buffer.xml
+++ b/app/src/main/res/layout/widget_buffer.xml
@@ -20,15 +20,15 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/material_drawer_item_secondary"
-    android:clickable="true"
-    android:orientation="horizontal"
-    android:paddingEnd="@dimen/material_drawer_vertical_padding"
-    android:paddingLeft="@dimen/material_drawer_vertical_padding"
-    android:paddingRight="@dimen/material_drawer_vertical_padding"
-    android:paddingStart="@dimen/material_drawer_vertical_padding">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="@dimen/material_drawer_item_secondary"
+              android:clickable="true"
+              android:orientation="horizontal"
+              android:paddingEnd="@dimen/material_drawer_vertical_padding"
+              android:paddingLeft="@dimen/material_drawer_vertical_padding"
+              android:paddingRight="@dimen/material_drawer_vertical_padding"
+              android:paddingStart="@dimen/material_drawer_vertical_padding">
 
     <ImageView
         android:id="@+id/material_drawer_icon"
@@ -40,7 +40,7 @@
         android:paddingLeft="0dp"
         android:paddingRight="@dimen/material_drawer_item_secondary_icon_padding_right"
         android:paddingStart="0dp"
-        android:paddingTop="@dimen/material_drawer_item_secondary_icon_padding" />
+        android:paddingTop="@dimen/material_drawer_item_secondary_icon_padding"/>
 
     <LinearLayout
         android:layout_width="0dp"
@@ -58,7 +58,7 @@
             android:lines="1"
             android:singleLine="true"
             android:textSize="@dimen/material_drawer_item_secondary_text"
-            tools:text="Some secondary text" />
+            tools:text="Some secondary text"/>
 
         <TextView
             android:id="@+id/material_drawer_description"
@@ -69,7 +69,7 @@
             android:lines="1"
             android:singleLine="true"
             android:textSize="@dimen/material_drawer_item_secondary_description"
-            tools:text="Some drawer text" />
+            tools:text="Some drawer text"/>
 
     </LinearLayout>
 
@@ -96,7 +96,7 @@
             android:singleLine="true"
             android:textColor="@color/md_white_1000"
             android:textSize="@dimen/material_drawer_item_secondary_text"
-            tools:text="99+" />
+            tools:text="99+"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/widget_channel_mode.xml b/app/src/main/res/layout/widget_channel_mode.xml
index 6842f07b241e5dee5c6fa5c81666ea520a4fea95..672ddc39733fe64796515bb0fb3a02e0e2291959 100644
--- a/app/src/main/res/layout/widget_channel_mode.xml
+++ b/app/src/main/res/layout/widget_channel_mode.xml
@@ -20,16 +20,16 @@
   -->
 
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="4dp"
-    app:cardBackgroundColor="?attr/colorBackgroundCard"
-    app:cardUseCompatPadding="true"
-    app:contentPaddingBottom="16dp"
-    app:contentPaddingLeft="16dp"
-    app:contentPaddingRight="16dp"
-    app:contentPaddingTop="16dp">
+                                    xmlns:app="http://schemas.android.com/apk/res-auto"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_margin="4dp"
+                                    app:cardBackgroundColor="?attr/colorBackgroundCard"
+                                    app:cardUseCompatPadding="true"
+                                    app:contentPaddingBottom="16dp"
+                                    app:contentPaddingLeft="16dp"
+                                    app:contentPaddingRight="16dp"
+                                    app:contentPaddingTop="16dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -41,14 +41,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"
-            android:textColor="?attr/colorForeground" />
+            android:textColor="?attr/colorForeground"/>
 
         <TextView
             android:id="@+id/description"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead"
-            android:textColor="?attr/colorForeground" />
+            android:textColor="?attr/colorForeground"/>
 
         <TextView
             android:id="@+id/value"
@@ -57,7 +57,7 @@
             android:layout_marginTop="8dp"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead"
             android:textColor="?attr/colorForeground"
-            android:visibility="gone" />
+            android:visibility="gone"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/widget_core_account.xml b/app/src/main/res/layout/widget_core_account.xml
index 769ffc1e662218ca3d23e0eda05569ec1ec616ba..c02778e3a3356a4c7f1bd6908857e8c85a5afc8e 100644
--- a/app/src/main/res/layout/widget_core_account.xml
+++ b/app/src/main/res/layout/widget_core_account.xml
@@ -21,18 +21,18 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/material_drawer_item_profile"
-    android:background="?attr/selectableItemBackground"
-    android:clickable="true"
-    android:orientation="horizontal">
+              android:layout_width="match_parent"
+              android:layout_height="@dimen/material_drawer_item_profile"
+              android:background="?attr/selectableItemBackground"
+              android:clickable="true"
+              android:orientation="horizontal">
 
     <android.support.v7.widget.AppCompatRadioButton
         android:id="@+id/account_select"
         android:layout_width="@dimen/material_drawer_item_profile_icon_width"
         android:layout_height="@dimen/material_drawer_item_profile_icon_width"
         android:layout_gravity="center_vertical"
-        android:background="@android:color/transparent" />
+        android:background="@android:color/transparent"/>
 
     <LinearLayout
         android:layout_width="0dip"
@@ -50,7 +50,7 @@
             android:gravity="center_vertical|start"
             android:lines="1"
             android:singleLine="true"
-            android:textSize="@dimen/material_drawer_item_profile_text" />
+            android:textSize="@dimen/material_drawer_item_profile_text"/>
 
         <TextView
             android:id="@+id/account_description"
@@ -60,7 +60,7 @@
             android:gravity="center_vertical|start"
             android:lines="1"
             android:singleLine="true"
-            android:textSize="@dimen/material_drawer_item_profile_description" />
+            android:textSize="@dimen/material_drawer_item_profile_description"/>
     </LinearLayout>
 
     <android.support.v7.widget.AppCompatImageButton
diff --git a/app/src/main/res/layout/widget_core_account_add.xml b/app/src/main/res/layout/widget_core_account_add.xml
index 01567be953530c734e4869516e2fad567028d2d2..a4597f2f4eef8d19dbd65a0de3aae48892c50f18 100644
--- a/app/src/main/res/layout/widget_core_account_add.xml
+++ b/app/src/main/res/layout/widget_core_account_add.xml
@@ -71,6 +71,6 @@
             android:paddingRight="@dimen/material_drawer_item_primary_icon_padding_right"
             android:singleLine="true"
             android:text="@string/add_account"
-            android:textSize="@dimen/material_drawer_item_profile_text" />
+            android:textSize="@dimen/material_drawer_item_profile_text"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_core_backend.xml b/app/src/main/res/layout/widget_core_backend.xml
index 97b2fe08f02f563b83dbc0280b520b44bb05bb24..050825bfe9d1af1fbc16cc49d898e5228663c8ec 100644
--- a/app/src/main/res/layout/widget_core_backend.xml
+++ b/app/src/main/res/layout/widget_core_backend.xml
@@ -21,28 +21,28 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:clickable="true"
-    android:orientation="horizontal">
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="?attr/selectableItemBackground"
+              android:clickable="true"
+              android:orientation="horizontal">
 
     <android.support.v7.widget.AppCompatRadioButton
         android:id="@+id/backend_select"
         android:layout_width="@dimen/material_drawer_item_profile_icon_width"
         android:layout_height="@dimen/material_drawer_item_profile_icon_width"
         android:layout_gravity="top"
-        android:layout_marginTop="12dp"
         android:layout_marginBottom="12dp"
-        android:background="@android:color/transparent" />
+        android:layout_marginTop="12dp"
+        android:background="@android:color/transparent"/>
 
     <LinearLayout
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/material_drawer_item_profile_icon_padding_right"
         android:layout_weight="1"
-        android:minHeight="56dp"
         android:gravity="center_vertical|start"
+        android:minHeight="56dp"
         android:orientation="vertical">
 
         <TextView
@@ -53,7 +53,7 @@
             android:gravity="center_vertical|start"
             android:lines="1"
             android:singleLine="true"
-            android:textSize="@dimen/material_drawer_item_profile_text" />
+            android:textSize="@dimen/material_drawer_item_profile_text"/>
 
         <TextView
             android:id="@+id/backend_description"
@@ -61,6 +61,6 @@
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif"
             android:gravity="center_vertical|start"
-            android:textSize="@dimen/material_drawer_item_profile_description" />
+            android:textSize="@dimen/material_drawer_item_profile_description"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_editor.xml b/app/src/main/res/layout/widget_editor.xml
index 8a92b0b2ae627bd1822fe2e6e2402475af6971a6..173b13ba1ec1a6c94f6083309a569b54df452702 100644
--- a/app/src/main/res/layout/widget_editor.xml
+++ b/app/src/main/res/layout/widget_editor.xml
@@ -51,7 +51,7 @@
             android:paddingRight="20dp"
             android:paddingTop="17dp"
             android:textColor="?attr/colorForeground"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </ScrollView>
 
diff --git a/app/src/main/res/layout/widget_input_string.xml b/app/src/main/res/layout/widget_input_string.xml
index 828c97647c23470d0836ec61a391c99e3cf0be4a..f641966db27f1211f5fcc1032e7f5338d0186ed2 100644
--- a/app/src/main/res/layout/widget_input_string.xml
+++ b/app/src/main/res/layout/widget_input_string.xml
@@ -25,6 +25,7 @@
     android:id="@+id/inputLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
+
     <android.support.design.widget.TextInputEditText
         android:id="@+id/editText"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/widget_slider.xml b/app/src/main/res/layout/widget_slider.xml
index aeb551b6f8328aa2f992dbee117a84f309ac761f..d1ebbc810926f1dd69503540180ac3b3994bc8be 100644
--- a/app/src/main/res/layout/widget_slider.xml
+++ b/app/src/main/res/layout/widget_slider.xml
@@ -38,7 +38,7 @@
                                                  tools:showIn="@layout/activity_main">
 
 
-    <include layout="@layout/widget_editor" />
+    <include layout="@layout/widget_editor"/>
 
     <FrameLayout
         android:id="@+id/card_panel"
@@ -68,12 +68,12 @@
                     android:paddingRight="16.0dip"
                     android:text="@string/labelHistory"
                     android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-                    android:textColor="?attr/colorForegroundSecondary" />
+                    android:textColor="?attr/colorForegroundSecondary"/>
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/msg_history"
                     android:layout_width="fill_parent"
-                    android:layout_height="fill_parent" />
+                    android:layout_height="fill_parent"/>
             </LinearLayout>
         </android.support.v7.widget.CardView>
     </FrameLayout>
diff --git a/app/src/main/res/layout/widget_spinner_item_inline.xml b/app/src/main/res/layout/widget_spinner_item_inline.xml
index 8c20aa8c8f39fa7241be4a949acd912bcd15dc2a..53e21e0ce9ad98f7fa05a728115134b7c281659b 100644
--- a/app/src/main/res/layout/widget_spinner_item_inline.xml
+++ b/app/src/main/res/layout/widget_spinner_item_inline.xml
@@ -25,4 +25,4 @@
           android:layout_height="wrap_content"
           android:gravity="center_vertical"
           android:minHeight="48dp"
-          android:textAppearance="?android:attr/textAppearanceListItemSmall" />
+          android:textAppearance="?android:attr/textAppearanceListItemSmall"/>
diff --git a/app/src/main/res/menu/chat.xml b/app/src/main/res/menu/chat.xml
index 02cb18e3f885aefdb1e3c834ad79b9be9f71e386..d0550b3a53def7420f0e83e9aaa0eac6c46701d5 100644
--- a/app/src/main/res/menu/chat.xml
+++ b/app/src/main/res/menu/chat.xml
@@ -21,7 +21,7 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+      xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_search"
         android:title="@string/label_search"
@@ -30,21 +30,21 @@
     <item
         android:id="@+id/action_hide_events"
         android:title="@string/labelHideEvents"
-        app:showAsAction="never" />
+        app:showAsAction="never"/>
     <item
         android:id="@+id/action_settings"
         android:title="@string/label_settings"
-        app:showAsAction="never" />
+        app:showAsAction="never"/>
     <item
         android:id="@+id/action_networks"
         android:title="@string/networks"
-        app:showAsAction="never" />
+        app:showAsAction="never"/>
     <item
         android:id="@+id/action_identities"
         android:title="@string/identities"
-        app:showAsAction="never" />
+        app:showAsAction="never"/>
     <item
         android:id="@+id/action_reauth"
         android:title="@string/label_disconnect"
-        app:showAsAction="never" />
+        app:showAsAction="never"/>
 </menu>
diff --git a/app/src/main/res/menu/chatlist.xml b/app/src/main/res/menu/chatlist.xml
index 191773cdc6daed348930ad714f37243626df749f..b78f2cb6cf67d2c0b264115ea823d7017e635a51 100644
--- a/app/src/main/res/menu/chatlist.xml
+++ b/app/src/main/res/menu/chatlist.xml
@@ -20,12 +20,12 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+      xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_join_channel"
         android:icon="@drawable/ic_add"
         android:title="@string/action_join_channel"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_show_all"
         android:checkable="true"
@@ -34,5 +34,5 @@
     <item
         android:id="@+id/action_manage_chat_lists"
         android:title="@string/action_manage_chat_lists"
-        app:showAsAction="never" />
+        app:showAsAction="never"/>
 </menu>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 8eb1673ab54f80e1cd1b1eecae382608f5e04918..05ae0682b54052501503010d492f4924571a2b80 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -23,73 +23,73 @@
 <resources>
     <!-- sender colors -->
 
-    <attr name="senderColor0" format="color" />
-    <attr name="senderColor1" format="color" />
-    <attr name="senderColor2" format="color" />
-    <attr name="senderColor3" format="color" />
-    <attr name="senderColor4" format="color" />
-    <attr name="senderColor5" format="color" />
-    <attr name="senderColor6" format="color" />
-    <attr name="senderColor7" format="color" />
-    <attr name="senderColor8" format="color" />
-    <attr name="senderColor9" format="color" />
-    <attr name="senderColorA" format="color" />
-    <attr name="senderColorB" format="color" />
-    <attr name="senderColorC" format="color" />
-    <attr name="senderColorD" format="color" />
-    <attr name="senderColorE" format="color" />
-    <attr name="senderColorF" format="color" />
+    <attr name="senderColor0" format="color"/>
+    <attr name="senderColor1" format="color"/>
+    <attr name="senderColor2" format="color"/>
+    <attr name="senderColor3" format="color"/>
+    <attr name="senderColor4" format="color"/>
+    <attr name="senderColor5" format="color"/>
+    <attr name="senderColor6" format="color"/>
+    <attr name="senderColor7" format="color"/>
+    <attr name="senderColor8" format="color"/>
+    <attr name="senderColor9" format="color"/>
+    <attr name="senderColorA" format="color"/>
+    <attr name="senderColorB" format="color"/>
+    <attr name="senderColorC" format="color"/>
+    <attr name="senderColorD" format="color"/>
+    <attr name="senderColorE" format="color"/>
+    <attr name="senderColorF" format="color"/>
 
     <!-- mirc colors -->
 
-    <attr name="mircColor0" format="color" />
-    <attr name="mircColor1" format="color" />
-    <attr name="mircColor2" format="color" />
-    <attr name="mircColor3" format="color" />
-    <attr name="mircColor4" format="color" />
-    <attr name="mircColor5" format="color" />
-    <attr name="mircColor6" format="color" />
-    <attr name="mircColor7" format="color" />
-    <attr name="mircColor8" format="color" />
-    <attr name="mircColor9" format="color" />
-    <attr name="mircColorA" format="color" />
-    <attr name="mircColorB" format="color" />
-    <attr name="mircColorC" format="color" />
-    <attr name="mircColorD" format="color" />
-    <attr name="mircColorE" format="color" />
-    <attr name="mircColorF" format="color" />
+    <attr name="mircColor0" format="color"/>
+    <attr name="mircColor1" format="color"/>
+    <attr name="mircColor2" format="color"/>
+    <attr name="mircColor3" format="color"/>
+    <attr name="mircColor4" format="color"/>
+    <attr name="mircColor5" format="color"/>
+    <attr name="mircColor6" format="color"/>
+    <attr name="mircColor7" format="color"/>
+    <attr name="mircColor8" format="color"/>
+    <attr name="mircColor9" format="color"/>
+    <attr name="mircColorA" format="color"/>
+    <attr name="mircColorB" format="color"/>
+    <attr name="mircColorC" format="color"/>
+    <attr name="mircColorD" format="color"/>
+    <attr name="mircColorE" format="color"/>
+    <attr name="mircColorF" format="color"/>
 
     <!-- Background and foreground colors for UI -->
 
-    <attr name="colorForeground" format="color" />
-    <attr name="colorForegroundHighlight" format="color" />
-    <attr name="colorForegroundSecondary" format="color" />
-    <attr name="colorForegroundAction" format="color" />
-    <attr name="colorForegroundError" format="color" />
+    <attr name="colorForeground" format="color"/>
+    <attr name="colorForegroundHighlight" format="color"/>
+    <attr name="colorForegroundSecondary" format="color"/>
+    <attr name="colorForegroundAction" format="color"/>
+    <attr name="colorForegroundError" format="color"/>
 
     <attr name="colorForegroundMirc" format="integer"/>
 
-    <attr name="colorAccentFocus" format="color" />
-    <attr name="colorDivider" format="color" />
+    <attr name="colorAccentFocus" format="color"/>
+    <attr name="colorDivider" format="color"/>
 
-    <attr name="colorBackground" format="color" />
-    <attr name="colorBackgroundHighlight" format="color" />
-    <attr name="colorBackgroundSecondary" format="color" />
-    <attr name="colorBackgroundCard" format="color" />
+    <attr name="colorBackground" format="color"/>
+    <attr name="colorBackgroundHighlight" format="color"/>
+    <attr name="colorBackgroundSecondary" format="color"/>
+    <attr name="colorBackgroundCard" format="color"/>
     <attr name="colorBackgroundDialog" format="color"/>
 
     <!-- Tint colors for drawer -->
 
-    <attr name="colorTintActivity" format="color" />
-    <attr name="colorTintMessage" format="color" />
-    <attr name="colorTintHighlight" format="color" />
-    <attr name="chatlineExpandedSize" />
+    <attr name="colorTintActivity" format="color"/>
+    <attr name="colorTintMessage" format="color"/>
+    <attr name="colorTintHighlight" format="color"/>
+    <attr name="chatlineExpandedSize"/>
 
     <!-- Icons -->
     <attr name="colorOffline" format="color"/>
     <attr name="colorAway" format="color"/>
     <attr name="colorFill" format="color"/>
 
-    <attr name="formatBarTheme" format="reference" />
-    <attr name="cardStyle" format="reference" />
+    <attr name="formatBarTheme" format="reference"/>
+    <attr name="cardStyle" format="reference"/>
 </resources>
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 6f8df7cd61f518913cb19e1912ed550bda1d7406..046d53ec073aa9943956938c096debf194179689 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -21,9 +21,9 @@
   -->
 
 <resources>
-    <item name="custom_url_span" type="id" />
-    <item name="custom_channel_span" type="id" />
-    <item name="item_create_account" type="id" />
-    <item name="item_account" type="id" />
+    <item name="custom_url_span" type="id"/>
+    <item name="custom_channel_span" type="id"/>
+    <item name="item_create_account" type="id"/>
+    <item name="item_account" type="id"/>
     <item name="item_backend" type="id"/>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1881c90cec0744473619305218a3be340cb5882f..14eab8029cc19e621b97b8f37a5446e0fea862d8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -112,5 +112,5 @@
         <item name="color">?attr/colorControlNormal</item>
     </style>
 
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index f8ef1426de4f404bfb5087d236392091423302b0..46bf3d6924d66253419a17f192418c4fee0e20e5 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -21,6 +21,7 @@
   -->
 
 <resources>
+
     <style name="Quassel_Light" parent="AppTheme.Light">
         <item name="senderColor0">#e90d7f</item>
         <item name="senderColor1">#8e55e9</item>
diff --git a/app/src/main/res/xml/pref_appearance.xml b/app/src/main/res/xml/pref_appearance.xml
index c0b5a5bf444e51e2c0a6238c471776d1fe45034d..7668ae01b866e5b44015e916df5a316be8a0db32 100644
--- a/app/src/main/res/xml/pref_appearance.xml
+++ b/app/src/main/res/xml/pref_appearance.xml
@@ -26,30 +26,30 @@
         android:entries="@array/preference_theme_entries"
         android:entryValues="@array/preference_theme_values"
         android:key="@string/preference_theme"
-        android:title="@string/preference_theme_title" />
+        android:title="@string/preference_theme_title"/>
 
     <SwitchPreference
         android:key="@string/preference_colors"
         android:summaryOff="@string/preference_colors_summary_off"
         android:summaryOn="@string/preference_colors_summary_on"
-        android:title="@string/preference_colors_title" />
+        android:title="@string/preference_colors_title"/>
 
     <SwitchPreference
         android:key="@string/preference_hostmask"
         android:summaryOff="@string/preference_hostmask_summary_off"
         android:summaryOn="@string/preference_hostmask_summary_on"
-        android:title="@string/preference_hostmask_title" />
+        android:title="@string/preference_hostmask_title"/>
 
     <SwitchPreference
         android:key="@string/preference_lag"
         android:summaryOff="@string/preference_lag_summary_off"
         android:summaryOn="@string/preference_lag_summary_on"
-        android:title="@string/preference_lag_title" />
+        android:title="@string/preference_lag_title"/>
 
     <SwitchPreference
         android:key="@string/preference_brackets"
         android:summaryOff="@string/preference_brackets_summary_off"
         android:summaryOn="@string/preference_brackets_summary_on"
-        android:title="@string/preference_brackets_title" />
+        android:title="@string/preference_brackets_title"/>
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_overview.xml b/app/src/main/res/xml/pref_overview.xml
index d997aef11c8ea6bae33133fa7c19e83567c5fdc3..66e9b983de62d9db76dc0bfdae5fef6666298f51 100644
--- a/app/src/main/res/xml/pref_overview.xml
+++ b/app/src/main/res/xml/pref_overview.xml
@@ -25,7 +25,7 @@
 
         <Preference
             android:summary="@string/appDescriptionLong"
-            android:title="@string/app_name" />
+            android:title="@string/app_name"/>
 
     </PreferenceScreen>