diff --git a/app/src/main/res/color/material_dark_foreground_hint.xml b/app/src/main/res/color/material_dark_foreground_hint.xml
index 4d3e59e8b..4dcb16b68 100644
--- a/app/src/main/res/color/material_dark_foreground_hint.xml
+++ b/app/src/main/res/color/material_dark_foreground_hint.xml
@@ -12,9 +12,9 @@
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:state_enabled="true"
-      android:state_pressed="true"
-      android:alpha="@dimen/material_dark_hint_pressed_alpha"
-      android:color="@color/foreground_material_dark" />
+    android:state_pressed="true"
+    android:alpha="@dimen/material_dark_hint_pressed_alpha"
+    android:color="@color/foreground_material_dark" />
   <item android:alpha="@dimen/material_light_hint_alpha"
-      android:color="@color/foreground_material_dark" />
+    android:color="@color/foreground_material_dark" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_bookmarks.xml b/app/src/main/res/layout/activity_bookmarks.xml
index ab35c9da8..4595e59cd 100644
--- a/app/src/main/res/layout/activity_bookmarks.xml
+++ b/app/src/main/res/layout/activity_bookmarks.xml
@@ -1,77 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/bookmarks_activity_layout"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:fitsSystemWindows="true"
-    tools:context=".BookmarksActivity">
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/bookmarks_activity_layout"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:fitsSystemWindows="true"
+  tools:context=".BookmarksActivity">
 
-    <LinearLayout
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      android:id="@+id/toolbar_layout"
+      android:layout_width="match_parent"
+      android:layout_height="?actionBarSize">
+
+      <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?actionBarSize"
+        android:background="?colorPrimaryDark"
+        app:popupTheme="@style/AppTheme.PopupOverlay"
+        app:theme="@style/AppTheme.AppBarOverlay" />
+    </RelativeLayout>
+
+    <RelativeLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent">
+
+      <ListView
+        android:id="@+id/bookmarks_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                        xmlns:app="http://schemas.android.com/apk/res-auto"
-                        android:id="@+id/toolbar_layout"
-                        android:layout_width="match_parent"
-                        android:layout_height="?actionBarSize">
-
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?actionBarSize"
-                android:background="?colorPrimaryDark"
-                app:popupTheme="@style/AppTheme.PopupOverlay"
-                app:theme="@style/AppTheme.AppBarOverlay"/>
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ListView
-                android:id="@+id/bookmarks_list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="?attr/listBackground"/>
+        android:background="?attr/listBackground" />
 
 
-            <LinearLayout
-                android:id="@+id/bookmarks_none_linlayout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="gone">
+      <LinearLayout
+        android:id="@+id/bookmarks_none_linlayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone">
 
-                <ImageView
-                    android:layout_width="@dimen/dimen_100dp"
-                    android:layout_height="@dimen/dimen_100dp"
-                    android:src="@drawable/ic_star_yellow"/>
+        <ImageView
+          android:layout_width="@dimen/dimen_100dp"
+          android:layout_height="@dimen/dimen_100dp"
+          android:src="@drawable/ic_star_yellow" />
 
-                <TextView
-                    style="@android:style/TextAppearance.Large"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:gravity="center"
-                    android:paddingBottom="@dimen/dimen_15dp"
-                    android:paddingLeft="@dimen/dimen_10dp"
-                    android:paddingRight="@dimen/dimen_10dp"
-                    android:paddingTop="@dimen/dimen_15dp"
-                    android:text="@string/no_bookmarks"
-                    android:visibility="visible"/>
+        <TextView
+          style="@android:style/TextAppearance.Large"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_centerInParent="true"
+          android:gravity="center"
+          android:paddingBottom="@dimen/dimen_15dp"
+          android:paddingLeft="@dimen/dimen_10dp"
+          android:paddingRight="@dimen/dimen_10dp"
+          android:paddingTop="@dimen/dimen_15dp"
+          android:text="@string/no_bookmarks"
+          android:visibility="visible" />
 
-            </LinearLayout>
+      </LinearLayout>
 
 
-        </RelativeLayout>
+    </RelativeLayout>
 
-    </LinearLayout>
+  </LinearLayout>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_library.xml b/app/src/main/res/layout/activity_library.xml
index d373b2793..d6341ca6e 100644
--- a/app/src/main/res/layout/activity_library.xml
+++ b/app/src/main/res/layout/activity_library.xml
@@ -28,19 +28,19 @@
       android:id="@+id/network_permission_text"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/network_permission_text_margin_top"
       android:layout_centerHorizontal="true"
+      android:layout_marginTop="@dimen/network_permission_text_margin_top"
       android:text="@string/get_library_over_network"
-      android:visibility="gone"/>
+      android:visibility="gone" />
 
     <Button
       android:id="@+id/network_permission_button"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/network_permission_button_margin_top"
       android:layout_centerHorizontal="true"
+      android:layout_marginTop="@dimen/network_permission_button_margin_top"
       android:text="@string/proceed"
-      android:visibility="gone"/>
+      android:visibility="gone" />
 
     <android.support.v4.widget.SwipeRefreshLayout
       android:id="@+id/library_swiperefresh"
@@ -51,9 +51,9 @@
         android:id="@+id/library_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingBottom="@dimen/library_article_list_padding"
         android:background="?attr/listBackground"
-        android:divider="@null"/>
+        android:divider="@null"
+        android:paddingBottom="@dimen/library_article_list_padding" />
 
     </android.support.v4.widget.SwipeRefreshLayout>
 
diff --git a/app/src/main/res/layout/bookmark_tab.xml b/app/src/main/res/layout/bookmark_tab.xml
index db8ccf4dc..e409281bb 100644
--- a/app/src/main/res/layout/bookmark_tab.xml
+++ b/app/src/main/res/layout/bookmark_tab.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <ImageView
-        android:id="@+id/bookmark_tab_icon"
-        android:layout_width="@dimen/dimen_24dp"
-        android:layout_height="@dimen/dimen_24dp"
-        android:layout_centerInParent="true"
-        android:background="@drawable/action_bookmark"
-        android:contentDescription="@string/menu_bookmarks" />
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content">
+
+  <ImageView
+    android:id="@+id/bookmark_tab_icon"
+    android:layout_width="@dimen/dimen_24dp"
+    android:layout_height="@dimen/dimen_24dp"
+    android:layout_centerInParent="true"
+    android:background="@drawable/action_bookmark"
+    android:contentDescription="@string/menu_bookmarks" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bookmarks_row.xml b/app/src/main/res/layout/bookmarks_row.xml
index 375d16588..b06886991 100644
--- a/app/src/main/res/layout/bookmarks_row.xml
+++ b/app/src/main/res/layout/bookmarks_row.xml
@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:orientation="horizontal"
-    android:layout_height="wrap_content">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:orientation="horizontal">
 
 
   <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="?attr/selectableItemBackground">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground">
 
     <TextView
-        android:id="@+id/bookmark_title"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_margin="@dimen/dimen_15dp"
-        android:textColor="@drawable/bookmarks_selector"
-        android:textSize="@dimen/bookmark_title_text_size"
-        />
+      android:id="@+id/bookmark_title"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:layout_margin="@dimen/dimen_15dp"
+      android:textColor="@drawable/bookmarks_selector"
+      android:textSize="@dimen/bookmark_title_text_size" />
 
 
   </LinearLayout>
 
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/credits_webview.xml b/app/src/main/res/layout/credits_webview.xml
index 9fa4e6eb8..d951c0a9b 100644
--- a/app/src/main/res/layout/credits_webview.xml
+++ b/app/src/main/res/layout/credits_webview.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<WebView
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<WebView xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  />
\ No newline at end of file
+  android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml
index 6640bedbb..3d29a952d 100644
--- a/app/src/main/res/layout/download_item.xml
+++ b/app/src/main/res/layout/download_item.xml
@@ -1,100 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  android:orientation="horizontal"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:minHeight="?android:attr/listPreferredItemHeight"
-  android:paddingTop="@dimen/activity_vertical_margin"
+  android:orientation="horizontal"
   android:paddingLeft="@dimen/activity_horizontal_margin"
-  android:paddingRight="@dimen/activity_horizontal_margin">
+  android:paddingRight="@dimen/activity_horizontal_margin"
+  android:paddingTop="@dimen/activity_vertical_margin">
 
   <ImageView
+    android:id="@+id/favicon"
     android:layout_width="@dimen/dimen_48dp"
     android:layout_height="wrap_content"
+    android:layout_gravity="center"
     android:layout_marginRight="@dimen/dimen_medium_padding"
     android:adjustViewBounds="true"
-    android:src="@mipmap/kiwix_icon"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:scaleType="fitCenter"
-    android:layout_gravity="center"
-    android:id="@+id/favicon"
-    android:minHeight="?android:attr/listPreferredItemHeight"/>
+    android:src="@mipmap/kiwix_icon" />
 
   <LinearLayout
-    android:orientation="vertical"
     android:layout_width="@dimen/dimen_0dp"
-    android:layout_weight="1"
     android:layout_height="wrap_content"
+    android:layout_weight="1"
     android:gravity="center"
+    android:orientation="vertical"
     tools:ignore="HardcodedText">
 
     <TextView
+      android:id="@+id/title"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:textAppearance="?android:attr/textAppearanceListItem"
+      android:layout_gravity="left"
       android:text="Title"
-      android:id="@+id/title"
-      android:layout_gravity="left"/>
+      android:textAppearance="?android:attr/textAppearanceListItem" />
 
     <TextView
+      android:id="@+id/description"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:textAppearance="?android:attr/textAppearanceSmall"
+      android:layout_gravity="left"
       android:text="Description"
-      android:id="@+id/description"
-      android:layout_gravity="left"/>
+      android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <ProgressBar
+      android:id="@+id/downloadProgress"
       style="?android:attr/progressBarStyleHorizontal"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:id="@+id/downloadProgress"
-      android:indeterminate="false"
-      android:layout_alignParentStart="true"
       android:layout_alignParentLeft="true"
-      android:padding="@dimen/dimen_1dp"/>
+      android:layout_alignParentStart="true"
+      android:indeterminate="false"
+      android:padding="@dimen/dimen_1dp" />
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:id="@+id/time_remaining"
-        android:layout_gravity="right"/>
+      android:id="@+id/time_remaining"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="right"
+      android:textAppearance="?android:attr/textAppearanceSmall" />
   </LinearLayout>
 
   <LinearLayout
-    android:orientation="horizontal"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_alignParentEnd="true"
-    android:layout_alignParentRight="true">
+    android:layout_alignParentRight="true"
+    android:orientation="horizontal">
 
     <ImageView
+      android:id="@+id/pause"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:id="@+id/pause"
       android:layout_alignParentEnd="true"
       android:layout_alignParentRight="true"
+      android:layout_gravity="center_vertical"
+      android:layout_weight="0.5"
       android:minHeight="@dimen/dimen_35dp"
       android:minWidth="@dimen/dimen_35dp"
-      android:layout_gravity="center_vertical"
-      android:text="@string/download_pause"
       android:src="@drawable/ic_pause_black_24dp"
-      android:layout_weight="0.5"/>
+      android:text="@string/download_pause" />
 
     <ImageView
+      android:id="@+id/stop"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:id="@+id/stop"
       android:layout_alignParentEnd="true"
-      android:minHeight="@dimen/dimen_35dp"
-      android:minWidth="@dimen/dimen_35dp"
+      android:layout_alignParentRight="true"
       android:layout_gravity="center_vertical"
-      android:text="@string/download_stop"
-      android:src="@drawable/ic_stop_black_24dp"
-      android:layout_weight="0.5"
       android:layout_marginLeft="@dimen/dimen_medium_padding"
       android:layout_marginRight="@dimen/dimen_medium_padding"
-      android:layout_alignParentRight="true"/>
+      android:layout_weight="0.5"
+      android:minHeight="@dimen/dimen_35dp"
+      android:minWidth="@dimen/dimen_35dp"
+      android:src="@drawable/ic_stop_black_24dp"
+      android:text="@string/download_stop" />
   </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/download_management.xml b/app/src/main/res/layout/download_management.xml
index 5561cc8bc..f3140d9f8 100644
--- a/app/src/main/res/layout/download_management.xml
+++ b/app/src/main/res/layout/download_management.xml
@@ -2,8 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical"
-  android:background="?attr/listBackground">
+  android:background="?attr/listBackground"
+  android:orientation="vertical">
 
   <TextView
     android:id="@+id/download_management_no_downloads"
@@ -22,6 +22,6 @@
     android:id="@+id/zim_downloader_list"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/listBackground"/>
+    android:background="?attr/listBackground" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_left.xml b/app/src/main/res/layout/drawer_left.xml
index 55244087a..fdcb6b91b 100644
--- a/app/src/main/res/layout/drawer_left.xml
+++ b/app/src/main/res/layout/drawer_left.xml
@@ -1,101 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/left_drawer"
-    android:layout_width="@dimen/navigation_width"
-    android:layout_height="match_parent"
-    android:layout_gravity="start"
-    android:background="?attr/drawerBackground"
-    android:clickable="true"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical"
-    android:layout_marginTop="?actionBarSize">
+  android:id="@+id/left_drawer"
+  android:layout_width="@dimen/navigation_width"
+  android:layout_height="match_parent"
+  android:layout_gravity="start"
+  android:layout_marginTop="?actionBarSize"
+  android:background="?attr/drawerBackground"
+  android:clickable="true"
+  android:fitsSystemWindows="true"
+  android:orientation="vertical">
 
   <View
-      android:layout_width="fill_parent"
-      android:layout_height="@dimen/dimen_1dp"
-      android:background="?attr/dividerColor"/>
+    android:layout_width="fill_parent"
+    android:layout_height="@dimen/dimen_1dp"
+    android:background="?attr/dividerColor" />
 
   <android.support.v7.widget.RecyclerView
-      android:id="@+id/left_drawer_list"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/dimen_0dp"
-      android:layout_weight="1"
-      android:layout_gravity="start"
-      android:choiceMode="singleChoice"
-      android:divider="@null"
-      android:dividerHeight="@dimen/dimen_0dp"
-      android:listSelector="?attr/listBackground"/>
+    android:id="@+id/left_drawer_list"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dimen_0dp"
+    android:layout_gravity="start"
+    android:layout_weight="1"
+    android:choiceMode="singleChoice"
+    android:divider="@null"
+    android:dividerHeight="@dimen/dimen_0dp"
+    android:listSelector="?attr/listBackground" />
 
   <View
-      android:layout_width="fill_parent"
-      android:layout_height="@dimen/dimen_1dp"
-      android:background="?attr/dividerColor"/>
+    android:layout_width="fill_parent"
+    android:layout_height="@dimen/dimen_1dp"
+    android:background="?attr/dividerColor" />
 
   <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:baselineAligned="false"
+    android:orientation="horizontal"
+    android:weightSum="3">
+
+    <RelativeLayout
+      android:id="@+id/action_back"
       android:layout_width="match_parent"
-      android:layout_height="?attr/actionBarSize"
-      android:baselineAligned="false"
-      android:orientation="horizontal"
-      android:weightSum="3">
-
-    <RelativeLayout
-        android:id="@+id/action_back"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="?attr/listBackground"
-        android:clickable="true">
+      android:layout_height="match_parent"
+      android:layout_weight="1"
+      android:background="?attr/listBackground"
+      android:clickable="true">
 
       <ImageView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_centerInParent="true"
-          android:paddingBottom="@dimen/dimen_small_padding"
-          android:paddingLeft="@dimen/dimen_small_padding"
-          android:paddingRight="@dimen/dimen_small_padding"
-          android:paddingTop="@dimen/dimen_small_padding"
-          android:src="?attr/arrowBackDrawable"
-          android:id="@+id/action_back_button" />
+        android:id="@+id/action_back_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:paddingBottom="@dimen/dimen_small_padding"
+        android:paddingLeft="@dimen/dimen_small_padding"
+        android:paddingRight="@dimen/dimen_small_padding"
+        android:paddingTop="@dimen/dimen_small_padding"
+        android:src="?attr/arrowBackDrawable" />
     </RelativeLayout>
 
     <RelativeLayout
-        android:id="@+id/new_tab_button"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="?attr/listBackground"
-        android:clickable="true">
+      android:id="@+id/new_tab_button"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_weight="1"
+      android:background="?attr/listBackground"
+      android:clickable="true">
 
       <ImageView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_centerInParent="true"
-          android:paddingBottom="@dimen/dimen_small_padding"
-          android:paddingLeft="@dimen/dimen_small_padding"
-          android:paddingRight="@dimen/dimen_small_padding"
-          android:paddingTop="@dimen/dimen_small_padding"
-          android:src="?attr/plusDrawable">
-      </ImageView>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:paddingBottom="@dimen/dimen_small_padding"
+        android:paddingLeft="@dimen/dimen_small_padding"
+        android:paddingRight="@dimen/dimen_small_padding"
+        android:paddingTop="@dimen/dimen_small_padding"
+        android:src="?attr/plusDrawable"></ImageView>
     </RelativeLayout>
 
     <RelativeLayout
-        android:id="@+id/action_forward"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="?attr/listBackground"
-        android:clickable="true">
+      android:id="@+id/action_forward"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_weight="1"
+      android:background="?attr/listBackground"
+      android:clickable="true">
 
       <ImageView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_centerInParent="true"
-          android:paddingBottom="@dimen/dimen_small_padding"
-          android:paddingLeft="@dimen/dimen_small_padding"
-          android:paddingRight="@dimen/dimen_small_padding"
-          android:paddingTop="@dimen/dimen_small_padding"
-          android:src="?attr/arrowForwardDrawable"
-          android:id="@+id/action_forward_button" />
+        android:id="@+id/action_forward_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:paddingBottom="@dimen/dimen_small_padding"
+        android:paddingLeft="@dimen/dimen_small_padding"
+        android:paddingRight="@dimen/dimen_small_padding"
+        android:paddingTop="@dimen/dimen_small_padding"
+        android:src="?attr/arrowForwardDrawable" />
     </RelativeLayout>
   </LinearLayout>
 
diff --git a/app/src/main/res/layout/drawer_right.xml b/app/src/main/res/layout/drawer_right.xml
index e61115e66..40c42cba7 100644
--- a/app/src/main/res/layout/drawer_right.xml
+++ b/app/src/main/res/layout/drawer_right.xml
@@ -4,21 +4,21 @@
   android:layout_width="@dimen/navigation_width"
   android:layout_height="match_parent"
   android:layout_gravity="end"
+  android:layout_marginTop="?actionBarSize"
   android:background="?attr/drawerBackground"
   android:clickable="true"
   android:fitsSystemWindows="true"
-  android:orientation="vertical"
-  android:layout_marginTop="?actionBarSize">
+  android:orientation="vertical">
 
   <View
     android:layout_width="fill_parent"
     android:layout_height="@dimen/dimen_1dp"
-    android:background="?attr/dividerColor"/>
+    android:background="?attr/dividerColor" />
 
   <android.support.v7.widget.RecyclerView
     android:id="@+id/right_drawer_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_gravity="end"/>
+    android:layout_gravity="end" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/help.xml b/app/src/main/res/layout/help.xml
index c5d5c3f6e..23a5a00ca 100644
--- a/app/src/main/res/layout/help.xml
+++ b/app/src/main/res/layout/help.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:card_view="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
@@ -16,8 +15,7 @@
       android:layout_height="wrap_content"
       android:orientation="vertical">
 
-      <android.support.v7.widget.CardView
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+      <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
@@ -39,7 +37,7 @@
             android:adjustViewBounds="true"
             android:longClickable="false"
             android:src="@drawable/kiwix_welcome"
-            android:visibility="visible"/>
+            android:visibility="visible" />
 
 
           <TextView
@@ -50,8 +48,8 @@
             android:paddingRight="@dimen/dimen_10dp"
             android:paddingTop="@dimen/dimen_10dp"
             android:text="@string/help_1"
-            android:textColor="@color/primary_dark"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
 
         </LinearLayout>
       </android.support.v7.widget.CardView>
@@ -65,10 +63,9 @@
         android:text="@string/menu_zim_manager"
         android:textAllCaps="false"
         android:textColor="@color/white"
-        android:textSize="@dimen/dimen_20sp"/>
+        android:textSize="@dimen/dimen_20sp" />
 
-      <android.support.v7.widget.CardView
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+      <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
@@ -82,6 +79,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:orientation="vertical">
+
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -89,33 +87,32 @@
             android:paddingLeft="@dimen/dimen_10dp"
             android:paddingRight="@dimen/dimen_10dp"
             android:paddingTop="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:text="@string/help_2"
-            android:textAppearance="?android:attr/textAppearanceLarge"/>
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/dimen_10dp"
             android:paddingRight="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:text="@string/help_3"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingLeft="@dimen/dimen_10dp"
             android:paddingRight="@dimen/dimen_10dp"
             android:text="@string/help_4"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
         </LinearLayout>
       </android.support.v7.widget.CardView>
 
-      <android.support.v7.widget.CardView
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+      <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
@@ -129,78 +126,78 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:orientation="vertical">
+
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/dimen_10dp"
             android:paddingLeft="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingRight="@dimen/dimen_10dp"
             android:paddingTop="@dimen/dimen_10dp"
             android:text="@string/help_5"
-            android:textAppearance="?android:attr/textAppearanceLarge"/>
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingRight="@dimen/dimen_10dp"
             android:text="@string/help_6"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingRight="@dimen/dimen_10dp"
             android:text="@string/help_7"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingRight="@dimen/dimen_10dp"
             android:paddingTop="@dimen/dimen_10dp"
             android:text="@string/help_8"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingLeft="@dimen/dimen_10dp"
             android:paddingRight="@dimen/dimen_10dp"
             android:text="@string/help_9"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingRight="@dimen/dimen_10dp"
             android:text="@string/help_10"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/dimen_10dp"
             android:paddingLeft="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingRight="@dimen/dimen_10dp"
             android:text="@string/help_11"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
         </LinearLayout>
       </android.support.v7.widget.CardView>
 
-      <android.support.v7.widget.CardView
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+      <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
@@ -214,72 +211,73 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:orientation="vertical">
+
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingLeft="@dimen/dimen_10dp"
             android:paddingRight="@dimen/dimen_10dp"
             android:paddingTop="@dimen/dimen_10dp"
             android:text="@string/help_12"
-            android:textAppearance="?android:attr/textAppearanceLarge"/>
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingRight="@dimen/dimen_10dp"
             android:text="@string/help_13"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/primary_dark"
             android:paddingLeft="@dimen/dimen_10dp"
             android:paddingRight="@dimen/dimen_10dp"
             android:text="@string/help_14"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingRight="@dimen/dimen_10dp"
             android:text="@string/help_15"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/dimen_10dp"
             android:paddingRight="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingTop="@dimen/dimen_10dp"
             android:text="@string/help_16"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingRight="@dimen/dimen_10dp"
             android:text="@string/help_17"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/dimen_10dp"
             android:paddingLeft="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingRight="@dimen/dimen_10dp"
             android:text="@string/help_18"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:layout_width="wrap_content"
@@ -287,14 +285,13 @@
             android:paddingBottom="@dimen/dimen_10dp"
             android:paddingLeft="@dimen/dimen_10dp"
             android:paddingRight="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:text="@string/help_19"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
         </LinearLayout>
       </android.support.v7.widget.CardView>
 
-      <android.support.v7.widget.CardView
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+      <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
@@ -316,20 +313,20 @@
             android:paddingLeft="@dimen/dimen_10dp"
             android:paddingRight="@dimen/dimen_10dp"
             android:paddingTop="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:text="@string/help_20"
-            android:textAppearance="?android:attr/textAppearanceLarge"/>
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="@color/primary_dark" />
 
           <TextView
             android:id="@+id/welcome21"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/dimen_10dp"
-            android:textColor="@color/primary_dark"
             android:paddingLeft="@dimen/dimen_10dp"
             android:paddingRight="@dimen/dimen_10dp"
             android:text="@string/help_21"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/primary_dark" />
         </LinearLayout>
       </android.support.v7.widget.CardView>
     </LinearLayout>
diff --git a/app/src/main/res/layout/kiwix_search_widget.xml b/app/src/main/res/layout/kiwix_search_widget.xml
index d5cfb0f23..cd03870cc 100644
--- a/app/src/main/res/layout/kiwix_search_widget.xml
+++ b/app/src/main/res/layout/kiwix_search_widget.xml
@@ -1,42 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/kiwix_search_widget_layout_id_height"
-    android:background="@drawable/search_widget_background"
-    android:padding="@dimen/dimen_0dp"
-    android:gravity="center_vertical"
-    android:layout_marginRight="@dimen/dimen_1dp"
-    android:layout_marginLeft="@dimen/dimen_1dp">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="@dimen/kiwix_search_widget_layout_id_height"
+  android:layout_marginLeft="@dimen/dimen_1dp"
+  android:layout_marginRight="@dimen/dimen_1dp"
+  android:background="@drawable/search_widget_background"
+  android:gravity="center_vertical"
+  android:orientation="horizontal"
+  android:padding="@dimen/dimen_0dp">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/search_widget_icon"
-        android:src="@drawable/ic_kiwix_widget"
-        android:layout_weight="0.1"/>
+  <ImageView
+    android:id="@+id/search_widget_icon"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_weight="0.1"
+    android:src="@drawable/ic_kiwix_widget" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/search_widget_text"
-        android:textColor="@color/grey"
-        android:id="@+id/search_widget_text"
-        android:layout_weight="0.7"/>
+  <TextView
+    android:id="@+id/search_widget_text"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_weight="0.7"
+    android:text="@string/search_widget_text"
+    android:textColor="@color/grey" />
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/search_widget_star"
-        android:src="@drawable/ic_stars_black_24dp"
-        android:layout_weight="0.1"/>
+  <ImageView
+    android:id="@+id/search_widget_star"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_weight="0.1"
+    android:src="@drawable/ic_stars_black_24dp" />
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/search_widget_mic"
-        android:src="@drawable/ic_mic_black_24dp"
-        android:layout_weight="0.1"/>
+  <ImageView
+    android:id="@+id/search_widget_mic"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_weight="0.1"
+    android:src="@drawable/ic_mic_black_24dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/language_check_item.xml b/app/src/main/res/layout/language_check_item.xml
index 2d1192a37..96c5269ff 100644
--- a/app/src/main/res/layout/language_check_item.xml
+++ b/app/src/main/res/layout/language_check_item.xml
@@ -17,30 +17,31 @@
     android:buttonTint="@color/accent"
     android:focusable="false"
     android:focusableInTouchMode="false"
-    tools:checked="false"/>
+    tools:checked="false" />
 
   <LinearLayout
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
-    android:layout_toRightOf="@id/language_checkbox"
     android:layout_centerVertical="true"
-    android:orientation="horizontal"
-    android:gravity="center_vertical">
+    android:layout_toRightOf="@id/language_checkbox"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
 
     <TextView
       android:id="@+id/language_name"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:textSize="@dimen/dimen_18sp"
-      tools:text="German"/>
+      tools:text="German" />
+
     <TextView
       android:id="@+id/language_name_localized"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginLeft="@dimen/dimen_10dp"
-      android:textSize="@dimen/dimen_18sp"
       android:textColor="@color/grey"
-      tools:text="(Deutsch)"/>
+      android:textSize="@dimen/dimen_18sp"
+      tools:text="(Deutsch)" />
 
   </LinearLayout>
 
@@ -50,10 +51,10 @@
     android:layout_height="wrap_content"
     android:layout_alignParentRight="true"
     android:layout_centerVertical="true"
+    android:layout_marginBottom="@dimen/dimen_6dp"
     android:layout_marginRight="@dimen/dimen_16dp"
     android:layout_marginTop="@dimen/dimen_6dp"
-    android:layout_marginBottom="@dimen/dimen_6dp"
-    android:textSize="@dimen/dimen_18sp"
-    android:textColor="@color/grey" />
+    android:textColor="@color/grey"
+    android:textSize="@dimen/dimen_18sp" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/language_selection.xml b/app/src/main/res/layout/language_selection.xml
index c1e38cff3..1fb5cba3d 100644
--- a/app/src/main/res/layout/language_selection.xml
+++ b/app/src/main/res/layout/language_selection.xml
@@ -8,6 +8,6 @@
     android:id="@+id/language_check_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/listBackground"/>
+    android:background="?attr/listBackground" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/library_divider.xml b/app/src/main/res/layout/library_divider.xml
index 1e629bae8..63bacb3b6 100644
--- a/app/src/main/res/layout/library_divider.xml
+++ b/app/src/main/res/layout/library_divider.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:minHeight="?android:attr/listPreferredItemHeight"
-	android:paddingTop="@dimen/activity_vertical_margin"
-	android:paddingBottom="@dimen/dimen_medium_padding"
-	android:paddingLeft="@dimen/activity_horizontal_margin"
-	android:paddingRight="@dimen/activity_horizontal_margin">
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:minHeight="?android:attr/listPreferredItemHeight"
+  android:orientation="horizontal"
+  android:paddingBottom="@dimen/dimen_medium_padding"
+  android:paddingLeft="@dimen/activity_horizontal_margin"
+  android:paddingRight="@dimen/activity_horizontal_margin"
+  android:paddingTop="@dimen/activity_vertical_margin">
 
-	<TextView
-		android:id="@+id/divider_text"
-		android:textAppearance="?android:textAppearanceLarge"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"/>
+  <TextView
+    android:id="@+id/divider_text"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:textAppearanceLarge" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/library_item.xml b/app/src/main/res/layout/library_item.xml
index 5a8e1a816..dad2a479f 100755
--- a/app/src/main/res/layout/library_item.xml
+++ b/app/src/main/res/layout/library_item.xml
@@ -1,109 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  android:orientation="horizontal"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:minHeight="?android:attr/listPreferredItemHeight"
-  android:paddingTop="@dimen/activity_vertical_margin"
+  android:orientation="horizontal"
   android:paddingBottom="@dimen/activity_vertical_margin"
   android:paddingLeft="@dimen/activity_horizontal_margin"
-  android:paddingRight="@dimen/activity_horizontal_margin">
+  android:paddingRight="@dimen/activity_horizontal_margin"
+  android:paddingTop="@dimen/activity_vertical_margin">
 
   <ImageView
-      android:layout_width="@dimen/dimen_48dp"
-      android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/dimen_medium_padding"
-      android:adjustViewBounds="true"
-      android:src="@mipmap/kiwix_icon"
-      android:scaleType="fitCenter"
-      android:layout_gravity="center"
-      android:id="@+id/favicon" />
+    android:id="@+id/favicon"
+    android:layout_width="@dimen/dimen_48dp"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_marginRight="@dimen/dimen_medium_padding"
+    android:adjustViewBounds="true"
+    android:scaleType="fitCenter"
+    android:src="@mipmap/kiwix_icon" />
 
   <LinearLayout
-      android:layout_width="0dp"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/dimen_small_padding"
+    tools:ignore="HardcodedText">
+
+    <TextView
+      android:id="@+id/title"
+      android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:orientation="vertical"
-      android:paddingLeft="@dimen/dimen_small_padding"
-      android:layout_weight="1"
-      tools:ignore="HardcodedText">
+      android:text="Title"
+      android:textAppearance="?android:attr/textAppearanceListItem" />
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceListItem"
-        android:text="Title"
-        android:id="@+id/title" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="Description"
-        android:id="@+id/description" />
+      android:id="@+id/description"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="Description"
+      android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingTop="@dimen/dimen_medium_padding">
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal"
+      android:paddingTop="@dimen/dimen_medium_padding">
 
       <LinearLayout
-          android:layout_width="0dp"
-          android:layout_height="match_parent"
-          android:layout_weight="1"
-          android:orientation="vertical">
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="File Size"
-            android:id="@+id/size" />
+          android:id="@+id/size"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="File Size"
+          android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Author"
-            android:id="@+id/creator" />
+          android:id="@+id/creator"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="Author"
+          android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Publisher"
-            android:id="@+id/publisher" />
+          android:id="@+id/publisher"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="Publisher"
+          android:textAppearance="?android:attr/textAppearanceSmall" />
 
       </LinearLayout>
 
       <LinearLayout
-          android:layout_width="0dp"
-          android:layout_height="match_parent"
-          android:layout_weight="1"
-          android:gravity="right"
-          android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Date"
-            android:id="@+id/date" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Language"
-            android:id="@+id/language" />
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="right"
+        android:orientation="vertical">
 
         <TextView
+          android:id="@+id/date"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="Date"
+          android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+          android:id="@+id/language"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="Language"
+          android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+          android:id="@+id/fileName"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:textAppearance="?android:attr/textAppearanceSmall"
           android:text="File Name"
-          android:id="@+id/fileName"/>
+          android:textAppearance="?android:attr/textAppearanceSmall" />
 
       </LinearLayout>
 
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 922daf726..b24f12535 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -1,150 +1,150 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/snackbar_layout"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:id="@+id/snackbar_layout"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:fitsSystemWindows="false"
+  android:orientation="vertical">
+
+
+  <android.support.v4.widget.DrawerLayout
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="false"
-    android:orientation="vertical">
+    android:fitsSystemWindows="true">
 
+    <android.support.design.internal.ScrimInsetsFrameLayout
+      android:id="@+id/content_frame"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:fitsSystemWindows="true"
+      android:orientation="vertical" />
 
-    <android.support.v4.widget.DrawerLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
+    <RelativeLayout
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:orientation="vertical">
 
-        <android.support.design.internal.ScrimInsetsFrameLayout
-            android:id="@+id/content_frame"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fitsSystemWindows="true"
-            android:orientation="vertical" />
+      <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
 
         <RelativeLayout
+          android:layout_width="fill_parent"
+          android:layout_height="fill_parent"
+          android:orientation="vertical">
+
+
+          <ImageButton
+            android:id="@+id/FullscreenControlButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_margin="@dimen/fullscreen_control_button_margin"
+            android:background="@color/back_to_top_background"
+            android:hint="@string/menu_exitfullscreen"
+            android:src="@drawable/fullscreen_exit"
+            android:visibility="invisible" />
+
+
+          <Button
+            android:id="@+id/button_backtotop"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-
-                <RelativeLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:orientation="vertical">
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:alpha="0.6"
+            android:background="@color/back_to_top_background"
+            android:gravity="center"
+            android:text="@string/button_backtotop"
+            android:textColor="@color/back_to_top_text"
+            android:textStyle="bold"
+            android:visibility="invisible" />
 
 
-                    <ImageButton
-                        android:id="@+id/FullscreenControlButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:layout_margin="@dimen/fullscreen_control_button_margin"
-                        android:background="@color/back_to_top_background"
-                        android:hint="@string/menu_exitfullscreen"
-                        android:src="@drawable/fullscreen_exit"
-                        android:visibility="invisible" />
+          <LinearLayout
+            android:id="@+id/tts_controls"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:visibility="gone"
+            android:weightSum="1.0">
 
+            <Button
+              android:id="@+id/button_pause_tts"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_weight=".5"
+              android:alpha="0.6"
+              android:background="@color/back_to_top_background"
+              android:gravity="center"
+              android:text="@string/tts_pause"
+              android:textColor="@android:color/black"
+              android:textStyle="bold" />
 
-                    <Button
-                        android:id="@+id/button_backtotop"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:alpha="0.6"
-                        android:background="@color/back_to_top_background"
-                        android:gravity="center"
-                        android:text="@string/button_backtotop"
-                        android:textColor="@color/back_to_top_text"
-                        android:textStyle="bold"
-                        android:visibility="invisible" />
+            <Button
+              android:id="@+id/button_stop_tts"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_weight=".5"
+              android:alpha="0.6"
+              android:background="@color/back_to_top_background"
+              android:gravity="center"
+              android:text="@string/tts_stop"
+              android:textColor="@android:color/black"
+              android:textStyle="bold" />
 
-
-                    <LinearLayout
-                        android:id="@+id/tts_controls"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:visibility="gone"
-                        android:weightSum="1.0">
-
-                        <Button
-                            android:id="@+id/button_pause_tts"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_weight=".5"
-                            android:alpha="0.6"
-                            android:background="@color/back_to_top_background"
-                            android:gravity="center"
-                            android:text="@string/tts_pause"
-                            android:textColor="@android:color/black"
-                            android:textStyle="bold" />
-
-                        <Button
-                            android:id="@+id/button_stop_tts"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_weight=".5"
-                            android:alpha="0.6"
-                            android:background="@color/back_to_top_background"
-                            android:gravity="center"
-                            android:text="@string/tts_stop"
-                            android:textColor="@android:color/black"
-                            android:textStyle="bold" />
-
-                    </LinearLayout>
-
-                </RelativeLayout>
-
-            </RelativeLayout>
-
-            <org.kiwix.kiwixmobile.views.PageBottomTabLayout
-                android:id="@+id/page_bottom_tab_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:layout_gravity="bottom"
-                android:background="@color/grey"
-                android:visibility="gone"
-                app:tabGravity="fill"
-                app:tabIndicatorColor="@color/grey"
-                app:tabSelectedTextColor="@color/grey" />
+          </LinearLayout>
 
         </RelativeLayout>
 
-        <include layout="@layout/drawer_left" />
+      </RelativeLayout>
 
-        <include layout="@layout/drawer_right" />
-
-    </android.support.v4.widget.DrawerLayout>
-
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/toolbar_layout"
+      <org.kiwix.kiwixmobile.views.PageBottomTabLayout
+        android:id="@+id/page_bottom_tab_layout"
         android:layout_width="match_parent"
-        android:layout_height="?actionBarSize">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?actionBarSize"
-            android:background="?colorPrimaryDark"
-            app:popupTheme="@style/AppTheme.PopupOverlay"
-            app:theme="@style/AppTheme.AppBarOverlay" />
-
-        <org.kiwix.kiwixmobile.views.AnimatedProgressBar
-            android:id="@+id/progress_view"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dimen_3dp"
-            android:layout_alignParentBottom="true"
-            app:backgroundColor="?attr/progressBackgroundColor"
-            app:bidirectionalAnimate="false"
-            app:progressColor="@color/accent" />
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_gravity="bottom"
+        android:background="@color/grey"
+        android:visibility="gone"
+        app:tabGravity="fill"
+        app:tabIndicatorColor="@color/grey"
+        app:tabSelectedTextColor="@color/grey" />
 
     </RelativeLayout>
 
+    <include layout="@layout/drawer_left" />
+
+    <include layout="@layout/drawer_right" />
+
+  </android.support.v4.widget.DrawerLayout>
+
+  <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/toolbar_layout"
+    android:layout_width="match_parent"
+    android:layout_height="?actionBarSize">
+
+    <android.support.v7.widget.Toolbar
+      android:id="@+id/toolbar"
+      android:layout_width="match_parent"
+      android:layout_height="?actionBarSize"
+      android:background="?colorPrimaryDark"
+      app:popupTheme="@style/AppTheme.PopupOverlay"
+      app:theme="@style/AppTheme.AppBarOverlay" />
+
+    <org.kiwix.kiwixmobile.views.AnimatedProgressBar
+      android:id="@+id/progress_view"
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/dimen_3dp"
+      android:layout_alignParentBottom="true"
+      app:backgroundColor="?attr/progressBackgroundColor"
+      app:bidirectionalAnimate="false"
+      app:progressColor="@color/accent" />
+
+  </RelativeLayout>
+
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/page_bottom_tab_layout.xml b/app/src/main/res/layout/page_bottom_tab_layout.xml
index 47e02ae62..26ef1a1a3 100644
--- a/app/src/main/res/layout/page_bottom_tab_layout.xml
+++ b/app/src/main/res/layout/page_bottom_tab_layout.xml
@@ -1,32 +1,32 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
   <android.support.design.widget.TabItem
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:contentDescription="@string/menu_home"
-      android:icon="@drawable/action_home" />
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:contentDescription="@string/menu_home"
+    android:icon="@drawable/action_home" />
 
   <android.support.design.widget.TabItem
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:contentDescription="@string/menu_searchintext"
-      android:icon="@drawable/ic_find_in_page" />
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:contentDescription="@string/menu_searchintext"
+    android:icon="@drawable/ic_find_in_page" />
 
   <android.support.design.widget.TabItem
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:contentDescription="@string/menu_fullscreen"
-      android:icon="@drawable/fullscreen" />
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:contentDescription="@string/menu_fullscreen"
+    android:icon="@drawable/fullscreen" />
 
   <android.support.design.widget.TabItem
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:contentDescription="@string/menu_randomarticle"
-      android:icon="@drawable/action_randomarticle" />
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:contentDescription="@string/menu_randomarticle"
+    android:icon="@drawable/action_randomarticle" />
 
   <android.support.design.widget.TabItem
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:contentDescription="@string/menu_bookmarks"
-      android:icon="@drawable/action_bookmark_active" />
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:contentDescription="@string/menu_bookmarks"
+    android:icon="@drawable/action_bookmark_active" />
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/progress_bar.xml b/app/src/main/res/layout/progress_bar.xml
index 25ea47258..06128c082 100755
--- a/app/src/main/res/layout/progress_bar.xml
+++ b/app/src/main/res/layout/progress_bar.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="wrap_content"
+  android:layout_height="match_parent"
+  android:layout_centerInParent="true"
+  android:layout_marginTop="@dimen/progressbar_layout_margin_top">
+
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="-1dp"
+    android:background="?android:attr/listDivider" />
+
+  <ProgressBar
+    android:id="@+id/progressBar"
+    style="?android:attr/progressBarStyleLarge"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:layout_centerInParent="true"
-    android:layout_marginTop="@dimen/progressbar_layout_margin_top">
+    android:layout_height="wrap_content"
+    android:layout_centerHorizontal="true"
+    android:padding="@dimen/dimen_20dp" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-1dp"
-        android:background="?android:attr/listDivider" />
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:padding="@dimen/dimen_20dp" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/progressBar"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:paddingTop="@dimen/dimen_10dp"
-        android:text="@string/rescan_fs_warning"
-        android:textStyle="bold" />
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_below="@id/progressBar"
+    android:layout_centerHorizontal="true"
+    android:layout_centerVertical="true"
+    android:paddingTop="@dimen/dimen_10dp"
+    android:text="@string/rescan_fs_warning"
+    android:textStyle="bold" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/search.xml b/app/src/main/res/layout/search.xml
index 772b3be5d..8c912124f 100644
--- a/app/src/main/res/layout/search.xml
+++ b/app/src/main/res/layout/search.xml
@@ -2,8 +2,8 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:layoutDirection="ltr"
   android:fitsSystemWindows="true"
+  android:layoutDirection="ltr"
   android:orientation="vertical">
 
   <LinearLayout
diff --git a/app/src/main/res/layout/section_list.xml b/app/src/main/res/layout/section_list.xml
index 9f7b8fadc..bc828a80f 100644
--- a/app/src/main/res/layout/section_list.xml
+++ b/app/src/main/res/layout/section_list.xml
@@ -15,12 +15,12 @@
     android:layout_centerVertical="true"
     android:layout_marginLeft="@dimen/dimen_16dp"
     android:layout_marginRight="@dimen/dimen_16dp"
-    android:paddingLeft="@dimen/dimen_16dp"
     android:ellipsize="end"
     android:fontFamily="sans-serif-light"
     android:gravity="center_vertical"
     android:maxLines="1"
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:textAppearance="?android:attr/textAppearanceListItemSmall"/>
+    android:paddingLeft="@dimen/dimen_16dp"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/slider_dialog.xml b/app/src/main/res/layout/slider_dialog.xml
index 6122ed49e..0d1d7198d 100644
--- a/app/src/main/res/layout/slider_dialog.xml
+++ b/app/src/main/res/layout/slider_dialog.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical"
+  android:paddingBottom="@dimen/dimen_medium_padding"
+  android:paddingLeft="@dimen/dimen_16dp"
+  android:paddingRight="@dimen/dimen_16dp"
+  android:paddingTop="@dimen/dimen_medium_padding">
+
+  <TextView
+    android:id="@+id/message"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/dimen_medium_padding"
-    android:paddingLeft="@dimen/dimen_16dp"
-    android:paddingRight="@dimen/dimen_16dp"
-    android:paddingTop="@dimen/dimen_medium_padding">
+    android:layout_height="wrap_content"
+    android:gravity="center" />
 
-    <TextView
-        android:id="@+id/message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center" />
-
-    <SeekBar
-        android:id="@+id/slider_preference_seekbar"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/dimen_12dp"
-        android:paddingTop="@dimen/dimen_12dp" />
+  <SeekBar
+    android:id="@+id/slider_preference_seekbar"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="@dimen/dimen_12dp"
+    android:paddingTop="@dimen/dimen_12dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tabs_list.xml b/app/src/main/res/layout/tabs_list.xml
index e053950e7..e942c60c7 100644
--- a/app/src/main/res/layout/tabs_list.xml
+++ b/app/src/main/res/layout/tabs_list.xml
@@ -1,38 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/dimen_56dp"
-    android:background="?attr/selectedBackground"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
+  android:layout_width="match_parent"
+  android:layout_height="@dimen/dimen_56dp"
+  android:background="?attr/selectedBackground"
+  android:gravity="center_vertical"
+  android:orientation="horizontal">
 
   <TextView
-      android:id="@+id/titleText"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_centerVertical="true"
-      android:layout_marginLeft="@dimen/dimen_16dp"
-      android:layout_marginRight="@dimen/dimen_16dp"
-      android:layout_toLeftOf="@+id/exitButton"
-      android:ellipsize="end"
-      android:fontFamily="sans-serif-light"
-      android:gravity="center_vertical"
-      android:maxLines="1"
-      android:minHeight="?android:attr/listPreferredItemHeightSmall"
-      android:textAppearance="?android:attr/textAppearanceListItemSmall"/>
+    android:id="@+id/titleText"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_centerVertical="true"
+    android:layout_marginLeft="@dimen/dimen_16dp"
+    android:layout_marginRight="@dimen/dimen_16dp"
+    android:layout_toLeftOf="@+id/exitButton"
+    android:ellipsize="end"
+    android:fontFamily="sans-serif-light"
+    android:gravity="center_vertical"
+    android:maxLines="1"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall" />
 
   <ImageView
-      android:id="@+id/exitButton"
-      android:layout_width="@dimen/dimen_48dp"
-      android:layout_height="@dimen/dimen_48dp"
-      android:layout_alignParentRight="true"
-      android:layout_centerVertical="true"
-      android:layout_marginRight="@dimen/dimen_small_padding"
-      android:background="?attr/actionBarItemBackground"
-      android:contentDescription="@string/delete_tab"
-      android:gravity="center_vertical"
-      android:padding="@dimen/dimen_12dp"
-      android:src="?attr/deleteDrawable">
-  </ImageView>
+    android:id="@+id/exitButton"
+    android:layout_width="@dimen/dimen_48dp"
+    android:layout_height="@dimen/dimen_48dp"
+    android:layout_alignParentRight="true"
+    android:layout_centerVertical="true"
+    android:layout_marginRight="@dimen/dimen_small_padding"
+    android:background="?attr/actionBarItemBackground"
+    android:contentDescription="@string/delete_tab"
+    android:gravity="center_vertical"
+    android:padding="@dimen/dimen_12dp"
+    android:src="?attr/deleteDrawable"></ImageView>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/webview_search.xml b/app/src/main/res/layout/webview_search.xml
index 0ce773f1e..ed58822b6 100644
--- a/app/src/main/res/layout/webview_search.xml
+++ b/app/src/main/res/layout/webview_search.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,25 +14,25 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:orientation="horizontal">
 
   <EditText
-      android:id="@+id/edit"
-      android:layout_width="0dip"
-      android:layout_weight="1"
-      android:layout_height="wrap_content"
-      android:scrollHorizontally="true"
-      android:inputType="text"
-      android:hint="@string/search_label"
-      android:focusableInTouchMode="true"
-      android:textColorHint="@color/material_dark_foreground_hint"
-      android:textColor="@android:color/white"
-      android:imeOptions="actionDone|flagNoExtractUi|flagNoFullscreen"
-      android:layout_marginRight="@dimen/webview_search_edit_text_margin_right">
+    android:id="@+id/edit"
+    android:layout_width="0dip"
+    android:layout_height="wrap_content"
+    android:layout_marginRight="@dimen/webview_search_edit_text_margin_right"
+    android:layout_weight="1"
+    android:focusableInTouchMode="true"
+    android:hint="@string/search_label"
+    android:imeOptions="actionDone|flagNoExtractUi|flagNoFullscreen"
+    android:inputType="text"
+    android:scrollHorizontally="true"
+    android:textColor="@android:color/white"
+    android:textColorHint="@color/material_dark_foreground_hint">
 
-    <requestFocus/>
+    <requestFocus />
   </EditText>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/zim_list.xml b/app/src/main/res/layout/zim_list.xml
index 6fff3dcd0..c0478446c 100644
--- a/app/src/main/res/layout/zim_list.xml
+++ b/app/src/main/res/layout/zim_list.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?attr/listBackground"
-    android:orientation="vertical">
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:background="?attr/listBackground"
+  android:orientation="vertical">
+
+  <TextView
+    android:id="@+id/file_management_no_files"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_centerInParent="true"
+    android:layout_gravity="center_vertical"
+    android:gravity="center_vertical"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/file_management_no_files_padding_bottom"
+    android:text="@string/no_files_here"
+    android:textSize="@dimen/file_management_no_files_text_size"
+    android:visibility="gone" />
+
+  <android.support.v4.widget.SwipeRefreshLayout
+    android:id="@+id/zim_swiperefresh"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ListView
+      android:id="@+id/zimfilelist"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_below="@id/toolbar"
+      android:background="?attr/listBackground"
+      android:divider="@null"
+      android:paddingBottom="@dimen/zimfilelist_padding_bottom" />
 
     <TextView
-        android:id="@+id/file_management_no_files"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_centerInParent="true"
-        android:layout_gravity="center_vertical"
-        android:gravity="center_vertical"
-        android:orientation="vertical"
-        android:paddingBottom="@dimen/file_management_no_files_padding_bottom"
-        android:text="@string/no_files_here"
-        android:textSize="@dimen/file_management_no_files_text_size"
-        android:visibility="gone" />
-
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/zim_swiperefresh"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <ListView
-            android:id="@+id/zimfilelist"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/toolbar"
-            android:background="?attr/listBackground"
-            android:divider="@null"
-            android:paddingBottom="@dimen/zimfilelist_padding_bottom" />
-
-        <TextView
-            style="@android:style/TextAppearance.Large"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/dimen_15dp"
-            android:paddingLeft="@dimen/dimen_10dp"
-            android:paddingRight="@dimen/dimen_10dp"
-            android:paddingTop="@dimen/dimen_15dp"
-            android:text="@string/error_nozimfilesfound"
-            android:visibility="gone" />
-    </android.support.v4.widget.SwipeRefreshLayout>
+      style="@android:style/TextAppearance.Large"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="@dimen/dimen_15dp"
+      android:paddingLeft="@dimen/dimen_10dp"
+      android:paddingRight="@dimen/dimen_10dp"
+      android:paddingTop="@dimen/dimen_15dp"
+      android:text="@string/error_nozimfilesfound"
+      android:visibility="gone" />
+  </android.support.v4.widget.SwipeRefreshLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/zim_manager.xml b/app/src/main/res/layout/zim_manager.xml
index 58578f998..65af62517 100644
--- a/app/src/main/res/layout/zim_manager.xml
+++ b/app/src/main/res/layout/zim_manager.xml
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/zim_manager_main_activity"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/zim_manager_main_activity"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:fitsSystemWindows="true"
+  tools:context=".zim_manager.ZimManageActivity">
+
+  <android.support.design.widget.AppBarLayout
+    android:id="@+id/appbar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/dimen_medium_padding"
+    android:theme="@style/AppTheme.AppBarOverlay">
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      android:id="@+id/toolbar_layout"
+      android:layout_width="match_parent"
+      android:layout_height="?actionBarSize"
+      app:layout_scrollFlags="scroll|enterAlways">
+
+      <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">
+
+      </android.support.v7.widget.Toolbar>
+    </RelativeLayout>
+
+    <android.support.design.widget.TabLayout
+      android:id="@+id/tabs"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:tabGravity="fill"
+      app:tabMaxWidth="0dp" />
+
+  </android.support.design.widget.AppBarLayout>
+
+  <android.support.v4.view.ViewPager
+    android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:context=".zim_manager.ZimManageActivity">
-
-    <android.support.design.widget.AppBarLayout
-        android:id="@+id/appbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/dimen_medium_padding"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/toolbar_layout"
-            android:layout_width="match_parent"
-            android:layout_height="?actionBarSize"
-            app:layout_scrollFlags="scroll|enterAlways">
-
-            <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">
-
-            </android.support.v7.widget.Toolbar>
-        </RelativeLayout>
-
-        <android.support.design.widget.TabLayout
-            android:id="@+id/tabs"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:tabGravity="fill"
-            app:tabMaxWidth="0dp" />
-
-    </android.support.design.widget.AppBarLayout>
-
-    <android.support.v4.view.ViewPager
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+    app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/menu/menu_bookmarks.xml b/app/src/main/res/menu/menu_bookmarks.xml
index 1478df860..a56f2c4fe 100644
--- a/app/src/main/res/menu/menu_bookmarks.xml
+++ b/app/src/main/res/menu/menu_bookmarks.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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/menu_bookmarks_delete"
-      android:icon="@drawable/ic_delete_white_24dp"
-      app:showAsAction="always"
-      android:title="@string/delete"
-      android:titleCondensed="Delete"/>
+    android:id="@+id/menu_bookmarks_delete"
+    android:icon="@drawable/ic_delete_white_24dp"
+    android:title="@string/delete"
+    android:titleCondensed="Delete"
+    app:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index c67604bd9..c53b8ce46 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,73 +1,73 @@
 <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/menu_search"
-      android:icon="@drawable/action_search"
-      android:title="@string/menu_search"
-      android:visible="false"
-      app:showAsAction="always"/>
+    android:id="@+id/menu_search"
+    android:icon="@drawable/action_search"
+    android:title="@string/menu_search"
+    android:visible="false"
+    app:showAsAction="always" />
 
   <item
-      android:id="@+id/menu_bookmarks"
-      android:icon="@drawable/action_bookmark_active"
-      android:title="@string/menu_bookmarks"
-      android:visible="false"
-      app:showAsAction="always"/>
+    android:id="@+id/menu_bookmarks"
+    android:icon="@drawable/action_bookmark_active"
+    android:title="@string/menu_bookmarks"
+    android:visible="false"
+    app:showAsAction="always" />
 
   <item
-      android:id="@+id/menu_bookmarks_list"
-      android:title="@string/menu_bookmarks_list"
-      app:showAsAction="never"/>
+    android:id="@+id/menu_bookmarks_list"
+    android:title="@string/menu_bookmarks_list"
+    app:showAsAction="never" />
 
   <item
-      android:id="@+id/menu_home"
-      android:title="@string/menu_home"
-      android:icon="@drawable/action_home"
-      android:visible="false"
-      app:showAsAction="always"/>
+    android:id="@+id/menu_home"
+    android:icon="@drawable/action_home"
+    android:title="@string/menu_home"
+    android:visible="false"
+    app:showAsAction="always" />
 
   <item
-      android:id="@+id/menu_randomarticle"
-      android:icon="@drawable/action_randomarticle"
-      android:title="@string/menu_randomarticle"
-      android:visible="false"
-      app:showAsAction="never"/>
+    android:id="@+id/menu_randomarticle"
+    android:icon="@drawable/action_randomarticle"
+    android:title="@string/menu_randomarticle"
+    android:visible="false"
+    app:showAsAction="never" />
 
   <item
-      android:id="@+id/menu_openfile"
-      android:title="@string/menu_zim_manager"
-      android:icon="@drawable/action_open_file"
-      app:showAsAction="never"/>
+    android:id="@+id/menu_openfile"
+    android:icon="@drawable/action_open_file"
+    android:title="@string/menu_zim_manager"
+    app:showAsAction="never" />
 
   <item
-      android:id="@+id/menu_searchintext"
-      android:title="@string/menu_searchintext"
-      android:visible="false"
-      app:showAsAction="never"/>
+    android:id="@+id/menu_searchintext"
+    android:title="@string/menu_searchintext"
+    android:visible="false"
+    app:showAsAction="never" />
 
   <item
-      android:id="@+id/menu_fullscreen"
-      android:title="@string/menu_fullscreen"
-      android:visible="false"
-      app:showAsAction="never"/>
+    android:id="@+id/menu_fullscreen"
+    android:title="@string/menu_fullscreen"
+    android:visible="false"
+    app:showAsAction="never" />
 
   <item
-      android:id="@+id/menu_read_aloud"
-      android:title="@string/menu_read_aloud"
-      android:visible="false"
-      app:showAsAction="never"/>
+    android:id="@+id/menu_read_aloud"
+    android:title="@string/menu_read_aloud"
+    android:visible="false"
+    app:showAsAction="never" />
 
   <item
-      android:id="@+id/menu_help"
-      android:title="@string/menu_help"
-      android:icon="@drawable/action_help"
-      app:showAsAction="never"/>
+    android:id="@+id/menu_help"
+    android:icon="@drawable/action_help"
+    android:title="@string/menu_help"
+    app:showAsAction="never" />
 
   <item
-      android:id="@+id/menu_settings"
-      android:title="@string/menu_settings"
-      android:icon="@drawable/navigation_forward"
-      app:showAsAction="never"/>
+    android:id="@+id/menu_settings"
+    android:icon="@drawable/navigation_forward"
+    android:title="@string/menu_settings"
+    app:showAsAction="never" />
 
 </menu>
diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml
index 934202b19..158009d03 100644
--- a/app/src/main/res/menu/menu_search.xml
+++ b/app/src/main/res/menu/menu_search.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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/menu_search"
-      android:icon="@drawable/action_search"
-      android:title="@string/menu_search"
-      android:visible="false"
-      app:actionViewClass="android.support.v7.widget.SearchView"
-      app:showAsAction="always|collapseActionView"
-      app:iconifiedByDefault="false"/>
+    android:id="@+id/menu_search"
+    android:icon="@drawable/action_search"
+    android:title="@string/menu_search"
+    android:visible="false"
+    app:actionViewClass="android.support.v7.widget.SearchView"
+    app:iconifiedByDefault="false"
+    app:showAsAction="always|collapseActionView" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_webview.xml b/app/src/main/res/menu/menu_webview.xml
index 5c11b3f83..ff99b82d0 100644
--- a/app/src/main/res/menu/menu_webview.xml
+++ b/app/src/main/res/menu/menu_webview.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,16 +14,16 @@
 -->
 
 <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/find_prev"
-      android:icon="@drawable/action_find_previous"
-      app:showAsAction="always"
-      android:title="@string/previous"/>
+    android:id="@+id/find_prev"
+    android:icon="@drawable/action_find_previous"
+    android:title="@string/previous"
+    app:showAsAction="always" />
   <item
-      android:id="@+id/find_next"
-      android:icon="@drawable/action_find_next"
-      app:showAsAction="always"
-    android:title="@string/next"/>
+    android:id="@+id/find_next"
+    android:icon="@drawable/action_find_next"
+    android:title="@string/next"
+    app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/menu/menu_webview_action.xml b/app/src/main/res/menu/menu_webview_action.xml
index c6a053e93..ba79e6c4e 100644
--- a/app/src/main/res/menu/menu_webview_action.xml
+++ b/app/src/main/res/menu/menu_webview_action.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,11 +14,11 @@
 -->
 
 <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/menu_speak_text"
-      android:icon="@drawable/action_voice"
-      android:title="@string/menu_read_aloud"
-      app:showAsAction="always"/>
+    android:id="@+id/menu_speak_text"
+    android:icon="@drawable/action_voice"
+    android:title="@string/menu_read_aloud"
+    app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/menu/menu_zim_manager.xml b/app/src/main/res/menu/menu_zim_manager.xml
index c8ed66fff..ead52bf3d 100644
--- a/app/src/main/res/menu/menu_zim_manager.xml
+++ b/app/src/main/res/menu/menu_zim_manager.xml
@@ -9,12 +9,12 @@
     android:visible="true"
     app:actionViewClass="android.support.v7.widget.SearchView"
     app:iconifiedByDefault="true"
-    app:showAsAction="always|collapseActionView"/>
+    app:showAsAction="always|collapseActionView" />
   <item
     android:id="@+id/select_language"
     android:icon="@drawable/ic_language_white_24dp"
     android:title="@string/pref_language_chooser"
     android:visible="true"
-    app:showAsAction="always"/>
+    app:showAsAction="always" />
 </menu>
 
diff --git a/app/src/main/res/xml/kiwix_widget_provider_info.xml b/app/src/main/res/xml/kiwix_widget_provider_info.xml
index e8fa55b3a..da5fcc368 100644
--- a/app/src/main/res/xml/kiwix_widget_provider_info.xml
+++ b/app/src/main/res/xml/kiwix_widget_provider_info.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:minWidth="250dp"
-                    android:minHeight="40dp"
-                    android:minResizeWidth="250dp"
-                    android:minResizeHeight="40dp"
-                    android:updatePeriodMillis="86400000"
-                    android:previewImage="@drawable/search_widget_preview"
-                    android:initialLayout="@layout/kiwix_search_widget"
-                    android:resizeMode="horizontal|vertical">
-
-
-
-
+  android:initialLayout="@layout/kiwix_search_widget"
+  android:minHeight="40dp"
+  android:minResizeHeight="40dp"
+  android:minResizeWidth="250dp"
+  android:minWidth="250dp"
+  android:previewImage="@drawable/search_widget_preview"
+  android:resizeMode="horizontal|vertical"
+  android:updatePeriodMillis="86400000">
 </appwidget-provider>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 6f179795f..ada57adf9 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,69 +1,69 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
   <PreferenceCategory
-      android:key="pref_display"
-      android:title="@string/pref_display_title">
+    android:key="pref_display"
+    android:title="@string/pref_display_title">
 
     <org.kiwix.kiwixmobile.settings.CustomSwitchPreference
-        android:defaultValue="false"
-        android:key="pref_nightmode"
-        android:summary="@string/pref_nightmode_summary"
-        android:title="@string/pref_nightmode"/>
+      android:defaultValue="false"
+      android:key="pref_nightmode"
+      android:summary="@string/pref_nightmode_summary"
+      android:title="@string/pref_nightmode" />
 
     <org.kiwix.kiwixmobile.settings.CustomSwitchPreference
-        android:defaultValue="false"
-        android:key="pref_auto_nightmode"
-        android:summary="@string/pref_autonightmode_summary"
-        android:title="@string/pref_autonightmode"/>
+      android:defaultValue="false"
+      android:key="pref_auto_nightmode"
+      android:summary="@string/pref_autonightmode_summary"
+      android:title="@string/pref_autonightmode" />
 
     <org.kiwix.kiwixmobile.settings.CustomSwitchPreference
-        android:defaultValue="false"
-        android:key="pref_backtotop"
-        android:summary="@string/pref_backtotop_summary"
-        android:title="@string/pref_backtotop"/>
+      android:defaultValue="false"
+      android:key="pref_backtotop"
+      android:summary="@string/pref_backtotop_summary"
+      android:title="@string/pref_backtotop" />
 
     <org.kiwix.kiwixmobile.settings.CustomSwitchPreference
-        android:defaultValue="false"
-        android:key="pref_hidetoolbar"
-        android:summary="@string/pref_hidetoolbar_summary"
-        android:title="@string/pref_hidetoolbar"/>
+      android:defaultValue="false"
+      android:key="pref_hidetoolbar"
+      android:summary="@string/pref_hidetoolbar_summary"
+      android:title="@string/pref_hidetoolbar" />
 
     <org.kiwix.kiwixmobile.settings.CustomSwitchPreference
       android:defaultValue="false"
       android:key="pref_bottomtoolbar"
       android:summary="@string/pref_bottomtoolbar_summary"
-      android:title="@string/pref_bottomtoolbar"/>
+      android:title="@string/pref_bottomtoolbar" />
 
 
   </PreferenceCategory>
 
   <PreferenceCategory
-      android:key="pref_extras"
-      android:title="@string/pref_extras">
+    android:key="pref_extras"
+    android:title="@string/pref_extras">
 
     <org.kiwix.kiwixmobile.settings.CustomSwitchPreference
-        android:defaultValue="false"
-        android:key="pref_newtab_background"
-        android:title="@string/pref_newtab_background_title"
-        android:summary="@string/pref_newtab_background_summary"/>
+      android:defaultValue="false"
+      android:key="pref_newtab_background"
+      android:summary="@string/pref_newtab_background_summary"
+      android:title="@string/pref_newtab_background_title" />
 
     <org.kiwix.kiwixmobile.settings.CustomSwitchPreference
-        android:defaultValue="true"
-        android:key="pref_external_link_popup"
-        android:title="@string/pref_external_link_popup_title"
-        android:summary="@string/pref_external_link_popup_summary"/>
+      android:defaultValue="true"
+      android:key="pref_external_link_popup"
+      android:summary="@string/pref_external_link_popup_summary"
+      android:title="@string/pref_external_link_popup_title" />
 
     <org.kiwix.kiwixmobile.settings.CustomSwitchPreference
       android:defaultValue="false"
       android:key="pref_full_text_search"
-      android:title="@string/pref_multi_search_title"
-      android:summary="@string/pref_multi_search_summary"/>
+      android:summary="@string/pref_multi_search_summary"
+      android:title="@string/pref_multi_search_title" />
 
 
-      <org.kiwix.kiwixmobile.settings.CustomSwitchPreference
-          android:defaultValue="true"
-          android:key="pref_wifi_only"
-          android:title="@string/pref_wifi_only"
-          android:summary="@string/pref_wifi_only"/>
+    <org.kiwix.kiwixmobile.settings.CustomSwitchPreference
+      android:defaultValue="true"
+      android:key="pref_wifi_only"
+      android:summary="@string/pref_wifi_only"
+      android:title="@string/pref_wifi_only" />
   </PreferenceCategory>
 
   <PreferenceCategory
@@ -72,66 +72,66 @@
 
     <Preference
       android:key="pref_select_folder"
-      android:title="@string/pref_current_folder"/>
+      android:title="@string/pref_current_folder" />
 
   </PreferenceCategory>
 
   <PreferenceCategory
-      android:key="pref_zoom_sub"
-      android:title="@string/pref_zoom_sub_title">
+    android:key="pref_zoom_sub"
+    android:title="@string/pref_zoom_sub_title">
 
     <org.kiwix.kiwixmobile.settings.CustomSwitchPreference
-        android:defaultValue="false"
-        android:key="pref_zoom_enabled"
+      android:defaultValue="false"
+      android:key="pref_zoom_enabled"
 
-        android:title="@string/pref_zoom_enable"/>
+      android:title="@string/pref_zoom_enable" />
 
     <org.kiwix.kiwixmobile.views.SliderPreference
-        android:defaultValue="250.0"
-        android:dialogMessage="0"
-        android:enabled="false"
-        android:key="pref_zoom_slider"
-        android:summary="@array/pref_zoom_entryvalues"
-        android:title="@string/pref_zoom_dialog"/>
+      android:defaultValue="250.0"
+      android:dialogMessage="0"
+      android:enabled="false"
+      android:key="pref_zoom_slider"
+      android:summary="@array/pref_zoom_entryvalues"
+      android:title="@string/pref_zoom_dialog" />
   </PreferenceCategory>
 
   <PreferenceCategory
-      android:key="pref_history"
-      android:title="History">
+    android:key="pref_history"
+    android:title="History">
 
     <Preference
-        android:key="pref_clear_all_history"
-        android:summary="@string/pref_clear_all_history_summary"
-        android:title="@string/pref_clear_all_history_title"/>
+      android:key="pref_clear_all_history"
+      android:summary="@string/pref_clear_all_history_summary"
+      android:title="@string/pref_clear_all_history_title" />
 
   </PreferenceCategory>
   <PreferenceCategory
-      android:key="pref_language"
-      android:title="@string/pref_language_title">
+    android:key="pref_language"
+    android:title="@string/pref_language_title">
 
     <Preference
-        android:key="pref_language_chooser"
-        android:summary="@string/pref_language_chooser"
-        android:title="@string/pref_language_title"/>
+      android:key="pref_language_chooser"
+      android:summary="@string/pref_language_chooser"
+      android:title="@string/pref_language_title" />
 
   </PreferenceCategory>
 
   <PreferenceCategory
-      android:key="pref_info"
-      android:title="@string/pref_info_title">
+    android:key="pref_info"
+    android:title="@string/pref_info_title">
 
     <EditTextPreference
-        android:enabled="false"
-        android:key="pref_version"
-        android:persistent="false"
-        android:selectable="true"
-        android:shouldDisableView="false"
-        android:title="@string/pref_info_version"/>
+      android:enabled="false"
+      android:key="pref_version"
+      android:persistent="false"
+      android:selectable="true"
+      android:shouldDisableView="false"
+      android:title="@string/pref_info_version" />
 
     <Preference
       android:key="pref_credits"
       android:summary="@string/pref_credits"
-      android:title="@string/pref_credits_title"/>
+      android:title="@string/pref_credits_title" />
 
   </PreferenceCategory>
 
diff --git a/app/src/main/res/xml/webview.xml b/app/src/main/res/xml/webview.xml
index 7dc20a488..057b282ad 100644
--- a/app/src/main/res/xml/webview.xml
+++ b/app/src/main/res/xml/webview.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.kiwix.kiwixmobile.views.web.KiwixWebView
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<org.kiwix.kiwixmobile.views.web.KiwixWebView xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:scrollbarThumbVertical="@drawable/scrollbar_handle_vertical"
   android:scrollbarSize="15px"
- />
\ No newline at end of file
+  android:scrollbarThumbVertical="@drawable/scrollbar_handle_vertical" />
\ No newline at end of file