diff --git a/app/lint.xml b/app/lint.xml
index 53022753b..aa33b0803 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <lint>
-    <issue id="MissingTranslation" severity="ignore"/>
+  <issue id="MissingTranslation" severity="ignore"/>
 
-    <issue id="MissingQuantity" severity="ignore"/>
-    <issue id="ImpliedQuantity" severity="ignore"/>
+  <issue id="MissingQuantity" severity="ignore"/>
+  <issue id="ImpliedQuantity" severity="ignore"/>
 
-    <issue id="InvalidPackage">
-        <ignore regexp="net.fortuna.ical4j.util.JCacheTimeZoneCache" />
-    </issue>
+  <issue id="InvalidPackage">
+    <ignore regexp="net.fortuna.ical4j.util.JCacheTimeZoneCache"/>
+  </issue>
 </lint>
diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index 36161c091..9df381c48 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.tasks">
+  package="org.tasks">
 
-    <application>
-        <!-- Google Analytics -->
+  <application>
+    <!-- Google Analytics -->
 
-        <receiver
-            android:name="com.google.android.gms.analytics.AnalyticsReceiver"
-            android:enabled="true">
-            <intent-filter>
-                <action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH" />
-            </intent-filter>
-        </receiver>
+    <receiver
+      android:enabled="true"
+      android:name="com.google.android.gms.analytics.AnalyticsReceiver">
+      <intent-filter>
+        <action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH"/>
+      </intent-filter>
+    </receiver>
 
-        <service
-            android:name="com.google.android.gms.analytics.AnalyticsService"
-            android:enabled="true"
-            android:exported="false" />
+    <service
+      android:enabled="true"
+      android:exported="false"
+      android:name="com.google.android.gms.analytics.AnalyticsService"/>
 
-        <receiver
-            android:name="com.google.android.gms.analytics.CampaignTrackingReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.android.vending.INSTALL_REFERRER" />
-            </intent-filter>
-        </receiver>
+    <receiver
+      android:exported="true"
+      android:name="com.google.android.gms.analytics.CampaignTrackingReceiver">
+      <intent-filter>
+        <action android:name="com.android.vending.INSTALL_REFERRER"/>
+      </intent-filter>
+    </receiver>
 
-    </application>
+  </application>
 
 </manifest>
diff --git a/app/src/amazon/res/values/keys.xml b/app/src/amazon/res/values/keys.xml
index e0da02ee9..83393b812 100644
--- a/app/src/amazon/res/values/keys.xml
+++ b/app/src/amazon/res/values/keys.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sku_themes">themes</string>
-    <string name="common_google_play_services_notification_ticker">Google Play services error</string>
+  <string name="sku_themes">themes</string>
+  <string name="common_google_play_services_notification_ticker">Google Play services error</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/debug/res/xml/google_analytics.xml b/app/src/debug/res/xml/google_analytics.xml
index 74b369d3b..7695f27f8 100644
--- a/app/src/debug/res/xml/google_analytics.xml
+++ b/app/src/debug/res/xml/google_analytics.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="ga_trackingId">UA-71449238-1</string>
+  <string name="ga_trackingId">UA-71449238-1</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/generic/AndroidManifest.xml b/app/src/generic/AndroidManifest.xml
index aeb4d279e..e772685fc 100644
--- a/app/src/generic/AndroidManifest.xml
+++ b/app/src/generic/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    package="org.tasks">
+  package="org.tasks">
 
-    <application/>
+  <application/>
 
 </manifest>
diff --git a/app/src/generic/res/values/keys.xml b/app/src/generic/res/values/keys.xml
index e0da02ee9..83393b812 100644
--- a/app/src/generic/res/values/keys.xml
+++ b/app/src/generic/res/values/keys.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sku_themes">themes</string>
-    <string name="common_google_play_services_notification_ticker">Google Play services error</string>
+  <string name="sku_themes">themes</string>
+  <string name="common_google_play_services_notification_ticker">Google Play services error</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/googleplay/AndroidManifest.xml b/app/src/googleplay/AndroidManifest.xml
index ac28f9431..44e8864af 100644
--- a/app/src/googleplay/AndroidManifest.xml
+++ b/app/src/googleplay/AndroidManifest.xml
@@ -1,76 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.tasks">
-
-    <!-- **************** -->
-    <!-- in-app donations -->
-    <!-- **************** -->
-    <uses-permission android:name="com.android.vending.BILLING" />
-
-    <!-- ************************ -->
-    <!-- location based reminders -->
-    <!-- ************************ -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
-    <uses-feature android:name="android.hardware.location" android:required="false" />
-    <uses-feature android:name="android.hardware.location.gps" android:required="false" />
-
-    <!-- **************** -->
-    <!-- google task sync -->
-    <!-- **************** -->
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-
-    <application tools:ignore="GoogleAppIndexingWarning">
-
-        <meta-data
-            android:name="com.google.android.backup.api_key"
-            android:value="AEdPqrEAAAAI49v5bBusi_bq1bgLBB1LIsepNV0eBrFkQrBZkw" />
-
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-
-        <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyBq82FiK4U8Ke2TV_F8UjDZwgtSy8K9cyQ"/>
-
-        <service android:name=".location.GeofenceTransitionsIntentService"/>
-
-        <activity android:name=".activities.GoogleTaskListSettingsActivity" />
-
-        <activity
-            android:name="com.todoroo.astrid.gtasks.auth.GtasksLoginActivity"
-            android:theme="@style/TranslucentDialog" />
-
-        <activity
-            android:name=".sync.SynchronizationPreferences"
-            android:label="@string/synchronization"
-            android:theme="@style/Tasks" />
-
-        <!-- Google Analytics -->
-
-        <receiver
-            android:name="com.google.android.gms.analytics.AnalyticsReceiver"
-            android:enabled="true">
-            <intent-filter>
-                <action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name="com.google.android.gms.analytics.AnalyticsService"
-            android:enabled="true"
-            android:exported="false" />
-
-        <receiver
-            android:name="com.google.android.gms.analytics.CampaignTrackingReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.android.vending.INSTALL_REFERRER" />
-            </intent-filter>
-        </receiver>
-    </application>
+  xmlns:tools="http://schemas.android.com/tools"
+  package="org.tasks">
+
+  <!-- **************** -->
+  <!-- in-app donations -->
+  <!-- **************** -->
+  <uses-permission android:name="com.android.vending.BILLING"/>
+
+  <!-- ************************ -->
+  <!-- location based reminders -->
+  <!-- ************************ -->
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+  <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
+
+  <uses-feature
+    android:name="android.hardware.location"
+    android:required="false"/>
+  <uses-feature
+    android:name="android.hardware.location.gps"
+    android:required="false"/>
+
+  <!-- **************** -->
+  <!-- google task sync -->
+  <!-- **************** -->
+  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH"/>
+  <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+
+  <application tools:ignore="GoogleAppIndexingWarning">
+
+    <meta-data
+      android:name="com.google.android.backup.api_key"
+      android:value="AEdPqrEAAAAI49v5bBusi_bq1bgLBB1LIsepNV0eBrFkQrBZkw"/>
+
+    <meta-data
+      android:name="com.google.android.gms.version"
+      android:value="@integer/google_play_services_version"/>
+
+    <meta-data
+      android:name="com.google.android.geo.API_KEY"
+      android:value="AIzaSyBq82FiK4U8Ke2TV_F8UjDZwgtSy8K9cyQ"/>
+
+    <service android:name=".location.GeofenceTransitionsIntentService"/>
+
+    <activity android:name=".activities.GoogleTaskListSettingsActivity"/>
+
+    <activity
+      android:name="com.todoroo.astrid.gtasks.auth.GtasksLoginActivity"
+      android:theme="@style/TranslucentDialog"/>
+
+    <activity
+      android:label="@string/synchronization"
+      android:name=".sync.SynchronizationPreferences"
+      android:theme="@style/Tasks"/>
+
+    <!-- Google Analytics -->
+
+    <receiver
+      android:enabled="true"
+      android:name="com.google.android.gms.analytics.AnalyticsReceiver">
+      <intent-filter>
+        <action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH"/>
+      </intent-filter>
+    </receiver>
+
+    <service
+      android:enabled="true"
+      android:exported="false"
+      android:name="com.google.android.gms.analytics.AnalyticsService"/>
+
+    <receiver
+      android:exported="true"
+      android:name="com.google.android.gms.analytics.CampaignTrackingReceiver">
+      <intent-filter>
+        <action android:name="com.android.vending.INSTALL_REFERRER"/>
+      </intent-filter>
+    </receiver>
+  </application>
 
 </manifest>
diff --git a/app/src/googleplay/res/values/bools.xml b/app/src/googleplay/res/values/bools.xml
index 515c5e1fd..d549726a2 100644
--- a/app/src/googleplay/res/values/bools.xml
+++ b/app/src/googleplay/res/values/bools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="location_enabled">true</bool>
-    <bool name="google_play_store_available">true</bool>
+  <bool name="location_enabled">true</bool>
+  <bool name="google_play_store_available">true</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/googleplay/res/values/keys.xml b/app/src/googleplay/res/values/keys.xml
index 9cc3c02dd..8f2a01edb 100644
--- a/app/src/googleplay/res/values/keys.xml
+++ b/app/src/googleplay/res/values/keys.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="gp_key">MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk8mXRE3dDXwtinUILCEzKjov2rxs3kZbLRzNrcjFWXpG9OEsUzRGLzqEN+WwibVuMRpZLj/+IxbU2sJWq/M0q+90rOhmXn46ZPeNyr77IqX2pWKIAWpzBoWq/mshRwtm9m1FIiGdBNlXrhSE7u3TGB5FuEuuSqKWvWzxeqQ7fHmlM04Lqrh1mN3FaMne8rWv+DWVHDbLrtnXBuC36glOAj17HxrzaE2v6Pv7Df3QefJ3rM1+0fAp/5jNInaP0qHAlG8WTbUmDShQ5kG3urbv3HLByyx6TSqhmNudXUK/6TusvIj50OptAG7x+UFYf956dD3diXhY3yoICvyFWx1sNwIDAQAB</string>
-    <string name="sku_themes">themes</string>
-    <string name="play_services_available">play_services_available</string>
+  <string name="gp_key">MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk8mXRE3dDXwtinUILCEzKjov2rxs3kZbLRzNrcjFWXpG9OEsUzRGLzqEN+WwibVuMRpZLj/+IxbU2sJWq/M0q+90rOhmXn46ZPeNyr77IqX2pWKIAWpzBoWq/mshRwtm9m1FIiGdBNlXrhSE7u3TGB5FuEuuSqKWvWzxeqQ7fHmlM04Lqrh1mN3FaMne8rWv+DWVHDbLrtnXBuC36glOAj17HxrzaE2v6Pv7Df3QefJ3rM1+0fAp/5jNInaP0qHAlG8WTbUmDShQ5kG3urbv3HLByyx6TSqhmNudXUK/6TusvIj50OptAG7x+UFYf956dD3diXhY3yoICvyFWx1sNwIDAQAB</string>
+  <string name="sku_themes">themes</string>
+  <string name="play_services_available">play_services_available</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bed26f67a..b03547b0d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,498 +1,508 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.tasks">
-
-
-    <uses-sdk tools:overrideLibrary="timber.log"/>
-
-    <!-- ================================================== Used Permissions = -->
-
-    <!-- ************* -->
-    <!-- notifications -->
-    <!-- ************* -->
-    <uses-permission android:name="android.permission.VIBRATE" />
-
-    <!-- *************************** -->
-    <!-- google calendar integration -->
-    <!-- *************************** -->
-    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
-    <uses-permission android:name="android.permission.READ_CALENDAR" />
-
-    <!-- ****************** -->
-    <!-- creating shortcuts -->
-    <!-- ****************** -->
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-
-    <!-- **************************************** -->
-    <!-- write backups and attachments to storage -->
-    <!-- **************************************** -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <!-- ********************* -->
-    <!-- missed call reminders -->
-    <!-- ********************* -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_CALL_LOG" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-
-    <!-- ******************************************* -->
-    <!-- scheduling reminders after rebooting device -->
-    <!-- ******************************************* -->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
-    <!-- ********************* -->
-    <!-- recording voice notes -->
-    <!-- ********************* -->
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-feature android:name="android.hardware.microphone" android:required="false" />
-
-    <!-- *********************************** -->
-    <!-- keep device awake for notifications -->
-    <!-- *********************************** -->
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <!-- *************************** -->
-    <!-- caldav and google task sync -->
-    <!-- *************************** -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-
-    <!-- ============================================== Exported Permissions = -->
-
-    <!-- for v2 tasks provider -->
-    <permission
-        android:name="org.tasks.permission.READ_TASKS"
-        android:permissionGroup="android.permission-group.MESSAGES"
-        android:protectionLevel="normal"
-        android:label="@string/read_permission_label"
-        android:description="@string/read_permission_desc" />
-
-    <uses-permission android:name="org.tasks.permission.READ_TASKS" />
-
-    <!-- ========================================================== Metadata = -->
-
-    <supports-screens
-        android:xlargeScreens="true"
-        android:largeScreens="true" />
-
-    <uses-feature
-        android:name="android.hardware.touchscreen"
-        android:required="false" />
-
-    <application
-        tools:ignore="GoogleAppIndexingWarning"
-        android:icon="@mipmap/ic_launcher"
-        android:fullBackupContent="@xml/backup_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:label="@string/app_name"
-        android:theme="@style/Tasks"
-        android:allowBackup="true"
-        android:name=".Tasks"
-        android:supportsRtl="true"
-        android:manageSpaceActivity="com.todoroo.astrid.core.OldTaskPreferences">
-
-        <!-- ====================================================== Activities = -->
-
-        <activity
-            android:name=".activities.ColorPickerActivity"
-            android:theme="@style/TranslucentDialog" />
-
-        <activity
-            android:name=".activities.DatePickerActivity"
-            android:theme="@style/TranslucentDialog" />
-
-        <activity
-            android:name=".activities.TimePickerActivity"
-            android:theme="@style/TranslucentDialog" />
-
-        <activity
-            android:name=".activities.DateAndTimePickerActivity"
-            android:theme="@style/TranslucentDialog"
-            android:taskAffinity="" />
-
-        <activity
-            android:name=".activities.FilterSelectionActivity"
-            android:exported="true"
-            android:theme="@style/TranslucentDialog" />
-
-        <activity
-            android:name=".activities.AddAttachmentActivity"
-            android:theme="@style/TranslucentDialog" />
-
-        <activity
-            android:name=".activities.CameraActivity"
-            android:theme="@style/TranslucentDialog" />
-
-        <!-- Activity that displays task list -->
-        <activity
-            android:name="com.todoroo.astrid.activity.TaskListActivity"
-            android:launchMode="singleTask" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.todoroo.astrid.activity.TaskEditActivity">
-            <intent-filter tools:ignore="AppLinkUrlError">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/task" />
-            </intent-filter>
-        </activity>
-
-        <!-- Activity for selecting Android shortcut -->
-        <activity
-            android:name=".widget.ShortcutConfigActivity"
-            android:theme="@style/TranslucentDialog"
-            android:label="@string/FSA_label">
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_SHORTCUT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <!-- Activity launched from ShareLink menu item -->
-        <!-- TODO: clearTaskOnLaunch probable cause of #275 -->
-        <activity
-            android:name="com.todoroo.astrid.activity.ShareLinkActivity"
-            android:clearTaskOnLaunch="true">
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-        </activity>
-
-        <!-- Activity for preferences -->
-
-        <activity
-            android:name=".preferences.HelpAndFeedbackActivity"
-            android:label="@string/help_and_feedback"
-            android:theme="@style/Tasks" />
-
-        <activity
-            android:name=".preferences.BasicPreferences"
-            android:label="@string/TLA_menu_settings"
-            android:theme="@style/Tasks" />
-
-        <activity
-            android:name=".preferences.MiscellaneousPreferences"
-            android:label="@string/miscellaneous"
-            android:theme="@style/Tasks" />
-
-        <activity
-            android:name=".widget.WidgetConfigActivity"
-            android:taskAffinity=""
-            android:label="@string/widget_settings"
-            android:excludeFromRecents="true"
-            android:theme="@style/Tasks"
-            android:exported="false" >
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
-            </intent-filter>
-        </activity>
-
-        <!-- ======================================================= Receivers = -->
-
-        <!-- widgets -->
-        <receiver
-            android:name=".widget.TasksWidget"
-            android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="com.todoroo.astrid.widget.TasksWidget.COMPLETE_TASK"/>
-                <action android:name="com.todoroo.astrid.widget.TasksWidget.EDIT_TASK"/>
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/scrollable_widget_provider_info" />
-        </receiver>
-
-        <receiver android:name="com.todoroo.astrid.calls.PhoneStateChangedReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.PHONE_STATE" />
-            </intent-filter>
-        </receiver>
-
-        <!-- ======================================================== Services = -->
-
-        <service
-            android:name=".widget.ScrollableWidgetUpdateService"
-            android:permission="android.permission.BIND_REMOTEVIEWS"/>
-
-        <!-- ======================================================= Providers = -->
-
-        <provider
-            android:name="com.todoroo.astrid.provider.Astrid2TaskProvider"
-            android:authorities="org.tasks;org.tasks.tasksprovider"
-            android:exported="true"
-            android:multiprocess="true"
-            android:grantUriPermissions="true"
-            android:readPermission="org.tasks.permission.READ_TASKS" />
-
-        <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_provider_paths" />
-        </provider>
-
-        <!-- ========================================================= Plugins = -->
-
-        <activity
-            android:name=".preferences.AppearancePreferences"
-            android:label="@string/EPr_appearance_header"
-            android:theme="@style/Tasks" />
-
-        <activity
-            android:name=".preferences.DateTimePreferences"
-            android:label="@string/date_and_time"
-            android:theme="@style/Tasks" />
-
-        <activity
-            android:name="com.todoroo.astrid.core.DefaultsPreferences"
-            android:label="@string/task_defaults"
-            android:theme="@style/Tasks"/>
-
-        <activity
-            android:name="com.todoroo.astrid.activity.BeastModePreferences"
-            android:theme="@style/Tasks"/>
-
-        <activity
-            android:name=".reminders.MissedCallActivity"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:taskAffinity=""
-            android:theme="@style/TranslucentDialog" />
-
-        <activity
-            android:name=".reminders.SnoozeActivity"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:taskAffinity=""
-            android:theme="@style/TranslucentDialog" />
-
-        <activity
-            android:name=".reminders.NotificationActivity"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:taskAffinity=""
-            android:theme="@style/TranslucentDialog" />
-
-        <!-- tags -->
-
-        <!-- custom filters -->
-        <activity
-            android:name="com.todoroo.astrid.core.CustomFilterActivity"
-            android:theme="@style/Tasks"/>
-
-        <!-- actfm -->
-
-        <activity android:name=".activities.TagSettingsActivity" />
-
-        <activity android:name=".activities.FilterSettingsActivity" />
-
-        <activity android:name=".caldav.CaldavSettingsActivity" />
-
-        <activity
-            android:name=".activities.CalendarSelectionActivity"
-            android:theme="@style/TranslucentDialog" />
-
-        <activity
-            android:name="com.todoroo.astrid.gcal.CalendarReminderActivity"
-            android:theme="@style/TasksDialog"/>
-
-        <receiver android:name="com.todoroo.astrid.gcal.CalendarAlarmReceiver" />
-
-        <!-- old tasks -->
-        <activity
-            android:name="com.todoroo.astrid.core.OldTaskPreferences"
-            android:label="@string/EPr_manage_header"
-            android:theme="@style/Tasks"/>
-
-        <!-- premium -->
-        <activity
-            android:name="com.todoroo.astrid.files.AACRecordingActivity"
-            android:configChanges="orientation|screenSize"
-            android:screenOrientation="portrait"
-            android:theme="@style/TranslucentDialog" />
-
-        <activity
-            android:name=".files.MyFilePickerActivity"
-            android:label="@string/app_name"
-            android:theme="@style/Tasks">
-            <intent-filter>
-                <action android:name="android.intent.action.GET_CONTENT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".files.FileExplore"
-            android:theme="@style/TranslucentDialog"/>
-
-        <!-- reminders -->
-        <activity
-            android:name="com.todoroo.astrid.reminders.ReminderPreferences"
-            android:label="@string/notifications"
-            android:theme="@style/Tasks"
-            android:exported="false" >
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
-            </intent-filter>
-
-        </activity>
-
-        <activity
-            android:name=".voice.VoiceCommandActivity"
-            android:theme="@style/TranslucentDialog">
-            <intent-filter>
-                <action android:name="com.google.android.gm.action.AUTO_SEND"/>
-
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="text/plain"/>
-            </intent-filter>
-        </activity>
-
-        <receiver android:name=".receivers.BootCompletedReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-
-        <receiver android:name=".receivers.CompleteTaskReceiver"/>
-
-        <receiver android:name=".receivers.MyPackageReplacedReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name=".jobs.AfterSaveIntentService"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-        <service
-            android:name=".scheduling.GeofenceSchedulingIntentService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="false" />
-        <service
-            android:name=".scheduling.BackgroundScheduler"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="false" />
-        <service
-            android:name=".scheduling.NotificationSchedulerIntentService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="false" />
-
-        <receiver android:name=".scheduling.CalendarNotificationIntentService$Broadcast" />
-        <service
-            android:name=".scheduling.CalendarNotificationIntentService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="false" />
-
-        <receiver android:name=".location.GeofenceTransitionsIntentService$Broadcast" />
-        <service
-            android:name=".location.GeofenceTransitionsIntentService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="false" />
-
-        <receiver android:name=".notifications.NotificationClearedReceiver" />
-
-        <service
-            android:name=".locale.receiver.TaskerIntentService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="false" />
-
-        <!-- Uses Library -->
-        <uses-library
-            android:name="com.google.android.maps"
-            android:required="false" />
-
-        <!-- DashClock extension -->
-
-        <service android:name=".dashclock.DashClockExtension"
-            android:icon="@drawable/ic_check_white_24dp"
-            android:label="@string/app_name"
-            android:permission="com.google.android.apps.dashclock.permission.READ_EXTENSION_DATA">
-            <intent-filter>
-                <action android:name="com.google.android.apps.dashclock.Extension" />
-            </intent-filter>
-            <meta-data android:name="protocolVersion" android:value="2" />
-            <meta-data android:name="worldReadable" android:value="true" />
-            <meta-data android:name="description"
-                android:value="Display a count of active tasks" />
-            <meta-data android:name="settingsActivity"
-                android:value=".dashclock.DashClockSettings" />
-        </service>
-
-        <activity
-          android:exported="true"
-          android:label="@string/app_name"
-          android:name=".dashclock.DashClockSettings"/>
-
-        <!-- Tasker/Locale -->
-
-        <activity
-            android:name=".locale.ui.activity.TaskerCreateTaskActivity"
-            android:exported="true"
-            android:enabled="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/tasker_create_task"
-            android:theme="@style/Tasks"
-            android:uiOptions="splitActionBarWhenNarrow"
-            android:windowSoftInputMode="adjustResize"
-            tools:ignore="ExportedActivity">
-            <intent-filter>
-                <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".locale.ui.activity.TaskerSettingsActivity"
-            android:exported="false"
-            android:label="@string/tasker_list_notification"
-            android:theme="@style/Tasks"
-            android:uiOptions="splitActionBarWhenNarrow"
-            android:windowSoftInputMode="adjustResize"/>
-
-        <activity-alias
-            android:name="com.twofortyfouram.locale.example.setting.toast.ui.activity.PluginActivity"
-            android:exported="true"
-            android:enabled="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/tasker_list_notification"
-            android:targetActivity=".locale.ui.activity.TaskerSettingsActivity"
-            tools:ignore="ExportedActivity">
-            <intent-filter>
-                <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
-            </intent-filter>
-        </activity-alias>
-
-        <receiver
-            android:name=".locale.receiver.FireReceiver"
-            android:exported="true"
-            android:enabled="true"
-            tools:ignore="ExportedReceiver">
-            <intent-filter>
-                <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING"/>
-            </intent-filter>
-        </receiver>
-
-    </application>
+  xmlns:tools="http://schemas.android.com/tools"
+  package="org.tasks">
+
+
+  <uses-sdk tools:overrideLibrary="timber.log"/>
+
+  <!-- ================================================== Used Permissions = -->
+
+  <!-- ************* -->
+  <!-- notifications -->
+  <!-- ************* -->
+  <uses-permission android:name="android.permission.VIBRATE"/>
+
+  <!-- *************************** -->
+  <!-- google calendar integration -->
+  <!-- *************************** -->
+  <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
+  <uses-permission android:name="android.permission.READ_CALENDAR"/>
+
+  <!-- ****************** -->
+  <!-- creating shortcuts -->
+  <!-- ****************** -->
+  <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
+
+  <!-- **************************************** -->
+  <!-- write backups and attachments to storage -->
+  <!-- **************************************** -->
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+  <!-- ********************* -->
+  <!-- missed call reminders -->
+  <!-- ********************* -->
+  <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+  <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+  <uses-permission android:name="android.permission.READ_CONTACTS"/>
+
+  <!-- ******************************************* -->
+  <!-- scheduling reminders after rebooting device -->
+  <!-- ******************************************* -->
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+
+  <!-- ********************* -->
+  <!-- recording voice notes -->
+  <!-- ********************* -->
+  <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+  <uses-feature
+    android:name="android.hardware.microphone"
+    android:required="false"/>
+
+  <!-- *********************************** -->
+  <!-- keep device awake for notifications -->
+  <!-- *********************************** -->
+  <uses-permission android:name="android.permission.WAKE_LOCK"/>
+
+  <!-- *************************** -->
+  <!-- caldav and google task sync -->
+  <!-- *************************** -->
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
+  <!-- ============================================== Exported Permissions = -->
+
+  <!-- for v2 tasks provider -->
+  <permission
+    android:description="@string/read_permission_desc"
+    android:label="@string/read_permission_label"
+    android:name="org.tasks.permission.READ_TASKS"
+    android:permissionGroup="android.permission-group.MESSAGES"
+    android:protectionLevel="normal"/>
+
+  <uses-permission android:name="org.tasks.permission.READ_TASKS"/>
+
+  <!-- ========================================================== Metadata = -->
+
+  <supports-screens
+    android:largeScreens="true"
+    android:xlargeScreens="true"/>
+
+  <uses-feature
+    android:name="android.hardware.touchscreen"
+    android:required="false"/>
+
+  <application
+    android:allowBackup="true"
+    android:fullBackupContent="@xml/backup_config"
+    android:icon="@mipmap/ic_launcher"
+    android:label="@string/app_name"
+    android:manageSpaceActivity="com.todoroo.astrid.core.OldTaskPreferences"
+    android:name=".Tasks"
+    android:roundIcon="@mipmap/ic_launcher_round"
+    android:supportsRtl="true"
+    android:theme="@style/Tasks"
+    tools:ignore="GoogleAppIndexingWarning">
+
+    <!-- ====================================================== Activities = -->
+
+    <activity
+      android:name=".activities.ColorPickerActivity"
+      android:theme="@style/TranslucentDialog"/>
+
+    <activity
+      android:name=".activities.DatePickerActivity"
+      android:theme="@style/TranslucentDialog"/>
+
+    <activity
+      android:name=".activities.TimePickerActivity"
+      android:theme="@style/TranslucentDialog"/>
+
+    <activity
+      android:name=".activities.DateAndTimePickerActivity"
+      android:taskAffinity=""
+      android:theme="@style/TranslucentDialog"/>
+
+    <activity
+      android:exported="true"
+      android:name=".activities.FilterSelectionActivity"
+      android:theme="@style/TranslucentDialog"/>
+
+    <activity
+      android:name=".activities.AddAttachmentActivity"
+      android:theme="@style/TranslucentDialog"/>
+
+    <activity
+      android:name=".activities.CameraActivity"
+      android:theme="@style/TranslucentDialog"/>
+
+    <!-- Activity that displays task list -->
+    <activity
+      android:launchMode="singleTask"
+      android:name="com.todoroo.astrid.activity.TaskListActivity">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+    </activity>
+
+    <activity android:name="com.todoroo.astrid.activity.TaskEditActivity">
+      <intent-filter tools:ignore="AppLinkUrlError">
+        <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+        <data android:mimeType="vnd.android.cursor.item/task"/>
+      </intent-filter>
+    </activity>
+
+    <!-- Activity for selecting Android shortcut -->
+    <activity
+      android:label="@string/FSA_label"
+      android:name=".widget.ShortcutConfigActivity"
+      android:theme="@style/TranslucentDialog">
+      <intent-filter>
+        <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+    </activity>
+
+    <!-- Activity launched from ShareLink menu item -->
+    <!-- TODO: clearTaskOnLaunch probable cause of #275 -->
+    <activity
+      android:clearTaskOnLaunch="true"
+      android:name="com.todoroo.astrid.activity.ShareLinkActivity">
+      <intent-filter>
+        <action android:name="android.intent.action.SEND"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+        <data android:mimeType="text/plain"/>
+      </intent-filter>
+    </activity>
+
+    <!-- Activity for preferences -->
+
+    <activity
+      android:label="@string/help_and_feedback"
+      android:name=".preferences.HelpAndFeedbackActivity"
+      android:theme="@style/Tasks"/>
+
+    <activity
+      android:label="@string/TLA_menu_settings"
+      android:name=".preferences.BasicPreferences"
+      android:theme="@style/Tasks"/>
+
+    <activity
+      android:label="@string/miscellaneous"
+      android:name=".preferences.MiscellaneousPreferences"
+      android:theme="@style/Tasks"/>
+
+    <activity
+      android:excludeFromRecents="true"
+      android:exported="false"
+      android:label="@string/widget_settings"
+      android:name=".widget.WidgetConfigActivity"
+      android:taskAffinity=""
+      android:theme="@style/Tasks">
+      <intent-filter>
+        <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
+      </intent-filter>
+    </activity>
+
+    <!-- ======================================================= Receivers = -->
+
+    <!-- widgets -->
+    <receiver
+      android:label="@string/app_name"
+      android:name=".widget.TasksWidget">
+      <intent-filter>
+        <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+        <action android:name="com.todoroo.astrid.widget.TasksWidget.COMPLETE_TASK"/>
+        <action android:name="com.todoroo.astrid.widget.TasksWidget.EDIT_TASK"/>
+      </intent-filter>
+
+      <meta-data
+        android:name="android.appwidget.provider"
+        android:resource="@xml/scrollable_widget_provider_info"/>
+    </receiver>
+
+    <receiver android:name="com.todoroo.astrid.calls.PhoneStateChangedReceiver">
+      <intent-filter>
+        <action android:name="android.intent.action.PHONE_STATE"/>
+      </intent-filter>
+    </receiver>
+
+    <!-- ======================================================== Services = -->
+
+    <service
+      android:name=".widget.ScrollableWidgetUpdateService"
+      android:permission="android.permission.BIND_REMOTEVIEWS"/>
+
+    <!-- ======================================================= Providers = -->
+
+    <provider
+      android:authorities="org.tasks;org.tasks.tasksprovider"
+      android:exported="true"
+      android:grantUriPermissions="true"
+      android:multiprocess="true"
+      android:name="com.todoroo.astrid.provider.Astrid2TaskProvider"
+      android:readPermission="org.tasks.permission.READ_TASKS"/>
+
+    <provider
+      android:authorities="${applicationId}.provider"
+      android:exported="false"
+      android:grantUriPermissions="true"
+      android:name="android.support.v4.content.FileProvider">
+      <meta-data
+        android:name="android.support.FILE_PROVIDER_PATHS"
+        android:resource="@xml/file_provider_paths"/>
+    </provider>
+
+    <!-- ========================================================= Plugins = -->
+
+    <activity
+      android:label="@string/EPr_appearance_header"
+      android:name=".preferences.AppearancePreferences"
+      android:theme="@style/Tasks"/>
+
+    <activity
+      android:label="@string/date_and_time"
+      android:name=".preferences.DateTimePreferences"
+      android:theme="@style/Tasks"/>
+
+    <activity
+      android:label="@string/task_defaults"
+      android:name="com.todoroo.astrid.core.DefaultsPreferences"
+      android:theme="@style/Tasks"/>
+
+    <activity
+      android:name="com.todoroo.astrid.activity.BeastModePreferences"
+      android:theme="@style/Tasks"/>
+
+    <activity
+      android:excludeFromRecents="true"
+      android:launchMode="singleTask"
+      android:name=".reminders.MissedCallActivity"
+      android:taskAffinity=""
+      android:theme="@style/TranslucentDialog"/>
+
+    <activity
+      android:excludeFromRecents="true"
+      android:launchMode="singleTask"
+      android:name=".reminders.SnoozeActivity"
+      android:taskAffinity=""
+      android:theme="@style/TranslucentDialog"/>
+
+    <activity
+      android:excludeFromRecents="true"
+      android:launchMode="singleTask"
+      android:name=".reminders.NotificationActivity"
+      android:taskAffinity=""
+      android:theme="@style/TranslucentDialog"/>
+
+    <!-- tags -->
+
+    <!-- custom filters -->
+    <activity
+      android:name="com.todoroo.astrid.core.CustomFilterActivity"
+      android:theme="@style/Tasks"/>
+
+    <!-- actfm -->
+
+    <activity android:name=".activities.TagSettingsActivity"/>
+
+    <activity android:name=".activities.FilterSettingsActivity"/>
+
+    <activity android:name=".caldav.CaldavSettingsActivity"/>
+
+    <activity
+      android:name=".activities.CalendarSelectionActivity"
+      android:theme="@style/TranslucentDialog"/>
+
+    <activity
+      android:name="com.todoroo.astrid.gcal.CalendarReminderActivity"
+      android:theme="@style/TasksDialog"/>
+
+    <receiver android:name="com.todoroo.astrid.gcal.CalendarAlarmReceiver"/>
+
+    <!-- old tasks -->
+    <activity
+      android:label="@string/EPr_manage_header"
+      android:name="com.todoroo.astrid.core.OldTaskPreferences"
+      android:theme="@style/Tasks"/>
+
+    <!-- premium -->
+    <activity
+      android:configChanges="orientation|screenSize"
+      android:name="com.todoroo.astrid.files.AACRecordingActivity"
+      android:screenOrientation="portrait"
+      android:theme="@style/TranslucentDialog"/>
+
+    <activity
+      android:label="@string/app_name"
+      android:name=".files.MyFilePickerActivity"
+      android:theme="@style/Tasks">
+      <intent-filter>
+        <action android:name="android.intent.action.GET_CONTENT"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+    </activity>
+
+    <activity
+      android:name=".files.FileExplore"
+      android:theme="@style/TranslucentDialog"/>
+
+    <!-- reminders -->
+    <activity
+      android:exported="false"
+      android:label="@string/notifications"
+      android:name="com.todoroo.astrid.reminders.ReminderPreferences"
+      android:theme="@style/Tasks">
+
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.NOTIFICATION_PREFERENCES"/>
+      </intent-filter>
+
+    </activity>
+
+    <activity
+      android:name=".voice.VoiceCommandActivity"
+      android:theme="@style/TranslucentDialog">
+      <intent-filter>
+        <action android:name="com.google.android.gm.action.AUTO_SEND"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <data android:mimeType="text/plain"/>
+      </intent-filter>
+    </activity>
+
+    <receiver android:name=".receivers.BootCompletedReceiver">
+      <intent-filter>
+        <action android:name="android.intent.action.BOOT_COMPLETED"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+    </receiver>
+
+    <receiver android:name=".receivers.CompleteTaskReceiver"/>
+
+    <receiver android:name=".receivers.MyPackageReplacedReceiver">
+      <intent-filter>
+        <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
+      </intent-filter>
+    </receiver>
+
+    <service
+      android:exported="false"
+      android:name=".jobs.AfterSaveIntentService"
+      android:permission="android.permission.BIND_JOB_SERVICE"/>
+    <service
+      android:exported="false"
+      android:name=".scheduling.GeofenceSchedulingIntentService"
+      android:permission="android.permission.BIND_JOB_SERVICE"/>
+    <service
+      android:exported="false"
+      android:name=".scheduling.BackgroundScheduler"
+      android:permission="android.permission.BIND_JOB_SERVICE"/>
+    <service
+      android:exported="false"
+      android:name=".scheduling.NotificationSchedulerIntentService"
+      android:permission="android.permission.BIND_JOB_SERVICE"/>
+
+    <receiver android:name=".scheduling.CalendarNotificationIntentService$Broadcast"/>
+    <service
+      android:exported="false"
+      android:name=".scheduling.CalendarNotificationIntentService"
+      android:permission="android.permission.BIND_JOB_SERVICE"/>
+
+    <receiver android:name=".location.GeofenceTransitionsIntentService$Broadcast"/>
+    <service
+      android:exported="false"
+      android:name=".location.GeofenceTransitionsIntentService"
+      android:permission="android.permission.BIND_JOB_SERVICE"/>
+
+    <receiver android:name=".notifications.NotificationClearedReceiver"/>
+
+    <service
+      android:exported="false"
+      android:name=".locale.receiver.TaskerIntentService"
+      android:permission="android.permission.BIND_JOB_SERVICE"/>
+
+    <!-- Uses Library -->
+    <uses-library
+      android:name="com.google.android.maps"
+      android:required="false"/>
+
+    <!-- DashClock extension -->
+
+    <service
+      android:icon="@drawable/ic_check_white_24dp"
+      android:label="@string/app_name"
+      android:name=".dashclock.DashClockExtension"
+      android:permission="com.google.android.apps.dashclock.permission.READ_EXTENSION_DATA">
+      <intent-filter>
+        <action android:name="com.google.android.apps.dashclock.Extension"/>
+      </intent-filter>
+
+      <meta-data
+        android:name="protocolVersion"
+        android:value="2"/>
+      <meta-data
+        android:name="worldReadable"
+        android:value="true"/>
+      <meta-data
+        android:name="description"
+        android:value="Display a count of active tasks"/>
+      <meta-data
+        android:name="settingsActivity"
+        android:value=".dashclock.DashClockSettings"/>
+    </service>
+
+    <activity
+      android:exported="true"
+      android:label="@string/app_name"
+      android:name=".dashclock.DashClockSettings"/>
+
+    <!-- Tasker/Locale -->
+
+    <activity
+      android:enabled="true"
+      android:exported="true"
+      android:icon="@mipmap/ic_launcher"
+      android:label="@string/tasker_create_task"
+      android:name=".locale.ui.activity.TaskerCreateTaskActivity"
+      android:theme="@style/Tasks"
+      android:uiOptions="splitActionBarWhenNarrow"
+      android:windowSoftInputMode="adjustResize"
+      tools:ignore="ExportedActivity">
+      <intent-filter>
+        <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING"/>
+      </intent-filter>
+    </activity>
+
+    <activity
+      android:exported="false"
+      android:label="@string/tasker_list_notification"
+      android:name=".locale.ui.activity.TaskerSettingsActivity"
+      android:theme="@style/Tasks"
+      android:uiOptions="splitActionBarWhenNarrow"
+      android:windowSoftInputMode="adjustResize"/>
+
+    <activity-alias
+      android:enabled="true"
+      android:exported="true"
+      android:icon="@mipmap/ic_launcher"
+      android:label="@string/tasker_list_notification"
+      android:name="com.twofortyfouram.locale.example.setting.toast.ui.activity.PluginActivity"
+      android:targetActivity=".locale.ui.activity.TaskerSettingsActivity"
+      tools:ignore="ExportedActivity">
+      <intent-filter>
+        <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING"/>
+      </intent-filter>
+    </activity-alias>
+
+    <receiver
+      android:enabled="true"
+      android:exported="true"
+      android:name=".locale.receiver.FireReceiver"
+      tools:ignore="ExportedReceiver">
+      <intent-filter>
+        <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING"/>
+      </intent-filter>
+    </receiver>
+
+  </application>
 
 </manifest>
diff --git a/app/src/main/res/color-night/text_primary.xml b/app/src/main/res/color-night/text_primary.xml
index 9ed021e68..f0005dd05 100644
--- a/app/src/main/res/color-night/text_primary.xml
+++ b/app/src/main/res/color-night/text_primary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_enabled="false" android:color="@color/white_50"/>
-    <item android:color="@color/white_100"/>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@color/white_50" android:state_enabled="false"/>
+  <item android:color="@color/white_100"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_primary.xml b/app/src/main/res/color/text_primary.xml
index 003b2be28..c78fe7d9f 100644
--- a/app/src/main/res/color/text_primary.xml
+++ b/app/src/main/res/color/text_primary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_enabled="false" android:color="@color/black_38"/>
-    <item android:color="@color/black_87"/>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@color/black_38" android:state_enabled="false"/>
+  <item android:color="@color/black_87"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/checkmark.xml b/app/src/main/res/drawable/checkmark.xml
index e73b78e3b..ccd8b89af 100644
--- a/app/src/main/res/drawable/checkmark.xml
+++ b/app/src/main/res/drawable/checkmark.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_check_black_24dp" android:state_checked="true" />
-    <item android:state_checked="false">
-        <shape />
-    </item>
+  <item android:drawable="@drawable/ic_check_black_24dp" android:state_checked="true"/>
+  <item android:state_checked="false">
+    <shape/>
+  </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_add_24dp.xml b/app/src/main/res/drawable/ic_add_24dp.xml
index c922de0f7..363cebc63 100644
--- a/app/src/main/res/drawable/ic_add_24dp.xml
+++ b/app/src/main/res/drawable/ic_add_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_back_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_24dp.xml
index a536e3f74..a3e79e7b6 100644
--- a/app/src/main/res/drawable/ic_arrow_back_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_back_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_attachment_24dp.xml b/app/src/main/res/drawable/ic_attachment_24dp.xml
index 4e6d8b0d4..d9bc3d511 100644
--- a/app/src/main/res/drawable/ic_attachment_24dp.xml
+++ b/app/src/main/res/drawable/ic_attachment_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M7.5,18C4.46,18 2,15.54 2,12.5S4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v1.5H9.5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1H18c1.38,0 2.5,-1.12 2.5,-2.5S19.38,8.5 18,8.5H7.5c-2.21,0 -4,1.79 -4,4s1.79,4 4,4H17V18H7.5z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M7.5,18C4.46,18 2,15.54 2,12.5S4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v1.5H9.5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1H18c1.38,0 2.5,-1.12 2.5,-2.5S19.38,8.5 18,8.5H7.5c-2.21,0 -4,1.79 -4,4s1.79,4 4,4H17V18H7.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml b/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml
index bceee996f..0b35f9479 100644
--- a/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml
@@ -1,8 +1,15 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
-    <path android:fillColor="#FF000000" android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cancel_24dp.xml b/app/src/main/res/drawable/ic_cancel_24dp.xml
index f3ef17192..5e9b5b27e 100644
--- a/app/src/main/res/drawable/ic_cancel_24dp.xml
+++ b/app/src/main/res/drawable/ic_cancel_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zm5,13.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zm5,13.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_check_black_24dp.xml b/app/src/main/res/drawable/ic_check_black_24dp.xml
index 67a98c8ca..e8eb34d3a 100644
--- a/app/src/main/res/drawable/ic_check_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_check_black_24dp.xml
@@ -1,7 +1,12 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
   tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_check_box_24dp.xml b/app/src/main/res/drawable/ic_check_box_24dp.xml
index 4ea20f511..413d3583f 100644
--- a/app/src/main/res/drawable/ic_check_box_24dp.xml
+++ b/app/src/main/res/drawable/ic_check_box_24dp.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2V5c0,-1.1 -0.89,-2 -2,-2zm-9,14l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M19,3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2V5c0,-1.1 -0.89,-2 -2,-2zm-9,14l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml b/app/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml
index cf8bfa24b..c29ca58ff 100644
--- a/app/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml
+++ b/app/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_close_24dp.xml b/app/src/main/res/drawable/ic_close_24dp.xml
index 5ecfe77ae..c5a77c119 100644
--- a/app/src/main/res/drawable/ic_close_24dp.xml
+++ b/app/src/main/res/drawable/ic_close_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cloud_black_24dp.xml b/app/src/main/res/drawable/ic_cloud_black_24dp.xml
index e0940ca0e..884b2aaf0 100644
--- a/app/src/main/res/drawable/ic_cloud_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_cloud_black_24dp.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96z"/>
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cloud_off_black_24dp.xml b/app/src/main/res/drawable/ic_cloud_off_black_24dp.xml
index 4537dcd03..022df57e8 100644
--- a/app/src/main/res/drawable/ic_cloud_off_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_cloud_off_black_24dp.xml
@@ -1,7 +1,12 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
   tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4c-1.48,0 -2.85,0.43 -4.01,1.17l1.46,1.46C10.21,6.23 11.08,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,1.13 -0.64,2.11 -1.56,2.62l1.45,1.45C23.16,18.16 24,16.68 24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96zM3,5.27l2.75,2.74C2.56,8.15 0,10.77 0,14c0,3.31 2.69,6 6,6h11.73l2,2L21,20.73 4.27,4 3,5.27zM7.73,10l8,8H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73z"/>
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4c-1.48,0 -2.85,0.43 -4.01,1.17l1.46,1.46C10.21,6.23 11.08,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,1.13 -0.64,2.11 -1.56,2.62l1.45,1.45C23.16,18.16 24,16.68 24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96zM3,5.27l2.75,2.74C2.56,8.15 0,10.77 0,14c0,3.31 2.69,6 6,6h11.73l2,2L21,20.73 4.27,4 3,5.27zM7.73,10l8,8H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_content_copy_black_24dp.xml b/app/src/main/res/drawable/ic_content_copy_black_24dp.xml
index d4b2086a2..9ea11bf4a 100644
--- a/app/src/main/res/drawable/ic_content_copy_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_content_copy_black_24dp.xml
@@ -1,7 +1,12 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
   tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete_24dp.xml b/app/src/main/res/drawable/ic_delete_24dp.xml
index 0d77091de..3f7ef7a93 100644
--- a/app/src/main/res/drawable/ic_delete_24dp.xml
+++ b/app/src/main/res/drawable/ic_delete_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml b/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml
index 986b24463..e2029f4e7 100644
--- a/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml
@@ -1,7 +1,12 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
   tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z"/>
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_email_black_24dp.xml b/app/src/main/res/drawable/ic_email_black_24dp.xml
index dca6e6af5..97fe8ae5a 100644
--- a/app/src/main/res/drawable/ic_email_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_email_black_24dp.xml
@@ -1,7 +1,12 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
   tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_event_24dp.xml b/app/src/main/res/drawable/ic_event_24dp.xml
index ea23cc9af..a77ae741f 100644
--- a/app/src/main/res/drawable/ic_event_24dp.xml
+++ b/app/src/main/res/drawable/ic_event_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M17,12h-5v5h5v-5zM16,1v2H8V1H6v2H5c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2h-1V1h-2zm3,18H5V8h14v11z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M17,12h-5v5h5v-5zM16,1v2H8V1H6v2H5c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2h-1V1h-2zm3,18H5V8h14v11z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_event_note_24dp.xml b/app/src/main/res/drawable/ic_event_note_24dp.xml
index bfaccecbe..12c5b6566 100644
--- a/app/src/main/res/drawable/ic_event_note_24dp.xml
+++ b/app/src/main/res/drawable/ic_event_note_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M17,10H7v2h10v-2zm2,-7h-1V1h-2v2H8V1H6v2H5c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,16H5V8h14v11zm-5,-5H7v2h7v-2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M17,10H7v2h10v-2zm2,-7h-1V1h-2v2H8V1H6v2H5c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,16H5V8h14v11zm-5,-5H7v2h7v-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_list_24dp.xml b/app/src/main/res/drawable/ic_filter_list_24dp.xml
index bab2cc53d..e7b23ed2d 100644
--- a/app/src/main/res/drawable/ic_filter_list_24dp.xml
+++ b/app/src/main/res/drawable/ic_filter_list_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18V6H3zm3,7h12v-2H6v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M10,18h4v-2h-4v2zM3,6v2h18V6H3zm3,7h12v-2H6v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_flag_24dp.xml b/app/src/main/res/drawable/ic_flag_24dp.xml
index 32cae2606..59fd1fbb7 100644
--- a/app/src/main/res/drawable/ic_flag_24dp.xml
+++ b/app/src/main/res/drawable/ic_flag_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_help_24dp.xml b/app/src/main/res/drawable/ic_help_24dp.xml
index c5999e560..a7370fa1f 100644
--- a/app/src/main/res/drawable/ic_help_24dp.xml
+++ b/app/src/main/res/drawable/ic_help_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,17h-2v-2h2v2zm2.07,-7.75l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2H8c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,17h-2v-2h2v2zm2.07,-7.75l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2H8c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_history_24dp.xml b/app/src/main/res/drawable/ic_history_24dp.xml
index 9822786ec..42ea5d8da 100644
--- a/app/src/main/res/drawable/ic_history_24dp.xml
+++ b/app/src/main/res/drawable/ic_history_24dp.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillAlpha=".9" android:fillColor="#FF000000" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9H1l3.89,3.89 0.07,0.14L9,12H6c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zm-1,5v5l4.28,2.54 0.72,-1.21 -3.5,-2.08V8H12z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillAlpha=".9"
+    android:fillColor="#FF000000"
+    android:pathData="M13,3c-4.97,0 -9,4.03 -9,9H1l3.89,3.89 0.07,0.14L9,12H6c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zm-1,5v5l4.28,2.54 0.72,-1.21 -3.5,-2.08V8H12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_inbox_168px.xml b/app/src/main/res/drawable/ic_inbox_168px.xml
index 952608692..1f8aeed80 100644
--- a/app/src/main/res/drawable/ic_inbox_168px.xml
+++ b/app/src/main/res/drawable/ic_inbox_168px.xml
@@ -1,4 +1,9 @@
-<vector android:height="168dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="168dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.89 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.11 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:height="168dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="168dp">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.89 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.11 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_inbox_24dp.xml b/app/src/main/res/drawable/ic_inbox_24dp.xml
index 1c8766831..6ee0a023a 100644
--- a/app/src/main/res/drawable/ic_inbox_24dp.xml
+++ b/app/src/main/res/drawable/ic_inbox_24dp.xml
@@ -1,7 +1,12 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.89 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.11 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.89 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.11 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_label_24dp.xml b/app/src/main/res/drawable/ic_label_24dp.xml
index 15e25a2ab..0d98c5205 100644
--- a/app/src/main/res/drawable/ic_label_24dp.xml
+++ b/app/src/main/res/drawable/ic_label_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_label_outline_24dp.xml b/app/src/main/res/drawable/ic_label_outline_24dp.xml
index 158076604..0201881c0 100644
--- a/app/src/main/res/drawable/ic_label_outline_24dp.xml
+++ b/app/src/main/res/drawable/ic_label_outline_24dp.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16zM16,17H5V7h11l3.55,5L16,17z"/>
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16zM16,17H5V7h11l3.55,5L16,17z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_lens_black_24dp.xml b/app/src/main/res/drawable/ic_lens_black_24dp.xml
index 812c1c4be..46278c79a 100644
--- a/app/src/main/res/drawable/ic_lens_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_lens_black_24dp.xml
@@ -1,7 +1,12 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_24dp.xml b/app/src/main/res/drawable/ic_menu_24dp.xml
index 581c39dbb..2eac24f73 100644
--- a/app/src/main/res/drawable/ic_menu_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M3,18h18v-2H3v2zm0,-5h18v-2H3v2zm0,-7v2h18V6H3z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M3,18h18v-2H3v2zm0,-5h18v-2H3v2zm0,-7v2h18V6H3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_mic_24dp.xml b/app/src/main/res/drawable/ic_mic_24dp.xml
index bab187f0a..31c2601e6 100644
--- a/app/src/main/res/drawable/ic_mic_24dp.xml
+++ b/app/src/main/res/drawable/ic_mic_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zm5.3,-3c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11H5c0,3.41 2.72,6.23 6,6.72V21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zm5.3,-3c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11H5c0,3.41 2.72,6.23 6,6.72V21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_notifications_24dp.xml b/app/src/main/res/drawable/ic_notifications_24dp.xml
index 2844c72cf..f4992d708 100644
--- a/app/src/main/res/drawable/ic_notifications_24dp.xml
+++ b/app/src/main/res/drawable/ic_notifications_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M11.5,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6.5,-6v-5.5c0,-3.07 -2.13,-5.64 -5,-6.32V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5v0.68c-2.87,0.68 -5,3.25 -5,6.32V16l-2,2v1h17v-1l-2,-2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M11.5,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6.5,-6v-5.5c0,-3.07 -2.13,-5.64 -5,-6.32V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5v0.68c-2.87,0.68 -5,3.25 -5,6.32V16l-2,2v1h17v-1l-2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause_24dp.xml b/app/src/main/res/drawable/ic_pause_24dp.xml
index 617b86136..1786cf2ef 100644
--- a/app/src/main/res/drawable/ic_pause_24dp.xml
+++ b/app/src/main/res/drawable/ic_pause_24dp.xml
@@ -1,7 +1,12 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M6,19h4V5H6v14zm8,-14v14h4V5h-4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M6,19h4V5H6v14zm8,-14v14h4V5h-4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_24dp.xml
index 48f8a33ba..112579a1f 100644
--- a/app/src/main/res/drawable/ic_play_arrow_24dp.xml
+++ b/app/src/main/res/drawable/ic_play_arrow_24dp.xml
@@ -1,7 +1,12 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M8,5v14l11,-7z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M8,5v14l11,-7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_public_black_24dp.xml b/app/src/main/res/drawable/ic_public_black_24dp.xml
index ef40ec047..b81339b7b 100644
--- a/app/src/main/res/drawable/ic_public_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_public_black_24dp.xml
@@ -1,7 +1,12 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
   tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_repeat_24dp.xml b/app/src/main/res/drawable/ic_repeat_24dp.xml
index 565a06cb1..7468118a4 100644
--- a/app/src/main/res/drawable/ic_repeat_24dp.xml
+++ b/app/src/main/res/drawable/ic_repeat_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M7,7h10v3l4,-4 -4,-4v3H5v6h2V7zm10,10H7v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M7,7h10v3l4,-4 -4,-4v3H5v6h2V7zm10,10H7v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_save_24dp.xml b/app/src/main/res/drawable/ic_save_24dp.xml
index 030e45226..4f8bdc8ca 100644
--- a/app/src/main/res/drawable/ic_save_24dp.xml
+++ b/app/src/main/res/drawable/ic_save_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M17,3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V7l-4,-4zm-5,16c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zm3,-10H5V5h10v4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M17,3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V7l-4,-4zm-5,16c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zm3,-10H5V5h10v4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_schedule_24dp.xml b/app/src/main/res/drawable/ic_schedule_24dp.xml
index c8650d085..473579d3c 100644
--- a/app/src/main/res/drawable/ic_schedule_24dp.xml
+++ b/app/src/main/res/drawable/ic_schedule_24dp.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillAlpha=".9" android:fillColor="#FF000000" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillAlpha=".9"
+    android:fillColor="#FF000000"
+    android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_search_24dp.xml b/app/src/main/res/drawable/ic_search_24dp.xml
index 26d8c3dee..bf9bd3f73 100644
--- a/app/src/main/res/drawable/ic_search_24dp.xml
+++ b/app/src/main/res/drawable/ic_search_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zm-6,0C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zm-6,0C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml
index 4937ea832..d135e523b 100644
--- a/app/src/main/res/drawable/ic_settings_24dp.xml
+++ b/app/src/main/res/drawable/ic_settings_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_sort_24dp.xml b/app/src/main/res/drawable/ic_sort_24dp.xml
index bfb7622cb..d872e01a6 100644
--- a/app/src/main/res/drawable/ic_sort_24dp.xml
+++ b/app/src/main/res/drawable/ic_sort_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M3,18h6v-2H3v2zM3,6v2h18V6H3zm0,7h12v-2H3v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M3,18h6v-2H3v2zM3,6v2h18V6H3zm0,7h12v-2H3v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_24dp.xml b/app/src/main/res/drawable/ic_timer_24dp.xml
index f8336a82b..894bdcf20 100644
--- a/app/src/main/res/drawable/ic_timer_24dp.xml
+++ b/app/src/main/res/drawable/ic_timer_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M15,1H9v2h6V1zm-4,13h2V8h-2v6zm8.03,-6.61l1.42,-1.42c-0.43,-0.51 -0.9,-0.99 -1.41,-1.41l-1.42,1.42C16.07,4.74 14.12,4 12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9 9,-4.03 9,-9c0,-2.12 -0.74,-4.07 -1.97,-5.61zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M15,1H9v2h6V1zm-4,13h2V8h-2v6zm8.03,-6.61l1.42,-1.42c-0.43,-0.51 -0.9,-0.99 -1.41,-1.41l-1.42,1.42C16.07,4.74 14.12,4 12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9 9,-4.03 9,-9c0,-2.12 -0.74,-4.07 -1.97,-5.61zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_today_24dp.xml b/app/src/main/res/drawable/ic_today_24dp.xml
index aac3b8e9c..0cc4a1ef2 100644
--- a/app/src/main/res/drawable/ic_today_24dp.xml
+++ b/app/src/main/res/drawable/ic_today_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M19,3h-1V1h-2v2H8V1H6v2H5c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,16H5V8h14v11zM7,10h5v5H7z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M19,3h-1V1h-2v2H8V1H6v2H5c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,16H5V8h14v11zM7,10h5v5H7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_visibility_off_24dp.xml b/app/src/main/res/drawable/ic_visibility_off_24dp.xml
index 694c66c3a..aabe5d142 100644
--- a/app/src/main/res/drawable/ic_visibility_off_24dp.xml
+++ b/app/src/main/res/drawable/ic_visibility_off_24dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zm4.31,-0.78l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zm4.31,-0.78l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml b/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml
index 4b1fa6add..810e5061d 100644
--- a/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml
@@ -1,7 +1,12 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="UnusedAttribute,VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:autoMirrored="true"
+  android:height="24dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0"
+  android:width="24dp"
+  tools:ignore="UnusedAttribute,VectorRaster">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/reminder_dialog_background.xml b/app/src/main/res/drawable/reminder_dialog_background.xml
index 9b8739fda..fbc9d6203 100644
--- a/app/src/main/res/drawable/reminder_dialog_background.xml
+++ b/app/src/main/res/drawable/reminder_dialog_background.xml
@@ -4,10 +4,10 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:shape="rectangle">
-    <corners 
-        android:radius="5dip"/>
-    <solid 
-        android:color="@color/reminder_background"/>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle">
+  <corners
+    android:radius="5dip"/>
+  <solid
+    android:color="@color/reminder_background"/>
 </shape>
diff --git a/app/src/main/res/drawable/timepicker_down_btn.xml b/app/src/main/res/drawable/timepicker_down_btn.xml
index 17719b065..a61b6ab1f 100644
--- a/app/src/main/res/drawable/timepicker_down_btn.xml
+++ b/app/src/main/res/drawable/timepicker_down_btn.xml
@@ -16,15 +16,15 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="false" android:drawable="@drawable/timepicker_down_normal" />
-    <item android:state_pressed="true" android:state_enabled="true"
-          android:drawable="@drawable/timepicker_down_pressed" />
-    <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="true" android:drawable="@drawable/timepicker_down_selected" />
-    <item android:state_pressed="false" android:state_enabled="false"
-          android:state_focused="false" android:drawable="@drawable/timepicker_down_disabled" />
-    <item android:state_pressed="false" android:state_enabled="false"
-          android:state_focused="true" android:drawable="@drawable/timepicker_down_normal" />
+  <item android:drawable="@drawable/timepicker_down_normal" android:state_enabled="true"
+    android:state_focused="false" android:state_pressed="false"/>
+  <item android:drawable="@drawable/timepicker_down_pressed" android:state_enabled="true"
+    android:state_pressed="true"/>
+  <item android:drawable="@drawable/timepicker_down_selected" android:state_enabled="true"
+    android:state_focused="true" android:state_pressed="false"/>
+  <item android:drawable="@drawable/timepicker_down_disabled" android:state_enabled="false"
+    android:state_focused="false" android:state_pressed="false"/>
+  <item android:drawable="@drawable/timepicker_down_normal" android:state_enabled="false"
+    android:state_focused="true" android:state_pressed="false"/>
 
 </selector>
diff --git a/app/src/main/res/drawable/timepicker_input.xml b/app/src/main/res/drawable/timepicker_input.xml
index b811d4e3a..bbc23e597 100644
--- a/app/src/main/res/drawable/timepicker_input.xml
+++ b/app/src/main/res/drawable/timepicker_input.xml
@@ -16,15 +16,15 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="false" android:drawable="@drawable/timepicker_input_normal" />
-    <item android:state_pressed="true" android:state_enabled="true"
-          android:drawable="@drawable/timepicker_input_pressed" />
-    <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="true" android:drawable="@drawable/timepicker_input_selected" />
-    <item android:state_pressed="false" android:state_enabled="false"
-          android:state_focused="false" android:drawable="@drawable/timepicker_input_disabled" />
-    <item android:state_pressed="false" android:state_enabled="false"
-          android:state_focused="true" android:drawable="@drawable/timepicker_input_normal" />
+  <item android:drawable="@drawable/timepicker_input_normal" android:state_enabled="true"
+    android:state_focused="false" android:state_pressed="false"/>
+  <item android:drawable="@drawable/timepicker_input_pressed" android:state_enabled="true"
+    android:state_pressed="true"/>
+  <item android:drawable="@drawable/timepicker_input_selected" android:state_enabled="true"
+    android:state_focused="true" android:state_pressed="false"/>
+  <item android:drawable="@drawable/timepicker_input_disabled" android:state_enabled="false"
+    android:state_focused="false" android:state_pressed="false"/>
+  <item android:drawable="@drawable/timepicker_input_normal" android:state_enabled="false"
+    android:state_focused="true" android:state_pressed="false"/>
 
 </selector>
diff --git a/app/src/main/res/drawable/timepicker_up_btn.xml b/app/src/main/res/drawable/timepicker_up_btn.xml
index d684c37d0..a5048caf8 100644
--- a/app/src/main/res/drawable/timepicker_up_btn.xml
+++ b/app/src/main/res/drawable/timepicker_up_btn.xml
@@ -16,15 +16,15 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="false" android:drawable="@drawable/timepicker_up_normal" />
-    <item android:state_pressed="true" android:state_enabled="true"
-          android:drawable="@drawable/timepicker_up_pressed" />
-    <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="true" android:drawable="@drawable/timepicker_up_selected" />
-    <item android:state_pressed="false" android:state_enabled="false"
-          android:state_focused="false" android:drawable="@drawable/timepicker_up_disabled" />
-    <item android:state_pressed="false" android:state_enabled="false"
-          android:state_focused="true" android:drawable="@drawable/timepicker_up_normal" />
+  <item android:drawable="@drawable/timepicker_up_normal" android:state_enabled="true"
+    android:state_focused="false" android:state_pressed="false"/>
+  <item android:drawable="@drawable/timepicker_up_pressed" android:state_enabled="true"
+    android:state_pressed="true"/>
+  <item android:drawable="@drawable/timepicker_up_selected" android:state_enabled="true"
+    android:state_focused="true" android:state_pressed="false"/>
+  <item android:drawable="@drawable/timepicker_up_disabled" android:state_enabled="false"
+    android:state_focused="false" android:state_pressed="false"/>
+  <item android:drawable="@drawable/timepicker_up_normal" android:state_enabled="false"
+    android:state_focused="true" android:state_pressed="false"/>
 
 </selector>
diff --git a/app/src/main/res/drawable/week_day_button_oval.xml b/app/src/main/res/drawable/week_day_button_oval.xml
index f0de65456..34be63161 100644
--- a/app/src/main/res/drawable/week_day_button_oval.xml
+++ b/app/src/main/res/drawable/week_day_button_oval.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/week_button_state_on_circle_size" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="oval">
+  <corners android:radius="@dimen/week_button_state_on_circle_size"/>
 </shape>
diff --git a/app/src/main/res/layout-v21/task_adapter_row_simple.xml b/app/src/main/res/layout-v21/task_adapter_row_simple.xml
index 355486906..a99b90c1b 100644
--- a/app/src/main/res/layout-v21/task_adapter_row_simple.xml
+++ b/app/src/main/res/layout-v21/task_adapter_row_simple.xml
@@ -4,16 +4,16 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="1px"
-    app:cardBackgroundColor="?attr/asContentBackground"
-    app:cardCornerRadius="0dp"
-    app:cardElevation="?attr/card_elevation"
-    app:cardPreventCornerOverlap="false">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:id="@+id/row"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:layout_marginBottom="1px"
+  app:cardBackgroundColor="?attr/asContentBackground"
+  app:cardCornerRadius="0dp"
+  app:cardElevation="?attr/card_elevation"
+  app:cardPreventCornerOverlap="false">
 
-    <include layout="@layout/task_adapter_row_body" />
+  <include layout="@layout/task_adapter_row_body"/>
 
 </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout-w820dp/task_list_activity.xml b/app/src/main/res/layout-w820dp/task_list_activity.xml
index 7c5ab2cb7..b0c1a56db 100644
--- a/app/src/main/res/layout-w820dp/task_list_activity.xml
+++ b/app/src/main/res/layout-w820dp/task_list_activity.xml
@@ -1,35 +1,35 @@
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/drawer_layout"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:fitsSystemWindows="true">
+
+  <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:baselineAligned="false">
+    android:baselineAligned="false"
+    android:orientation="horizontal">
 
-        <!-- Task List -->
-        <FrameLayout
-            android:id="@+id/master"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="60"
-            tools:ignore="InconsistentLayout" />
+    <!-- Task List -->
+    <FrameLayout
+      android:id="@+id/master"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_weight="60"
+      tools:ignore="InconsistentLayout"/>
 
-        <!-- Task Edit -->
-        <FrameLayout
-            android:id="@+id/detail"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="40"
-            tools:ignore="InconsistentLayout" />
+    <!-- Task Edit -->
+    <FrameLayout
+      android:id="@+id/detail"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_weight="40"
+      tools:ignore="InconsistentLayout"/>
 
-    </LinearLayout>
+  </LinearLayout>
 
-    <include layout="@layout/navigation_drawer" />
+  <include layout="@layout/navigation_drawer"/>
 
 </android.support.v4.widget.DrawerLayout>
 
diff --git a/app/src/main/res/layout-w820dp/week_buttons.xml b/app/src/main/res/layout-w820dp/week_buttons.xml
index 64599df98..96050fcf6 100644
--- a/app/src/main/res/layout-w820dp/week_buttons.xml
+++ b/app/src/main/res/layout-w820dp/week_buttons.xml
@@ -14,44 +14,44 @@
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <LinearLayout
-        android:id="@+id/weekGroup"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="8dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal">
-
-        <include
-            android:id="@+id/week_day_1"
-            layout="@layout/week_day_button" />
-
-        <include
-            android:id="@+id/week_day_2"
-            layout="@layout/week_day_button" />
-
-        <include
-            android:id="@+id/week_day_3"
-            layout="@layout/week_day_button" />
-
-        <include
-            android:id="@+id/week_day_4"
-            layout="@layout/week_day_button" />
-
-        <include
-            android:id="@+id/week_day_5"
-            layout="@layout/week_day_button" />
-
-        <include
-            android:id="@+id/week_day_6"
-            layout="@layout/week_day_button" />
-
-        <include
-            android:id="@+id/week_day_7"
-            layout="@layout/week_day_button" />
-
-    </LinearLayout>
+  <LinearLayout
+    android:id="@+id/weekGroup"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="8dp"
+    android:layout_marginLeft="20dp"
+    android:layout_marginRight="20dp"
+    android:gravity="center_horizontal"
+    android:orientation="horizontal">
+
+    <include
+      android:id="@+id/week_day_1"
+      layout="@layout/week_day_button"/>
+
+    <include
+      android:id="@+id/week_day_2"
+      layout="@layout/week_day_button"/>
+
+    <include
+      android:id="@+id/week_day_3"
+      layout="@layout/week_day_button"/>
+
+    <include
+      android:id="@+id/week_day_4"
+      layout="@layout/week_day_button"/>
+
+    <include
+      android:id="@+id/week_day_5"
+      layout="@layout/week_day_button"/>
+
+    <include
+      android:id="@+id/week_day_6"
+      layout="@layout/week_day_button"/>
+
+    <include
+      android:id="@+id/week_day_7"
+      layout="@layout/week_day_button"/>
+
+  </LinearLayout>
 
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/aac_record_activity.xml b/app/src/main/res/layout/aac_record_activity.xml
index 0f24d49f6..33d41cdf3 100644
--- a/app/src/main/res/layout/aac_record_activity.xml
+++ b/app/src/main/res/layout/aac_record_activity.xml
@@ -5,32 +5,32 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
+  android:layout_marginLeft="10dip"
+  android:layout_marginRight="10dip"
+  android:orientation="vertical">
+
+  <Chronometer
+    android:id="@+id/timer"
+    android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="10dip"
+    android:gravity="center"
+    android:textColor="@color/text_primary"
+    android:textSize="24sp"/>
+
+  <TextView
+    android:id="@+id/stop_recording"
+    android:layout_width="fill_parent"
+    android:layout_height="35dip"
+    android:layout_marginBottom="10dip"
     android:layout_marginLeft="10dip"
     android:layout_marginRight="10dip"
-    android:orientation="vertical">
-
-    <Chronometer
-        android:id="@+id/timer"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dip"
-        android:textColor="@color/text_primary"
-        android:textSize="24sp"
-        android:gravity="center" />
-
-    <TextView
-        android:id="@+id/stop_recording"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:background="@color/overdue"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:text="@string/audio_stop_recording" />
+    android:background="@color/overdue"
+    android:gravity="center"
+    android:text="@string/audio_stop_recording"
+    android:textColor="@android:color/white"
+    android:textSize="24sp"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_caldav_settings.xml b/app/src/main/res/layout/activity_caldav_settings.xml
index 2baa2a902..b30ac0106 100644
--- a/app/src/main/res/layout/activity_caldav_settings.xml
+++ b/app/src/main/res/layout/activity_caldav_settings.xml
@@ -1,81 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="?attr/asContentBackground"
-    android:orientation="vertical">
-
-    <include layout="@layout/toolbar" />
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:descendantFocusability="beforeDescendants"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical">
-
-            <android.support.design.widget.TextInputLayout
-                android:id="@+id/url_layout"
-                style="@style/TagSettingsRow">
-
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/url"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/url"
-                    android:imeOptions="flagNoExtractUi"
-                    android:textColor="?attr/asTextColor" />
-
-            </android.support.design.widget.TextInputLayout>
-
-            <android.support.design.widget.TextInputLayout
-                android:id="@+id/user_layout"
-                style="@style/TagSettingsRow">
-
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/user"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/user"
-                    android:imeOptions="flagNoExtractUi"
-                    android:textColor="?attr/asTextColor" />
-
-            </android.support.design.widget.TextInputLayout>
-
-            <android.support.design.widget.TextInputLayout
-                android:id="@+id/password_layout"
-                style="@style/TagSettingsRow"
-                app:passwordToggleEnabled="true">
-
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/password"
-                    android:textColor="?attr/asTextColor"
-                    android:imeOptions="flagNoExtractUi"
-                    android:inputType="textPassword"/>
-
-            </android.support.design.widget.TextInputLayout>
-
-            <android.support.design.widget.TextInputLayout style="@style/TagSettingsRow">
-
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/color"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/color"
-                    android:textColor="?attr/asTextColor" />
-            </android.support.design.widget.TextInputLayout>
-
-        </LinearLayout>
-
-    </ScrollView>
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:id="@+id/root_layout"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="?attr/asContentBackground"
+  android:orientation="vertical">
+
+  <include layout="@layout/toolbar"/>
+
+  <ScrollView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:descendantFocusability="beforeDescendants"
+      android:focusableInTouchMode="true"
+      android:orientation="vertical">
+
+      <android.support.design.widget.TextInputLayout
+        android:id="@+id/url_layout"
+        style="@style/TagSettingsRow">
+
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/url"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/url"
+          android:imeOptions="flagNoExtractUi"
+          android:textColor="?attr/asTextColor"/>
+
+      </android.support.design.widget.TextInputLayout>
+
+      <android.support.design.widget.TextInputLayout
+        android:id="@+id/user_layout"
+        style="@style/TagSettingsRow">
+
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/user"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/user"
+          android:imeOptions="flagNoExtractUi"
+          android:textColor="?attr/asTextColor"/>
+
+      </android.support.design.widget.TextInputLayout>
+
+      <android.support.design.widget.TextInputLayout
+        android:id="@+id/password_layout"
+        style="@style/TagSettingsRow"
+        app:passwordToggleEnabled="true">
+
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/password"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/password"
+          android:imeOptions="flagNoExtractUi"
+          android:inputType="textPassword"
+          android:textColor="?attr/asTextColor"/>
+
+      </android.support.design.widget.TextInputLayout>
+
+      <android.support.design.widget.TextInputLayout style="@style/TagSettingsRow">
+
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/color"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/color"
+          android:textColor="?attr/asTextColor"/>
+      </android.support.design.widget.TextInputLayout>
+
+    </LinearLayout>
+
+  </ScrollView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_google_task_list_settings.xml b/app/src/main/res/layout/activity_google_task_list_settings.xml
index 0504eb858..9520720a3 100644
--- a/app/src/main/res/layout/activity_google_task_list_settings.xml
+++ b/app/src/main/res/layout/activity_google_task_list_settings.xml
@@ -1,48 +1,48 @@
 <?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:background="?attr/asContentBackground"
-    android:orientation="vertical">
-
-    <include layout="@layout/toolbar" />
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:descendantFocusability="beforeDescendants"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical">
-
-            <android.support.design.widget.TextInputLayout style="@style/TagSettingsRow">
-
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/name"
-                    android:imeOptions="flagNoExtractUi"
-                    android:inputType="textCapSentences|textFilter"
-                    android:maxLines="1"
-                    android:textColor="?attr/asTextColor" />
-            </android.support.design.widget.TextInputLayout>
-
-            <android.support.design.widget.TextInputLayout style="@style/TagSettingsRow">
-
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/color"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/color"
-                    android:textColor="?attr/asTextColor" />
-            </android.support.design.widget.TextInputLayout>
-
-        </LinearLayout>
-
-    </ScrollView>
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="?attr/asContentBackground"
+  android:orientation="vertical">
+
+  <include layout="@layout/toolbar"/>
+
+  <ScrollView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:descendantFocusability="beforeDescendants"
+      android:focusableInTouchMode="true"
+      android:orientation="vertical">
+
+      <android.support.design.widget.TextInputLayout style="@style/TagSettingsRow">
+
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/name"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/name"
+          android:imeOptions="flagNoExtractUi"
+          android:inputType="textCapSentences|textFilter"
+          android:maxLines="1"
+          android:textColor="?attr/asTextColor"/>
+      </android.support.design.widget.TextInputLayout>
+
+      <android.support.design.widget.TextInputLayout style="@style/TagSettingsRow">
+
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/color"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/color"
+          android:textColor="?attr/asTextColor"/>
+      </android.support.design.widget.TextInputLayout>
+
+    </LinearLayout>
+
+  </ScrollView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_prefs.xml b/app/src/main/res/layout/activity_prefs.xml
index 7453acf8d..490ccadac 100644
--- a/app/src/main/res/layout/activity_prefs.xml
+++ b/app/src/main/res/layout/activity_prefs.xml
@@ -1,10 +1,10 @@
 <?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:background="?attr/asContentBackground"
-    android:orientation="vertical">
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="?attr/asContentBackground"
+  android:orientation="vertical">
 
-    <include layout="@layout/toolbar" />
+  <include layout="@layout/toolbar"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_tasker_create.xml b/app/src/main/res/layout/activity_tasker_create.xml
index d0199dca3..97cb523a6 100644
--- a/app/src/main/res/layout/activity_tasker_create.xml
+++ b/app/src/main/res/layout/activity_tasker_create.xml
@@ -1,121 +1,121 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/asContentBackground"
-    android:orientation="vertical">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="?attr/asContentBackground"
+  android:orientation="vertical">
 
-    <include layout="@layout/toolbar" />
+  <include layout="@layout/toolbar"/>
 
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+  <ScrollView
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
-        <android.support.constraint.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+    <android.support.constraint.ConstraintLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
 
-            <android.support.design.widget.TextInputLayout
-                android:id="@+id/textInputLayout"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
+      <android.support.design.widget.TextInputLayout
+        android:id="@+id/textInputLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/TEA_title_hint"
-                    android:imeOptions="flagNoExtractUi"
-                    android:inputType="textCapSentences|textAutoCorrect"
-                    android:singleLine="true" />
-            </android.support.design.widget.TextInputLayout>
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/title"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/TEA_title_hint"
+          android:imeOptions="flagNoExtractUi"
+          android:inputType="textCapSentences|textAutoCorrect"
+          android:singleLine="true"/>
+      </android.support.design.widget.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
-                android:id="@+id/textInputLayout2"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textInputLayout">
+      <android.support.design.widget.TextInputLayout
+        android:id="@+id/textInputLayout2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textInputLayout">
 
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/due_date"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/due_date"
-                    android:imeOptions="flagNoExtractUi"
-                    android:singleLine="true" />
-            </android.support.design.widget.TextInputLayout>
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/due_date"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/due_date"
+          android:imeOptions="flagNoExtractUi"
+          android:singleLine="true"/>
+      </android.support.design.widget.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
-                android:id="@+id/textInputLayout3"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textInputLayout2">
+      <android.support.design.widget.TextInputLayout
+        android:id="@+id/textInputLayout3"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textInputLayout2">
 
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/due_time"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/due_time"
-                    android:imeOptions="flagNoExtractUi"
-                    android:singleLine="true" />
-            </android.support.design.widget.TextInputLayout>
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/due_time"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/due_time"
+          android:imeOptions="flagNoExtractUi"
+          android:singleLine="true"/>
+      </android.support.design.widget.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
-                android:id="@+id/textInputLayout4"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textInputLayout3">
+      <android.support.design.widget.TextInputLayout
+        android:id="@+id/textInputLayout4"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textInputLayout3">
 
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/priority"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/TEA_importance_label"
-                    android:imeOptions="flagNoExtractUi"
-                    android:singleLine="true" />
-            </android.support.design.widget.TextInputLayout>
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/priority"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/TEA_importance_label"
+          android:imeOptions="flagNoExtractUi"
+          android:singleLine="true"/>
+      </android.support.design.widget.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textInputLayout4">
+      <android.support.design.widget.TextInputLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textInputLayout4">
 
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/description"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/TEA_note_label"
-                    android:imeOptions="flagNoExtractUi" />
-            </android.support.design.widget.TextInputLayout>
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/description"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/TEA_note_label"
+          android:imeOptions="flagNoExtractUi"/>
+      </android.support.design.widget.TextInputLayout>
 
-        </android.support.constraint.ConstraintLayout>
-    </ScrollView>
+    </android.support.constraint.ConstraintLayout>
+  </ScrollView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/alarm_edit_row.xml b/app/src/main/res/layout/alarm_edit_row.xml
index 99ea23ca2..427e17a12 100644
--- a/app/src/main/res/layout/alarm_edit_row.xml
+++ b/app/src/main/res/layout/alarm_edit_row.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/task_edit_double_padding_top_bottom"
-    android:layout_marginBottom="@dimen/task_edit_double_padding_top_bottom"
-    android:baselineAligned="false">
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
+  android:layout_marginBottom="@dimen/task_edit_double_padding_top_bottom"
+  android:paddingBottom="@dimen/task_edit_double_padding_top_bottom"
+  android:baselineAligned="false"
+  android:orientation="horizontal">
 
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_weight="100">
+  <LinearLayout
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="100"
+    android:orientation="horizontal">
 
-        <TextView
-            style="@style/TaskEditTextPrimary"
-            android:id="@+id/alarm_string"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="?attr/asTextColor" />
+    <TextView
+      android:id="@+id/alarm_string"
+      style="@style/TaskEditTextPrimary"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:textColor="?attr/asTextColor"/>
 
-        <Spinner
-            android:id="@+id/reminder_random_interval"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"/>
+    <Spinner
+      android:id="@+id/reminder_random_interval"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:visibility="gone"/>
 
-    </LinearLayout>
+  </LinearLayout>
 
-    <include layout="@layout/control_set_clear_button" />
+  <include layout="@layout/control_set_clear_button"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/astrid_calendar_reminder_view.xml b/app/src/main/res/layout/astrid_calendar_reminder_view.xml
index fbff822af..2f2948aa8 100644
--- a/app/src/main/res/layout/astrid_calendar_reminder_view.xml
+++ b/app/src/main/res/layout/astrid_calendar_reminder_view.xml
@@ -5,138 +5,138 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:layout_marginLeft="10dip"
+  android:layout_marginRight="10dip"
+  android:background="@drawable/reminder_dialog_background"
+  android:orientation="vertical">
+
+  <LinearLayout
+    android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+    android:layout_marginTop="5dip"
+    android:layout_marginBottom="15dip"
+    android:layout_marginStart="10dp"
+    android:layout_marginEnd="5dp"
     android:layout_marginLeft="10dip"
-    android:layout_marginRight="10dip"
-    android:orientation="vertical"
-    android:background="@drawable/reminder_dialog_background">
-    
+    android:layout_marginRight="5dip"
+    android:orientation="horizontal">
+
+    <TextView
+      android:id="@+id/reminder_title"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:layout_marginTop="1dip"
+      android:text="@string/CRA_title"
+      android:textColor="@android:color/white"
+      android:textSize="24sp"/>
+    <ImageView
+      android:id="@+id/dismiss"
+      android:layout_width="25dip"
+      android:layout_height="25dip"
+      android:scaleType="fitCenter"
+      android:src="@drawable/ic_close_24dp"
+      android:tint="@android:color/white"/>
+
+  </LinearLayout>
+
+  <FrameLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
     <LinearLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="10dip"
+      android:layout_marginStart="2dp"
+      android:layout_marginEnd="5dp"
+      android:layout_marginLeft="2dip"
+      android:layout_marginRight="5dip"
+      android:gravity="bottom"
+      android:orientation="horizontal">
+      <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dip"
+        android:scaleType="fitCenter"
+        android:src="@mipmap/ic_launcher"/>
+
+
+      <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="5dip"
+        android:layout_marginBottom="5dip"
+        android:layout_marginEnd="5dp"
         android:layout_marginRight="5dip"
-		android:layout_marginEnd="5dp"
-        android:layout_marginBottom="15dip"
-        android:layout_marginLeft="10dip"
-		android:layout_marginStart="10dp">
-        
-        <TextView 
-            android:id="@+id/reminder_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="1dip"
-            android:textSize="24sp"
-            android:textColor="@android:color/white"
-            android:layout_weight="1"
-            android:text="@string/CRA_title"/>
-        <ImageView
-            android:id="@+id/dismiss"
-            android:layout_width="25dip"
-            android:layout_height="25dip"
-            android:scaleType="fitCenter"
-            android:tint="@android:color/white"
-            android:src="@drawable/ic_close_24dp"/>
-    
+        android:background="@drawable/speech_bubble_reminder"
+        android:gravity="center_vertical"
+        android:minHeight="60dip">
+        <TextView
+          android:id="@+id/reminder_message"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:gravity="center_vertical"
+          android:textColor="#000000"
+          android:textSize="16sp"/>
+      </LinearLayout>
     </LinearLayout>
+  </FrameLayout>
 
-    <FrameLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <LinearLayout
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:orientation="horizontal"
-	    android:layout_marginLeft="2dip"
-			android:layout_marginStart="2dp"
-	    android:layout_marginRight="5dip"
-			android:layout_marginEnd="5dp"
-	    android:layout_marginBottom="10dip"
-	    android:gravity="bottom">
-	    <ImageView
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_marginBottom="5dip"
-	        android:src="@mipmap/ic_launcher"
-	        android:scaleType="fitCenter" />
+  <TextView
+    android:id="@+id/create_list"
+    android:layout_width="fill_parent"
+    android:layout_height="35dip"
+    android:layout_marginBottom="10dip"
+    android:layout_marginLeft="10dip"
+    android:layout_marginRight="10dip"
+    android:gravity="center"
+    android:text="@string/new_tag"
+    android:textColor="@android:color/white"
+    android:textSize="24sp"/>
 
+  <TextView
+    android:id="@+id/postpone"
+    android:layout_width="fill_parent"
+    android:layout_height="35dip"
+    android:layout_marginBottom="10dip"
+    android:layout_marginLeft="10dip"
+    android:layout_marginRight="10dip"
+    android:background="#707070"
+    android:gravity="center"
+    android:text="@string/CRA_postpone"
+    android:textColor="@android:color/white"
+    android:textSize="24sp"/>
 
-	    <LinearLayout
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginRight="5dip"
-			android:layout_marginEnd="5dp"
-	        android:layout_marginBottom="5dip"
-	        android:minHeight="60dip"
-	        android:gravity="center_vertical"
-	        android:background="@drawable/speech_bubble_reminder" >
-	        <TextView
-	            android:id="@+id/reminder_message"
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-                android:textSize="16sp"
-                android:textColor="#000000"
-                android:gravity="center_vertical"/>
-	    </LinearLayout>
-	</LinearLayout>
-    </FrameLayout>
-    
-    <TextView
-        android:id="@+id/create_list"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:text="@string/new_tag"/>
+  <RelativeLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="10dip"
+    android:layout_marginLeft="10dip"
+    android:layout_marginRight="10dip">
 
     <TextView
-        android:id="@+id/postpone"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:background="#707070"
-        android:text="@string/CRA_postpone"/>
-    
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip">
-	    
-	    <TextView
-	        android:id="@+id/ignore"
-	        android:layout_width="fill_parent"
-	        android:layout_height="35dip"
-	        android:textColor="@android:color/white"
-	        android:textSize="24sp"
-	        android:gravity="center"
-	        android:text="@string/CRA_ignore"
-	        android:background="#707070"/>
-	    
-	    <ImageView 
-	        android:id="@+id/ignore_settings"
-	        android:layout_alignParentRight="true"
-			android:layout_alignParentEnd="true"
-	        android:layout_width="35dip"
-	        android:layout_height="35dip"
-	        android:padding="4dip"
-	        android:background="@android:color/transparent"
-	        android:scaleType="fitCenter"
-            android:tint="@android:color/white"
-	        android:src="@drawable/ic_settings_24dp"/>
-    </RelativeLayout>
+      android:id="@+id/ignore"
+      android:layout_width="fill_parent"
+      android:layout_height="35dip"
+      android:background="#707070"
+      android:gravity="center"
+      android:text="@string/CRA_ignore"
+      android:textColor="@android:color/white"
+      android:textSize="24sp"/>
+
+    <ImageView
+      android:id="@+id/ignore_settings"
+      android:layout_width="35dip"
+      android:layout_height="35dip"
+      android:layout_alignParentEnd="true"
+      android:layout_alignParentRight="true"
+      android:padding="4dip"
+      android:background="@android:color/transparent"
+      android:scaleType="fitCenter"
+      android:src="@drawable/ic_settings_24dp"
+      android:tint="@android:color/white"/>
+  </RelativeLayout>
 
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/beast_mode_pref_activity.xml b/app/src/main/res/layout/beast_mode_pref_activity.xml
index e19af41b6..8a7651aee 100644
--- a/app/src/main/res/layout/beast_mode_pref_activity.xml
+++ b/app/src/main/res/layout/beast_mode_pref_activity.xml
@@ -1,15 +1,15 @@
 <?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:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
 
-    <include layout="@layout/toolbar" />
+  <include layout="@layout/toolbar"/>
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:background="?asWindowBackground"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+  <android.support.v7.widget.RecyclerView
+    android:id="@+id/recycler_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?asWindowBackground"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/calendar_reminder_activity.xml b/app/src/main/res/layout/calendar_reminder_activity.xml
index cec67ac55..aa721b618 100644
--- a/app/src/main/res/layout/calendar_reminder_activity.xml
+++ b/app/src/main/res/layout/calendar_reminder_activity.xml
@@ -5,10 +5,10 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" 
-    android:gravity="center">
-    
-    <include layout="@layout/astrid_calendar_reminder_view"/>
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:gravity="center"
+  android:orientation="vertical">
+
+  <include layout="@layout/astrid_calendar_reminder_view"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/comment_adapter_row.xml b/app/src/main/res/layout/comment_adapter_row.xml
index aa75d18c4..1e5583d3c 100644
--- a/app/src/main/res/layout/comment_adapter_row.xml
+++ b/app/src/main/res/layout/comment_adapter_row.xml
@@ -4,36 +4,36 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:orientation="vertical"
-    android:padding="@dimen/keyline_first">
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:padding="@dimen/keyline_first"
+  android:background="?attr/selectableItemBackground"
+  android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="16sp" />
+  <TextView
+    android:id="@+id/title"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textColor="?android:attr/textColorPrimary"
+    android:textSize="16sp"/>
 
-    <TextView
-        android:id="@+id/date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        android:textStyle="normal" />
+  <TextView
+    android:id="@+id/date"
+    android:textStyle="normal"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:ellipsize="end"
+    android:singleLine="true"
+    android:textColor="?android:attr/textColorSecondary"
+    android:textSize="12sp"/>
 
-    <ImageView
-        android:id="@+id/comment_picture"
-        android:layout_width="50dip"
-        android:layout_height="50dip"
-        android:scaleType="fitCenter"
-        android:visibility="gone"
-        tools:ignore="ContentDescription" />
+  <ImageView
+    android:id="@+id/comment_picture"
+    android:layout_width="50dip"
+    android:layout_height="50dip"
+    android:scaleType="fitCenter"
+    android:visibility="gone"
+    tools:ignore="ContentDescription"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/control_set_clear_button.xml b/app/src/main/res/layout/control_set_clear_button.xml
index c431419e7..f3562af8e 100644
--- a/app/src/main/res/layout/control_set_clear_button.xml
+++ b/app/src/main/res/layout/control_set_clear_button.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/clear"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_alignParentEnd="true"
-    android:layout_alignParentRight="true"
-    android:layout_gravity="center"
-    android:layout_weight="1"
-    android:alpha="?attr/alpha_secondary"
-    android:background="?attr/selectableItemBackgroundBorderless"
-    android:clickable="true"
-    android:src="@drawable/ic_cancel_24dp"
-    android:tint="?attr/icon_tint" />
\ No newline at end of file
+  android:id="@+id/clear"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
+  android:layout_weight="1"
+  android:layout_alignParentEnd="true"
+  android:layout_alignParentRight="true"
+  android:layout_gravity="center"
+  android:alpha="?attr/alpha_secondary"
+  android:background="?attr/selectableItemBackgroundBorderless"
+  android:clickable="true"
+  android:src="@drawable/ic_cancel_24dp"
+  android:tint="?attr/icon_tint"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/control_set_deadline.xml b/app/src/main/res/layout/control_set_deadline.xml
index 393aba4e4..07fe6b151 100644
--- a/app/src/main/res/layout/control_set_deadline.xml
+++ b/app/src/main/res/layout/control_set_deadline.xml
@@ -1,33 +1,33 @@
 <?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:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    tools:ignore="DisableBaselineAlignment">
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:orientation="horizontal"
+  tools:ignore="DisableBaselineAlignment">
 
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="100"
-        android:orientation="horizontal">
+  <LinearLayout
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="100"
+    android:orientation="horizontal">
 
-        <Spinner
-            android:id="@+id/due_date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@null" />
+    <Spinner
+      android:id="@+id/due_date"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:background="@null"/>
 
-        <Spinner
-            android:id="@+id/due_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="15dp"
-            android:layout_marginStart="15dp"
-            android:background="@null" />
+    <Spinner
+      android:id="@+id/due_time"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="15dp"
+      android:layout_marginLeft="15dp"
+      android:background="@null"/>
 
-    </LinearLayout>
+  </LinearLayout>
 
-    <include layout="@layout/control_set_clear_button" />
+  <include layout="@layout/control_set_clear_button"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/control_set_description.xml b/app/src/main/res/layout/control_set_description.xml
index d12fa3de4..5f42e401d 100644
--- a/app/src/main/res/layout/control_set_description.xml
+++ b/app/src/main/res/layout/control_set_description.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <EditText xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/notes"
-    style="@style/TaskEditTextPrimary"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@android:color/transparent"
-    android:freezesText="true"
-    android:hint="@string/TEA_note_label"
-    android:imeOptions="flagNoExtractUi"
-    android:inputType="textCapSentences|textMultiLine"
-    android:gravity="start"
-    android:textAlignment="viewStart"
-    android:paddingLeft="0dp"
-    android:paddingStart="0dp"
-    android:paddingEnd="@dimen/keyline_first"
-    android:paddingRight="@dimen/keyline_first"
-    android:scrollbars="vertical" />
+  android:id="@+id/notes"
+  style="@style/TaskEditTextPrimary"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:paddingStart="0dp"
+  android:paddingEnd="@dimen/keyline_first"
+  android:paddingLeft="0dp"
+  android:paddingRight="@dimen/keyline_first"
+  android:background="@android:color/transparent"
+  android:freezesText="true"
+  android:gravity="start"
+  android:hint="@string/TEA_note_label"
+  android:imeOptions="flagNoExtractUi"
+  android:inputType="textCapSentences|textMultiLine"
+  android:scrollbars="vertical"
+  android:textAlignment="viewStart"/>
diff --git a/app/src/main/res/layout/control_set_files.xml b/app/src/main/res/layout/control_set_files.xml
index cfc320242..dd2d53a21 100644
--- a/app/src/main/res/layout/control_set_files.xml
+++ b/app/src/main/res/layout/control_set_files.xml
@@ -4,33 +4,33 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:orientation="vertical">
+
+  <LinearLayout
+    android:id="@+id/attachment_container"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/attachment_container"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
+    android:orientation="vertical"/>
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:layout_gravity="start"
-        android:layout_weight="50"
-        android:gravity="start"
-        android:orientation="horizontal">
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="0dp"
+    android:layout_weight="50"
+    android:layout_gravity="start"
+    android:gravity="start"
+    android:orientation="horizontal">
 
-        <TextView
-            style="@style/TaskEditTextPrimary"
-            android:id="@+id/add_attachment"
-            android:gravity="start"
-            android:textAlignment="viewStart"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/add_attachment"/>
+    <TextView
+      android:id="@+id/add_attachment"
+      style="@style/TaskEditTextPrimary"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:gravity="start"
+      android:hint="@string/add_attachment"
+      android:textAlignment="viewStart"/>
 
-    </LinearLayout>
+  </LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/control_set_gcal_display.xml b/app/src/main/res/layout/control_set_gcal_display.xml
index 9d90a30e1..27356418f 100644
--- a/app/src/main/res/layout/control_set_gcal_display.xml
+++ b/app/src/main/res/layout/control_set_gcal_display.xml
@@ -4,21 +4,21 @@
 ** See the file "LICENSE" for the full license governing this code.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/calendar_display_which"
-        style="@style/TaskEditTextPrimary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:layout_weight="100"
-        android:gravity="start"
-        android:hint="@string/dont_add_to_calendar"
-        android:textAlignment="viewStart" />
+  <TextView
+    android:id="@+id/calendar_display_which"
+    style="@style/TaskEditTextPrimary"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="100"
+    android:layout_gravity="top"
+    android:gravity="start"
+    android:hint="@string/dont_add_to_calendar"
+    android:textAlignment="viewStart"/>
 
-    <include layout="@layout/control_set_clear_button" />
+  <include layout="@layout/control_set_clear_button"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/control_set_hide.xml b/app/src/main/res/layout/control_set_hide.xml
index 58d5b6e4e..9a561278b 100644
--- a/app/src/main/res/layout/control_set_hide.xml
+++ b/app/src/main/res/layout/control_set_hide.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:baselineAligned="false">
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:baselineAligned="false"
+  android:orientation="horizontal">
 
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="100"
-        android:orientation="horizontal">
+  <LinearLayout
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="100"
+    android:orientation="horizontal">
 
-        <Spinner
-            android:id="@+id/hideUntil"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@null"/>
+    <Spinner
+      android:id="@+id/hideUntil"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:background="@null"/>
 
-    </LinearLayout>
+  </LinearLayout>
 
-    <include layout="@layout/control_set_clear_button" />
+  <include layout="@layout/control_set_clear_button"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/control_set_priority.xml b/app/src/main/res/layout/control_set_priority.xml
index eca53fb54..f88777f1d 100644
--- a/app/src/main/res/layout/control_set_priority.xml
+++ b/app/src/main/res/layout/control_set_priority.xml
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:gravity="center_vertical"
+  android:orientation="horizontal">
+
+  <TextView
+    style="@style/TaskEditTextPrimary"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingStart="0dp"
+    android:paddingEnd="@dimen/keyline_second"
+    android:paddingLeft="0dp"
+    android:paddingRight="@dimen/keyline_second"
+    android:gravity="start|center_vertical"
+    android:text="@string/TEA_importance_label"/>
+
+  <RadioGroup
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical"
+    android:layout_gravity="end"
+    android:paddingStart="@dimen/keyline_second"
+    android:paddingEnd="0dp"
+    android:paddingLeft="@dimen/keyline_second"
+    android:paddingRight="0dp"
+    android:gravity="end"
     android:orientation="horizontal">
 
-    <TextView
-        style="@style/TaskEditTextPrimary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="start|center_vertical"
-        android:paddingEnd="@dimen/keyline_second"
-        android:paddingLeft="0dp"
-        android:paddingRight="@dimen/keyline_second"
-        android:paddingStart="0dp"
-        android:text="@string/TEA_importance_label" />
-
-    <RadioGroup
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:gravity="end"
-        android:orientation="horizontal"
-        android:paddingRight="0dp"
-        android:paddingEnd="0dp"
-        android:paddingLeft="@dimen/keyline_second"
-        android:paddingStart="@dimen/keyline_second">
-
-        <android.support.v7.widget.AppCompatRadioButton
-            android:id="@+id/priority_none"
-            style="@style/priority_button"
-            android:buttonTint="@color/importance_4"
-            tools:ignore="UnusedAttribute" />
+    <android.support.v7.widget.AppCompatRadioButton
+      android:id="@+id/priority_none"
+      style="@style/priority_button"
+      android:buttonTint="@color/importance_4"
+      tools:ignore="UnusedAttribute"/>
 
-        <android.support.v7.widget.AppCompatRadioButton
-            android:id="@+id/priority_low"
-            style="@style/priority_button"
-            android:buttonTint="@color/importance_3"
-            tools:ignore="UnusedAttribute" />
+    <android.support.v7.widget.AppCompatRadioButton
+      android:id="@+id/priority_low"
+      style="@style/priority_button"
+      android:buttonTint="@color/importance_3"
+      tools:ignore="UnusedAttribute"/>
 
-        <android.support.v7.widget.AppCompatRadioButton
-            android:id="@+id/priority_medium"
-            style="@style/priority_button"
-            android:buttonTint="@color/importance_2"
-            tools:ignore="UnusedAttribute" />
+    <android.support.v7.widget.AppCompatRadioButton
+      android:id="@+id/priority_medium"
+      style="@style/priority_button"
+      android:buttonTint="@color/importance_2"
+      tools:ignore="UnusedAttribute"/>
 
-        <android.support.v7.widget.AppCompatRadioButton
-            android:id="@+id/priority_high"
-            style="@style/priority_button"
-            android:buttonTint="@color/importance_1"
-            tools:ignore="UnusedAttribute" />
-    </RadioGroup>
+    <android.support.v7.widget.AppCompatRadioButton
+      android:id="@+id/priority_high"
+      style="@style/priority_button"
+      android:buttonTint="@color/importance_1"
+      tools:ignore="UnusedAttribute"/>
+  </RadioGroup>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/control_set_reminders.xml b/app/src/main/res/layout/control_set_reminders.xml
index dc56d7a20..daa386a6b 100644
--- a/app/src/main/res/layout/control_set_reminders.xml
+++ b/app/src/main/res/layout/control_set_reminders.xml
@@ -4,58 +4,58 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:orientation="vertical">
+
+  <LinearLayout
+    android:id="@+id/alert_container"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"/>
+
+  <RelativeLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+
+    <Spinner
+      android:id="@+id/reminder_alarm"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentEnd="true"
+      android:layout_alignParentRight="true"
+      android:paddingStart="0dp"
+      android:paddingEnd="10dp"
+      android:paddingLeft="0dp"
+      android:paddingRight="10dp"
+      android:background="@null"
+      android:gravity="end"/>
 
     <LinearLayout
-        android:id="@+id/alert_container"
-        android:layout_width="fill_parent"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentLeft="true"
+      android:layout_alignParentStart="true"
+      android:layout_gravity="start"
+      android:layout_toLeftOf="@id/reminder_alarm"
+      android:layout_toStartOf="@id/reminder_alarm"
+      android:gravity="start"
+      android:orientation="horizontal">
+
+      <TextView
+        android:id="@+id/alarms_add"
+        style="@style/TaskEditTextPrimary"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical" />
-
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <Spinner
-            android:id="@+id/reminder_alarm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:background="@null"
-            android:gravity="end"
-            android:paddingEnd="10dp"
-            android:paddingLeft="0dp"
-            android:paddingRight="10dp"
-            android:paddingStart="0dp" />
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_gravity="start"
-            android:layout_toLeftOf="@id/reminder_alarm"
-            android:layout_toStartOf="@id/reminder_alarm"
-            android:gravity="start"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/alarms_add"
-                style="@style/TaskEditTextPrimary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:hint="@string/add_reminder" />
-
-            <Spinner
-                android:id="@+id/alarms_add_spinner"
-                android:layout_width="0dip"
-                android:layout_height="0dip" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
+        android:hint="@string/add_reminder"/>
+
+      <Spinner
+        android:id="@+id/alarms_add_spinner"
+        android:layout_width="0dip"
+        android:layout_height="0dip"/>
+
+    </LinearLayout>
+
+  </RelativeLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/control_set_remote_list.xml b/app/src/main/res/layout/control_set_remote_list.xml
index c5148c161..defa09b63 100644
--- a/app/src/main/res/layout/control_set_remote_list.xml
+++ b/app/src/main/res/layout/control_set_remote_list.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/google_task_list"
-    style="@style/TaskEditTextPrimary"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="top"
-    android:gravity="start"
-    android:hint="@string/dont_sync"
-    android:textAlignment="viewStart" />
+  android:id="@+id/google_task_list"
+  style="@style/TaskEditTextPrimary"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:layout_gravity="top"
+  android:gravity="start"
+  android:hint="@string/dont_sync"
+  android:textAlignment="viewStart"/>
diff --git a/app/src/main/res/layout/control_set_repeat.xml b/app/src/main/res/layout/control_set_repeat.xml
index ad340d4c8..e86a41efd 100644
--- a/app/src/main/res/layout/control_set_repeat.xml
+++ b/app/src/main/res/layout/control_set_repeat.xml
@@ -4,162 +4,162 @@
 ** See the file "LICENSE" for the full license governing this code.
 -->
 <ScrollView 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"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:orientation="vertical">
+
+  <LinearLayout
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_height="0dp"
     android:orientation="vertical">
 
+    <FrameLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="?colorAccentDialog">
+
+      <android.support.v7.widget.AppCompatSpinner
+        android:id="@+id/frequency"
+        style="Widget.AppCompat.Spinner"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
+        android:layout_gravity="center_horizontal"
+        android:paddingStart="@dimen/keyline_first"
+        android:paddingEnd="@dimen/keyline_first"
+        android:paddingLeft="@dimen/keyline_first"
+        android:paddingRight="@dimen/keyline_first"
+        app:backgroundTint="?fab_text"/>
+
+    </FrameLayout>
+
+    <LinearLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="8dp"
+      android:focusableInTouchMode="true"
+      android:orientation="horizontal">
+
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/keyline_first"
+        android:paddingEnd="0dp"
+        android:paddingLeft="@dimen/keyline_first"
+        android:paddingRight="0dp"
+        android:text="@string/repeat_every"
+        android:textAppearance="@style/TextAppearance"/>
+
+      <EditText
+        android:id="@+id/intervalValue"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp"
+        android:ems="3"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:gravity="center_horizontal"
+        android:imeOptions="flagNoExtractUi"
+        android:inputType="number"
+        android:maxLength="3"
+        android:selectAllOnFocus="true"
+        android:singleLine="true"
+        android:textSize="15sp"/>
+
+      <TextView
+        android:id="@+id/intervalText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="0dp"
+        android:paddingEnd="@dimen/keyline_first"
+        android:paddingLeft="0dp"
+        android:paddingRight="@dimen/keyline_first"
+        android:textAppearance="@style/TextAppearance"/>
+
+    </LinearLayout>
+
+    <include layout="@layout/week_buttons"/>
+
+    <RadioGroup
+      android:id="@+id/month_group"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingStart="@dimen/keyline_first"
+      android:paddingEnd="@dimen/keyline_first"
+      android:paddingLeft="@dimen/keyline_first"
+      android:paddingRight="@dimen/keyline_first"
+      android:orientation="vertical"
+      android:visibility="gone">
+
+      <RadioButton
+        android:id="@+id/repeat_monthly_same_day"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/repeat_monthly_same_day_each_month"/>
+
+      <RadioButton
+        android:id="@+id/repeat_monthly_day_of_nth_week"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+      <RadioButton
+        android:id="@+id/repeat_monthly_day_of_last_week"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+    </RadioGroup>
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?colorAccentDialog">
-
-            <android.support.v7.widget.AppCompatSpinner
-                android:id="@+id/frequency"
-                style="Widget.AppCompat.Spinner"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="4dp"
-                android:layout_marginTop="4dp"
-                android:paddingEnd="@dimen/keyline_first"
-                android:paddingLeft="@dimen/keyline_first"
-                android:paddingRight="@dimen/keyline_first"
-                android:paddingStart="@dimen/keyline_first"
-                app:backgroundTint="?fab_text" />
-
-        </FrameLayout>
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:focusableInTouchMode="true"
-            android:orientation="horizontal"
-            android:layout_marginTop="8dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingEnd="0dp"
-                android:paddingLeft="@dimen/keyline_first"
-                android:paddingRight="0dp"
-                android:paddingStart="@dimen/keyline_first"
-                android:text="@string/repeat_every"
-                android:textAppearance="@style/TextAppearance" />
-
-            <EditText
-                android:id="@+id/intervalValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ems="3"
-                android:focusable="true"
-                android:imeOptions="flagNoExtractUi"
-                android:focusableInTouchMode="true"
-                android:gravity="center_horizontal"
-                android:inputType="number"
-                android:maxLength="3"
-                android:paddingLeft="4dp"
-                android:paddingRight="4dp"
-                android:selectAllOnFocus="true"
-                android:singleLine="true"
-                android:textSize="15sp" />
-
-            <TextView
-                android:id="@+id/intervalText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingEnd="@dimen/keyline_first"
-                android:paddingLeft="0dp"
-                android:paddingRight="@dimen/keyline_first"
-                android:paddingStart="0dp"
-                android:textAppearance="@style/TextAppearance" />
-
-        </LinearLayout>
-
-        <include layout="@layout/week_buttons" />
-
-        <RadioGroup
-            android:id="@+id/month_group"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone"
-            android:paddingEnd="@dimen/keyline_first"
-            android:paddingLeft="@dimen/keyline_first"
-            android:paddingRight="@dimen/keyline_first"
-            android:paddingStart="@dimen/keyline_first">
-
-            <RadioButton
-                android:id="@+id/repeat_monthly_same_day"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/repeat_monthly_same_day_each_month" />
-
-            <RadioButton
-                android:id="@+id/repeat_monthly_day_of_nth_week"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-            <RadioButton
-                android:id="@+id/repeat_monthly_day_of_last_week"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-        </RadioGroup>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:orientation="horizontal">
-
-            <Spinner
-                android:id="@+id/repeat_until"
-                style="Widget.AppCompat.Spinner"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="@dimen/keyline_first"
-                android:layout_marginStart="@dimen/keyline_first"
-                android:layout_marginRight="0dp"
-                android:layout_marginEnd="0dp"
-                android:textColor="?attr/asTextColor" />
-
-            <EditText
-                android:id="@+id/repeatTimesValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ems="3"
-                android:focusable="true"
-                android:imeOptions="flagNoExtractUi"
-                android:focusableInTouchMode="true"
-                android:gravity="center"
-                android:inputType="number"
-                android:maxLength="3"
-                android:paddingLeft="4dp"
-                android:paddingRight="4dp"
-                android:selectAllOnFocus="true"
-                android:singleLine="true"
-                android:textSize="15sp" />
-
-            <TextView
-                android:id="@+id/repeatTimesText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingEnd="@dimen/keyline_first"
-                android:paddingLeft="0dp"
-                android:paddingRight="@dimen/keyline_first"
-                android:paddingStart="0dp"
-                android:textAppearance="@style/TextAppearance" />
-
-        </LinearLayout>
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="8dp"
+      android:orientation="horizontal">
+
+      <Spinner
+        android:id="@+id/repeat_until"
+        style="Widget.AppCompat.Spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/keyline_first"
+        android:layout_marginEnd="0dp"
+        android:layout_marginLeft="@dimen/keyline_first"
+        android:layout_marginRight="0dp"
+        android:layout_gravity="center"
+        android:textColor="?attr/asTextColor"/>
+
+      <EditText
+        android:id="@+id/repeatTimesValue"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp"
+        android:ems="3"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:gravity="center"
+        android:imeOptions="flagNoExtractUi"
+        android:inputType="number"
+        android:maxLength="3"
+        android:selectAllOnFocus="true"
+        android:singleLine="true"
+        android:textSize="15sp"/>
+
+      <TextView
+        android:id="@+id/repeatTimesText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:paddingStart="0dp"
+        android:paddingEnd="@dimen/keyline_first"
+        android:paddingLeft="0dp"
+        android:paddingRight="@dimen/keyline_first"
+        android:textAppearance="@style/TextAppearance"/>
 
     </LinearLayout>
 
+  </LinearLayout>
+
 </ScrollView>
 
diff --git a/app/src/main/res/layout/control_set_repeat_display.xml b/app/src/main/res/layout/control_set_repeat_display.xml
index 10ec72caf..52d114fc3 100644
--- a/app/src/main/res/layout/control_set_repeat_display.xml
+++ b/app/src/main/res/layout/control_set_repeat_display.xml
@@ -4,46 +4,46 @@
 ** See the file "LICENSE" for the full license governing this code.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:baselineAligned="false"
-    android:orientation="vertical">
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:baselineAligned="false"
+  android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/display_row_edit"
-        style="@style/TaskEditTextPrimary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:gravity="start"
-        android:hint="@string/repeat_option_does_not_repeat"
-        android:textAlignment="viewStart" />
+  <TextView
+    android:id="@+id/display_row_edit"
+    style="@style/TaskEditTextPrimary"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="top"
+    android:gravity="start"
+    android:hint="@string/repeat_option_does_not_repeat"
+    android:textAlignment="viewStart"/>
 
-    <LinearLayout
-        android:id="@+id/repeatTypeContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom"
-        android:visibility="gone">
+  <LinearLayout
+    android:id="@+id/repeatTypeContainer"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom"
+    android:orientation="horizontal"
+    android:visibility="gone">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingEnd="5dp"
-            android:paddingLeft="0dp"
-            android:paddingRight="5dp"
-            android:paddingStart="0dp"
-            android:text="@string/repeats_from"
-            android:textAppearance="@style/TextAppearance" />
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingStart="0dp"
+      android:paddingEnd="5dp"
+      android:paddingLeft="0dp"
+      android:paddingRight="5dp"
+      android:text="@string/repeats_from"
+      android:textAppearance="@style/TextAppearance"/>
 
-        <Spinner
-            android:id="@+id/repeatType"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:textColor="?attr/colorPrimary" />
+    <Spinner
+      android:id="@+id/repeatType"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:background="@null"
+      android:textColor="?attr/colorPrimary"/>
 
-    </LinearLayout>
+  </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/control_set_tag_list.xml b/app/src/main/res/layout/control_set_tag_list.xml
index aea0d6967..8da7d282d 100644
--- a/app/src/main/res/layout/control_set_tag_list.xml
+++ b/app/src/main/res/layout/control_set_tag_list.xml
@@ -6,31 +6,31 @@
 -->
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
   android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  
+  android:layout_height="fill_parent"
+  android:orientation="vertical">
+
   <LinearLayout
-      android:id="@+id/newTags"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:paddingLeft="@dimen/keyline_first"
-      android:paddingStart="@dimen/keyline_first"
-      android:paddingRight="@dimen/keyline_first"
-      android:paddingEnd="@dimen/keyline_first"/>
-  
+    android:id="@+id/newTags"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/keyline_first"
+    android:paddingEnd="@dimen/keyline_first"
+    android:paddingLeft="@dimen/keyline_first"
+    android:paddingRight="@dimen/keyline_first"
+    android:orientation="vertical"/>
+
   <View
-      style="@style/horizontal_divider"
-      android:padding="5dip" />
+    style="@style/horizontal_divider"
+    android:padding="5dip"/>
 
   <ListView
-      android:id="@+id/existingTags"
-      android:layout_width="fill_parent"
-      android:layout_height="0dp"
-      android:layout_weight="100"
-      android:dividerHeight="0dp"
-      android:divider="@null"
-      android:choiceMode="multipleChoice"/>
+    android:id="@+id/existingTags"
+    android:layout_width="fill_parent"
+    android:layout_height="0dp"
+    android:layout_weight="100"
+    android:choiceMode="multipleChoice"
+    android:divider="@null"
+    android:dividerHeight="0dp"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/control_set_tags.xml b/app/src/main/res/layout/control_set_tags.xml
index fa9287ea3..8f4146420 100644
--- a/app/src/main/res/layout/control_set_tags.xml
+++ b/app/src/main/res/layout/control_set_tags.xml
@@ -4,10 +4,10 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/TaskEditTextPrimary"
-    android:id="@+id/display_row_edit"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="start"
-    android:textAlignment="viewStart"
-    android:hint="@string/tag_FEx_untagged"/>
+  android:id="@+id/display_row_edit"
+  style="@style/TaskEditTextPrimary"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:gravity="start"
+  android:hint="@string/tag_FEx_untagged"
+  android:textAlignment="viewStart"/>
diff --git a/app/src/main/res/layout/control_set_template.xml b/app/src/main/res/layout/control_set_template.xml
index cf57d7d11..2614ea2e2 100644
--- a/app/src/main/res/layout/control_set_template.xml
+++ b/app/src/main/res/layout/control_set_template.xml
@@ -1,29 +1,29 @@
 <?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:id="@+id/content"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:paddingBottom="@dimen/task_edit_drawable_padding_top_bottom"
-    android:paddingEnd="@dimen/keyline_first"
-    android:paddingLeft="0dp"
-    android:paddingRight="@dimen/keyline_first"
-    android:paddingStart="0dp"
-    android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom">
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/content"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom"
+  android:paddingBottom="@dimen/task_edit_drawable_padding_top_bottom"
+  android:paddingStart="0dp"
+  android:paddingEnd="@dimen/keyline_first"
+  android:paddingLeft="0dp"
+  android:paddingRight="@dimen/keyline_first"
+  android:orientation="horizontal">
 
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:alpha="?attr/alpha_secondary"
-        android:paddingEnd="@dimen/keyline_second"
-        android:paddingLeft="@dimen/keyline_first"
-        android:paddingRight="@dimen/keyline_second"
-        android:paddingStart="@dimen/keyline_first"
-        android:scaleType="center"
-        android:tint="?attr/icon_tint"
-        tools:ignore="ContentDescription" />
+  <ImageView
+    android:id="@+id/icon"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="top"
+    android:paddingStart="@dimen/keyline_first"
+    android:paddingEnd="@dimen/keyline_second"
+    android:paddingLeft="@dimen/keyline_first"
+    android:paddingRight="@dimen/keyline_second"
+    android:alpha="?attr/alpha_secondary"
+    android:scaleType="center"
+    android:tint="?attr/icon_tint"
+    tools:ignore="ContentDescription"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/control_set_timers.xml b/app/src/main/res/layout/control_set_timers.xml
index d6bb5bbf9..d6b8a73dc 100644
--- a/app/src/main/res/layout/control_set_timers.xml
+++ b/app/src/main/res/layout/control_set_timers.xml
@@ -4,57 +4,57 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:baselineAligned="false"
+  android:orientation="horizontal">
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="100"
+    android:orientation="vertical">
+
+    <TextView
+      android:id="@+id/display_row_edit"
+      style="@style/TaskEditTextPrimary"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:gravity="start"
+      android:hint="@string/TEA_timer_controls"
+      android:textAlignment="viewStart"/>
+
+  </LinearLayout>
+
+  <LinearLayout
+    android:id="@+id/timer_container"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:baselineAligned="false">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="100"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/display_row_edit"
-            style="@style/TaskEditTextPrimary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="start"
-            android:textAlignment="viewStart"
-            android:hint="@string/TEA_timer_controls" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/timer_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/timer_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center_vertical|center_horizontal"
-            android:paddingLeft="5dip"
-            android:paddingRight="5dip"
-            android:alpha="?attr/alpha_secondary"
-            android:scaleType="centerInside"
-            android:tint="?attr/icon_tint" />
-
-        <Chronometer
-            android:id="@+id/timer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="2"
-            android:gravity="center_horizontal"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="10sp"
-            android:visibility="visible" />
-    </LinearLayout>
+    android:layout_weight="1"
+    android:orientation="vertical">
+
+    <ImageView
+      android:id="@+id/timer_button"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:paddingLeft="5dip"
+      android:paddingRight="5dip"
+      android:alpha="?attr/alpha_secondary"
+      android:gravity="center_vertical|center_horizontal"
+      android:scaleType="centerInside"
+      android:tint="?attr/icon_tint"/>
+
+    <Chronometer
+      android:id="@+id/timer"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_weight="2"
+      android:gravity="center_horizontal"
+      android:textColor="?android:attr/textColorSecondary"
+      android:textSize="10sp"
+      android:visibility="visible"/>
+  </LinearLayout>
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/control_set_timers_dialog.xml b/app/src/main/res/layout/control_set_timers_dialog.xml
index 13ae1f9c0..0bfca745d 100644
--- a/app/src/main/res/layout/control_set_timers_dialog.xml
+++ b/app/src/main/res/layout/control_set_timers_dialog.xml
@@ -6,67 +6,67 @@
 -->
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
   android:layout_width="fill_parent"
   android:layout_height="fill_parent"
   android:paddingLeft="5dip"
-  android:paddingRight="5dip">
-        
-    <!-- estimated time -->
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-	    <TextView
-	      android:layout_width="wrap_content"
-	      android:layout_height="wrap_content"
-	      android:text="@string/TEA_estimatedDuration_label"
-	      style="@style/TextAppearance" />
-	    <TextView
-             android:id="@+id/estimatedDuration"
-             android:layout_width="0dp"
-             android:layout_height="wrap_content"
-             android:layout_weight="1"
-             android:gravity="end"
-             android:paddingLeft="10dip"
-            android:paddingStart="10dp"
-			android:paddingEnd="0dp"
-			android:paddingRight="0dp"
-             android:textColor="?attr/asTextColor" />
-    </LinearLayout>
+  android:paddingRight="5dip"
+  android:orientation="vertical">
 
-    <View style="@style/horizontal_divider" />
+  <!-- estimated time -->
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="50dip"
+    android:layout_marginLeft="10dip"
+    android:layout_marginRight="10dip"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+    <TextView
+      style="@style/TextAppearance"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/TEA_estimatedDuration_label"/>
+    <TextView
+      android:id="@+id/estimatedDuration"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:paddingStart="10dp"
+      android:paddingEnd="0dp"
+      android:paddingLeft="10dip"
+      android:paddingRight="0dp"
+      android:gravity="end"
+      android:textColor="?attr/asTextColor"/>
+  </LinearLayout>
 
-    <!-- elapsed time -->
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
+  <View style="@style/horizontal_divider"/>
 
-        <TextView
-	      android:layout_width="wrap_content"
-	      android:layout_height="wrap_content"
-	      android:text="@string/TEA_elapsedDuration_label"
-	      style="@style/TextAppearance" />
+  <!-- elapsed time -->
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="50dip"
+    android:layout_marginLeft="10dip"
+    android:layout_marginRight="10dip"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
 
-	    <TextView
-             android:id="@+id/elapsedDuration"
-             android:layout_width="0dp"
-             android:layout_height="wrap_content"
-             android:layout_weight="1"
-             android:gravity="end"
-             android:paddingLeft="10dip"
-			android:paddingStart="10dp"
-			android:paddingRight="0dp"
-			android:paddingEnd="0dp"
-             android:textColor="?attr/asTextColor" />
-    </LinearLayout>
+    <TextView
+      style="@style/TextAppearance"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/TEA_elapsedDuration_label"/>
+
+    <TextView
+      android:id="@+id/elapsedDuration"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:paddingStart="10dp"
+      android:paddingEnd="0dp"
+      android:paddingLeft="10dip"
+      android:paddingRight="0dp"
+      android:gravity="end"
+      android:textColor="?attr/asTextColor"/>
+  </LinearLayout>
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/control_set_title.xml b/app/src/main/res/layout/control_set_title.xml
index 15ed8a7ae..941919322 100644
--- a/app/src/main/res/layout/control_set_title.xml
+++ b/app/src/main/res/layout/control_set_title.xml
@@ -4,58 +4,58 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:orientation="vertical">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:descendantFocusability="beforeDescendants"
-        android:focusableInTouchMode="true"
-        android:orientation="horizontal"
-        android:paddingBottom="@dimen/task_edit_drawable_padding_top_bottom"
-        android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom">
+  <RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom"
+    android:paddingBottom="@dimen/task_edit_drawable_padding_top_bottom"
+    android:descendantFocusability="beforeDescendants"
+    android:focusableInTouchMode="true"
+    android:orientation="horizontal">
 
-        <com.todoroo.astrid.ui.CheckableImageView
-            android:id="@+id/completeBox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_gravity="top"
-            android:paddingRight="@dimen/keyline_second"
-            android:paddingEnd="@dimen/keyline_second"
-            android:paddingStart="@dimen/keyline_first"
-            android:paddingLeft="@dimen/keyline_first"
-            android:scaleType="center" />
+    <com.todoroo.astrid.ui.CheckableImageView
+      android:id="@+id/completeBox"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentLeft="true"
+      android:layout_alignParentStart="true"
+      android:layout_gravity="top"
+      android:paddingStart="@dimen/keyline_first"
+      android:paddingEnd="@dimen/keyline_second"
+      android:paddingLeft="@dimen/keyline_first"
+      android:paddingRight="@dimen/keyline_second"
+      android:scaleType="center"/>
 
-        <EditText
-            android:id="@+id/title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/completeBox"
-            android:layout_toEndOf="@id/completeBox"
-            android:gravity="start"
-            android:textAlignment="viewStart"
-            android:paddingLeft="0dp"
-            android:paddingStart="0dp"
-            android:paddingRight="@dimen/keyline_first"
-            android:paddingEnd="@dimen/keyline_first"
-            android:background="@null"
-            android:freezesText="true"
-            android:hint="@string/TEA_title_hint"
-            android:imeOptions="flagNoExtractUi"
-            android:inputType="textCapSentences|textAutoCorrect"
-            android:nextFocusLeft="@id/title"
-            android:nextFocusUp="@id/title"
-            android:scrollbars="vertical"
-            android:textColor="?attr/asTextColor"
-            android:textColorHint="?attr/asTextColorHint" />
+    <EditText
+      android:id="@+id/title"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_toEndOf="@id/completeBox"
+      android:layout_toRightOf="@id/completeBox"
+      android:paddingStart="0dp"
+      android:paddingEnd="@dimen/keyline_first"
+      android:paddingLeft="0dp"
+      android:paddingRight="@dimen/keyline_first"
+      android:background="@null"
+      android:freezesText="true"
+      android:gravity="start"
+      android:hint="@string/TEA_title_hint"
+      android:imeOptions="flagNoExtractUi"
+      android:inputType="textCapSentences|textAutoCorrect"
+      android:nextFocusLeft="@id/title"
+      android:nextFocusUp="@id/title"
+      android:scrollbars="vertical"
+      android:textAlignment="viewStart"
+      android:textColor="?attr/asTextColor"
+      android:textColorHint="?attr/asTextColorHint"/>
 
-    </RelativeLayout>
+  </RelativeLayout>
 
-    <View style="@style/horizontal_divider" />
+  <View style="@style/horizontal_divider"/>
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/custom_filter_activity.xml b/app/src/main/res/layout/custom_filter_activity.xml
index 339496cb4..2a42098fa 100644
--- a/app/src/main/res/layout/custom_filter_activity.xml
+++ b/app/src/main/res/layout/custom_filter_activity.xml
@@ -5,83 +5,85 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:background="?attr/asContentBackground">
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:background="?attr/asContentBackground"
+  android:orientation="vertical">
 
-    <include layout="@layout/toolbar" />
+  <include layout="@layout/toolbar"/>
 
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp">
+  <RelativeLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
 
-        <TextView
-            android:id="@+id/tag_label"
-            style="@style/TextAppearance"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:text="@string/name" />
-
-        <EditText
-            android:id="@+id/tag_name"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/tag_label"
-            android:layout_marginTop="16dp"
-            android:background="#00000000"
-            android:hint="@string/enter_filter_name"
-            android:gravity="start"
-            android:textAlignment="viewStart"
-            android:imeOptions="flagNoExtractUi"
-            android:inputType="textCapSentences"
-            android:singleLine="true"
-            android:textColor="?attr/asTextColorHint"
-            android:textColorHint="?attr/asTextColorHint"
-            android:textSize="15sp" />
-    </RelativeLayout>
-
-    <!-- List -->
-    <ListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:scrollbars="vertical"
-        android:cacheColorHint="#00000000"/>
-    
-    <!-- help text -->
     <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:paddingLeft="5dip"
-        android:paddingStart="5dp"
-        android:paddingRight="0dp"
-        android:paddingEnd="0dp"
-        android:text="@string/CFA_help"
-        style="@style/TextAppearance"/>
-    
-    <!-- buttons -->
-    <LinearLayout
-      android:orientation="horizontal"
+      android:id="@+id/tag_label"
+      style="@style/TextAppearance"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentTop="true"
+      android:text="@string/name"/>
+
+    <EditText
+      android:id="@+id/tag_name"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:layout_marginTop="10dip"
-      android:padding="5dip"
-      android:baselineAligned="false">
-      
-      <Button android:id="@+id/add"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:paddingTop="10dip"
-        android:paddingBottom="10dip"
-        android:layout_marginRight="3dip"
-          android:layout_marginEnd="3dp"
-        android:layout_weight="1"
-        android:text="@string/CFA_button_add" />
+      android:layout_marginTop="16dp"
+      android:layout_below="@id/tag_label"
+      android:background="#00000000"
+      android:gravity="start"
+      android:hint="@string/enter_filter_name"
+      android:imeOptions="flagNoExtractUi"
+      android:inputType="textCapSentences"
+      android:singleLine="true"
+      android:textAlignment="viewStart"
+      android:textColor="?attr/asTextColorHint"
+      android:textColorHint="?attr/asTextColorHint"
+      android:textSize="15sp"/>
+  </RelativeLayout>
+
+  <!-- List -->
+  <ListView
+    android:id="@android:id/list"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:cacheColorHint="#00000000"
+    android:scrollbars="vertical"/>
+
+  <!-- help text -->
+  <TextView
+    style="@style/TextAppearance"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="5dp"
+    android:paddingEnd="0dp"
+    android:paddingLeft="5dip"
+    android:paddingRight="0dp"
+    android:gravity="center"
+    android:text="@string/CFA_help"/>
+
+  <!-- buttons -->
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="10dip"
+    android:padding="5dip"
+    android:baselineAligned="false"
+    android:orientation="horizontal">
+
+    <Button
+      android:id="@+id/add"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:layout_marginEnd="3dp"
+      android:layout_marginRight="3dip"
+      android:paddingTop="10dip"
+      android:paddingBottom="10dip"
+      android:text="@string/CFA_button_add"/>
+
+  </LinearLayout>
 
-    </LinearLayout>
-    
 </LinearLayout>
     
diff --git a/app/src/main/res/layout/custom_filter_row.xml b/app/src/main/res/layout/custom_filter_row.xml
index 958dfa638..4c562a03f 100644
--- a/app/src/main/res/layout/custom_filter_row.xml
+++ b/app/src/main/res/layout/custom_filter_row.xml
@@ -5,68 +5,71 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="55dip"
-    android:background="?attr/selectableItemBackground"
-    android:paddingLeft="4dip"
-    android:paddingStart="4dip"
-    android:paddingRight="6dip"
-    android:paddingEnd="6dip"
-    android:orientation="horizontal">
+  android:layout_width="fill_parent"
+  android:layout_height="55dip"
+  android:paddingStart="4dip"
+  android:paddingEnd="6dip"
+  android:paddingLeft="4dip"
+  android:paddingRight="6dip"
+  android:background="?attr/selectableItemBackground"
+  android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/filter_count"
-        android:paddingLeft="5dip"
-        android:paddingRight="5dip"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:gravity="center_vertical|end"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent" />
+  <TextView
+    android:id="@+id/filter_count"
+    android:layout_width="wrap_content"
+    android:layout_height="fill_parent"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:paddingLeft="5dip"
+    android:paddingRight="5dip"
+    android:gravity="center_vertical|end"/>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="fill_parent"
-        android:layout_toLeftOf="@id/filter_count"
-        android:layout_toStartOf="@id/filter_count"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
-        android:gravity="center_vertical|start"
-        android:orientation="horizontal">
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="fill_parent"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:layout_toLeftOf="@id/filter_count"
+    android:layout_toStartOf="@id/filter_count"
+    android:gravity="center_vertical|start"
+    android:orientation="horizontal">
 
-        <!-- filter intersection type icon -->
-        <ImageView android:id="@+id/type"
-            android:layout_width="32dip"
-            android:layout_height="fill_parent"
-            android:paddingLeft="5dip"
-            android:paddingStart="5dp"
-            android:paddingRight="5dip"
-            android:paddingEnd="5dp"
-            android:scaleType="center"/>
+    <!-- filter intersection type icon -->
+    <ImageView
+      android:id="@+id/type"
+      android:layout_width="32dip"
+      android:layout_height="fill_parent"
+      android:paddingStart="5dp"
+      android:paddingEnd="5dp"
+      android:paddingLeft="5dip"
+      android:paddingRight="5dip"
+      android:scaleType="center"/>
 
-        <!-- filter icon -->
-        <ImageView android:id="@+id/icon"
-            android:layout_width="32dip"
-            android:layout_height="fill_parent"
-            android:paddingLeft="5dip"
-            android:paddingStart="5dp"
-            android:paddingRight="5dip"
-            android:paddingEnd="5dp"
-            android:visibility="gone"/>
+    <!-- filter icon -->
+    <ImageView
+      android:id="@+id/icon"
+      android:layout_width="32dip"
+      android:layout_height="fill_parent"
+      android:paddingStart="5dp"
+      android:paddingEnd="5dp"
+      android:paddingLeft="5dip"
+      android:paddingRight="5dip"
+      android:visibility="gone"/>
 
-        <!-- filter text -->
-        <TextView android:id="@+id/name"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:paddingLeft="5dip"
-            android:paddingStart="5dip"
-            android:paddingRight="5dp"
-            android:paddingEnd="5dp"
-            android:textAlignment="viewStart"
-            android:textSize="18sp"
-            android:gravity="start|center_vertical"
-            style="@style/TextAppearance"/>
+    <!-- filter text -->
+    <TextView
+      android:id="@+id/name"
+      style="@style/TextAppearance"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:paddingStart="5dip"
+      android:paddingEnd="5dp"
+      android:paddingLeft="5dip"
+      android:paddingRight="5dp"
+      android:gravity="start|center_vertical"
+      android:textAlignment="viewStart"
+      android:textSize="18sp"/>
 
-    </LinearLayout>
+  </LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_font_size_seekbar.xml b/app/src/main/res/layout/dialog_font_size_seekbar.xml
index e477455e9..4de60bfcc 100644
--- a/app/src/main/res/layout/dialog_font_size_seekbar.xml
+++ b/app/src/main/res/layout/dialog_font_size_seekbar.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="match_parent"
-    android:layout_height="wrap_content">
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content">
 
-    <com.rey.material.widget.Slider xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/slider"
-        style="@style/Material.Widget.Slider.Discrete"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:minHeight="?attr/listPreferredItemHeight"
-        android:paddingEnd="@dimen/keyline_first"
-        android:paddingLeft="@dimen/keyline_first"
-        android:paddingRight="@dimen/keyline_first"
-        android:paddingStart="@dimen/keyline_first"
-        app:sl_discreteMode="true"
-        app:sl_stepValue="2"
-        app:sl_travelAnimDuration="100" />
+  <com.rey.material.widget.Slider xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/slider"
+    style="@style/Material.Widget.Slider.Discrete"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/keyline_first"
+    android:paddingEnd="@dimen/keyline_first"
+    android:paddingLeft="@dimen/keyline_first"
+    android:paddingRight="@dimen/keyline_first"
+    android:gravity="center"
+    android:minHeight="?attr/listPreferredItemHeight"
+    app:sl_discreteMode="true"
+    app:sl_stepValue="2"
+    app:sl_travelAnimDuration="100"/>
 
-    <TextView
-        android:id="@+id/min"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_below="@id/slider"
-        android:paddingEnd="@dimen/keyline_first"
-        android:paddingLeft="@dimen/keyline_first"
-        android:paddingRight="@dimen/keyline_first"
-        android:paddingStart="@dimen/keyline_first"
-        android:paddingTop="5dp" />
+  <TextView
+    android:id="@+id/min"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:layout_below="@id/slider"
+    android:paddingTop="5dp"
+    android:paddingStart="@dimen/keyline_first"
+    android:paddingEnd="@dimen/keyline_first"
+    android:paddingLeft="@dimen/keyline_first"
+    android:paddingRight="@dimen/keyline_first"/>
 
-    <TextView
-        android:id="@+id/max"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_below="@id/slider"
-        android:paddingEnd="@dimen/keyline_first"
-        android:paddingLeft="@dimen/keyline_first"
-        android:paddingRight="@dimen/keyline_first"
-        android:paddingStart="@dimen/keyline_first"
-        android:paddingTop="5dp" />
+  <TextView
+    android:id="@+id/max"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:layout_below="@id/slider"
+    android:paddingTop="5dp"
+    android:paddingStart="@dimen/keyline_first"
+    android:paddingEnd="@dimen/keyline_first"
+    android:paddingLeft="@dimen/keyline_first"
+    android:paddingRight="@dimen/keyline_first"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_opacity_seekbar.xml b/app/src/main/res/layout/dialog_opacity_seekbar.xml
index 8ecfcc0ec..4408e8a02 100644
--- a/app/src/main/res/layout/dialog_opacity_seekbar.xml
+++ b/app/src/main/res/layout/dialog_opacity_seekbar.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="match_parent"
-    android:layout_height="wrap_content">
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content">
 
-    <com.rey.material.widget.Slider xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/slider"
-        style="@style/Material.Widget.Slider.Discrete"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:minHeight="?attr/listPreferredItemHeight"
-        android:paddingEnd="@dimen/keyline_first"
-        android:paddingLeft="@dimen/keyline_first"
-        android:paddingRight="@dimen/keyline_first"
-        android:paddingStart="@dimen/keyline_first"
-        app:sl_discreteMode="true"
-        app:sl_stepValue="5"
-        app:sl_travelAnimDuration="100" />
+  <com.rey.material.widget.Slider xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/slider"
+    style="@style/Material.Widget.Slider.Discrete"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/keyline_first"
+    android:paddingEnd="@dimen/keyline_first"
+    android:paddingLeft="@dimen/keyline_first"
+    android:paddingRight="@dimen/keyline_first"
+    android:gravity="center"
+    android:minHeight="?attr/listPreferredItemHeight"
+    app:sl_discreteMode="true"
+    app:sl_stepValue="5"
+    app:sl_travelAnimDuration="100"/>
 
-    <TextView
-        android:id="@+id/min"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_below="@id/slider"
-        android:paddingEnd="@dimen/keyline_first"
-        android:paddingLeft="@dimen/keyline_first"
-        android:paddingRight="@dimen/keyline_first"
-        android:paddingStart="@dimen/keyline_first"
-        android:paddingTop="5dp" />
+  <TextView
+    android:id="@+id/min"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:layout_below="@id/slider"
+    android:paddingTop="5dp"
+    android:paddingStart="@dimen/keyline_first"
+    android:paddingEnd="@dimen/keyline_first"
+    android:paddingLeft="@dimen/keyline_first"
+    android:paddingRight="@dimen/keyline_first"/>
 
-    <TextView
-        android:id="@+id/max"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_below="@id/slider"
-        android:paddingEnd="@dimen/keyline_first"
-        android:paddingLeft="@dimen/keyline_first"
-        android:paddingRight="@dimen/keyline_first"
-        android:paddingStart="@dimen/keyline_first"
-        android:paddingTop="5dp" />
+  <TextView
+    android:id="@+id/max"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:layout_below="@id/slider"
+    android:paddingTop="5dp"
+    android:paddingStart="@dimen/keyline_first"
+    android:paddingEnd="@dimen/keyline_first"
+    android:paddingLeft="@dimen/keyline_first"
+    android:paddingRight="@dimen/keyline_first"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/file_row.xml b/app/src/main/res/layout/file_row.xml
index 54f89e87e..db5e4dd74 100644
--- a/app/src/main/res/layout/file_row.xml
+++ b/app/src/main/res/layout/file_row.xml
@@ -4,26 +4,26 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/task_edit_double_padding_top_bottom">
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:paddingBottom="@dimen/task_edit_double_padding_top_bottom">
 
-    <include layout="@layout/control_set_clear_button" />
+  <include layout="@layout/control_set_clear_button"/>
 
-    <TextView
-        android:id="@+id/file_text"
-        style="@android:style/TextAppearance"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_gravity="start"
-        android:layout_toLeftOf="@id/clear"
-        android:layout_toStartOf="@id/clear"
-        android:gravity="start"
-        android:textDirection="locale"
-        android:textColor="?attr/asTextColor"
-        tools:ignore="UnusedAttribute" />
+  <TextView
+    android:id="@+id/file_text"
+    style="@android:style/TextAppearance"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:layout_gravity="start"
+    android:layout_toLeftOf="@id/clear"
+    android:layout_toStartOf="@id/clear"
+    android:gravity="start"
+    android:textColor="?attr/asTextColor"
+    android:textDirection="locale"
+    tools:ignore="UnusedAttribute"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/filter_adapter_row.xml b/app/src/main/res/layout/filter_adapter_row.xml
index 4436bb2af..ae8fd9f9e 100644
--- a/app/src/main/res/layout/filter_adapter_row.xml
+++ b/app/src/main/res/layout/filter_adapter_row.xml
@@ -1,68 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.todoroo.astrid.adapter.CheckableRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="12dp"
-    android:paddingTop="12dp"
-    android:paddingLeft="@dimen/keyline_first"
-    android:paddingStart="@dimen/keyline_first"
-    android:paddingRight="0dp"
-    android:paddingEnd="0dp">
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:paddingTop="12dp"
+  android:paddingBottom="12dp"
+  android:paddingStart="@dimen/keyline_first"
+  android:paddingEnd="0dp"
+  android:paddingLeft="@dimen/keyline_first"
+  android:paddingRight="0dp">
 
-    <TextView
-        android:id="@+id/size"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:paddingLeft="0dp"
-        android:paddingStart="0dp"
-        android:paddingRight="@dimen/keyline_first"
-        android:paddingEnd="@dimen/keyline_first"
-        android:gravity="end"
-        android:fontFamily="@string/font_fontFamily_medium"
-        android:minEms="3"
-        android:textColor="?android:attr/textColorSecondary"
-        tools:ignore="UnusedAttribute" />
+  <TextView
+    android:id="@+id/size"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:layout_centerVertical="true"
+    android:paddingStart="0dp"
+    android:paddingEnd="@dimen/keyline_first"
+    android:paddingLeft="0dp"
+    android:paddingRight="@dimen/keyline_first"
+    android:fontFamily="@string/font_fontFamily_medium"
+    android:gravity="end"
+    android:minEms="3"
+    android:textColor="?android:attr/textColorSecondary"
+    tools:ignore="UnusedAttribute"/>
 
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_gravity="center_vertical"
-        android:alpha="?attr/alpha_secondary"
-        android:scaleType="center"
-        android:tint="?attr/icon_tint" />
+  <ImageView
+    android:id="@+id/icon"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:layout_gravity="center_vertical"
+    android:alpha="?attr/alpha_secondary"
+    android:scaleType="center"
+    android:tint="?attr/icon_tint"/>
 
-    <CheckedTextView
-        android:id="@+id/name"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_toEndOf="@id/icon"
-        android:layout_toLeftOf="@id/size"
-        android:layout_toRightOf="@id/icon"
-        android:layout_toStartOf="@id/size"
-        android:paddingLeft="@dimen/keyline_second"
-        android:paddingStart="@dimen/keyline_second"
-        android:paddingRight="@dimen/keyline_first"
-        android:paddingEnd="@dimen/keyline_first"
-        android:gravity="start"
-        android:duplicateParentState="true"
-        android:textAlignment="viewStart"
-        android:checked="false"
-        android:ellipsize="end"
-        android:checkMark="@drawable/checkmark"
-        android:checkMarkTint="?colorAccent"
-        android:fontFamily="@string/font_fontFamily_medium"
-        android:lines="1"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="14sp"
-        tools:ignore="UnusedAttribute" />
+  <CheckedTextView
+    android:id="@+id/name"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_centerVertical="true"
+    android:layout_toEndOf="@id/icon"
+    android:layout_toLeftOf="@id/size"
+    android:layout_toRightOf="@id/icon"
+    android:layout_toStartOf="@id/size"
+    android:paddingStart="@dimen/keyline_second"
+    android:paddingEnd="@dimen/keyline_first"
+    android:paddingLeft="@dimen/keyline_second"
+    android:paddingRight="@dimen/keyline_first"
+    android:checkMark="@drawable/checkmark"
+    android:checkMarkTint="?colorAccent"
+    android:checked="false"
+    android:duplicateParentState="true"
+    android:ellipsize="end"
+    android:fontFamily="@string/font_fontFamily_medium"
+    android:gravity="start"
+    android:lines="1"
+    android:singleLine="true"
+    android:textAlignment="viewStart"
+    android:textColor="?android:attr/textColorPrimary"
+    android:textSize="14sp"
+    tools:ignore="UnusedAttribute"/>
 
 </com.todoroo.astrid.adapter.CheckableRelativeLayout>
diff --git a/app/src/main/res/layout/filter_adapter_separator.xml b/app/src/main/res/layout/filter_adapter_separator.xml
index 3be3ae357..d6be501d1 100644
--- a/app/src/main/res/layout/filter_adapter_separator.xml
+++ b/app/src/main/res/layout/filter_adapter_separator.xml
@@ -1,12 +1,12 @@
 <?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="wrap_content"
-    android:orientation="vertical"
-    android:paddingBottom="8dp"
-    android:paddingTop="8dp"
-    android:focusable="false">
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:paddingTop="8dp"
+  android:paddingBottom="8dp"
+  android:focusable="false"
+  android:orientation="vertical">
 
-    <View style="@style/horizontal_divider" />
+  <View style="@style/horizontal_divider"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/filter_adapter_subheader.xml b/app/src/main/res/layout/filter_adapter_subheader.xml
index 86f1acce8..6162ce091 100644
--- a/app/src/main/res/layout/filter_adapter_subheader.xml
+++ b/app/src/main/res/layout/filter_adapter_subheader.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:orientation="vertical"
-    android:paddingTop="8dp">
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="48dp"
+  android:paddingTop="8dp"
+  android:orientation="vertical">
 
-    <View
-        android:id="@+id/divider"
-        style="@style/horizontal_divider"
-        android:layout_gravity="top" />
+  <View
+    android:id="@+id/divider"
+    style="@style/horizontal_divider"
+    android:layout_gravity="top"/>
 
-    <CheckedTextView
-        android:paddingRight="0dp"
-        android:paddingEnd="0dp"
-        android:paddingLeft="@dimen/keyline_first"
-        android:paddingStart="@dimen/keyline_first"
-        android:layout_below="@id/divider"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
-        android:gravity="start|center_vertical"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:id="@+id/subheader_text"
-        android:textColor="?attr/asTextColor"
-        android:textSize="14sp"
-        android:textAlignment="viewStart"
-        android:fontFamily="@string/font_fontFamily_medium"
-        android:alpha="0.54"
-        android:clickable="false"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        tools:ignore="UnusedAttribute" />
+  <CheckedTextView
+    android:id="@+id/subheader_text"
+    android:layout_width="wrap_content"
+    android:layout_height="fill_parent"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:layout_below="@id/divider"
+    android:paddingStart="@dimen/keyline_first"
+    android:paddingEnd="0dp"
+    android:paddingLeft="@dimen/keyline_first"
+    android:paddingRight="0dp"
+    android:alpha="0.54"
+    android:clickable="false"
+    android:ellipsize="end"
+    android:fontFamily="@string/font_fontFamily_medium"
+    android:gravity="start|center_vertical"
+    android:singleLine="true"
+    android:textAlignment="viewStart"
+    android:textColor="?attr/asTextColor"
+    android:textSize="14sp"
+    tools:ignore="UnusedAttribute"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/filter_settings_activity.xml b/app/src/main/res/layout/filter_settings_activity.xml
index 429eb95b9..cb7b2a7bb 100644
--- a/app/src/main/res/layout/filter_settings_activity.xml
+++ b/app/src/main/res/layout/filter_settings_activity.xml
@@ -1,41 +1,41 @@
 <?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:background="?attr/asContentBackground"
-    android:orientation="vertical">
-
-    <include layout="@layout/toolbar" />
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:descendantFocusability="beforeDescendants"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical">
-
-            <android.support.design.widget.TextInputLayout
-                android:id="@+id/name_layout"
-                style="@style/TagSettingsRow">
-
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/name"
-                    android:imeOptions="flagNoExtractUi"
-                    android:inputType="textCapSentences|textFilter"
-                    android:maxLines="1"
-                    android:textColor="?attr/asTextColor" />
-            </android.support.design.widget.TextInputLayout>
-
-        </LinearLayout>
-
-    </ScrollView>
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="?attr/asContentBackground"
+  android:orientation="vertical">
+
+  <include layout="@layout/toolbar"/>
+
+  <ScrollView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="top">
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:descendantFocusability="beforeDescendants"
+      android:focusableInTouchMode="true"
+      android:orientation="vertical">
+
+      <android.support.design.widget.TextInputLayout
+        android:id="@+id/name_layout"
+        style="@style/TagSettingsRow">
+
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/name"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/name"
+          android:imeOptions="flagNoExtractUi"
+          android:inputType="textCapSentences|textFilter"
+          android:maxLines="1"
+          android:textColor="?attr/asTextColor"/>
+      </android.support.design.widget.TextInputLayout>
+
+    </LinearLayout>
+
+  </ScrollView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_comment_bar.xml b/app/src/main/res/layout/fragment_comment_bar.xml
index 1a68c2c48..1f0ce6664 100644
--- a/app/src/main/res/layout/fragment_comment_bar.xml
+++ b/app/src/main/res/layout/fragment_comment_bar.xml
@@ -1,62 +1,62 @@
 <?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:id="@+id/updatesFooter"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/colorPrimary"
-    android:gravity="center_vertical"
-    android:minHeight="50dp"
-    android:orientation="horizontal"
-    android:paddingLeft="@dimen/keyline_first"
-    android:paddingStart="@dimen/keyline_first"
-    android:paddingRight="@dimen/keyline_first"
-    android:paddingEnd="@dimen/keyline_first">
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/updatesFooter"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:paddingStart="@dimen/keyline_first"
+  android:paddingEnd="@dimen/keyline_first"
+  android:paddingLeft="@dimen/keyline_first"
+  android:paddingRight="@dimen/keyline_first"
+  android:background="?attr/colorPrimary"
+  android:gravity="center_vertical"
+  android:minHeight="50dp"
+  android:orientation="horizontal">
 
-    <ImageView
-        android:id="@+id/picture"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_gravity="center_vertical"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:layout_weight="1"
-        tools:ignore="ContentDescription" />
+  <ImageView
+    android:id="@+id/picture"
+    android:layout_width="24dp"
+    android:layout_height="24dp"
+    android:layout_weight="1"
+    android:layout_gravity="center_vertical"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    tools:ignore="ContentDescription"/>
 
-    <EditText
-        android:id="@+id/commentField"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="100"
-        android:background="@null"
-        android:freezesText="true"
-        android:hint="@string/TVA_add_comment"
-        android:imeOptions="flagNoExtractUi|actionDone"
-        android:inputType="textCapSentences"
-        android:nextFocusUp="@id/commentField"
-        android:nextFocusLeft="@id/commentField"
-        android:gravity="start"
-        android:textAlignment="viewStart"
-        android:paddingLeft="@dimen/keyline_second"
-        android:paddingStart="@dimen/keyline_second"
-        android:paddingRight="0dp"
-        android:paddingEnd="0dp"
-        android:textColor="?attr/actionBarPrimaryText"
-        android:textColorHint="?attr/actionBarSecondaryText"
-        android:textCursorDrawable="@null"
-        android:textSize="16sp" />
+  <EditText
+    android:id="@+id/commentField"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="100"
+    android:layout_gravity="center_vertical"
+    android:paddingStart="@dimen/keyline_second"
+    android:paddingEnd="0dp"
+    android:paddingLeft="@dimen/keyline_second"
+    android:paddingRight="0dp"
+    android:background="@null"
+    android:freezesText="true"
+    android:gravity="start"
+    android:hint="@string/TVA_add_comment"
+    android:imeOptions="flagNoExtractUi|actionDone"
+    android:inputType="textCapSentences"
+    android:nextFocusLeft="@id/commentField"
+    android:nextFocusUp="@id/commentField"
+    android:textAlignment="viewStart"
+    android:textColor="?attr/actionBarPrimaryText"
+    android:textColorHint="?attr/actionBarSecondaryText"
+    android:textCursorDrawable="@null"
+    android:textSize="16sp"/>
 
-    <ImageView
-        android:id="@+id/commentButton"
-        android:layout_width="39dip"
-        android:layout_height="39dip"
-        android:layout_marginStart="3dp"
-        android:layout_marginLeft="3dip"
-        android:layout_weight="1"
-        android:scaleType="center"
-        android:src="@drawable/ic_add_24dp"
-        android:tint="?attr/actionBarPrimaryText"
-        android:visibility="gone" />
+  <ImageView
+    android:id="@+id/commentButton"
+    android:layout_width="39dip"
+    android:layout_height="39dip"
+    android:layout_weight="1"
+    android:layout_marginStart="3dp"
+    android:layout_marginLeft="3dip"
+    android:scaleType="center"
+    android:src="@drawable/ic_add_24dp"
+    android:tint="?attr/actionBarPrimaryText"
+    android:visibility="gone"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml
index 0433d3dc5..c209dbfcf 100644
--- a/app/src/main/res/layout/fragment_navigation_drawer.xml
+++ b/app/src/main/res/layout/fragment_navigation_drawer.xml
@@ -1,27 +1,27 @@
 <org.tasks.ui.ScrimInsetsFrameLayout 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/scrim_layout"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/scrim_layout"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="@color/drawer_color"
+  android:fitsSystemWindows="true"
+  app:insetForeground="#4000">
+
+  <ListView
+    android:id="@android:id/list"
+    android:scrollbarStyle="outsideOverlay"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:background="@color/drawer_color"
-    app:insetForeground="#4000">
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:choiceMode="singleChoice"
-        android:divider="@android:color/transparent"
-        android:scrollbars="vertical"
-        android:scrollbarStyle="outsideOverlay"
-        android:clipToPadding="false"
-        android:listSelector="?attr/selectableItemBackground"
-        android:drawSelectorOnTop="true"
-        tools:context=".NavigationDrawerFragment"
-        android:cacheColorHint="@android:color/transparent"
-        android:scrollingCache="false" />
+    android:layout_weight="1"
+    android:cacheColorHint="@android:color/transparent"
+    android:choiceMode="singleChoice"
+    android:clipToPadding="false"
+    android:divider="@android:color/transparent"
+    android:drawSelectorOnTop="true"
+    android:listSelector="?attr/selectableItemBackground"
+    android:scrollbars="vertical"
+    android:scrollingCache="false"
+    tools:context=".NavigationDrawerFragment"/>
 
 </org.tasks.ui.ScrimInsetsFrameLayout>
diff --git a/app/src/main/res/layout/fragment_task_edit.xml b/app/src/main/res/layout/fragment_task_edit.xml
index 4bbf2198e..e7370bb75 100644
--- a/app/src/main/res/layout/fragment_task_edit.xml
+++ b/app/src/main/res/layout/fragment_task_edit.xml
@@ -4,101 +4,101 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:orientation="vertical">
+
+  <include layout="@layout/toolbar"/>
+
+  <ScrollView
+    android:scrollbarStyle="outsideOverlay"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-
-    <include layout="@layout/toolbar" />
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:layout_weight="100"
-        android:background="?attr/asContentBackground"
-        android:elevation="0dp"
-        android:overScrollMode="never"
-        android:scrollbarStyle="outsideOverlay">
-
-        <LinearLayout
-            android:id="@+id/control_sets"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
-
-            <FrameLayout
-                android:id="@+id/row_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <FrameLayout
-                android:id="@+id/row_1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <FrameLayout
-                android:id="@+id/row_2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <FrameLayout
-                android:id="@+id/row_3"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <FrameLayout
-                android:id="@+id/row_4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <FrameLayout
-                android:id="@+id/row_5"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <FrameLayout
-                android:id="@+id/row_6"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <FrameLayout
-                android:id="@+id/row_7"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <FrameLayout
-                android:id="@+id/row_8"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <FrameLayout
-                android:id="@+id/row_9"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <FrameLayout
-                android:id="@+id/row_10"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <FrameLayout
-                android:id="@+id/row_11"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <LinearLayout
-                android:id="@+id/comments"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"/>
-
-        </LinearLayout>
-    </ScrollView>
-
-    <FrameLayout
-        android:id="@+id/comment_bar"
-        android:elevation="@dimen/elevation_toolbar"
+    android:layout_height="0dp"
+    android:layout_weight="100"
+    android:background="?attr/asContentBackground"
+    android:elevation="0dp"
+    android:overScrollMode="never">
+
+    <LinearLayout
+      android:id="@+id/control_sets"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:gravity="center_horizontal"
+      android:orientation="vertical">
+
+      <FrameLayout
+        android:id="@+id/row_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+      <FrameLayout
+        android:id="@+id/row_1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+      <FrameLayout
+        android:id="@+id/row_2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+      <FrameLayout
+        android:id="@+id/row_3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+      <FrameLayout
+        android:id="@+id/row_4"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+      <FrameLayout
+        android:id="@+id/row_5"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+      <FrameLayout
+        android:id="@+id/row_6"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
 
+      <FrameLayout
+        android:id="@+id/row_7"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+      <FrameLayout
+        android:id="@+id/row_8"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+      <FrameLayout
+        android:id="@+id/row_9"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+      <FrameLayout
+        android:id="@+id/row_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+      <FrameLayout
+        android:id="@+id/row_11"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+      <LinearLayout
+        android:id="@+id/comments"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"/>
+
+    </LinearLayout>
+  </ScrollView>
+
+  <FrameLayout
+    android:id="@+id/comment_bar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:elevation="@dimen/elevation_toolbar"/>
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_task_edit_empty.xml b/app/src/main/res/layout/fragment_task_edit_empty.xml
index 77419d694..d94877a52 100644
--- a/app/src/main/res/layout/fragment_task_edit_empty.xml
+++ b/app/src/main/res/layout/fragment_task_edit_empty.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:orientation="vertical">
 
-    <include layout="@layout/toolbar" />
+  <include layout="@layout/toolbar"/>
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/asWindowBackground"/>
+  <FrameLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/asWindowBackground"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml
index d04e75eb6..d9f75d997 100644
--- a/app/src/main/res/layout/fragment_task_list.xml
+++ b/app/src/main/res/layout/fragment_task_list.xml
@@ -4,55 +4,55 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <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/task_list_coordinator"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:descendantFocusability="beforeDescendants"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:id="@+id/task_list_coordinator"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:descendantFocusability="beforeDescendants"
+  android:focusable="true"
+  android:focusableInTouchMode="true"
+  android:orientation="vertical">
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <include layout="@layout/toolbar"/>
+
     <LinearLayout
-        android:layout_width="match_parent"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:background="?attr/asWindowBackground"
+      android:elevation="@dimen/elevation_task_list"
+      android:orientation="horizontal">
+
+      <FrameLayout
+        android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include layout="@layout/toolbar" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:background="?attr/asWindowBackground"
-            android:elevation="@dimen/elevation_task_list">
-
-            <FrameLayout
-                android:layout_weight="100"
-                android:layout_width="0dp"
-                android:layout_height="match_parent">
-
-                <include layout="@layout/task_list_body_standard" />
+        android:layout_weight="100">
 
-                <include layout="@layout/task_list_body_empty" />
+        <include layout="@layout/task_list_body_standard"/>
 
-            </FrameLayout>
+        <include layout="@layout/task_list_body_empty"/>
 
-            <View style="@style/vertical_divider" />
+      </FrameLayout>
 
-        </LinearLayout>
+      <View style="@style/vertical_divider"/>
 
     </LinearLayout>
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:src="@drawable/ic_add_24dp"
-        android:tint="?attr/fab_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        android:layout_margin="@dimen/task_list_fab_margin"
-        android:padding="0dp"
-        app:borderWidth="0dp"/>
+  </LinearLayout>
+
+  <android.support.design.widget.FloatingActionButton
+    android:id="@+id/fab"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="@dimen/task_list_fab_margin"
+    android:layout_gravity="end|bottom"
+    android:padding="0dp"
+    android:src="@drawable/ic_add_24dp"
+    android:tint="?attr/fab_text"
+    app:borderWidth="0dp"/>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/frequency_item.xml b/app/src/main/res/layout/frequency_item.xml
index 852f5079d..9ac9680a8 100644
--- a/app/src/main/res/layout/frequency_item.xml
+++ b/app/src/main/res/layout/frequency_item.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/Widget.AppCompat.TextView.SpinnerItem"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:ellipsize="end"
-    android:paddingBottom="12dp"
-    android:paddingEnd="0dp"
-    android:paddingLeft="0dp"
-    android:paddingRight="0dp"
-    android:paddingStart="0dp"
-    android:paddingTop="12dp"
-    android:singleLine="true"
-    android:layout_gravity="start"
-    android:textAlignment="viewStart"
-    android:textColor="?fab_text" />
+  style="@style/Widget.AppCompat.TextView.SpinnerItem"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:layout_gravity="start"
+  android:paddingTop="12dp"
+  android:paddingBottom="12dp"
+  android:paddingStart="0dp"
+  android:paddingEnd="0dp"
+  android:paddingLeft="0dp"
+  android:paddingRight="0dp"
+  android:ellipsize="end"
+  android:singleLine="true"
+  android:textAlignment="viewStart"
+  android:textColor="?fab_text"/>
diff --git a/app/src/main/res/layout/n_number_picker_dialog.xml b/app/src/main/res/layout/n_number_picker_dialog.xml
index 49a7e4a91..a89f707ce 100644
--- a/app/src/main/res/layout/n_number_picker_dialog.xml
+++ b/app/src/main/res/layout/n_number_picker_dialog.xml
@@ -17,11 +17,11 @@
 */
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/container"
-        android:gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:padding="5dip">
+  android:id="@+id/container"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
+  android:padding="5dip"
+  android:gravity="center"
+  android:orientation="horizontal">
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/navigation_drawer.xml b/app/src/main/res/layout/navigation_drawer.xml
index 5868b110b..c33f1a18d 100644
--- a/app/src/main/res/layout/navigation_drawer.xml
+++ b/app/src/main/res/layout/navigation_drawer.xml
@@ -1,10 +1,10 @@
 <fragment
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/navigation_drawer"
-    android:name="org.tasks.ui.NavigationDrawerFragment"
-    android:layout_width="@dimen/navigation_drawer_width"
-    android:layout_height="match_parent"
-    android:layout_gravity="start"
-    android:fitsSystemWindows="true"
-    tools:layout="@layout/fragment_navigation_drawer" />
\ No newline at end of file
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/navigation_drawer"
+  android:layout_width="@dimen/navigation_drawer_width"
+  android:layout_height="match_parent"
+  android:layout_gravity="start"
+  android:fitsSystemWindows="true"
+  android:name="org.tasks.ui.NavigationDrawerFragment"
+  tools:layout="@layout/fragment_navigation_drawer"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/number_picker.xml b/app/src/main/res/layout/number_picker.xml
index 4dfe7813f..98ee71232 100644
--- a/app/src/main/res/layout/number_picker.xml
+++ b/app/src/main/res/layout/number_picker.xml
@@ -18,27 +18,30 @@
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.todoroo.astrid.ui.NumberPickerButton android:id="@+id/increment"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/timepicker_up_btn"
-        />
-        
-        <EditText android:id="@+id/timepicker_input"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            style="?android:attr/textAppearanceLargeInverse"
-            android:textColor="@android:color/black"
-            android:gravity="center"
-            android:inputType="phone"
-            android:textSize="30sp"
-            android:background="@drawable/timepicker_input"
-            />
-        
-    <com.todoroo.astrid.ui.NumberPickerButton android:id="@+id/decrement"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/timepicker_down_btn"
-        />
-        
+  <com.todoroo.astrid.ui.NumberPickerButton
+    android:id="@+id/increment"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/timepicker_up_btn"
+    />
+
+  <EditText
+    android:id="@+id/timepicker_input"
+    style="?android:attr/textAppearanceLargeInverse"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/timepicker_input"
+    android:gravity="center"
+    android:inputType="phone"
+    android:textColor="@android:color/black"
+    android:textSize="30sp"
+    />
+
+  <com.todoroo.astrid.ui.NumberPickerButton
+    android:id="@+id/decrement"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/timepicker_down_btn"
+    />
+
 </merge>
diff --git a/app/src/main/res/layout/preference_draggable_row.xml b/app/src/main/res/layout/preference_draggable_row.xml
index cc20bfe7e..9adb1b591 100644
--- a/app/src/main/res/layout/preference_draggable_row.xml
+++ b/app/src/main/res/layout/preference_draggable_row.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="?listPreferredItemHeight"
-    android:layout_margin="8dp"
-    android:clickable="true"
-    android:focusable="true"
-    android:foreground="?selectableItemBackground"
-    app:cardBackgroundColor="?attr/asContentBackground"
-    app:cardCornerRadius="2dp">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="?listPreferredItemHeight"
+  android:layout_margin="8dp"
+  android:clickable="true"
+  android:focusable="true"
+  android:foreground="?selectableItemBackground"
+  app:cardBackgroundColor="?attr/asContentBackground"
+  app:cardCornerRadius="2dp">
 
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginEnd="@dimen/keyline_first"
-        android:layout_marginLeft="@dimen/keyline_first"
-        android:layout_marginRight="@dimen/keyline_first"
-        android:layout_marginStart="@dimen/keyline_first"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+  <TextView
+    android:id="@+id/text"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/keyline_first"
+    android:layout_marginEnd="@dimen/keyline_first"
+    android:layout_marginLeft="@dimen/keyline_first"
+    android:layout_marginRight="@dimen/keyline_first"
+    android:layout_gravity="center_vertical"
+    android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-    <ImageView
-        android:id="@+id/grabber"
-        android:layout_width="?listPreferredItemHeight"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical|end"
-        android:scaleType="center"
-        android:src="@drawable/ic_drag_handle_black_24dp"
-        android:tint="?attr/icon_tint" />
+  <ImageView
+    android:id="@+id/grabber"
+    android:layout_width="?listPreferredItemHeight"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical|end"
+    android:scaleType="center"
+    android:src="@drawable/ic_drag_handle_black_24dp"
+    android:tint="?attr/icon_tint"/>
 </android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/scrollable_widget.xml b/app/src/main/res/layout/scrollable_widget.xml
index 7074965c4..5a24e4625 100644
--- a/app/src/main/res/layout/scrollable_widget.xml
+++ b/app/src/main/res/layout/scrollable_widget.xml
@@ -4,100 +4,100 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
+  android:id="@+id/widget"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:orientation="vertical">
 
-    <RelativeLayout
-        android:id="@+id/widget_header"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:orientation="horizontal">
+  <RelativeLayout
+    android:id="@+id/widget_header"
+    android:layout_width="match_parent"
+    android:layout_height="45dp"
+    android:orientation="horizontal">
 
-        <ImageView
-            android:id="@+id/widget_header_background"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:scaleType="fitXY" />
+    <ImageView
+      android:id="@+id/widget_header_background"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:scaleType="fitXY"/>
 
-        <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@android:color/transparent"
-            android:paddingEnd="@dimen/widget_padding"
-            android:paddingLeft="@dimen/widget_padding"
-            android:paddingRight="@dimen/widget_padding"
-            android:paddingStart="@dimen/widget_padding"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_add_24dp"
-            android:tint="@android:color/white" />
+    <ImageButton
+      android:id="@+id/widget_button"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentEnd="true"
+      android:layout_alignParentRight="true"
+      android:layout_centerVertical="true"
+      android:paddingStart="@dimen/widget_padding"
+      android:paddingEnd="@dimen/widget_padding"
+      android:paddingLeft="@dimen/widget_padding"
+      android:paddingRight="@dimen/widget_padding"
+      android:background="@android:color/transparent"
+      android:scaleType="fitCenter"
+      android:src="@drawable/ic_add_24dp"
+      android:tint="@android:color/white"/>
 
-        <ImageButton
-            android:id="@+id/widget_reconfigure"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@id/widget_button"
-            android:layout_toStartOf="@id/widget_button"
-            android:background="@android:color/transparent"
-            android:paddingEnd="0dp"
-            android:paddingLeft="@dimen/widget_padding"
-            android:paddingRight="0dp"
-            android:paddingStart="@dimen/widget_padding"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_settings_24dp"
-            android:tint="@android:color/white" />
+    <ImageButton
+      android:id="@+id/widget_reconfigure"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_centerVertical="true"
+      android:layout_toLeftOf="@id/widget_button"
+      android:layout_toStartOf="@id/widget_button"
+      android:paddingStart="@dimen/widget_padding"
+      android:paddingEnd="0dp"
+      android:paddingLeft="@dimen/widget_padding"
+      android:paddingRight="0dp"
+      android:background="@android:color/transparent"
+      android:scaleType="fitCenter"
+      android:src="@drawable/ic_settings_24dp"
+      android:tint="@android:color/white"/>
 
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@id/widget_reconfigure"
-            android:layout_toStartOf="@id/widget_reconfigure"
-            android:ellipsize="end"
-            android:gravity="start|center_vertical"
-            android:maxLines="2"
-            android:paddingEnd="0dp"
-            android:paddingLeft="@dimen/widget_padding"
-            android:paddingRight="0dp"
-            android:paddingStart="@dimen/widget_padding"
-            android:textAlignment="viewStart"
-            android:textColor="@android:color/white"
-            android:textSize="18sp" />
+    <TextView
+      android:id="@+id/widget_title"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:layout_alignParentLeft="true"
+      android:layout_alignParentStart="true"
+      android:layout_centerVertical="true"
+      android:layout_toLeftOf="@id/widget_reconfigure"
+      android:layout_toStartOf="@id/widget_reconfigure"
+      android:paddingStart="@dimen/widget_padding"
+      android:paddingEnd="0dp"
+      android:paddingLeft="@dimen/widget_padding"
+      android:paddingRight="0dp"
+      android:ellipsize="end"
+      android:gravity="start|center_vertical"
+      android:maxLines="2"
+      android:textAlignment="viewStart"
+      android:textColor="@android:color/white"
+      android:textSize="18sp"/>
 
-    </RelativeLayout>
+  </RelativeLayout>
 
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+  <RelativeLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
 
-        <ImageView
-            android:id="@+id/widget_background"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:scaleType="fitXY" />
+    <ImageView
+      android:id="@+id/widget_background"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:scaleType="fitXY"/>
 
-        <ListView
-            android:id="@+id/list_view"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:divider="@null"
-            android:dividerHeight="0dp" />
+    <ListView
+      android:id="@+id/list_view"
+      android:layout_width="match_parent"
+      android:layout_height="fill_parent"
+      android:divider="@null"
+      android:dividerHeight="0dp"/>
 
-        <TextView
-            android:id="@+id/empty_view"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:gravity="center" />
+    <TextView
+      android:id="@+id/empty_view"
+      android:layout_width="match_parent"
+      android:layout_height="fill_parent"
+      android:gravity="center"/>
 
-    </RelativeLayout>
+  </RelativeLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml b/app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml
index c5943b6fb..d08376c1a 100644
--- a/app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml
+++ b/app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml
@@ -4,16 +4,16 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeightSmall"
-    android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-    android:drawableLeft="@drawable/ic_label_24dp"
-    android:drawableStart="@drawable/ic_label_24dp"
-    android:drawablePadding="@dimen/keyline_second"
-    android:gravity="center_vertical"
-    android:paddingEnd="@dimen/keyline_first"
-    android:paddingLeft="@dimen/keyline_first"
-    android:paddingRight="@dimen/keyline_first"
-    android:paddingStart="@dimen/keyline_first"
-    android:textColor="?attr/asTextColor" />
+  android:id="@android:id/text1"
+  android:layout_width="match_parent"
+  android:layout_height="?android:attr/listPreferredItemHeightSmall"
+  android:paddingStart="@dimen/keyline_first"
+  android:paddingEnd="@dimen/keyline_first"
+  android:paddingLeft="@dimen/keyline_first"
+  android:paddingRight="@dimen/keyline_first"
+  android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+  android:drawableLeft="@drawable/ic_label_24dp"
+  android:drawablePadding="@dimen/keyline_second"
+  android:drawableStart="@drawable/ic_label_24dp"
+  android:gravity="center_vertical"
+  android:textColor="?attr/asTextColor"/>
diff --git a/app/src/main/res/layout/simple_list_item_single_choice_themed.xml b/app/src/main/res/layout/simple_list_item_single_choice_themed.xml
index fba09d69a..31f5bbcca 100644
--- a/app/src/main/res/layout/simple_list_item_single_choice_themed.xml
+++ b/app/src/main/res/layout/simple_list_item_single_choice_themed.xml
@@ -14,17 +14,17 @@
 -->
 
 <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:checkMark="@drawable/checkmark"
-    android:checkMarkTint="?colorAccent"
-    android:checked="false"
-    android:layout_height="?android:attr/listPreferredItemHeightSmall"
-    android:textAppearance="?attr/textAppearanceListItemSmall"
-    android:drawablePadding="@dimen/keyline_second"
-    android:gravity="center_vertical"
-    android:paddingEnd="@dimen/keyline_first"
-    android:paddingLeft="@dimen/keyline_first"
-    android:paddingRight="@dimen/keyline_first"
-    android:paddingStart="@dimen/keyline_first"
-    android:textColor="?attr/asTextColor" />
+  android:id="@android:id/text1"
+  android:layout_width="match_parent"
+  android:layout_height="?android:attr/listPreferredItemHeightSmall"
+  android:paddingStart="@dimen/keyline_first"
+  android:paddingEnd="@dimen/keyline_first"
+  android:paddingLeft="@dimen/keyline_first"
+  android:paddingRight="@dimen/keyline_first"
+  android:checkMark="@drawable/checkmark"
+  android:checkMarkTint="?colorAccent"
+  android:checked="false"
+  android:drawablePadding="@dimen/keyline_second"
+  android:gravity="center_vertical"
+  android:textAppearance="?attr/textAppearanceListItemSmall"
+  android:textColor="?attr/asTextColor"/>
diff --git a/app/src/main/res/layout/simple_spinner_dropdown_item.xml b/app/src/main/res/layout/simple_spinner_dropdown_item.xml
index b92c0a429..aba00a9ad 100644
--- a/app/src/main/res/layout/simple_spinner_dropdown_item.xml
+++ b/app/src/main/res/layout/simple_spinner_dropdown_item.xml
@@ -17,33 +17,33 @@
 */
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="?attr/dropdownListPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
+  android:layout_width="fill_parent"
+  android:layout_height="?attr/dropdownListPreferredItemHeight"
+  android:gravity="center_vertical"
+  android:orientation="horizontal">
 
-    <CheckedTextView
-        android:id="@+id/text1"
-        style="?attr/spinnerDropDownItemStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="marquee"
-        android:singleLine="true" />
+  <CheckedTextView
+    android:id="@+id/text1"
+    style="?attr/spinnerDropDownItemStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:ellipsize="marquee"
+    android:singleLine="true"/>
 
-    <TextView
-        android:id="@+id/text2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical|end"
-        android:layout_alignBaseline="@id/text1"
-        android:paddingLeft="8dp"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:paddingRight="8dp"
-        android:layout_toRightOf="@id/text1"
-        android:layout_toEndOf="@id/text1"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:textSize="12sp" />
+  <TextView
+    android:id="@+id/text2"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignBaseline="@id/text1"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:layout_toEndOf="@id/text1"
+    android:layout_toRightOf="@id/text1"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:gravity="center_vertical|end"
+    android:textSize="12sp"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/tag_edit_row.xml b/app/src/main/res/layout/tag_edit_row.xml
index a52522f0a..3dee9a114 100644
--- a/app/src/main/res/layout/tag_edit_row.xml
+++ b/app/src/main/res/layout/tag_edit_row.xml
@@ -14,26 +14,27 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
-    
-    <AutoCompleteTextView android:id="@+id/text1"
-        android:hint="@string/new_tag"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_gravity="center_vertical"
-        style="@style/TextBoxText"
-        android:textColorHint="?attr/asTextColorHint"
-        android:inputType="textCapSentences"/>
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:orientation="horizontal">
 
-    <ImageView
-        android:id="@+id/button1"
-        android:tint="?attr/icon_tint"
-        android:src="@drawable/ic_close_24dp"
-        android:contentDescription="@string/remove"
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+  <AutoCompleteTextView
+    android:id="@+id/text1"
+    style="@style/TextBoxText"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:layout_gravity="center_vertical"
+    android:hint="@string/new_tag"
+    android:inputType="textCapSentences"
+    android:textColorHint="?attr/asTextColorHint"/>
+
+  <ImageView
+    android:id="@+id/button1"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:contentDescription="@string/remove"
+    android:src="@drawable/ic_close_24dp"
+    android:tint="?attr/icon_tint"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/tag_settings_activity.xml b/app/src/main/res/layout/tag_settings_activity.xml
index ce3007caa..cd5f1bc55 100644
--- a/app/src/main/res/layout/tag_settings_activity.xml
+++ b/app/src/main/res/layout/tag_settings_activity.xml
@@ -1,50 +1,50 @@
 <?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:background="?attr/asContentBackground"
-    android:orientation="vertical">
-
-    <include layout="@layout/toolbar" />
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:descendantFocusability="beforeDescendants"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical">
-
-            <android.support.design.widget.TextInputLayout
-                android:id="@+id/name_layout"
-                style="@style/TagSettingsRow">
-
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/name"
-                    android:imeOptions="flagNoExtractUi"
-                    android:inputType="textCapSentences|textFilter"
-                    android:maxLines="1"
-                    android:textColor="?attr/asTextColor" />
-            </android.support.design.widget.TextInputLayout>
-
-            <android.support.design.widget.TextInputLayout style="@style/TagSettingsRow">
-
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/color"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/color"
-                    android:textColor="?attr/asTextColor" />
-            </android.support.design.widget.TextInputLayout>
-
-        </LinearLayout>
-
-    </ScrollView>
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="?attr/asContentBackground"
+  android:orientation="vertical">
+
+  <include layout="@layout/toolbar"/>
+
+  <ScrollView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:descendantFocusability="beforeDescendants"
+      android:focusableInTouchMode="true"
+      android:orientation="vertical">
+
+      <android.support.design.widget.TextInputLayout
+        android:id="@+id/name_layout"
+        style="@style/TagSettingsRow">
+
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/name"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/name"
+          android:imeOptions="flagNoExtractUi"
+          android:inputType="textCapSentences|textFilter"
+          android:maxLines="1"
+          android:textColor="?attr/asTextColor"/>
+      </android.support.design.widget.TextInputLayout>
+
+      <android.support.design.widget.TextInputLayout style="@style/TagSettingsRow">
+
+        <android.support.design.widget.TextInputEditText
+          android:id="@+id/color"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/color"
+          android:textColor="?attr/asTextColor"/>
+      </android.support.design.widget.TextInputLayout>
+
+    </LinearLayout>
+
+  </ScrollView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/task_adapter_row_body.xml b/app/src/main/res/layout/task_adapter_row_body.xml
index b7e8b3053..01183ad43 100644
--- a/app/src/main/res/layout/task_adapter_row_body.xml
+++ b/app/src/main/res/layout/task_adapter_row_body.xml
@@ -1,111 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/rowBody"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:orientation="vertical">
+  android:id="@+id/rowBody"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:background="?attr/selectableItemBackground"
+  android:clickable="true"
+  android:focusable="true"
+  android:orientation="vertical">
 
-    <!-- row 1 -->
+  <!-- row 1 -->
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+  <RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
-        <com.todoroo.astrid.ui.CheckableImageView
-            android:id="@+id/completeBox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:paddingEnd="@dimen/keyline_second"
-            android:paddingLeft="@dimen/keyline_first"
-            android:paddingRight="@dimen/keyline_second"
-            android:paddingStart="@dimen/keyline_first"
-            android:scaleType="center" />
+    <com.todoroo.astrid.ui.CheckableImageView
+      android:id="@+id/completeBox"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentLeft="true"
+      android:layout_alignParentStart="true"
+      android:paddingStart="@dimen/keyline_first"
+      android:paddingEnd="@dimen/keyline_second"
+      android:paddingLeft="@dimen/keyline_first"
+      android:paddingRight="@dimen/keyline_second"
+      android:scaleType="center"/>
 
-        <ImageView
-            android:id="@+id/taskActionIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:alpha="?attr/alpha_secondary"
-            android:gravity="end|center_vertical"
-            android:paddingEnd="@dimen/keyline_first"
-            android:paddingLeft="0dp"
-            android:paddingRight="@dimen/keyline_first"
-            android:paddingStart="0dp"
-            android:scaleType="center"
-            android:tint="?attr/icon_tint" />
+    <ImageView
+      android:id="@+id/taskActionIcon"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentEnd="true"
+      android:layout_alignParentRight="true"
+      android:paddingStart="0dp"
+      android:paddingEnd="@dimen/keyline_first"
+      android:paddingLeft="0dp"
+      android:paddingRight="@dimen/keyline_first"
+      android:alpha="?attr/alpha_secondary"
+      android:gravity="end|center_vertical"
+      android:scaleType="center"
+      android:tint="?attr/icon_tint"/>
 
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/completeBox"
-            android:layout_toLeftOf="@id/taskActionIcon"
-            android:layout_toRightOf="@id/completeBox"
-            android:layout_toStartOf="@id/taskActionIcon"
-            android:ellipsize="end"
-            android:gravity="start|center_vertical"
-            android:maxLines="1"
-            android:paddingEnd="@dimen/keyline_first"
-            android:paddingLeft="0dp"
-            android:paddingRight="@dimen/keyline_first"
-            android:paddingStart="0dp"
-            android:singleLine="true"
-            android:textAlignment="viewStart"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="16sp" />
+    <TextView
+      android:id="@+id/title"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_centerVertical="true"
+      android:layout_toEndOf="@id/completeBox"
+      android:layout_toLeftOf="@id/taskActionIcon"
+      android:layout_toRightOf="@id/completeBox"
+      android:layout_toStartOf="@id/taskActionIcon"
+      android:paddingStart="0dp"
+      android:paddingEnd="@dimen/keyline_first"
+      android:paddingLeft="0dp"
+      android:paddingRight="@dimen/keyline_first"
+      android:ellipsize="end"
+      android:gravity="start|center_vertical"
+      android:maxLines="1"
+      android:singleLine="true"
+      android:textAlignment="viewStart"
+      android:textColor="?android:attr/textColorPrimary"
+      android:textSize="16sp"/>
 
-    </RelativeLayout>
+  </RelativeLayout>
 
-    <!-- row 2 -->
+  <!-- row 2 -->
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingEnd="0dp"
-        android:paddingLeft="@dimen/keyline_content_inset"
-        android:paddingRight="0dp"
-        android:paddingStart="@dimen/keyline_content_inset">
+  <RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/keyline_content_inset"
+    android:paddingEnd="0dp"
+    android:paddingLeft="@dimen/keyline_content_inset"
+    android:paddingRight="0dp"
+    android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/tag_block"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:ellipsize="none"
-            android:paddingEnd="@dimen/keyline_first"
-            android:paddingLeft="0dp"
-            android:paddingRight="@dimen/keyline_first"
-            android:paddingStart="0dp"
-            android:singleLine="true"
-            android:textSize="14sp" />
+    <TextView
+      android:id="@+id/tag_block"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentEnd="true"
+      android:layout_alignParentRight="true"
+      android:paddingStart="0dp"
+      android:paddingEnd="@dimen/keyline_first"
+      android:paddingLeft="0dp"
+      android:paddingRight="@dimen/keyline_first"
+      android:ellipsize="none"
+      android:singleLine="true"
+      android:textSize="14sp"/>
 
-        <TextView
-            android:id="@+id/due_date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/tag_block"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignStart="@id/tag_block"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:paddingEnd="@dimen/keyline_first"
-            android:paddingLeft="0dp"
-            android:paddingRight="@dimen/keyline_first"
-            android:paddingStart="0dp"
-            android:singleLine="true"
-            android:textSize="14sp" />
+    <TextView
+      android:id="@+id/due_date"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignLeft="@id/tag_block"
+      android:layout_alignParentLeft="true"
+      android:layout_alignParentStart="true"
+      android:layout_alignStart="@id/tag_block"
+      android:paddingStart="0dp"
+      android:paddingEnd="@dimen/keyline_first"
+      android:paddingLeft="0dp"
+      android:paddingRight="@dimen/keyline_first"
+      android:ellipsize="end"
+      android:gravity="center_vertical"
+      android:singleLine="true"
+      android:textSize="14sp"/>
 
-    </RelativeLayout>
+  </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/task_adapter_row_simple.xml b/app/src/main/res/layout/task_adapter_row_simple.xml
index 4b3dcc899..47aaa7a8e 100644
--- a/app/src/main/res/layout/task_adapter_row_simple.xml
+++ b/app/src/main/res/layout/task_adapter_row_simple.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/asContentBackground"
-    android:orientation="vertical">
+  android:id="@+id/row"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:background="?attr/asContentBackground"
+  android:orientation="vertical">
 
-    <include layout="@layout/task_adapter_row_body" />
+  <include layout="@layout/task_adapter_row_body"/>
 
-    <View style="@style/horizontal_divider" />
+  <View style="@style/horizontal_divider"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/task_edit_row_divider.xml b/app/src/main/res/layout/task_edit_row_divider.xml
index 4175eeacb..c7c84c700 100644
--- a/app/src/main/res/layout/task_edit_row_divider.xml
+++ b/app/src/main/res/layout/task_edit_row_divider.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<View style="@style/task_edit_row_divider" />
+<View style="@style/task_edit_row_divider"/>
diff --git a/app/src/main/res/layout/task_list_activity.xml b/app/src/main/res/layout/task_list_activity.xml
index 6948bc2c0..5f8896ec7 100644
--- a/app/src/main/res/layout/task_list_activity.xml
+++ b/app/src/main/res/layout/task_list_activity.xml
@@ -1,25 +1,25 @@
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/drawer_layout"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:fitsSystemWindows="true">
+
+  <FrameLayout
+    android:id="@+id/master"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <FrameLayout
-        android:id="@+id/master"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:ignore="InconsistentLayout" />
+    tools:ignore="InconsistentLayout"/>
 
-    <FrameLayout
-        android:id="@+id/detail"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        tools:ignore="InconsistentLayout" />
+  <FrameLayout
+    android:id="@+id/detail"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone"
+    tools:ignore="InconsistentLayout"/>
 
 
-    <include layout="@layout/navigation_drawer" />
+  <include layout="@layout/navigation_drawer"/>
 
 </android.support.v4.widget.DrawerLayout>
 
diff --git a/app/src/main/res/layout/task_list_body_empty.xml b/app/src/main/res/layout/task_list_body_empty.xml
index 03b56ef02..2ede90fd0 100644
--- a/app/src/main/res/layout/task_list_body_empty.xml
+++ b/app/src/main/res/layout/task_list_body_empty.xml
@@ -1,42 +1,42 @@
 <android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/swipe_layout_empty"
-    style="@style/task_list_container"
-    android:layout_width="fill_parent"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/swipe_layout_empty"
+  style="@style/task_list_container"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:visibility="invisible"
+  tools:ignore="UnusedAttribute">
+
+  <ScrollView
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:visibility="invisible"
-    tools:ignore="UnusedAttribute">
+    android:background="?attr/asWindowBackground"
+    android:elevation="@dimen/elevation_task_list">
+
+    <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"
+      android:orientation="vertical">
 
-    <ScrollView
+      <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:elevation="@dimen/elevation_task_list"
-        android:background="?attr/asWindowBackground">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_gravity="center">
+        android:layout_gravity="center"
+        android:alpha="?attr/alpha_disabled"
+        android:src="@drawable/ic_inbox_168px"
+        android:tint="?attr/icon_tint"/>
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:alpha="?attr/alpha_disabled"
-                android:src="@drawable/ic_inbox_168px"
-                android:tint="?attr/icon_tint" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/TLA_no_items"
-                android:textColor="?android:attr/textColorTertiary"
-                android:textSize="20sp" />
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/TLA_no_items"
+        android:textColor="?android:attr/textColorTertiary"
+        android:textSize="20sp"/>
 
-        </LinearLayout>
+    </LinearLayout>
 
-    </ScrollView>
+  </ScrollView>
 
 </android.support.v4.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/task_list_body_standard.xml b/app/src/main/res/layout/task_list_body_standard.xml
index daab3f915..45d733b2b 100644
--- a/app/src/main/res/layout/task_list_body_standard.xml
+++ b/app/src/main/res/layout/task_list_body_standard.xml
@@ -1,20 +1,20 @@
 <org.tasks.ui.DraggableSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/swipe_layout"
-    style="@style/task_list_container"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    tools:ignore="UnusedAttribute">
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/swipe_layout"
+  style="@style/task_list_container"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  tools:ignore="UnusedAttribute">
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="vertical"
-        android:scrollbarStyle="outsideOverlay"
-        android:paddingBottom="@dimen/task_list_footer_height"
-        android:elevation="@dimen/elevation_task_list"
-        android:background="?attr/asWindowBackground"
-        android:clipToPadding="false"/>
+  <android.support.v7.widget.RecyclerView
+    android:id="@+id/recycler_view"
+    android:scrollbarStyle="outsideOverlay"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/task_list_footer_height"
+    android:background="?attr/asWindowBackground"
+    android:clipToPadding="false"
+    android:elevation="@dimen/elevation_task_list"
+    android:scrollbars="vertical"/>
 
 </org.tasks.ui.DraggableSwipeRefreshLayout>
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index 312fdb063..11511d475 100644
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -1,12 +1,12 @@
 <android.support.v7.widget.Toolbar 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/toolbar"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    android:background="?attr/colorPrimary"
-    android:elevation="@dimen/elevation_toolbar"
-    app:toolbarStyle="@style/Widget.AppCompat.Toolbar"
-    app:popupTheme="@style/popup_overlay"
-    app:theme="?attr/overlay_theme"
-    tools:ignore="UnusedAttribute" />
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/toolbar"
+  android:layout_width="match_parent"
+  android:layout_height="?attr/actionBarSize"
+  android:background="?attr/colorPrimary"
+  android:elevation="@dimen/elevation_toolbar"
+  app:popupTheme="@style/popup_overlay"
+  app:theme="?attr/overlay_theme"
+  app:toolbarStyle="@style/Widget.AppCompat.Toolbar"
+  tools:ignore="UnusedAttribute"/>
diff --git a/app/src/main/res/layout/week_buttons.xml b/app/src/main/res/layout/week_buttons.xml
index ad3bc4103..098cfc79b 100644
--- a/app/src/main/res/layout/week_buttons.xml
+++ b/app/src/main/res/layout/week_buttons.xml
@@ -15,53 +15,53 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools">
 
-    <LinearLayout
-        android:id="@+id/weekGroup"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal">
+  <LinearLayout
+    android:id="@+id/weekGroup"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="horizontal">
 
-        <include
-            android:id="@+id/week_day_1"
-            layout="@layout/week_day_button" />
+    <include
+      android:id="@+id/week_day_1"
+      layout="@layout/week_day_button"/>
 
-        <include
-            android:id="@+id/week_day_2"
-            layout="@layout/week_day_button" />
+    <include
+      android:id="@+id/week_day_2"
+      layout="@layout/week_day_button"/>
 
-        <include
-            android:id="@+id/week_day_3"
-            layout="@layout/week_day_button" />
+    <include
+      android:id="@+id/week_day_3"
+      layout="@layout/week_day_button"/>
 
-        <include
-            android:id="@+id/week_day_4"
-            layout="@layout/week_day_button" />
-    </LinearLayout>
+    <include
+      android:id="@+id/week_day_4"
+      layout="@layout/week_day_button"/>
+  </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/weekGroup2"
-        tools:ignore="InconsistentLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal">
+  <LinearLayout
+    android:id="@+id/weekGroup2"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="horizontal"
+    tools:ignore="InconsistentLayout">
 
-        <include
-            android:id="@+id/week_day_5"
-            layout="@layout/week_day_button" />
+    <include
+      android:id="@+id/week_day_5"
+      layout="@layout/week_day_button"/>
 
-        <include
-            android:id="@+id/week_day_6"
-            layout="@layout/week_day_button" />
+    <include
+      android:id="@+id/week_day_6"
+      layout="@layout/week_day_button"/>
 
-        <include
-            android:id="@+id/week_day_7"
-            layout="@layout/week_day_button" />
+    <include
+      android:id="@+id/week_day_7"
+      layout="@layout/week_day_button"/>
 
-        <include
-            android:visibility="invisible"
-            layout="@layout/week_day_button" />
-    </LinearLayout>
+    <include
+      layout="@layout/week_day_button"
+      android:visibility="invisible"/>
+  </LinearLayout>
 
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/week_day_button.xml b/app/src/main/res/layout/week_day_button.xml
index f89ba3829..3a7aac883 100644
--- a/app/src/main/res/layout/week_day_button.xml
+++ b/app/src/main/res/layout/week_day_button.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ToggleButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="60dp"
-    android:layout_height="60dp"
-    android:textAllCaps="true"
-    android:textSize="12sp"
-    android:singleLine="true"
-    android:background="@null"
-    android:gravity="center" />
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="60dp"
+  android:layout_height="60dp"
+  android:background="@null"
+  android:gravity="center"
+  android:singleLine="true"
+  android:textAllCaps="true"
+  android:textSize="12sp"/>
diff --git a/app/src/main/res/layout/widget_row.xml b/app/src/main/res/layout/widget_row.xml
index 58b21da75..3cff669d1 100644
--- a/app/src/main/res/layout/widget_row.xml
+++ b/app/src/main/res/layout/widget_row.xml
@@ -4,62 +4,62 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget_row"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clickable="false">
+  android:id="@+id/widget_row"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:clickable="false">
 
-    <ImageView
-        android:id="@+id/widget_complete_box"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_gravity="center"
-        android:paddingEnd="0dp"
-        android:paddingLeft="@dimen/widget_padding"
-        android:paddingRight="0dp"
-        android:paddingStart="@dimen/widget_padding" />
+  <ImageView
+    android:id="@+id/widget_complete_box"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:layout_centerVertical="true"
+    android:layout_gravity="center"
+    android:paddingStart="@dimen/widget_padding"
+    android:paddingEnd="0dp"
+    android:paddingLeft="@dimen/widget_padding"
+    android:paddingRight="0dp"/>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_toEndOf="@id/widget_complete_box"
-        android:layout_toRightOf="@id/widget_complete_box"
-        android:orientation="vertical"
-        android:paddingBottom="3dp"
-        android:paddingTop="3dp">
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_centerVertical="true"
+    android:layout_toEndOf="@id/widget_complete_box"
+    android:layout_toRightOf="@id/widget_complete_box"
+    android:paddingTop="3dp"
+    android:paddingBottom="3dp"
+    android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/widget_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="start|center_vertical"
-            android:paddingEnd="@dimen/widget_padding"
-            android:paddingLeft="@dimen/widget_padding"
-            android:paddingRight="@dimen/widget_padding"
-            android:paddingStart="@dimen/widget_padding"
-            android:singleLine="true"
-            android:textAlignment="viewStart"
-            android:textSize="16sp" />
+    <TextView
+      android:id="@+id/widget_text"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingStart="@dimen/widget_padding"
+      android:paddingEnd="@dimen/widget_padding"
+      android:paddingLeft="@dimen/widget_padding"
+      android:paddingRight="@dimen/widget_padding"
+      android:gravity="start|center_vertical"
+      android:singleLine="true"
+      android:textAlignment="viewStart"
+      android:textSize="16sp"/>
 
-        <TextView
-            android:id="@+id/widget_due_date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:gravity="start|center_vertical"
-            android:paddingEnd="@dimen/widget_padding"
-            android:paddingLeft="@dimen/widget_padding"
-            android:paddingRight="@dimen/widget_padding"
-            android:paddingStart="@dimen/widget_padding"
-            android:singleLine="true"
-            android:textAlignment="viewStart"
-            android:textSize="12sp"
-            android:visibility="gone" />
+    <TextView
+      android:id="@+id/widget_due_date"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingStart="@dimen/widget_padding"
+      android:paddingEnd="@dimen/widget_padding"
+      android:paddingLeft="@dimen/widget_padding"
+      android:paddingRight="@dimen/widget_padding"
+      android:ellipsize="end"
+      android:gravity="start|center_vertical"
+      android:singleLine="true"
+      android:textAlignment="viewStart"
+      android:textSize="12sp"
+      android:visibility="gone"/>
 
-    </LinearLayout>
+  </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/beast_mode.xml b/app/src/main/res/menu/beast_mode.xml
index b16f7c3ff..2736de565 100644
--- a/app/src/main/res/menu/beast_mode.xml
+++ b/app/src/main/res/menu/beast_mode.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tasks="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/menu_reset_to_defaults"
-        android:title="@string/EPr_beastMode_reset"
-        tasks:showAsAction="ifRoom" />
+  xmlns:tasks="http://schemas.android.com/apk/res-auto">
+  <item
+    android:id="@+id/menu_reset_to_defaults"
+    android:title="@string/EPr_beastMode_reset"
+    tasks:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_caldav_list_fragment.xml b/app/src/main/res/menu/menu_caldav_list_fragment.xml
index f55a8844c..a36bef66a 100644
--- a/app/src/main/res/menu/menu_caldav_list_fragment.xml
+++ b/app/src/main/res/menu/menu_caldav_list_fragment.xml
@@ -1,8 +1,8 @@
 <?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">
-    <item
-        android:id="@+id/menu_caldav_list_fragment"
-        android:title="@string/account_settings"
-        app:showAsAction="never" />
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+  <item
+    android:id="@+id/menu_caldav_list_fragment"
+    android:title="@string/account_settings"
+    app:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_custom_filter.xml b/app/src/main/res/menu/menu_custom_filter.xml
index 57089b516..fb5a89c26 100644
--- a/app/src/main/res/menu/menu_custom_filter.xml
+++ b/app/src/main/res/menu/menu_custom_filter.xml
@@ -1,8 +1,8 @@
 <?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">
-    <item
-        android:id="@+id/menu_filter_settings"
-        android:title="@string/filter_settings"
-        app:showAsAction="never" />
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+  <item
+    android:id="@+id/menu_filter_settings"
+    android:title="@string/filter_settings"
+    app:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_custom_filter_activity.xml b/app/src/main/res/menu/menu_custom_filter_activity.xml
index c0ee03f20..1ce6c1d48 100644
--- a/app/src/main/res/menu/menu_custom_filter_activity.xml
+++ b/app/src/main/res/menu/menu_custom_filter_activity.xml
@@ -1,11 +1,11 @@
 <?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_save"
-        android:title="@string/save"
-        android:icon="@drawable/ic_save_24dp"
-        app:showAsAction="always"/>
+  <item
+    android:id="@+id/menu_save"
+    android:icon="@drawable/ic_save_24dp"
+    android:title="@string/save"
+    app:showAsAction="always"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_gtasks_list_fragment.xml b/app/src/main/res/menu/menu_gtasks_list_fragment.xml
index 291ec863c..56572ec4c 100644
--- a/app/src/main/res/menu/menu_gtasks_list_fragment.xml
+++ b/app/src/main/res/menu/menu_gtasks_list_fragment.xml
@@ -1,8 +1,8 @@
 <?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">
-    <item
-        android:id="@+id/menu_gtasks_list_settings"
-        android:title="@string/list_settings"
-        app:showAsAction="never" />
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+  <item
+    android:id="@+id/menu_gtasks_list_settings"
+    android:title="@string/list_settings"
+    app:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_multi_select.xml b/app/src/main/res/menu/menu_multi_select.xml
index 21ef5ed19..96c5627c0 100644
--- a/app/src/main/res/menu/menu_multi_select.xml
+++ b/app/src/main/res/menu/menu_multi_select.xml
@@ -1,17 +1,17 @@
 <?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/copy_tasks"
-        android:title="@string/copy"
-        android:icon="@drawable/ic_content_copy_black_24dp"
-        app:showAsAction="ifRoom" />
+  <item
+    android:id="@+id/copy_tasks"
+    android:icon="@drawable/ic_content_copy_black_24dp"
+    android:title="@string/copy"
+    app:showAsAction="ifRoom"/>
 
-    <item
-        android:id="@+id/delete"
-        android:title="@string/delete"
-        android:icon="@drawable/ic_delete_24dp"
-        app:showAsAction="ifRoom" />
+  <item
+    android:id="@+id/delete"
+    android:icon="@drawable/ic_delete_24dp"
+    android:title="@string/delete"
+    app:showAsAction="ifRoom"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_tag_settings.xml b/app/src/main/res/menu/menu_tag_settings.xml
index 674972849..9b4e99154 100644
--- a/app/src/main/res/menu/menu_tag_settings.xml
+++ b/app/src/main/res/menu/menu_tag_settings.xml
@@ -1,11 +1,11 @@
 <?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/delete"
-        android:title="@string/delete"
-        android:icon="@drawable/ic_delete_24dp"
-        app:showAsAction="ifRoom" />
+  <item
+    android:id="@+id/delete"
+    android:icon="@drawable/ic_delete_24dp"
+    android:title="@string/delete"
+    app:showAsAction="ifRoom"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_tag_view_fragment.xml b/app/src/main/res/menu/menu_tag_view_fragment.xml
index 91d98c55b..6cc6b9c35 100644
--- a/app/src/main/res/menu/menu_tag_view_fragment.xml
+++ b/app/src/main/res/menu/menu_tag_view_fragment.xml
@@ -1,8 +1,8 @@
 <?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">
-    <item
-        android:id="@+id/menu_tag_settings"
-        android:title="@string/tag_settings"
-        app:showAsAction="never" />
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+  <item
+    android:id="@+id/menu_tag_settings"
+    android:title="@string/tag_settings"
+    app:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_task_edit_fragment.xml b/app/src/main/res/menu/menu_task_edit_fragment.xml
index 494c72b36..794f0422b 100644
--- a/app/src/main/res/menu/menu_task_edit_fragment.xml
+++ b/app/src/main/res/menu/menu_task_edit_fragment.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:tasks="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/menu_delete"
-        android:icon="@drawable/ic_delete_24dp"
-        android:title="@string/delete_task"
-        tasks:showAsAction="ifRoom"/>
+  xmlns:tasks="http://schemas.android.com/apk/res-auto">
+  <item
+    android:id="@+id/menu_delete"
+    android:icon="@drawable/ic_delete_24dp"
+    android:title="@string/delete_task"
+    tasks:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_task_list_fragment.xml b/app/src/main/res/menu/menu_task_list_fragment.xml
index 2c77994f7..4caa18323 100644
--- a/app/src/main/res/menu/menu_task_list_fragment.xml
+++ b/app/src/main/res/menu/menu_task_list_fragment.xml
@@ -1,37 +1,37 @@
 <?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_voice_add"
+    android:icon="@drawable/ic_mic_24dp"
+    android:title="@string/EPr_voiceInputEnabled_title"
+    app:showAsAction="ifRoom"/>
+  <item
+    android:id="@+id/menu_search"
+    android:icon="@drawable/ic_search_24dp"
+    android:title="@string/TLA_menu_search"
+    app:actionViewClass="android.support.v7.widget.SearchView"
+    app:showAsAction="ifRoom|collapseActionView"/>
+  <item
+    android:id="@+id/menu_sort"
+    android:icon="@drawable/ic_sort_24dp"
+    android:title="@string/TLA_menu_sort"
+    app:showAsAction="ifRoom"/>
+  <group
+    android:checkableBehavior="all">
     <item
-        android:id="@+id/menu_voice_add"
-        android:title="@string/EPr_voiceInputEnabled_title"
-        android:icon="@drawable/ic_mic_24dp"
-        app:showAsAction="ifRoom"/>
+      android:id="@+id/menu_show_hidden"
+      android:checkable="true"
+      android:title="@string/show_hidden"/>
     <item
-        android:id="@+id/menu_search"
-        android:title="@string/TLA_menu_search"
-        android:icon="@drawable/ic_search_24dp"
-        app:showAsAction="ifRoom|collapseActionView"
-        app:actionViewClass="android.support.v7.widget.SearchView"/>
-    <item
-        android:id="@+id/menu_sort"
-        android:title="@string/TLA_menu_sort"
-        android:icon="@drawable/ic_sort_24dp"
-        app:showAsAction="ifRoom" />
-    <group
-        android:checkableBehavior="all">
-        <item
-            android:id="@+id/menu_show_hidden"
-            android:title="@string/show_hidden"
-            android:checkable="true"/>
-        <item
-            android:id="@+id/menu_show_completed"
-            android:title="@string/show_completed"
-            android:checkable="true" />
-    </group>
-    <item
-        android:id="@+id/menu_clear_completed"
-        android:title="@string/gtasks_GTA_clear_completed"
-        app:showAsAction="never" />
+      android:id="@+id/menu_show_completed"
+      android:checkable="true"
+      android:title="@string/show_completed"/>
+  </group>
+  <item
+    android:id="@+id/menu_clear_completed"
+    android:title="@string/gtasks_GTA_clear_completed"
+    app:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_tasker_create_task.xml b/app/src/main/res/menu/menu_tasker_create_task.xml
index 6ce2e5a04..059e56b46 100644
--- a/app/src/main/res/menu/menu_tasker_create_task.xml
+++ b/app/src/main/res/menu/menu_tasker_create_task.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:tasks="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/menu_help"
-        android:icon="@drawable/ic_help_24dp"
-        android:title="@string/help"
-        tasks:showAsAction="ifRoom"/>
+  xmlns:tasks="http://schemas.android.com/apk/res-auto">
+  <item
+    android:id="@+id/menu_help"
+    android:icon="@drawable/ic_help_24dp"
+    android:title="@string/help"
+    tasks:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 036d09bc5..578e6ac72 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 036d09bc5..578e6ac72 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index e2b38dc8a..989e33480 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="navigation_drawer_width">320dp</dimen>
+  <dimen name="navigation_drawer_width">320dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index c4126c5f3..46eea2915 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="window_background">@color/md_background_dark</color>
-    <color name="content_background">@color/grey_800</color>
-    <color name="dialog_background">@color/grey_800</color>
-    <color name="icon_tint">@color/icon_tint_dark</color>
-    <color name="drawer_color">@color/drawer_background_dark</color>
-    <color name="drawer_color_selected">@color/drawer_background_dark_selected</color>
-    <color name="text_secondary">@color/white_70</color>
-    <color name="text_tertiary">@color/white_50</color>
-    <color name="divider">@color/white_12</color>
+  <color name="window_background">@color/md_background_dark</color>
+  <color name="content_background">@color/grey_800</color>
+  <color name="dialog_background">@color/grey_800</color>
+  <color name="icon_tint">@color/icon_tint_dark</color>
+  <color name="drawer_color">@color/drawer_background_dark</color>
+  <color name="drawer_color_selected">@color/drawer_background_dark_selected</color>
+  <color name="text_secondary">@color/white_70</color>
+  <color name="text_tertiary">@color/white_50</color>
+  <color name="divider">@color/white_12</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/dimens.xml b/app/src/main/res/values-night/dimens.xml
index 3764c3112..05d4479d8 100644
--- a/app/src/main/res/values-night/dimens.xml
+++ b/app/src/main/res/values-night/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item name="alpha_secondary" format="float" type="dimen">0.70</item>
-    <item name="alpha_disabled" format="float" type="dimen">0.50</item>
+  <item format="float" name="alpha_secondary" type="dimen">0.70</item>
+  <item format="float" name="alpha_disabled" type="dimen">0.50</item>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index e9bf5d871..70e4c73ca 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,3 +1,4 @@
 <resources>
-    <style name="popup_overlay" parent="ThemeOverlay.AppCompat" />
+
+  <style name="popup_overlay" parent="ThemeOverlay.AppCompat"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-notnight/colors.xml b/app/src/main/res/values-notnight/colors.xml
index a2de3ca2f..5c1952a3c 100644
--- a/app/src/main/res/values-notnight/colors.xml
+++ b/app/src/main/res/values-notnight/colors.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="window_background">@color/grey_50</color>
-    <color name="content_background">@android:color/white</color>
-    <color name="dialog_background">@android:color/white</color>
-    <color name="icon_tint">@color/icon_tint_light</color>
-    <color name="drawer_color">@color/drawer_background_light</color>
-    <color name="drawer_color_selected">@color/drawer_background_light_selected</color>
-    <color name="text_secondary">@color/black_54</color>
-    <color name="text_tertiary">@color/black_38</color>
-    <color name="divider">@color/black_12</color>
+  <color name="window_background">@color/grey_50</color>
+  <color name="content_background">@android:color/white</color>
+  <color name="dialog_background">@android:color/white</color>
+  <color name="icon_tint">@color/icon_tint_light</color>
+  <color name="drawer_color">@color/drawer_background_light</color>
+  <color name="drawer_color_selected">@color/drawer_background_light_selected</color>
+  <color name="text_secondary">@color/black_54</color>
+  <color name="text_tertiary">@color/black_38</color>
+  <color name="divider">@color/black_12</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw360dp/dimens.xml b/app/src/main/res/values-sw360dp/dimens.xml
index a3d1d52a1..c04ca2ccb 100644
--- a/app/src/main/res/values-sw360dp/dimens.xml
+++ b/app/src/main/res/values-sw360dp/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="navigation_drawer_width">304dp</dimen>
+  <dimen name="navigation_drawer_width">304dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw384dp/dimens.xml b/app/src/main/res/values-sw384dp/dimens.xml
index e2b38dc8a..989e33480 100644
--- a/app/src/main/res/values-sw384dp/dimens.xml
+++ b/app/src/main/res/values-sw384dp/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="navigation_drawer_width">320dp</dimen>
+  <dimen name="navigation_drawer_width">320dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index acce1e86e..54e3d11e4 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="keyline_first">24dp</dimen>
-    <dimen name="keyline_content_inset">80dp</dimen>
+  <dimen name="keyline_first">24dp</dimen>
+  <dimen name="keyline_content_inset">80dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml
index c17f09161..a18709811 100644
--- a/app/src/main/res/values-v21/dimens.xml
+++ b/app/src/main/res/values-v21/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="elevation_padding">3dp</dimen>
+  <dimen name="elevation_padding">3dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/fonts.xml b/app/src/main/res/values-v21/fonts.xml
index 15629ea6c..073e30a8d 100644
--- a/app/src/main/res/values-v21/fonts.xml
+++ b/app/src/main/res/values-v21/fonts.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="font_fontFamily_medium">sans-serif-medium</string>
+  <string name="font_fontFamily_medium">sans-serif-medium</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index c76b8e7fd..7173796a6 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="priority_button" parent="priority_button_base">
-    </style>
+  <style name="priority_button" parent="priority_button_base">
+  </style>
 
-    <style name="vertical_divider">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">0dp</item>
-        <item name="android:visibility">gone</item>
-    </style>
+  <style name="vertical_divider">
+    <item name="android:layout_width">0dp</item>
+    <item name="android:layout_height">0dp</item>
+    <item name="android:visibility">gone</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/theme.xml b/app/src/main/res/values-v21/theme.xml
index 7fc645f8b..2bfe90e1d 100644
--- a/app/src/main/res/values-v21/theme.xml
+++ b/app/src/main/res/values-v21/theme.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Tasks" parent="TasksBase">
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
+
+  <style name="Tasks" parent="TasksBase">
+    <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+    <item name="android:statusBarColor">@android:color/transparent</item>
+  </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v24/bools.xml b/app/src/main/res/values-v24/bools.xml
index 06bf5f5ae..3b8a98a37 100644
--- a/app/src/main/res/values-v24/bools.xml
+++ b/app/src/main/res/values-v24/bools.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="default_bundle_notifications">true</bool>
+  <bool name="default_bundle_notifications">true</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w380dp/dimens.xml b/app/src/main/res/values-w380dp/dimens.xml
index aa6a2677e..3cf68bf86 100644
--- a/app/src/main/res/values-w380dp/dimens.xml
+++ b/app/src/main/res/values-w380dp/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item name="tag_characters" format="float" type="dimen">16</item>
+  <item format="float" name="tag_characters" type="dimen">16</item>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w400dp/dimens.xml b/app/src/main/res/values-w400dp/dimens.xml
index bb4defecf..5096e650e 100644
--- a/app/src/main/res/values-w400dp/dimens.xml
+++ b/app/src/main/res/values-w400dp/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item name="tag_characters" format="float" type="dimen">20</item>
+  <item format="float" name="tag_characters" type="dimen">20</item>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w820dp/bools.xml b/app/src/main/res/values-w820dp/bools.xml
index 82ac1f05c..fcbdd015c 100644
--- a/app/src/main/res/values-w820dp/bools.xml
+++ b/app/src/main/res/values-w820dp/bools.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="two_pane_layout">true</bool>
+  <bool name="two_pane_layout">true</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w820dp/styles.xml b/app/src/main/res/values-w820dp/styles.xml
index ae17fa515..06691d199 100644
--- a/app/src/main/res/values-w820dp/styles.xml
+++ b/app/src/main/res/values-w820dp/styles.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="task_list_container">
-        <item name="android:elevation" tools:ignore="NewApi">@dimen/elevation_refresh_indicator</item>
-        <item name="android:clipToPadding">false</item>
-        <item name="android:paddingLeft">0dp</item>
-        <item name="android:paddingStart" tools:ignore="NewApi">0dp</item>
-        <item name="android:paddingRight">@dimen/elevation_padding</item>
-        <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/elevation_padding</item>
-    </style>
+
+  <style name="task_list_container">
+    <item name="android:elevation" tools:ignore="NewApi">@dimen/elevation_refresh_indicator</item>
+    <item name="android:clipToPadding">false</item>
+    <item name="android:paddingLeft">0dp</item>
+    <item name="android:paddingStart" tools:ignore="NewApi">0dp</item>
+    <item name="android:paddingRight">@dimen/elevation_padding</item>
+    <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/elevation_padding</item>
+  </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 40c380739..ead47a633 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,227 +1,227 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string-array name="geofence_radius_values">
-        <item>75</item>
-        <item>125</item>
-        <item>250</item>
-        <item>500</item>
-        <item>1000</item>
-    </string-array>
-
-    <string-array name="geofence_responsiveness">
-        <item>00:15</item>
-        <item>00:30</item>
-        <item>01:00</item>
-        <item>05:00</item>
-        <item>10:00</item>
-    </string-array>
-
-    <string-array name="geofence_responsiveness_values">
-        <item>15</item>
-        <item>30</item>
-        <item>60</item>
-        <item>300</item>
-        <item>600</item>
-    </string-array>
-
-    <string-array name="TEA_hideUntil">
-        <item>@string/due_date</item>
-        <item>@string/due_time</item>
-        <item>@string/day_before_due</item>
-        <item>@string/week_before_due</item>
-        <item>@string/pick_a_date_and_time</item>
-    </string-array>
-
-    <string-array name="EPr_default_hideUntil">
-        <item>@string/dont_hide</item>
-        <item>@string/due_date</item>
-        <item>@string/day_before_due</item>
-        <item>@string/week_before_due</item>
-    </string-array>
-
-    <string-array name="EPr_default_importance">
-        <item>@string/priority_high</item>
-        <item>@string/priority_medium</item>
-        <item>@string/priority_low</item>
-        <item>@string/none</item>
-    </string-array>
-
-    <string-array name="reminder_ring_modes">
-        <item>@string/ring_once</item>
-        <item>@string/ring_five_times</item>
-        <item>@string/ring_nonstop</item>
-    </string-array>
-
-    <string-array name="colors">
-        <item>@string/theme_blue_grey</item>
-        <item>@string/theme_dark_grey</item>
-        <item>@string/theme_red</item>
-        <item>@string/theme_pink</item>
-        <item>@string/theme_purple</item>
-        <item>@string/theme_deep_purple</item>
-        <item>@string/theme_indigo</item>
-        <item>@string/theme_blue</item>
-        <item>@string/theme_light_blue</item>
-        <item>@string/theme_cyan</item>
-        <item>@string/theme_teal</item>
-        <item>@string/theme_green</item>
-        <item>@string/theme_light_green</item>
-        <item>@string/theme_lime</item>
-        <item>@string/theme_yellow</item>
-        <item>@string/theme_amber</item>
-        <item>@string/theme_orange</item>
-        <item>@string/theme_deep_orange</item>
-        <item>@string/theme_brown</item>
-        <item>@string/theme_grey</item>
-    </string-array>
-
-    <string-array name="accents">
-        <item>@string/theme_blue_grey</item>
-        <item>@string/theme_red</item>
-        <item>@string/theme_pink</item>
-        <item>@string/theme_purple</item>
-        <item>@string/theme_deep_purple</item>
-        <item>@string/theme_indigo</item>
-        <item>@string/theme_blue</item>
-        <item>@string/theme_light_blue</item>
-        <item>@string/theme_cyan</item>
-        <item>@string/theme_teal</item>
-        <item>@string/theme_green</item>
-        <item>@string/theme_light_green</item>
-        <item>@string/theme_lime</item>
-        <item>@string/theme_yellow</item>
-        <item>@string/theme_amber</item>
-        <item>@string/theme_orange</item>
-        <item>@string/theme_deep_orange</item>
-    </string-array>
-
-    <string-array name="widget_background">
-        <item>@string/theme_light</item>
-        <item>@string/theme_black</item>
-        <item>@string/theme_dark</item>
-    </string-array>
-
-    <string-array name="localization">
-        <item>af-rZA</item>
-        <item>ar</item>
-        <item>bg-bg</item>
-        <item>ca</item>
-        <item>cs</item>
-        <item>da</item>
-        <item>de</item>
-        <item>el</item>
-        <item>en</item>
-        <item>es</item>
-        <item>fa</item>
-        <item>fi</item>
-        <item>fr</item>
-        <item>gl</item>
-        <item>hu</item>
-        <item>it</item>
-        <item>iw</item>
-        <item>ja</item>
-        <item>ko</item>
-        <item>nb</item>
-        <item>nl</item>
-        <item>pl</item>
-        <item>pt</item>
-        <item>pt-br</item>
-        <item>ro</item>
-        <item>ru</item>
-        <item>sk</item>
-        <item>sl-si</item>
-        <item>sr</item>
-        <item>sv</item>
-        <item>th</item>
-        <item>tr</item>
-        <item>uk</item>
-        <item>zh-cn</item>
-        <item>zh-tw</item>
-    </string-array>
-
-    <string-array name="layout_direction_entries">
-        <item>@string/use_locale_default</item>
-        <item>@string/layout_direction_left_to_right</item>
-        <item>@string/layout_direction_right_to_left</item>
-    </string-array>
-
-    <string-array name="layout_direction_values">
-        <item>-1</item>
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-
-    <string-array name="EPr_default_urgency">
-        <item>@string/no_deadline</item>
-        <item>@string/today</item>
-        <item>@string/tomorrow</item>
-        <item>@string/day_after_tomorrow</item>
-        <item>@string/next_week</item>
-    </string-array>
-
-    <string-array name="EPr_default_reminders">
-        <item>@string/no_deadline_reminder</item>
-        <item>@string/at_deadline</item>
-        <item>@string/when_overdue</item>
-        <item>@string/at_deadline_or_overdue</item>
-    </string-array>
-
-    <string-array name="CFC_dueBefore_entries">
-        <item>@string/no_due_date</item>
-        <item>@string/yesterday</item>
-        <item>@string/today</item>
-        <item>@string/tomorrow</item>
-        <item>@string/day_after_tomorrow</item>
-        <item>@string/next_week</item>
-        <item>@string/next_month</item>
-    </string-array>
-
-    <string-array name="TEA_reminder_random">
-        <item>@string/random_reminder_hour</item>
-        <item>@string/random_reminder_day</item>
-        <item>@string/random_reminder_week</item>
-        <item>@string/random_reminder_two_weeks</item>
-        <item>@string/random_reminder_month</item>
-        <item>@string/random_reminder_two_months</item>
-    </string-array>
-
-    <string-array name="EPr_reminder_random">
-        <item>@string/default_random_reminder_disabled</item>
-        <item>@string/default_random_reminder_hourly</item>
-        <item>@string/default_random_reminder_daily</item>
-        <item>@string/default_random_reminder_weekly</item>
-        <item>@string/default_random_reminder_bi_weekly</item>
-        <item>@string/default_random_reminder_monthly</item>
-        <item>@string/default_random_reminder_bi_monthly</item>
-    </string-array>
-
-    <string-array name="repeat_options">
-        <item>@string/repeat_option_does_not_repeat</item>
-        <item>@string/repeat_option_every_day</item>
-        <item>@string/repeat_option_every_week</item>
-        <item>@string/repeat_option_every_month</item>
-        <item>@string/repeat_option_every_year</item>
-        <item>@string/repeat_option_custom</item>
-    </string-array>
-
-    <string-array name="repeat_frequency">
-        <item>@string/repeat_minutely</item>
-        <item>@string/repeat_hourly</item>
-        <item>@string/repeat_daily</item>
-        <item>@string/repeat_weekly</item>
-        <item>@string/repeat_monthly</item>
-        <item>@string/repeat_yearly</item>
-    </string-array>
-
-    <string-array name="repeat_type">
-        <item>@string/repeat_type_due</item>
-        <item>@string/repeat_type_completion</item>
-    </string-array>
-
-    <string-array name="day_of_week_values">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
+  <string-array name="geofence_radius_values">
+    <item>75</item>
+    <item>125</item>
+    <item>250</item>
+    <item>500</item>
+    <item>1000</item>
+  </string-array>
+
+  <string-array name="geofence_responsiveness">
+    <item>00:15</item>
+    <item>00:30</item>
+    <item>01:00</item>
+    <item>05:00</item>
+    <item>10:00</item>
+  </string-array>
+
+  <string-array name="geofence_responsiveness_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+    <item>300</item>
+    <item>600</item>
+  </string-array>
+
+  <string-array name="TEA_hideUntil">
+    <item>@string/due_date</item>
+    <item>@string/due_time</item>
+    <item>@string/day_before_due</item>
+    <item>@string/week_before_due</item>
+    <item>@string/pick_a_date_and_time</item>
+  </string-array>
+
+  <string-array name="EPr_default_hideUntil">
+    <item>@string/dont_hide</item>
+    <item>@string/due_date</item>
+    <item>@string/day_before_due</item>
+    <item>@string/week_before_due</item>
+  </string-array>
+
+  <string-array name="EPr_default_importance">
+    <item>@string/priority_high</item>
+    <item>@string/priority_medium</item>
+    <item>@string/priority_low</item>
+    <item>@string/none</item>
+  </string-array>
+
+  <string-array name="reminder_ring_modes">
+    <item>@string/ring_once</item>
+    <item>@string/ring_five_times</item>
+    <item>@string/ring_nonstop</item>
+  </string-array>
+
+  <string-array name="colors">
+    <item>@string/theme_blue_grey</item>
+    <item>@string/theme_dark_grey</item>
+    <item>@string/theme_red</item>
+    <item>@string/theme_pink</item>
+    <item>@string/theme_purple</item>
+    <item>@string/theme_deep_purple</item>
+    <item>@string/theme_indigo</item>
+    <item>@string/theme_blue</item>
+    <item>@string/theme_light_blue</item>
+    <item>@string/theme_cyan</item>
+    <item>@string/theme_teal</item>
+    <item>@string/theme_green</item>
+    <item>@string/theme_light_green</item>
+    <item>@string/theme_lime</item>
+    <item>@string/theme_yellow</item>
+    <item>@string/theme_amber</item>
+    <item>@string/theme_orange</item>
+    <item>@string/theme_deep_orange</item>
+    <item>@string/theme_brown</item>
+    <item>@string/theme_grey</item>
+  </string-array>
+
+  <string-array name="accents">
+    <item>@string/theme_blue_grey</item>
+    <item>@string/theme_red</item>
+    <item>@string/theme_pink</item>
+    <item>@string/theme_purple</item>
+    <item>@string/theme_deep_purple</item>
+    <item>@string/theme_indigo</item>
+    <item>@string/theme_blue</item>
+    <item>@string/theme_light_blue</item>
+    <item>@string/theme_cyan</item>
+    <item>@string/theme_teal</item>
+    <item>@string/theme_green</item>
+    <item>@string/theme_light_green</item>
+    <item>@string/theme_lime</item>
+    <item>@string/theme_yellow</item>
+    <item>@string/theme_amber</item>
+    <item>@string/theme_orange</item>
+    <item>@string/theme_deep_orange</item>
+  </string-array>
+
+  <string-array name="widget_background">
+    <item>@string/theme_light</item>
+    <item>@string/theme_black</item>
+    <item>@string/theme_dark</item>
+  </string-array>
+
+  <string-array name="localization">
+    <item>af-rZA</item>
+    <item>ar</item>
+    <item>bg-bg</item>
+    <item>ca</item>
+    <item>cs</item>
+    <item>da</item>
+    <item>de</item>
+    <item>el</item>
+    <item>en</item>
+    <item>es</item>
+    <item>fa</item>
+    <item>fi</item>
+    <item>fr</item>
+    <item>gl</item>
+    <item>hu</item>
+    <item>it</item>
+    <item>iw</item>
+    <item>ja</item>
+    <item>ko</item>
+    <item>nb</item>
+    <item>nl</item>
+    <item>pl</item>
+    <item>pt</item>
+    <item>pt-br</item>
+    <item>ro</item>
+    <item>ru</item>
+    <item>sk</item>
+    <item>sl-si</item>
+    <item>sr</item>
+    <item>sv</item>
+    <item>th</item>
+    <item>tr</item>
+    <item>uk</item>
+    <item>zh-cn</item>
+    <item>zh-tw</item>
+  </string-array>
+
+  <string-array name="layout_direction_entries">
+    <item>@string/use_locale_default</item>
+    <item>@string/layout_direction_left_to_right</item>
+    <item>@string/layout_direction_right_to_left</item>
+  </string-array>
+
+  <string-array name="layout_direction_values">
+    <item>-1</item>
+    <item>0</item>
+    <item>1</item>
+  </string-array>
+
+  <string-array name="EPr_default_urgency">
+    <item>@string/no_deadline</item>
+    <item>@string/today</item>
+    <item>@string/tomorrow</item>
+    <item>@string/day_after_tomorrow</item>
+    <item>@string/next_week</item>
+  </string-array>
+
+  <string-array name="EPr_default_reminders">
+    <item>@string/no_deadline_reminder</item>
+    <item>@string/at_deadline</item>
+    <item>@string/when_overdue</item>
+    <item>@string/at_deadline_or_overdue</item>
+  </string-array>
+
+  <string-array name="CFC_dueBefore_entries">
+    <item>@string/no_due_date</item>
+    <item>@string/yesterday</item>
+    <item>@string/today</item>
+    <item>@string/tomorrow</item>
+    <item>@string/day_after_tomorrow</item>
+    <item>@string/next_week</item>
+    <item>@string/next_month</item>
+  </string-array>
+
+  <string-array name="TEA_reminder_random">
+    <item>@string/random_reminder_hour</item>
+    <item>@string/random_reminder_day</item>
+    <item>@string/random_reminder_week</item>
+    <item>@string/random_reminder_two_weeks</item>
+    <item>@string/random_reminder_month</item>
+    <item>@string/random_reminder_two_months</item>
+  </string-array>
+
+  <string-array name="EPr_reminder_random">
+    <item>@string/default_random_reminder_disabled</item>
+    <item>@string/default_random_reminder_hourly</item>
+    <item>@string/default_random_reminder_daily</item>
+    <item>@string/default_random_reminder_weekly</item>
+    <item>@string/default_random_reminder_bi_weekly</item>
+    <item>@string/default_random_reminder_monthly</item>
+    <item>@string/default_random_reminder_bi_monthly</item>
+  </string-array>
+
+  <string-array name="repeat_options">
+    <item>@string/repeat_option_does_not_repeat</item>
+    <item>@string/repeat_option_every_day</item>
+    <item>@string/repeat_option_every_week</item>
+    <item>@string/repeat_option_every_month</item>
+    <item>@string/repeat_option_every_year</item>
+    <item>@string/repeat_option_custom</item>
+  </string-array>
+
+  <string-array name="repeat_frequency">
+    <item>@string/repeat_minutely</item>
+    <item>@string/repeat_hourly</item>
+    <item>@string/repeat_daily</item>
+    <item>@string/repeat_weekly</item>
+    <item>@string/repeat_monthly</item>
+    <item>@string/repeat_yearly</item>
+  </string-array>
+
+  <string-array name="repeat_type">
+    <item>@string/repeat_type_due</item>
+    <item>@string/repeat_type_completion</item>
+  </string-array>
+
+  <string-array name="day_of_week_values">
+    <item>0</item>
+    <item>1</item>
+    <item>2</item>
+  </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 326f10944..113238e2a 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -5,28 +5,28 @@
 -->
 <resources>
 
-    <!-- theme attributes -->
-    <attr name="asWindowBackground" format="color" />
-    <attr name="asContentBackground" format="color" />
-    <attr name="asTextColor" format="color" />
-    <attr name="asTextColorHint" format="color" />
-    <attr name="icon_tint" format="color"/>
-    <attr name="overlay_theme" format="reference" />
-    <attr name="actionBarPrimaryText" format="color" />
-    <attr name="actionBarSecondaryText" format="color" />
-    <attr name="dark_status_bar" format="boolean" />
-    <attr name="alpha_secondary" format="dimension" />
-    <attr name="alpha_disabled" format="dimension" />
-    <attr name="fab_text" format="color" />
-    <attr name="colorAccentDialog" format="color" />
-    <attr name="card_elevation" format="dimension" />
+  <!-- theme attributes -->
+  <attr format="color" name="asWindowBackground"/>
+  <attr format="color" name="asContentBackground"/>
+  <attr format="color" name="asTextColor"/>
+  <attr format="color" name="asTextColorHint"/>
+  <attr format="color" name="icon_tint"/>
+  <attr format="reference" name="overlay_theme"/>
+  <attr format="color" name="actionBarPrimaryText"/>
+  <attr format="color" name="actionBarSecondaryText"/>
+  <attr format="boolean" name="dark_status_bar"/>
+  <attr format="dimension" name="alpha_secondary"/>
+  <attr format="dimension" name="alpha_disabled"/>
+  <attr format="color" name="fab_text"/>
+  <attr format="color" name="colorAccentDialog"/>
+  <attr format="dimension" name="card_elevation"/>
 
-    <declare-styleable name="TimePreference">
-        <attr name="summary" format="string" />
-    </declare-styleable>
+  <declare-styleable name="TimePreference">
+    <attr format="string" name="summary"/>
+  </declare-styleable>
 
-    <declare-styleable name="ScrimInsetsFrameLayout">
-        <attr name="insetForeground" format="reference|color" />
-    </declare-styleable>
+  <declare-styleable name="ScrimInsetsFrameLayout">
+    <attr format="reference|color" name="insetForeground"/>
+  </declare-styleable>
 
 </resources>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index 743b42804..d4587b7f5 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="two_pane_layout">false</bool>
-    <bool name="location_enabled">false</bool>
-    <bool name="google_play_store_available">false</bool>
-    <bool name="default_bundle_notifications">false</bool>
+  <bool name="two_pane_layout">false</bool>
+  <bool name="location_enabled">false</bool>
+  <bool name="google_play_store_available">false</bool>
+  <bool name="default_bundle_notifications">false</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ed644d67e..88f8ce207 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,117 +6,117 @@
 -->
 <resources>
 
-    <color name="red_500">#f44336</color>
-    <color name="red_700">#d32f2f</color>
-    <color name="red_a400">#ff1744</color>
-
-    <color name="pink_500">#e91e63</color>
-    <color name="pink_700">#c2185b</color>
-    <color name="pink_a400">#f50057</color>
-
-    <color name="purple_500">#9c27b0</color>
-    <color name="purple_700">#7b1fa2</color>
-    <color name="purple_a400">#d500f9</color>
-
-    <color name="deep_purple_500">#673ab7</color>
-    <color name="deep_purple_700">#512da8</color>
-    <color name="deep_purple_a400">#651fff</color>
-
-    <color name="indigo_500">#3f51b5</color>
-    <color name="indigo_700">#303f9f</color>
-    <color name="indigo_a400">#3d5afe</color>
-
-    <color name="blue_500">#2196f3</color>
-    <color name="blue_700">#1976d2</color>
-    <color name="blue_a400">#2979ff</color>
-
-    <color name="light_blue_500">#03a9f4</color>
-    <color name="light_blue_700">#0288d1</color>
-    <color name="light_blue_a400">#00b0ff</color>
-
-    <color name="cyan_500">#00bcd4</color>
-    <color name="cyan_700">#0097a7</color>
-    <color name="cyan_a400">#00e5ff</color>
-
-    <color name="teal_500">#009688</color>
-    <color name="teal_700">#00796b</color>
-    <color name="teal_a400">#1de9b6</color>
-
-    <color name="green_500">#4caf50</color>
-    <color name="green_700">#388e3c</color>
-    <color name="green_a400">#00e676</color>
-
-    <color name="light_green_500">#8bc34a</color>
-    <color name="light_green_700">#689f38</color>
-    <color name="light_green_a400">#76ff03</color>
-
-    <color name="lime_500">#cddc39</color>
-    <color name="lime_700">#afb42b</color>
-    <color name="lime_a400">#c6ff00</color>
-
-    <color name="yellow_500">#ffeb3b</color>
-    <color name="yellow_700">#fbc02d</color>
-    <color name="yellow_a400">#ffea00</color>
-
-    <color name="amber_500">#ffc107</color>
-    <color name="amber_700">#ffa000</color>
-    <color name="amber_a400">#ffc400</color>
-
-    <color name="orange_500">#ff9800</color>
-    <color name="orange_700">#f57c00</color>
-    <color name="orange_a400">#ff9100</color>
-
-    <color name="deep_orange_500">#ff5722</color>
-    <color name="deep_orange_700">#e64a19</color>
-    <color name="deep_orange_a400">#ff3d00</color>
-
-    <color name="brown_500">#795548</color>
-    <color name="brown_700">#5d4037</color>
-
-    <color name="grey_50">#fafafa</color>
-    <color name="grey_500">#9e9e9e</color>
-    <color name="grey_700">#616161</color>
-    <color name="grey_800">#424242</color>
-    <color name="grey_900">#212121</color>
-    <color name="grey_statusbar">#111111</color>
-
-    <color name="blue_grey_400">#78909c</color>
-    <color name="blue_grey_500">#607d8b</color>
-    <color name="blue_grey_700">#455a64</color>
-
-    <color name="black_87">#de000000</color>
-    <color name="black_54">#8a000000</color>
-    <color name="black_38">#61000000</color>
-    <color name="black_12">#1f000000</color>
-
-    <color name="white_100">#ffffffff</color>
-    <color name="white_70">#b3ffffff</color>
-    <color name="white_50">#80ffffff</color>
-    <color name="white_12">#1fffffff</color>
-
-    <color name="overdue">@color/red_500</color>
-
-    <color name="md_background_dark">#303030</color>
-    <color name="widget_background_black">#000000</color>
-    <color name="icon_tint_light">@android:color/black</color>
-    <color name="icon_tint_dark">@android:color/white</color>
-
-    <color name="drawer_background_light">#f9f9f9</color>
-    <color name="drawer_background_light_selected">#e8e8e8</color>
-    <color name="drawer_background_dark">#303030</color>
-    <color name="drawer_background_dark_selected">#202020</color>
-
-    <color name="importance_1">@color/red_500</color>
-    <color name="importance_2">@color/amber_500</color>
-    <color name="importance_3">@color/blue_500</color>
-    <color name="importance_4">@color/grey_500</color>
-
-    <color name="snackbar_text_color">#f4b400</color>
-    <color name="snackbar_background">@color/grey_800</color>
-    <color name="tag_color_none_background">#e1e1e1</color>
-
-    <!-- deprecated -->
-    <color name="reminder_background">#262626</color>
+  <color name="red_500">#f44336</color>
+  <color name="red_700">#d32f2f</color>
+  <color name="red_a400">#ff1744</color>
+
+  <color name="pink_500">#e91e63</color>
+  <color name="pink_700">#c2185b</color>
+  <color name="pink_a400">#f50057</color>
+
+  <color name="purple_500">#9c27b0</color>
+  <color name="purple_700">#7b1fa2</color>
+  <color name="purple_a400">#d500f9</color>
+
+  <color name="deep_purple_500">#673ab7</color>
+  <color name="deep_purple_700">#512da8</color>
+  <color name="deep_purple_a400">#651fff</color>
+
+  <color name="indigo_500">#3f51b5</color>
+  <color name="indigo_700">#303f9f</color>
+  <color name="indigo_a400">#3d5afe</color>
+
+  <color name="blue_500">#2196f3</color>
+  <color name="blue_700">#1976d2</color>
+  <color name="blue_a400">#2979ff</color>
+
+  <color name="light_blue_500">#03a9f4</color>
+  <color name="light_blue_700">#0288d1</color>
+  <color name="light_blue_a400">#00b0ff</color>
+
+  <color name="cyan_500">#00bcd4</color>
+  <color name="cyan_700">#0097a7</color>
+  <color name="cyan_a400">#00e5ff</color>
+
+  <color name="teal_500">#009688</color>
+  <color name="teal_700">#00796b</color>
+  <color name="teal_a400">#1de9b6</color>
+
+  <color name="green_500">#4caf50</color>
+  <color name="green_700">#388e3c</color>
+  <color name="green_a400">#00e676</color>
+
+  <color name="light_green_500">#8bc34a</color>
+  <color name="light_green_700">#689f38</color>
+  <color name="light_green_a400">#76ff03</color>
+
+  <color name="lime_500">#cddc39</color>
+  <color name="lime_700">#afb42b</color>
+  <color name="lime_a400">#c6ff00</color>
+
+  <color name="yellow_500">#ffeb3b</color>
+  <color name="yellow_700">#fbc02d</color>
+  <color name="yellow_a400">#ffea00</color>
+
+  <color name="amber_500">#ffc107</color>
+  <color name="amber_700">#ffa000</color>
+  <color name="amber_a400">#ffc400</color>
+
+  <color name="orange_500">#ff9800</color>
+  <color name="orange_700">#f57c00</color>
+  <color name="orange_a400">#ff9100</color>
+
+  <color name="deep_orange_500">#ff5722</color>
+  <color name="deep_orange_700">#e64a19</color>
+  <color name="deep_orange_a400">#ff3d00</color>
+
+  <color name="brown_500">#795548</color>
+  <color name="brown_700">#5d4037</color>
+
+  <color name="grey_50">#fafafa</color>
+  <color name="grey_500">#9e9e9e</color>
+  <color name="grey_700">#616161</color>
+  <color name="grey_800">#424242</color>
+  <color name="grey_900">#212121</color>
+  <color name="grey_statusbar">#111111</color>
+
+  <color name="blue_grey_400">#78909c</color>
+  <color name="blue_grey_500">#607d8b</color>
+  <color name="blue_grey_700">#455a64</color>
+
+  <color name="black_87">#de000000</color>
+  <color name="black_54">#8a000000</color>
+  <color name="black_38">#61000000</color>
+  <color name="black_12">#1f000000</color>
+
+  <color name="white_100">#ffffffff</color>
+  <color name="white_70">#b3ffffff</color>
+  <color name="white_50">#80ffffff</color>
+  <color name="white_12">#1fffffff</color>
+
+  <color name="overdue">@color/red_500</color>
+
+  <color name="md_background_dark">#303030</color>
+  <color name="widget_background_black">#000000</color>
+  <color name="icon_tint_light">@android:color/black</color>
+  <color name="icon_tint_dark">@android:color/white</color>
+
+  <color name="drawer_background_light">#f9f9f9</color>
+  <color name="drawer_background_light_selected">#e8e8e8</color>
+  <color name="drawer_background_dark">#303030</color>
+  <color name="drawer_background_dark_selected">#202020</color>
+
+  <color name="importance_1">@color/red_500</color>
+  <color name="importance_2">@color/amber_500</color>
+  <color name="importance_3">@color/blue_500</color>
+  <color name="importance_4">@color/grey_500</color>
+
+  <color name="snackbar_text_color">#f4b400</color>
+  <color name="snackbar_background">@color/grey_800</color>
+  <color name="tag_color_none_background">#e1e1e1</color>
+
+  <!-- deprecated -->
+  <color name="reminder_background">#262626</color>
 
 </resources>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 035d44786..55918dfbe 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="navigation_drawer_width">260dp</dimen>
-    <dimen name="keyline_first">16dp</dimen>
-    <dimen name="keyline_second">32dp</dimen>
-    <dimen name="keyline_content_inset">72dp</dimen>
+  <dimen name="navigation_drawer_width">260dp</dimen>
+  <dimen name="keyline_first">16dp</dimen>
+  <dimen name="keyline_second">32dp</dimen>
+  <dimen name="keyline_content_inset">72dp</dimen>
 
-    <dimen name="task_list_footer_height">88dp</dimen>
-    <dimen name="task_list_fab_margin">16dp</dimen>
+  <dimen name="task_list_footer_height">88dp</dimen>
+  <dimen name="task_list_fab_margin">16dp</dimen>
 
-    <dimen name="task_edit_double_padding_top_bottom">18dp</dimen>
-    <dimen name="task_edit_drawable_padding_top_bottom">17dp</dimen>
-    <dimen name="task_edit_text_size">16sp</dimen>
+  <dimen name="task_edit_double_padding_top_bottom">18dp</dimen>
+  <dimen name="task_edit_drawable_padding_top_bottom">17dp</dimen>
+  <dimen name="task_edit_text_size">16sp</dimen>
 
-    <item name="tag_characters" format="float" type="dimen">12</item>
+  <item format="float" name="tag_characters" type="dimen">12</item>
 
-    <item name="alpha_secondary" format="float" type="dimen">0.54</item>
-    <item name="alpha_disabled" format="float" type="dimen">0.38</item>
+  <item format="float" name="alpha_secondary" type="dimen">0.54</item>
+  <item format="float" name="alpha_disabled" type="dimen">0.38</item>
 
-    <dimen name="elevation_toolbar">8dp</dimen>
-    <dimen name="elevation_task_list">2dp</dimen>
-    <dimen name="elevation_refresh_indicator">3dp</dimen>
-    <dimen name="elevation_padding">0dp</dimen>
+  <dimen name="elevation_toolbar">8dp</dimen>
+  <dimen name="elevation_task_list">2dp</dimen>
+  <dimen name="elevation_refresh_indicator">3dp</dimen>
+  <dimen name="elevation_padding">0dp</dimen>
 
-    <dimen name="widget_padding">10dp</dimen>
-    <dimen name="week_button_inset">6dp</dimen>
-    <dimen name="week_button_state_on_circle_size">48dp</dimen>
+  <dimen name="widget_padding">10dp</dimen>
+  <dimen name="week_button_inset">6dp</dimen>
+  <dimen name="week_button_state_on_circle_size">48dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/fonts.xml b/app/src/main/res/values/fonts.xml
index cf1294a20..6c7840833 100644
--- a/app/src/main/res/values/fonts.xml
+++ b/app/src/main/res/values/fonts.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="font_fontFamily_medium">sans-serif</string>
+  <string name="font_fontFamily_medium">sans-serif</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index 0d40556aa..cc9e64123 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#2196F3</color>
+  <color name="ic_launcher_background">#2196F3</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index 48a4ef8d2..730e0a441 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="default_quiet_hours_start">79200000</integer> <!-- 22:00 -->
-    <integer name="default_quiet_hours_end">36000000</integer> <!-- 10:00 -->
-    <integer name="default_remind_time">64800000</integer> <!-- 18:00 -->
-    <integer name="default_morning">32400000</integer> <!-- 09:00 -->
-    <integer name="default_afternoon">46800000</integer> <!-- 13:00 -->
-    <integer name="default_evening">61200000</integer> <!-- 17:00 -->
-    <integer name="default_night">72000000</integer> <!-- 20:00 -->
+  <integer name="default_quiet_hours_start">79200000</integer> <!-- 22:00 -->
+  <integer name="default_quiet_hours_end">36000000</integer> <!-- 10:00 -->
+  <integer name="default_remind_time">64800000</integer> <!-- 18:00 -->
+  <integer name="default_morning">32400000</integer> <!-- 09:00 -->
+  <integer name="default_afternoon">46800000</integer> <!-- 13:00 -->
+  <integer name="default_evening">61200000</integer> <!-- 17:00 -->
+  <integer name="default_night">72000000</integer> <!-- 20:00 -->
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 42f94d52e..91284e2ad 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -17,15 +17,15 @@
 
   <!-- ======================================================== REMINDERS == -->
 
-    <string name="p_attachment_dir">custom_files_dir</string>
+  <string name="p_attachment_dir">custom_files_dir</string>
   <string name="p_backup_dir">p_backup_dir</string>
-    <string name="p_rmd_enabled">notif_enabled</string>
+  <string name="p_rmd_enabled">notif_enabled</string>
   <!-- boolean : whether to enable quiet hours or not -->
   <string name="p_rmd_enable_quiet">enable_qhours</string>
 
-    <!-- hour to start quiet hours (inclusive) -->
+  <!-- hour to start quiet hours (inclusive) -->
   <string name="p_rmd_quietStart">notif_qstart_new</string>
-  
+
   <!-- hour to end quiet hours (non-inclusive) -->
   <string name="p_rmd_quietEnd">notif_qend_new</string>
 
@@ -34,19 +34,19 @@
 
   <!-- whether "clear all notifications" clears astrid notifications -->
   <string name="p_rmd_persistent">notif_annoy</string>
-  
+
   <!-- whether to vibrate phone when reminder fires -->
   <string name="p_rmd_vibrate">notif_vibrate</string>
 
   <!-- ringtone to use for notifications -->
   <string name="p_rmd_ringtone">notification_ringtone</string>
-  
+
   <!-- default random reminder setting (in hours) -->
   <string name="p_rmd_default_random_hours">notif_default_reminder</string>
 
   <!-- field missed calls preference -->
   <string name="p_field_missed_calls">field_missed_calls</string>
-  
+
   <!-- calendar reminders preference -->
   <string name="p_calendar_reminders">p_calendar_reminder</string>
 
@@ -54,7 +54,7 @@
   <string name="p_show_today_filter">p_show_today_f</string>
   <string name="p_show_recently_modified_filter">p_show_recently_modified_f</string>
   <string name="p_show_not_in_list_filter">p_show_no_list_f</string>
-  
+
   <!-- show comments in task edit -->
   <string name="p_show_task_edit_comments">p_show_task_edit_comments</string>
 
@@ -87,12 +87,12 @@
   <string name="p_voiceRemindersEnabled">voiceRemindersEnabled</string>
 
   <string name="p_fullTaskTitle">fullTaskTitle</string>
-  
+
   <!-- ========================================================= DEFAULTS == -->
-  
-  <!-- default urgency setting (corresponds to entry in TEA_urgency) -->  
+
+  <!-- default urgency setting (corresponds to entry in TEA_urgency) -->
   <string name="p_default_urgency_key">p_def_urg</string>
-      
+
   <string-array name="EPr_default_importance_values">
     <!-- importance: labels that map EPr_default_importance items to task importance values. -->
     <item>0</item>
@@ -100,7 +100,7 @@
     <item>2</item>
     <item>3</item>
   </string-array>
-      
+
   <string-array name="EPr_default_urgency_values">
     <!-- urgency: labels that map EPr_default_urgency items to index in TEA_urgency. -->
     <item>0</item>
@@ -110,7 +110,7 @@
     <item>4</item>
     <item>5</item>
   </string-array>
-      
+
   <string-array name="EPr_default_hideUntil_values">
     <!-- hideUntil: labels that map EPr_default_hideUntil items to index in TEA_hideUntil. -->
     <item>0</item>
@@ -118,7 +118,7 @@
     <item>2</item>
     <item>3</item>
   </string-array>
-      
+
   <string-array name="EPr_default_reminders_values">
     <!-- reminders: values that map EPr_default_reminders items to reminder flags. -->
     <item>0</item>
@@ -126,20 +126,20 @@
     <item>4</item>
     <item>6</item>
   </string-array>
-  
+
   <string-array name="EPr_default_reminders_mode_values">
     <!-- reminders: values that map EPr_default_reminders items to reminder flags. -->
     <item>0</item>
     <item>16</item>
     <item>8</item>
   </string-array>
-  
+
   <!-- default importance setting (corresponds to task setting) -->
   <string name="p_default_importance_key">p_def_imp</string>
-  
+
   <!-- default hide until setting (corresponds to entry in TEA_hideUntil) -->
   <string name="p_default_hideUntil_key">p_def_hide</string>
-  
+
   <!-- default reminders setting (corresponds to reminder flags) -->
   <string name="p_default_reminders_key">p_def_reminders</string>
 
@@ -148,46 +148,46 @@
 
   <!-- on calendar end at dealline if true, start at deadline if false -->
   <string name="p_end_at_deadline">p_end_at_deadline</string>
-  
+
   <!-- ============================================================ SYNC == -->
-  
-    <string name="sync_SPr_forget_key">sync_forget</string>
+
+  <string name="sync_SPr_forget_key">sync_forget</string>
 
   <!-- ============================================================ OTHER == -->
-  
+
   <!-- Default Calendar Preference Key (do not translate) -->
   <string name="gcal_p_default">default_calendar_id</string>
 
   <string-array name="TEA_control_sets_beast">
-      <item>@string/TEA_control_when</item>
-      <item>@string/TEA_control_repeat</item>
-      <item>@string/TEA_control_importance</item>
-      <item>@string/tags</item>
+    <item>@string/TEA_control_when</item>
+    <item>@string/TEA_control_repeat</item>
+    <item>@string/TEA_control_importance</item>
+    <item>@string/tags</item>
     <item>@string/TEA_control_google_task_list</item>
-      <item>@string/TEA_control_reminders</item>
-      <item>@string/TEA_control_files</item>
-      <item>@string/TEA_control_notes</item>
-      <item>@string/TEA_hideUntil_label</item>
-      <item>@string/TEA_control_gcal</item>
-      <item>@string/TEA_control_timer</item>
-      <item>@string/TEA_control_hidden_section</item>
+    <item>@string/TEA_control_reminders</item>
+    <item>@string/TEA_control_files</item>
+    <item>@string/TEA_control_notes</item>
+    <item>@string/TEA_hideUntil_label</item>
+    <item>@string/TEA_control_gcal</item>
+    <item>@string/TEA_control_timer</item>
+    <item>@string/TEA_control_hidden_section</item>
   </string-array>
 
-    <string name="TEA_ctrl_title_pref">TEA_ctrl_title_pref</string> <!-- Deprecated -->
-    <string name="TEA_ctrl_when_pref">TEA_ctrl_when_pref</string>
-    <string name="TEA_ctrl_repeat_pref">TEA_ctrl_repeat_pref</string>
-    <string name="TEA_ctrl_importance_pref">TEA_ctrl_importance_pref</string>
-    <string name="TEA_ctrl_lists_pref">TEA_ctrl_lists_pref</string>
-    <string name="TEA_ctrl_notes_pref">TEA_ctrl_notes_pref</string>
-    <string name="TEA_ctrl_files_pref">TEA_ctrl_files_pref</string>
-    <string name="TEA_ctrl_hide_until_pref">TEA_ctrl_hide_until_pref</string>
-    <string name="TEA_ctrl_hide_section_pref">TEA_ctrl_hide_section_pref</string>
-    <string name="TEA_ctrl_reminders_pref">TEA_ctrl_reminders_pref</string>
-    <string name="TEA_ctrl_timer_pref">TEA_ctrl_timer_pref</string>
+  <string name="TEA_ctrl_title_pref">TEA_ctrl_title_pref</string> <!-- Deprecated -->
+  <string name="TEA_ctrl_when_pref">TEA_ctrl_when_pref</string>
+  <string name="TEA_ctrl_repeat_pref">TEA_ctrl_repeat_pref</string>
+  <string name="TEA_ctrl_importance_pref">TEA_ctrl_importance_pref</string>
+  <string name="TEA_ctrl_lists_pref">TEA_ctrl_lists_pref</string>
+  <string name="TEA_ctrl_notes_pref">TEA_ctrl_notes_pref</string>
+  <string name="TEA_ctrl_files_pref">TEA_ctrl_files_pref</string>
+  <string name="TEA_ctrl_hide_until_pref">TEA_ctrl_hide_until_pref</string>
+  <string name="TEA_ctrl_hide_section_pref">TEA_ctrl_hide_section_pref</string>
+  <string name="TEA_ctrl_reminders_pref">TEA_ctrl_reminders_pref</string>
+  <string name="TEA_ctrl_timer_pref">TEA_ctrl_timer_pref</string>
   <string name="TEA_ctrl_comments">TEA_ctrl_comments</string>
-    <string name="TEA_ctrl_gcal">TEA_ctrl_gcal</string>
+  <string name="TEA_ctrl_gcal">TEA_ctrl_gcal</string>
   <string name="TEA_ctrl_google_task_list">TEA_ctrl_gtask</string>
-    <string name="sync_gtasks">sync_gtasks</string>
+  <string name="sync_gtasks">sync_gtasks</string>
   <string name="p_geofence_radius">geolocation_radius</string>
   <string name="p_geofence_responsiveness">geofence_responsiveness</string>
   <string name="p_show_hidden_tasks">show_hidden_tasks</string>
@@ -196,25 +196,25 @@
   <string name="p_manual_sort">manual_sort</string>
 
   <string-array name="TEA_control_sets_prefs">
-        <item>@string/TEA_ctrl_when_pref</item>
-        <item>@string/TEA_ctrl_repeat_pref</item>
-        <item>@string/TEA_ctrl_importance_pref</item>
-        <item>@string/TEA_ctrl_lists_pref</item>
+    <item>@string/TEA_ctrl_when_pref</item>
+    <item>@string/TEA_ctrl_repeat_pref</item>
+    <item>@string/TEA_ctrl_importance_pref</item>
+    <item>@string/TEA_ctrl_lists_pref</item>
     <item>@string/TEA_ctrl_google_task_list</item>
-        <item>@string/TEA_ctrl_reminders_pref</item>
-        <item>@string/TEA_ctrl_files_pref</item>
-        <item>@string/TEA_ctrl_notes_pref</item>
-        <item>@string/TEA_ctrl_hide_until_pref</item>
-        <item>@string/TEA_ctrl_gcal</item>
-        <item>@string/TEA_ctrl_timer_pref</item>
-        <item>@string/TEA_ctrl_hide_section_pref</item>
-    </string-array>
-
-    <string-array name="EPr_default_reminders_mode">
-        <item>@string/ring_once</item>
-        <item>@string/ring_five_times</item>
-        <item>@string/ring_nonstop</item>
-    </string-array>
+    <item>@string/TEA_ctrl_reminders_pref</item>
+    <item>@string/TEA_ctrl_files_pref</item>
+    <item>@string/TEA_ctrl_notes_pref</item>
+    <item>@string/TEA_ctrl_hide_until_pref</item>
+    <item>@string/TEA_ctrl_gcal</item>
+    <item>@string/TEA_ctrl_timer_pref</item>
+    <item>@string/TEA_ctrl_hide_section_pref</item>
+  </string-array>
+
+  <string-array name="EPr_default_reminders_mode">
+    <item>@string/ring_once</item>
+    <item>@string/ring_five_times</item>
+    <item>@string/ring_nonstop</item>
+  </string-array>
 
   <string name="p_collect_statistics">collect_statistics</string>
   <string name="p_back_button_saves_task">back_button_saves_task</string>
@@ -294,7 +294,7 @@
   <string name="p_bundle_notifications">bundle_notifications</string>
   <string name="p_strict_mode">strict_mode</string>
   <string name="warned_play_services">warned_play_services</string>
-    <string name="p_sync_caldav">sync_caldav</string>
+  <string name="p_sync_caldav">sync_caldav</string>
   <string name="p_background_sync_unmetered_only">background_sync_unmetered_only</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3543ed544..a85fd8f06 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- ================================================== general terms == -->
+  <!-- ================================================== general terms == -->
 
-    <!-- menu item to clear picture selection -->
-    <string name="actfm_picture_clear">Clear Picture</string>
+  <!-- menu item to clear picture selection -->
+  <string name="actfm_picture_clear">Clear Picture</string>
 
-    <!-- ================================================== TagViewActivity == -->
+  <!-- ================================================== TagViewActivity == -->
 
-    <!-- Tag View Activity: Add Comment hint -->
-    <string name="TVA_add_comment">Add a comment…</string>
+  <!-- Tag View Activity: Add Comment hint -->
+  <string name="TVA_add_comment">Add a comment…</string>
 
-    <string name="name">Name</string>
+  <string name="name">Name</string>
 
-    <string name="enter_filter_name">Enter filter name</string>
+  <string name="enter_filter_name">Enter filter name</string>
 
-    <!-- ================================================= BackupPreferences == -->
+  <!-- ================================================= BackupPreferences == -->
 
-    <!-- slide 33c/48d: Backup Preferences Title -->
-    <string name="backup_BPr_header">Backups</string>
+  <!-- slide 33c/48d: Backup Preferences Title -->
+  <string name="backup_BPr_header">Backups</string>
 
-    <!-- backup activity import button -->
-    <string name="backup_BAc_import">Import tasks</string>
+  <!-- backup activity import button -->
+  <string name="backup_BAc_import">Import tasks</string>
 
-    <!-- backup activity export button -->
-    <string name="backup_BAc_export">Export tasks</string>
+  <!-- backup activity export button -->
+  <string name="backup_BAc_export">Export tasks</string>
 
-    <!-- ============================================== Importer / Exporter == -->
+  <!-- ============================================== Importer / Exporter == -->
 
-    <string name="export_toast">Backed up %1$s to %2$s.</string>
+  <string name="export_toast">Backed up %1$s to %2$s.</string>
 
-    <string name="export_toast_no_tasks">No tasks to export.</string>
+  <string name="export_toast_no_tasks">No tasks to export.</string>
 
-    <!-- Backup: Title of Import Summary Dialog -->
-    <string name="import_summary_title">Restore summary</string>
+  <!-- Backup: Title of Import Summary Dialog -->
+  <string name="import_summary_title">Restore summary</string>
 
-    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
   <string name="import_summary_message">
 File %1$s contained %2$s.\n\n
 %3$s imported,\n
@@ -43,273 +43,273 @@ File %1$s contained %2$s.\n\n
 %5$s had errors\n
   </string>
 
-    <!-- Progress Dialog text for import reading task (%d -> task number)-->
-    <string name="import_progress_read">Reading task %d…</string>
+  <!-- Progress Dialog text for import reading task (%d -> task number)-->
+  <string name="import_progress_read">Reading task %d…</string>
 
-    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-    <string name="DLG_error_sdcard">Cannot access folder: %s</string>
+  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+  <string name="DLG_error_sdcard">Cannot access folder: %s</string>
 
-    <!-- Backup: Dialog when unable to open SD card in general -->
-    <string name="DLG_error_sdcard_general">Cannot access your SD card!</string>
+  <!-- Backup: Dialog when unable to open SD card in general -->
+  <string name="DLG_error_sdcard_general">Cannot access your SD card!</string>
 
-    <!-- ================================================== AndroidManifest == -->
+  <!-- ================================================== AndroidManifest == -->
 
-    <!-- permission title for READ_TASKS -->
-    <string name="read_permission_label">Tasks Permission</string>
+  <!-- permission title for READ_TASKS -->
+  <string name="read_permission_label">Tasks Permission</string>
 
-    <!-- ================================================== Generic Dialogs == -->
+  <!-- ================================================== Generic Dialogs == -->
 
-    <string name="discard_confirmation">Are you sure you want to discard your changes?</string>
+  <string name="discard_confirmation">Are you sure you want to discard your changes?</string>
 
-    <string name="keep_editing">Keep editing</string>
+  <string name="keep_editing">Keep editing</string>
 
-    <!-- question for deleting tasks -->
-    <string name="DLG_delete_this_task_question">Delete this task?</string>
+  <!-- question for deleting tasks -->
+  <string name="DLG_delete_this_task_question">Delete this task?</string>
 
-    <!-- Title for dialog selecting a time (hours and minutes) -->
-    <string name="DLG_hour_minutes">Time (hours : minutes)</string>
+  <!-- Title for dialog selecting a time (hours and minutes) -->
+  <string name="DLG_hour_minutes">Time (hours : minutes)</string>
 
-    <!-- Dialog - dismiss -->
+  <!-- Dialog - dismiss -->
 
-    <string name="DLG_undo">Undo</string>
+  <string name="DLG_undo">Undo</string>
 
-    <!-- =============================================================== UI == -->
+  <!-- =============================================================== UI == -->
 
-    <!-- Label for DateButtons with no value -->
-    <string name="WID_dateButtonUnset">Click to set</string>
+  <!-- Label for DateButtons with no value -->
+  <string name="WID_dateButtonUnset">Click to set</string>
 
-    <!-- ================================================= TaskListActivity == -->
+  <!-- ================================================= TaskListActivity == -->
 
-    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
-    <string name="TLA_no_items">There are no tasks here.</string>
+  <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+  <string name="TLA_no_items">There are no tasks here.</string>
 
-    <!-- Menu: Adjust Sort and Hidden Task Settings -->
-    <string name="TLA_menu_sort">Sort</string>
+  <!-- Menu: Adjust Sort and Hidden Task Settings -->
+  <string name="TLA_menu_sort">Sort</string>
 
-    <!-- Menu: Search -->
-    <string name="TLA_menu_search">Search</string>
+  <!-- Menu: Search -->
+  <string name="TLA_menu_search">Search</string>
 
-    <!-- Menu: Settings -->
-    <string name="TLA_menu_settings">Settings</string>
+  <!-- Menu: Settings -->
+  <string name="TLA_menu_settings">Settings</string>
 
-    <!-- ====================================================== TaskAdapter == -->
+  <!-- ====================================================== TaskAdapter == -->
 
-    <!-- Format string to indicate task is hidden (%s => task name) -->
-    <string name="TAd_hiddenFormat">%s [hidden]</string>
+  <!-- Format string to indicate task is hidden (%s => task name) -->
+  <string name="TAd_hiddenFormat">%s [hidden]</string>
 
-    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-    <string name="TAd_completed">Finished\n%s</string>
+  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+  <string name="TAd_completed">Finished\n%s</string>
 
-    <!-- slide 15a: Action Button: edit task -->
-    <string name="TAd_actionEditTask">Edit</string>
+  <!-- slide 15a: Action Button: edit task -->
+  <string name="TAd_actionEditTask">Edit</string>
 
-    <!-- ============================================== SortSelectionDialog == -->
+  <!-- ============================================== SortSelectionDialog == -->
 
-    <!-- Sort Selection: drag with subtasks -->
-    <string name="SSD_sort_drag">Manual order with subtasks</string>
+  <!-- Sort Selection: drag with subtasks -->
+  <string name="SSD_sort_drag">Manual order with subtasks</string>
 
-    <!-- slide 23b: Sort Selection: smart sort -->
-    <string name="SSD_sort_auto">Smart sort</string>
+  <!-- slide 23b: Sort Selection: smart sort -->
+  <string name="SSD_sort_auto">Smart sort</string>
 
-    <!-- slide 23e: Sort Selection: sort by alpha -->
-    <string name="SSD_sort_alpha">By title</string>
+  <!-- slide 23e: Sort Selection: sort by alpha -->
+  <string name="SSD_sort_alpha">By title</string>
 
-    <!-- slide 23c: Sort Selection: sort by due date -->
-    <string name="SSD_sort_due">By due date</string>
+  <!-- slide 23c: Sort Selection: sort by due date -->
+  <string name="SSD_sort_due">By due date</string>
 
-    <!-- slide 23d: Sort Selection: sort by importance -->
-    <string name="SSD_sort_importance">By priority</string>
+  <!-- slide 23d: Sort Selection: sort by importance -->
+  <string name="SSD_sort_importance">By priority</string>
 
-    <!-- slide 23f: Sort Selection: sort by modified date -->
-    <string name="SSD_sort_modified">By last modified</string>
+  <!-- slide 23f: Sort Selection: sort by modified date -->
+  <string name="SSD_sort_modified">By last modified</string>
 
-    <!-- =============================================== FilterListActivity == -->
+  <!-- =============================================== FilterListActivity == -->
 
-    <!-- Search Filter name (%s => query) -->
-    <string name="FLA_search_filter">Matching \'%s\'</string>
+  <!-- Search Filter name (%s => query) -->
+  <string name="FLA_search_filter">Matching \'%s\'</string>
 
-    <!-- Menu: new filter -->
-    <string name="FLA_new_filter">Create new filter</string>
+  <!-- Menu: new filter -->
+  <string name="FLA_new_filter">Create new filter</string>
 
-    <!-- ================================================= TaskEditActivity == -->
+  <!-- ================================================= TaskEditActivity == -->
 
-    <!-- Task title hint (displayed when edit box is empty) -->
-    <string name="TEA_title_hint">Task name</string>
+  <!-- Task title hint (displayed when edit box is empty) -->
+  <string name="TEA_title_hint">Task name</string>
 
-    <!-- Task importance label -->
-    <string name="TEA_importance_label">Priority</string>
+  <!-- Task importance label -->
+  <string name="TEA_importance_label">Priority</string>
 
-    <string name="TEA_no_date">No date</string>
+  <string name="TEA_no_date">No date</string>
 
-    <!-- Task hide until label -->
-    <string name="TEA_hideUntil_label">Hide until</string>
+  <!-- Task hide until label -->
+  <string name="TEA_hideUntil_label">Hide until</string>
 
-    <!-- Task hide until label -->
-    <string name="TEA_hideUntil_display">Hide until %s</string>
+  <!-- Task hide until label -->
+  <string name="TEA_hideUntil_display">Hide until %s</string>
 
-    <!-- slide 16c: Task note label -->
-    <string name="TEA_note_label">Description</string>
+  <!-- slide 16c: Task note label -->
+  <string name="TEA_note_label">Description</string>
 
-    <!-- Estimated time label -->
-    <string name="TEA_estimatedDuration_label">How long will it take?</string>
+  <!-- Estimated time label -->
+  <string name="TEA_estimatedDuration_label">How long will it take?</string>
 
-    <!-- Elapsed time label -->
-    <string name="TEA_elapsedDuration_label">Time already spent</string>
+  <!-- Elapsed time label -->
+  <string name="TEA_elapsedDuration_label">Time already spent</string>
 
-    <string name="save">Save</string>
+  <string name="save">Save</string>
 
-    <string name="TEA_timer_est">Est. %s</string>
+  <string name="TEA_timer_est">Est. %s</string>
 
-    <string name="TEA_timer_elap">Elapsed %s</string>
+  <string name="TEA_timer_elap">Elapsed %s</string>
 
-    <string name="TEA_no_time">No time</string>
+  <string name="TEA_no_time">No time</string>
 
-    <string name="due_date">Due date</string>
-    <string name="due_time">Due time</string>
-    <string name="day_before_due">Day before due</string>
-    <string name="week_before_due">Week before due</string>
+  <string name="due_date">Due date</string>
+  <string name="due_time">Due time</string>
+  <string name="day_before_due">Day before due</string>
+  <string name="week_before_due">Week before due</string>
 
-    <!-- Task edit control set descriptors -->
+  <!-- Task edit control set descriptors -->
 
-    <string name="TEA_control_when">When</string>
-    <string name="TEA_control_repeat">Repeat</string>
-    <string name="TEA_control_gcal">Calendar</string>
-    <string name="TEA_control_importance">Priority</string>
-    <string name="TEA_control_notes">Description</string>
+  <string name="TEA_control_when">When</string>
+  <string name="TEA_control_repeat">Repeat</string>
+  <string name="TEA_control_gcal">Calendar</string>
+  <string name="TEA_control_importance">Priority</string>
+  <string name="TEA_control_notes">Description</string>
 
-    <string name="TEA_control_files">Files</string>
+  <string name="TEA_control_files">Files</string>
   <string name="TEA_control_google_task_list">Google Task List</string>
 
-    <string name="TEA_control_reminders">Reminders</string>
+  <string name="TEA_control_reminders">Reminders</string>
 
-    <string name="TEA_control_timer">Timer Controls</string>
+  <string name="TEA_control_timer">Timer Controls</string>
 
-    <string name="TEA_control_hidden_section">----Hide Always----</string>
+  <string name="TEA_control_hidden_section">----Hide Always----</string>
 
-    <!-- Text to load more activity -->
-    <string name="TEA_load_more">Load more…</string>
+  <!-- Text to load more activity -->
+  <string name="TEA_load_more">Load more…</string>
 
-    <!-- ===================================================== MissedCallActivity == -->
+  <!-- ===================================================== MissedCallActivity == -->
 
-    <string name="missed_call">Missed call from %s</string>
+  <string name="missed_call">Missed call from %s</string>
 
-    <!-- Missed call: return call -->
-    <string name="MCA_return_call">Call now</string>
+  <!-- Missed call: return call -->
+  <string name="MCA_return_call">Call now</string>
 
-    <!-- Missed call: return call -->
-    <string name="MCA_add_task">Call later</string>
+  <!-- Missed call: return call -->
+  <string name="MCA_add_task">Call later</string>
 
-    <!-- Missed call: return call -->
-    <string name="MCA_ignore">Ignore</string>
+  <!-- Missed call: return call -->
+  <string name="MCA_ignore">Ignore</string>
 
-    <string name="missed_calls">Missed calls</string>
+  <string name="missed_calls">Missed calls</string>
 
-    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-    <string name="MCA_task_title_name">Call %1$s back at %2$s</string>
+  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+  <string name="MCA_task_title_name">Call %1$s back at %2$s</string>
 
-    <!-- Missed call: task title no name (%s -> number)-->
-    <string name="MCA_task_title_no_name">Call %s back</string>
+  <!-- Missed call: task title no name (%s -> number)-->
+  <string name="MCA_task_title_no_name">Call %s back</string>
 
-    <!-- ======================================= Calendar reminder activity == -->
+  <!-- ======================================= Calendar reminder activity == -->
 
-    <!-- Calendar remindeer ignore button -->
-    <string name="CRA_ignore">Ignore</string>
+  <!-- Calendar remindeer ignore button -->
+  <string name="CRA_ignore">Ignore</string>
 
-    <!-- Calendar event -->
-    <string name="CRA_title">Need a meeting list?</string>
+  <!-- Calendar event -->
+  <string name="CRA_title">Need a meeting list?</string>
 
-    <!-- Calendar reminder: dialog to ignore all missed calls body -->
-    <string name="CRA_ignore_body">You\'ve ignored several calendar events. Should Tasks stop asking you about them?</string>
+  <!-- Calendar reminder: dialog to ignore all missed calls body -->
+  <string name="CRA_ignore_body">You\'ve ignored several calendar events. Should Tasks stop asking you about them?</string>
 
-    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-    <string name="CRA_ignore_all">Ignore all events</string>
+  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+  <string name="CRA_ignore_all">Ignore all events</string>
 
-    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-    <string name="CRA_ignore_this">Ignore this event only</string>
+  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+  <string name="CRA_ignore_this">Ignore this event only</string>
 
-    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-    <string name="CRA_speech_bubble_start">Looks like %s is starting soon. Want to create a list for action items?</string>
+  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+  <string name="CRA_speech_bubble_start">Looks like %s is starting soon. Want to create a list for action items?</string>
 
-    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-    <string name="CRA_speech_bubble_end">Looks like you just finished with %s. Want to create a list for action items?</string>
+  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+  <string name="CRA_speech_bubble_end">Looks like you just finished with %s. Want to create a list for action items?</string>
 
-    <!-- Calendar reminder: postpone button -->
-    <string name="CRA_postpone">Maybe afterwards</string>
+  <!-- Calendar reminder: postpone button -->
+  <string name="CRA_postpone">Maybe afterwards</string>
 
-    <!-- Calendar reminder: preference title -->
-    <string name="CRA_calendar_reminders_pref_title">Calendar assistant</string>
+  <!-- Calendar reminder: preference title -->
+  <string name="CRA_calendar_reminders_pref_title">Calendar assistant</string>
 
-    <!-- Calendar reminder: pref description enabled -->
-    <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks will remind you about upcoming calendar events and prompt you to prepare for them</string>
+  <!-- Calendar reminder: pref description enabled -->
+  <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks will remind you about upcoming calendar events and prompt you to prepare for them</string>
 
-    <!-- Calendar reminder: default new list name (%s -> event title) -->
-    <string name="CRA_default_list_name">Action Items: %s</string>
+  <!-- Calendar reminder: default new list name (%s -> event title) -->
+  <string name="CRA_default_list_name">Action Items: %s</string>
 
-    <!-- ================================================== EditPreferences == -->
+  <!-- ================================================== EditPreferences == -->
 
-    <string name="none">None</string>
+  <string name="none">None</string>
 
-    <!-- slide 30i: Preference Category: Appearance Title -->
-    <string name="EPr_appearance_header">Appearance</string>
+  <!-- slide 30i: Preference Category: Appearance Title -->
+  <string name="EPr_appearance_header">Appearance</string>
 
-    <!-- Preference: Filters to show pref screen title -->
-    <string name="EPr_filters_to_show_title">Filters to show</string>
+  <!-- Preference: Filters to show pref screen title -->
+  <string name="EPr_filters_to_show_title">Filters to show</string>
 
-    <!-- Edit screen preference category -->
-    <string name="EPr_edit_screen_options">Edit screen options</string>
+  <!-- Edit screen preference category -->
+  <string name="EPr_edit_screen_options">Edit screen options</string>
 
-    <string name="EPr_beastMode_reset">Reset to defaults</string>
+  <string name="EPr_beastMode_reset">Reset to defaults</string>
 
-    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-    <string name="EPr_fullTask_title">Show full task title</string>
+  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+  <string name="EPr_fullTask_title">Show full task title</string>
 
-    <!-- Preference: task edit comments -->
-    <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
+  <!-- Preference: task edit comments -->
+  <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
 
-    <string name="task_list_options">Task list options</string>
+  <string name="task_list_options">Task list options</string>
 
-    <!-- Preferences: calendar event start time -->
-    <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
-    <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
-    <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+  <!-- Preferences: calendar event start time -->
+  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
 
-    <!-- ========================================== Task Management Settings == -->
+  <!-- ========================================== Task Management Settings == -->
 
-    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-    <string name="EPr_manage_header">Manage old tasks</string>
-    <string name="EPr_manage_purge_deleted">Purge deleted tasks</string>
-    <string name="EPr_manage_purge_deleted_message">Do you really want to purge all your deleted tasks?\n\nThese tasks will be gone forever!</string>
-    <string name="EPr_manage_purge_deleted_status">Purged %d tasks!</string>
-    <string name="EPr_reset_preferences">Reset preferences</string>
-    <string name="EPr_reset_preferences_warning">Preferences will be reset to default values</string>
-    <string name="EPr_delete_task_data">Delete task data</string>
-    <string name="EPr_delete_task_data_warning">All tasks will be permanently deleted</string>
+  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+  <string name="EPr_manage_header">Manage old tasks</string>
+  <string name="EPr_manage_purge_deleted">Purge deleted tasks</string>
+  <string name="EPr_manage_purge_deleted_message">Do you really want to purge all your deleted tasks?\n\nThese tasks will be gone forever!</string>
+  <string name="EPr_manage_purge_deleted_status">Purged %d tasks!</string>
+  <string name="EPr_reset_preferences">Reset preferences</string>
+  <string name="EPr_reset_preferences_warning">Preferences will be reset to default values</string>
+  <string name="EPr_delete_task_data">Delete task data</string>
+  <string name="EPr_delete_task_data_warning">All tasks will be permanently deleted</string>
 
-    <string name="EPr_manage_delete_completed_gcal">Delete calendar events for completed tasks</string>
-    <string name="EPr_manage_delete_completed_gcal_message">Do you really want to delete all your events for completed tasks?</string>
-    <string name="EPr_manage_delete_completed_gcal_status">Deleted %d calendar events!</string>
+  <string name="EPr_manage_delete_completed_gcal">Delete calendar events for completed tasks</string>
+  <string name="EPr_manage_delete_completed_gcal_message">Do you really want to delete all your events for completed tasks?</string>
+  <string name="EPr_manage_delete_completed_gcal_status">Deleted %d calendar events!</string>
 
-    <string name="EPr_manage_delete_all_gcal">Delete all calendar events for tasks</string>
-    <string name="EPr_manage_delete_all_gcal_message">Do you really want to delete all your events for tasks?</string>
-    <string name="EPr_manage_delete_all_gcal_status">Deleted %d calendar events!</string>
+  <string name="EPr_manage_delete_all_gcal">Delete all calendar events for tasks</string>
+  <string name="EPr_manage_delete_all_gcal_message">Do you really want to delete all your events for tasks?</string>
+  <string name="EPr_manage_delete_all_gcal_status">Deleted %d calendar events!</string>
 
-    <!-- ============================================================= Misc == -->
+  <!-- ============================================================= Misc == -->
 
-    <string name="task_defaults">Task defaults</string>
-    <!-- slide 41f:  Preference: Default Urgency Title -->
-    <string name="EPr_default_urgency_title">Default deadline</string>
+  <string name="task_defaults">Task defaults</string>
+  <!-- slide 41f:  Preference: Default Urgency Title -->
+  <string name="EPr_default_urgency_title">Default deadline</string>
 
-    <!-- slide 40a: Preference: Default Importance Title -->
-    <string name="EPr_default_importance_title">Default priority</string>
+  <!-- slide 40a: Preference: Default Importance Title -->
+  <string name="EPr_default_importance_title">Default priority</string>
 
-    <!-- slide 42e: Preference: Default Hide Until Title -->
-    <string name="EPr_default_hideUntil_title">Default hide until</string>
+  <!-- slide 42e: Preference: Default Hide Until Title -->
+  <string name="EPr_default_hideUntil_title">Default hide until</string>
 
-    <!-- slide 43e: Preference: Default Reminders Title -->
-    <string name="EPr_default_reminders_title">Default reminders</string>
+  <!-- slide 43e: Preference: Default Reminders Title -->
+  <string name="EPr_default_reminders_title">Default reminders</string>
 
-    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-    <string name="EPr_default_reminders_mode_title">Default ring/vibrate type</string>
+  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+  <string name="EPr_default_reminders_mode_title">Default ring/vibrate type</string>
 
   <string name="priority_high">High</string>
   <string name="priority_medium">Medium</string>
@@ -327,133 +327,133 @@ File %1$s contained %2$s.\n\n
 
   <!-- ================================================= Filter Exposer == -->
 
-    <!-- Active Tasks Filter -->
-    <string name="BFE_Active">My Tasks</string>
+  <!-- Active Tasks Filter -->
+  <string name="BFE_Active">My Tasks</string>
 
-    <!-- slide 10b: Recently Modified -->
-    <string name="BFE_Recent">Recently modified</string>
+  <!-- slide 10b: Recently Modified -->
+  <string name="BFE_Recent">Recently modified</string>
 
-    <!-- =========================================== CustomFilterActivity == -->
+  <!-- =========================================== CustomFilterActivity == -->
 
-    <!-- slide 30a: Filter Starting Universe: all tasks -->
-    <string name="CFA_universe_all">Active Tasks</string>
+  <!-- slide 30a: Filter Starting Universe: all tasks -->
+  <string name="CFA_universe_all">Active Tasks</string>
 
-    <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
-    <string name="CFA_type_add">or</string>
+  <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
+  <string name="CFA_type_add">or</string>
 
-    <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
-    <string name="CFA_type_subtract">not</string>
+  <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
+  <string name="CFA_type_subtract">not</string>
 
-    <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
-    <string name="CFA_type_intersect">also</string>
+  <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
+  <string name="CFA_type_intersect">also</string>
 
-    <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
-    <string name="CFA_context_chain">%s has criteria</string>
+  <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
+  <string name="CFA_context_chain">%s has criteria</string>
 
-    <!-- Filter Criteria Context Menu: delete -->
-    <string name="CFA_context_delete">Delete Row</string>
+  <!-- Filter Criteria Context Menu: delete -->
+  <string name="CFA_context_delete">Delete Row</string>
 
-    <!-- slide 30b: Filter Screen Help Text -->
-    <string name="CFA_help">Long press on items for additional options</string>
+  <!-- slide 30b: Filter Screen Help Text -->
+  <string name="CFA_help">Long press on items for additional options</string>
 
-    <!-- slide 30c: Filter Button: add new -->
-    <string name="CFA_button_add">Add Criteria</string>
+  <!-- slide 30c: Filter Button: add new -->
+  <string name="CFA_button_add">Add Criteria</string>
 
-    <!-- =========================================== CustomFilterCriteria == -->
+  <!-- =========================================== CustomFilterCriteria == -->
 
-    <!-- Criteria: due by X - display text (? -> user input) -->
-    <string name="CFC_dueBefore_text">Due By: ?</string>
-    <!-- Criteria: due by X - name of criteria -->
-    <string name="CFC_dueBefore_name">Due By…</string>
+  <!-- Criteria: due by X - display text (? -> user input) -->
+  <string name="CFC_dueBefore_text">Due By: ?</string>
+  <!-- Criteria: due by X - name of criteria -->
+  <string name="CFC_dueBefore_name">Due By…</string>
 
   <string name="no_due_date">No Due Date</string>
   <string name="next_month">Next Month</string>
 
   <!-- Criteria: importance - display text (? -> user input)-->
-    <string name="CFC_importance_text">Priority at least ?</string>
-    <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Priority…</string>
+  <string name="CFC_importance_text">Priority at least ?</string>
+  <!-- Criteria: importance - name of criteria -->
+  <string name="CFC_importance_name">Priority…</string>
 
-    <!-- Criteria: tag - display text (? -> user input) -->
-    <string name="CFC_tag_text">Tag: ?</string>
-    <!-- Criteria: tag - name of criteria -->
-    <string name="CFC_tag_name">Tag…</string>
+  <!-- Criteria: tag - display text (? -> user input) -->
+  <string name="CFC_tag_text">Tag: ?</string>
+  <!-- Criteria: tag - name of criteria -->
+  <string name="CFC_tag_name">Tag…</string>
 
-    <!-- Criteria: tag_contains - name of criteria -->
-    <string name="CFC_tag_contains_name">Tag name contains…</string>
-    <!-- Criteria: tag_contains - text (? -> user input) -->
-    <string name="CFC_tag_contains_text">Tag name contains: ?</string>
+  <!-- Criteria: tag_contains - name of criteria -->
+  <string name="CFC_tag_contains_name">Tag name contains…</string>
+  <!-- Criteria: tag_contains - text (? -> user input) -->
+  <string name="CFC_tag_contains_text">Tag name contains: ?</string>
 
-    <!-- Criteria: title_contains - name of criteria -->
-    <string name="CFC_title_contains_name">Title contains…</string>
-    <!-- Criteria: title_contains - text (? -> user input) -->
-    <string name="CFC_title_contains_text">Title contains: ?</string>
+  <!-- Criteria: title_contains - name of criteria -->
+  <string name="CFC_title_contains_name">Title contains…</string>
+  <!-- Criteria: title_contains - text (? -> user input) -->
+  <string name="CFC_title_contains_text">Title contains: ?</string>
 
-    <!-- =============================================== Task Edit Controls == -->
+  <!-- =============================================== Task Edit Controls == -->
 
-    <!-- Error message for adding to calendar  -->
-    <string name="gcal_TEA_error">Error adding task to calendar!</string>
+  <!-- Error message for adding to calendar  -->
+  <string name="gcal_TEA_error">Error adding task to calendar!</string>
 
-    <!-- Label when calendar event already exists -->
-    <string name="gcal_TEA_showCalendar_label">Open Calendar Event</string>
+  <!-- Label when calendar event already exists -->
+  <string name="gcal_TEA_showCalendar_label">Open Calendar Event</string>
 
   <string name="delete_calendar_event_confirmation">Delete calendar event?</string>
   <string name="calendar_event_not_found">Calendar event not found</string>
 
-    <!-- ======================================================== Calendars == -->
+  <!-- ======================================================== Calendars == -->
 
-    <!-- Calendar event name when task is completed (%s => task title) -->
-    <string name="gcal_completed_title">%s (completed)</string>
+  <!-- Calendar event name when task is completed (%s => task title) -->
+  <string name="gcal_completed_title">%s (completed)</string>
 
 
-    <!-- ============================================================= UI == -->
+  <!-- ============================================================= UI == -->
 
-    <!-- short help title for Gtasks -->
+  <!-- short help title for Gtasks -->
 
-    <string name="CFC_gtasks_list_text">In List: ?</string>
+  <string name="CFC_gtasks_list_text">In List: ?</string>
 
-    <string name="CFC_gtasks_list_name">In GTasks List…</string>
+  <string name="CFC_gtasks_list_name">In GTasks List…</string>
 
-    <!-- Label for clear completed menu item -->
-    <string name="gtasks_GTA_clear_completed">Clear Completed</string>
+  <!-- Label for clear completed menu item -->
+  <string name="gtasks_GTA_clear_completed">Clear Completed</string>
 
-    <!-- ============================================ GtasksLoginActivity == -->
+  <!-- ============================================ GtasksLoginActivity == -->
 
-    <!--  Authenticating toast -->
-    <string name="gtasks_GLA_authenticating">Authenticating…</string>
+  <!--  Authenticating toast -->
+  <string name="gtasks_GLA_authenticating">Authenticating…</string>
 
-    <!-- Error Message when we receive an IO Exception -->
-    <string name="gtasks_GLA_errorIOAuth">Sorry, we had trouble communicating with Google servers. Please try again later.</string>
+  <!-- Error Message when we receive an IO Exception -->
+  <string name="gtasks_GLA_errorIOAuth">Sorry, we had trouble communicating with Google servers. Please try again later.</string>
 
-    <!-- ===========================================SynchronizationPreferencesnces == -->
+  <!-- ===========================================SynchronizationPreferencesnces == -->
 
-    <!-- GTasks Preferences Title -->
-    <string name="gtasks_GPr_header">Google Tasks</string>
+  <!-- GTasks Preferences Title -->
+  <string name="gtasks_GPr_header">Google Tasks</string>
 
-    <!-- ================================================ Synchronization == -->
+  <!-- ================================================ Synchronization == -->
 
-    <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">Account %s not found—please log out and log back in from the Google Tasks settings.</string>
+  <!-- Error for account not found -->
+  <string name="gtasks_error_accountNotFound">Account %s not found—please log out and log back in from the Google Tasks settings.</string>
 
 
-    <string name="premium_record_audio">Record a note</string>
-    <string name="premium_remove_file_confirm">Are you sure? Cannot be undone</string>
+  <string name="premium_record_audio">Record a note</string>
+  <string name="premium_remove_file_confirm">Are you sure? Cannot be undone</string>
 
-    <string name="audio_recording_title">Recording Audio</string>
-    <string name="audio_stop_recording">Stop Recording</string>
+  <string name="audio_recording_title">Recording Audio</string>
+  <string name="audio_stop_recording">Stop Recording</string>
 
-    <string name="file_type_unhandled">Sorry! No application was found to handle this file type.</string>
+  <string name="file_type_unhandled">Sorry! No application was found to handle this file type.</string>
 
-    <string name="file_err_copy">Error copying file for attachment</string>
+  <string name="file_err_copy">Error copying file for attachment</string>
 
-    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
-    <string name="ring_once">Ring once</string>
+  <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+  <string name="ring_once">Ring once</string>
 
-    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
-    <string name="ring_five_times">Ring five times</string>
+  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+  <string name="ring_five_times">Ring five times</string>
 
-    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
-    <string name="ring_nonstop">Ring nonstop</string>
+  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+  <string name="ring_nonstop">Ring nonstop</string>
 
   <string name="random_reminder_hour">an hour</string>
   <string name="random_reminder_day">a day</string>
@@ -464,35 +464,35 @@ File %1$s contained %2$s.\n\n
 
   <!-- ==================================================== notifications == -->
 
-    <!-- Reminder: Task was already done -->
-    <string name="rmd_NoA_done">Complete</string>
+  <!-- Reminder: Task was already done -->
+  <string name="rmd_NoA_done">Complete</string>
 
-    <!-- Reminder: Snooze button (remind again later) -->
-    <string name="rmd_NoA_snooze">Snooze</string>
+  <!-- Reminder: Snooze button (remind again later) -->
+  <string name="rmd_NoA_snooze">Snooze</string>
   <string name="snooze_all">Snooze all</string>
 
-    <!-- ============================================= reminder preferences == -->
+  <!-- ============================================= reminder preferences == -->
 
-    <!-- Reminder Preference: Quiet Hours Start Title -->
-    <string name="rmd_EPr_quiet_hours_start_title">Quiet hours start</string>
+  <!-- Reminder Preference: Quiet Hours Start Title -->
+  <string name="rmd_EPr_quiet_hours_start_title">Quiet hours start</string>
 
-    <!-- Reminder Preference: Quiet Hours End Title -->
-    <string name="rmd_EPr_quiet_hours_end_title">Quiet hours end</string>
+  <!-- Reminder Preference: Quiet Hours End Title -->
+  <string name="rmd_EPr_quiet_hours_end_title">Quiet hours end</string>
 
-    <!-- Reminder Preference: Default Reminder Title -->
-    <string name="rmd_EPr_rmd_time_title">Default reminder</string>
-    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-    <string name="rmd_EPr_rmd_time_desc">Notifications for tasks without due times will appear at %s</string>
+  <!-- Reminder Preference: Default Reminder Title -->
+  <string name="rmd_EPr_rmd_time_title">Default reminder</string>
+  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+  <string name="rmd_EPr_rmd_time_desc">Notifications for tasks without due times will appear at %s</string>
 
-    <!-- Reminder Preference: Notification Persistence Title -->
-    <string name="persistent_notifications">Persistent notifications</string>
-    <!-- Reminder Preference: Notification Persistence Description (true) -->
-    <string name="persistent_notifications_description">Persistent notifications cannot be cleared</string>
+  <!-- Reminder Preference: Notification Persistence Title -->
+  <string name="persistent_notifications">Persistent notifications</string>
+  <!-- Reminder Preference: Notification Persistence Description (true) -->
+  <string name="persistent_notifications_description">Persistent notifications cannot be cleared</string>
 
-    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-    <string name="rmd_EPr_defaultRemind_title">Random reminders</string>
+  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+  <string name="rmd_EPr_defaultRemind_title">Random reminders</string>
 
-    <!-- slide 39a: Defaults Title -->
+  <!-- slide 39a: Defaults Title -->
 
   <string name="default_random_reminder_disabled">Disabled</string>
   <string name="default_random_reminder_hourly">Hourly</string>
@@ -582,179 +582,179 @@ File %1$s contained %2$s.\n\n
   <string name="repeat_type_due">due date</string>
   <string name="repeat_type_completion">completion date</string>
 
-    <!-- text for button when repeating task indefinitely -->
-    <string name="repeat_forever">Repeat forever</string>
+  <!-- text for button when repeating task indefinitely -->
+  <string name="repeat_forever">Repeat forever</string>
 
-    <!-- text for button when repeating task until specified date (%s -> date string) -->
-    <string name="repeat_until">Repeat until %s</string>
+  <!-- text for button when repeating task until specified date (%s -> date string) -->
+  <string name="repeat_until">Repeat until %s</string>
   <string name="repeat_number_of_times">Repeat a number of times</string>
   <string name="repeat_occurs">Occurs</string>
 
-    <string name="repeat_snackbar">%1$s rescheduled for %2$s</string>
+  <string name="repeat_snackbar">%1$s rescheduled for %2$s</string>
 
-   <!-- ========================================================== Extras == -->
+  <!-- ========================================================== Extras == -->
 
-    <string name="new_tag">Create new tag</string>
+  <string name="new_tag">Create new tag</string>
   <string name="new_list">Create new list</string>
 
-    <!-- ========================================================== Filters == -->
+  <!-- ========================================================== Filters == -->
 
-    <!-- slide 10d: filter for untagged tasks -->
-    <string name="tag_FEx_untagged">Uncategorized</string>
+  <!-- slide 10d: filter for untagged tasks -->
+  <string name="tag_FEx_untagged">Uncategorized</string>
 
-    <string name="delete_tag_confirmation">Delete %s?</string>
+  <string name="delete_tag_confirmation">Delete %s?</string>
 
 
-    <!-- Android Notification Title (%s => # tasks) -->
-    <string name="TPl_notification">Timers Active for %s!</string>
+  <!-- Android Notification Title (%s => # tasks) -->
+  <string name="TPl_notification">Timers Active for %s!</string>
 
-    <!-- Filter for Timed Tasks -->
-    <string name="TFE_workingOn">Tasks Being Timed</string>
+  <!-- Filter for Timed Tasks -->
+  <string name="TFE_workingOn">Tasks Being Timed</string>
 
-    <!-- Title for TEA -->
-    <string name="TEA_timer_controls">Timer</string>
+  <!-- Title for TEA -->
+  <string name="TEA_timer_controls">Timer</string>
 
-    <!-- Edit Notes: create comment for when timer is started -->
-    <string name="TEA_timer_comment_started">started this task:</string>
+  <!-- Edit Notes: create comment for when timer is started -->
+  <string name="TEA_timer_comment_started">started this task:</string>
 
-    <!-- Edit Notes: create comment for when timer is stopped -->
-    <string name="TEA_timer_comment_stopped">stopped doing this task:</string>
+  <!-- Edit Notes: create comment for when timer is stopped -->
+  <string name="TEA_timer_comment_stopped">stopped doing this task:</string>
 
-    <!-- Edit Notes: comment to notify how long was spent on task -->
-    <string name="TEA_timer_comment_spent">Time spent:</string>
+  <!-- Edit Notes: comment to notify how long was spent on task -->
+  <string name="TEA_timer_comment_spent">Time spent:</string>
 
 
-    <!-- Voice Add Prompt Text -->
-    <string name="voice_create_prompt">Speak to create a task</string>
+  <!-- Voice Add Prompt Text -->
+  <string name="voice_create_prompt">Speak to create a task</string>
 
-    <string name="EPr_voiceInputEnabled_title">Voice input</string>
-    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-    <string name="EPr_voiceRemindersEnabled_title">Voice reminders</string>
-    <!-- Preference: Voice reminders description (true) -->
-    <string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks will speak task names during task reminders</string>
+  <string name="EPr_voiceInputEnabled_title">Voice input</string>
+  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+  <string name="EPr_voiceRemindersEnabled_title">Voice reminders</string>
+  <!-- Preference: Voice reminders description (true) -->
+  <string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks will speak task names during task reminders</string>
 
-    <string name="delete_task">Delete task</string>
-    <string name="voice_command_added_task">Added task</string>
-    <string name="external_storage_unavailable">Cannot access external storage</string>
+  <string name="delete_task">Delete task</string>
+  <string name="voice_command_added_task">Added task</string>
+  <string name="external_storage_unavailable">Cannot access external storage</string>
 
-    <!-- ==================================================== Generic Units == -->
+  <!-- ==================================================== Generic Units == -->
 
-    <plurals name="Ntasks">
-        <!-- plurals: tasks -->
-        <item quantity="one">1 task</item>
-        <!-- plurals: tasks -->
-        <item quantity="other">%d tasks</item>
-    </plurals>
+  <plurals name="Ntasks">
+    <!-- plurals: tasks -->
+    <item quantity="one">1 task</item>
+    <!-- plurals: tasks -->
+    <item quantity="other">%d tasks</item>
+  </plurals>
 
-    <!-- slide 10a, 12c: today -->
-    <string name="today">Today</string>
+  <!-- slide 10a, 12c: today -->
+  <string name="today">Today</string>
 
-    <!-- tomorrow -->
-    <string name="tomorrow">Tomorrow</string>
+  <!-- tomorrow -->
+  <string name="tomorrow">Tomorrow</string>
 
-    <string name="next">Next %s</string>
+  <string name="next">Next %s</string>
 
-    <!-- yesterday -->
-    <string name="yesterday">Yesterday</string>
+  <!-- yesterday -->
+  <string name="yesterday">Yesterday</string>
 
-    <!-- slide 12c: tomorrow, abbreviated -->
-    <string name="tmrw">Tmrw</string>
+  <!-- slide 12c: tomorrow, abbreviated -->
+  <string name="tmrw">Tmrw</string>
 
-    <!-- slide 12c: yesterday, abbreviated -->
-    <string name="yest">Yest</string>
+  <!-- slide 12c: yesterday, abbreviated -->
+  <string name="yest">Yest</string>
 
-    <!-- ================================================== Generic Dialogs == -->
+  <!-- ================================================== Generic Dialogs == -->
 
-    <!-- Progress dialog shown when doing something slow -->
-    <string name="DLG_wait">Please wait…</string>
+  <!-- Progress dialog shown when doing something slow -->
+  <string name="DLG_wait">Please wait…</string>
 
-    <!-- ================================================== SyncPreferences == -->
+  <!-- ================================================== SyncPreferences == -->
 
-    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
-    <string name="sync_status_success">Last sync:\n%s</string>
+  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+  <string name="sync_status_success">Last sync:\n%s</string>
 
-    <!-- Preference: Synchronization Interval Title -->
-    <string name="sync_SPr_interval_title">Background sync</string>
+  <!-- Preference: Synchronization Interval Title -->
+  <string name="sync_SPr_interval_title">Background sync</string>
 
-    <!-- Sync: Clear Data Title -->
-    <string name="sync_SPr_forget">Log out</string>
-    <!-- Sync: Clear Data Description -->
-    <string name="sync_SPr_forget_description">Clears all synchronization data</string>
+  <!-- Sync: Clear Data Title -->
+  <string name="sync_SPr_forget">Log out</string>
+  <!-- Sync: Clear Data Description -->
+  <string name="sync_SPr_forget_description">Clears all synchronization data</string>
 
-    <!-- confirmation dialog for sync log out -->
-    <string name="sync_forget_confirm">Log out/clear synchronization data?</string>
+  <!-- confirmation dialog for sync log out -->
+  <string name="sync_forget_confirm">Log out/clear synchronization data?</string>
 
   <string name="widget_show_due_date">Show due dates</string>
   <string name="widget_show_checkboxes">Show checkboxes</string>
   <string name="widget_show_header">Show header</string>
   <string name="widget_show_settings">Show settings</string>
-    <string name="notifications">Notifications</string>
-    <string name="silent">Silent</string>
-    <string name="sound">Sound</string>
-    <string name="vibrations">Vibrations</string>
-    <string name="quiet_hours">Quiet hours</string>
-    <string name="attachment_directory">Attachment directory</string>
-    <string name="backup_directory">Backup directory</string>
-    <string name="miscellaneous">Miscellaneous</string>
-    <string name="synchronization">Synchronization</string>
-    <string name="enabled">Enabled</string>
-    <string name="font_size">Font size</string>
+  <string name="notifications">Notifications</string>
+  <string name="silent">Silent</string>
+  <string name="sound">Sound</string>
+  <string name="vibrations">Vibrations</string>
+  <string name="quiet_hours">Quiet hours</string>
+  <string name="attachment_directory">Attachment directory</string>
+  <string name="backup_directory">Backup directory</string>
+  <string name="miscellaneous">Miscellaneous</string>
+  <string name="synchronization">Synchronization</string>
+  <string name="enabled">Enabled</string>
+  <string name="font_size">Font size</string>
   <string name="row_spacing">Row spacing</string>
-    <string name="customize_edit_screen">Customize edit screen</string>
-    <string name="source_code">Source code</string>
-    <string name="translations">Contribute translations</string>
-    <string name="report_an_issue">Report an issue</string>
-    <string name="help_and_feedback">Help &amp; feedback</string>
-    <string name="contact_developer">Contact developer</string>
-    <string name="rate_tasks">Rate Tasks</string>
-    <string name="quiet_hours_summary">No reminders during quiet hours</string>
-    <string name="TLA_menu_donate">Donate</string>
-    <string name="select_amount">Select amount</string>
-    <string name="add_reminder">Add reminder</string>
-    <string name="remove">Remove</string>
-    <string name="randomly_once">Randomly once</string>
-    <string name="randomly">Randomly</string>
-    <string name="pick_a_date">Pick a date</string>
-    <string name="pick_a_time">Pick a time</string>
-    <string name="pick_a_date_and_time">Pick a date and time</string>
-    <string name="pick_a_location">Pick a location</string>
-    <string name="when_overdue">When overdue</string>
-    <string name="when_due">When due</string>
-    <string name="geofence_radius_title">Radius (meters)</string>
-    <string name="geofence_responsiveness_title">Response time (higher value conserves battery)</string>
-    <string name="geolocation_reminders">Geolocation Reminders</string>
-    <string name="tags">Tags</string>
-    <string name="filters">Filters</string>
-    <string name="date_shortcut_hour">For an hour</string>
-    <string name="date_shortcut_morning">Morning</string>
-    <string name="date_shortcut_afternoon">Afternoon</string>
-    <string name="date_shortcut_evening">Evening</string>
-    <string name="date_shortcut_night">Night</string>
-    <string name="date_shortcut_tomorrow_morning">Tomorrow morning</string>
-    <string name="date_shortcut_tomorrow_afternoon">Tomorrow afternoon</string>
-    <string name="date_shortcut_must_come_before">%1$s must come before %2$s</string>
-    <string name="date_shortcut_must_come_after">%1$s must come after %2$s</string>
-    <string name="discard_changes">Discard changes?</string>
-    <string name="discard">Discard</string>
-    <string name="tag_settings">Tag Settings</string>
+  <string name="customize_edit_screen">Customize edit screen</string>
+  <string name="source_code">Source code</string>
+  <string name="translations">Contribute translations</string>
+  <string name="report_an_issue">Report an issue</string>
+  <string name="help_and_feedback">Help &amp; feedback</string>
+  <string name="contact_developer">Contact developer</string>
+  <string name="rate_tasks">Rate Tasks</string>
+  <string name="quiet_hours_summary">No reminders during quiet hours</string>
+  <string name="TLA_menu_donate">Donate</string>
+  <string name="select_amount">Select amount</string>
+  <string name="add_reminder">Add reminder</string>
+  <string name="remove">Remove</string>
+  <string name="randomly_once">Randomly once</string>
+  <string name="randomly">Randomly</string>
+  <string name="pick_a_date">Pick a date</string>
+  <string name="pick_a_time">Pick a time</string>
+  <string name="pick_a_date_and_time">Pick a date and time</string>
+  <string name="pick_a_location">Pick a location</string>
+  <string name="when_overdue">When overdue</string>
+  <string name="when_due">When due</string>
+  <string name="geofence_radius_title">Radius (meters)</string>
+  <string name="geofence_responsiveness_title">Response time (higher value conserves battery)</string>
+  <string name="geolocation_reminders">Geolocation Reminders</string>
+  <string name="tags">Tags</string>
+  <string name="filters">Filters</string>
+  <string name="date_shortcut_hour">For an hour</string>
+  <string name="date_shortcut_morning">Morning</string>
+  <string name="date_shortcut_afternoon">Afternoon</string>
+  <string name="date_shortcut_evening">Evening</string>
+  <string name="date_shortcut_night">Night</string>
+  <string name="date_shortcut_tomorrow_morning">Tomorrow morning</string>
+  <string name="date_shortcut_tomorrow_afternoon">Tomorrow afternoon</string>
+  <string name="date_shortcut_must_come_before">%1$s must come before %2$s</string>
+  <string name="date_shortcut_must_come_after">%1$s must come after %2$s</string>
+  <string name="discard_changes">Discard changes?</string>
+  <string name="discard">Discard</string>
+  <string name="tag_settings">Tag Settings</string>
   <string name="list_settings">List settings</string>
-    <string name="delete">Delete</string>
+  <string name="delete">Delete</string>
   <string name="copy">Copy</string>
-    <string name="filter_settings">Filter Settings</string>
-    <string name="show_hidden">Show hidden</string>
-    <string name="show_completed">Show completed</string>
-    <string name="reverse">Reverse</string>
-    <string name="get_plugins">In-app purchases</string>
-    <string name="no_application_found">No application found to open attachment</string>
-    <string name="add_attachment">Add attachment</string>
-    <string name="take_a_picture">Take a picture</string>
-    <string name="pick_from_gallery">Pick from gallery</string>
-    <string name="pick_from_storage">Pick from storage</string>
-    <string name="privacy">Privacy</string>
-    <string name="privacy_policy">Privacy policy</string>
-    <string name="send_anonymous_statistics">Improve Tasks</string>
-    <string name="send_anonymous_statistics_summary">Send anonymous usage statistics and crash reports to help improve Tasks. No personal data will be collected.</string>
-    <string name="tag_already_exists">Tag already exists</string>
+  <string name="filter_settings">Filter Settings</string>
+  <string name="show_hidden">Show hidden</string>
+  <string name="show_completed">Show completed</string>
+  <string name="reverse">Reverse</string>
+  <string name="get_plugins">In-app purchases</string>
+  <string name="no_application_found">No application found to open attachment</string>
+  <string name="add_attachment">Add attachment</string>
+  <string name="take_a_picture">Take a picture</string>
+  <string name="pick_from_gallery">Pick from gallery</string>
+  <string name="pick_from_storage">Pick from storage</string>
+  <string name="privacy">Privacy</string>
+  <string name="privacy_policy">Privacy policy</string>
+  <string name="send_anonymous_statistics">Improve Tasks</string>
+  <string name="send_anonymous_statistics_summary">Send anonymous usage statistics and crash reports to help improve Tasks. No personal data will be collected.</string>
+  <string name="tag_already_exists">Tag already exists</string>
   <string name="name_cannot_be_empty">Name cannot be empty</string>
   <string name="username_required">Username required</string>
   <string name="password_required">Password required</string>
@@ -837,10 +837,10 @@ File %1$s contained %2$s.\n\n
   <string name="use_native_datetime_pickers">Use native date and time pickers</string>
   <string name="CalDAV">CalDAV</string>
   <string name="add_account">Add account</string>
-    <string name="user">User</string>
-    <string name="password">Password</string>
+  <string name="user">User</string>
+  <string name="password">Password</string>
   <string name="url">URL</string>
-    <string name="error_adding_account">Error adding account</string>
+  <string name="error_adding_account">Error adding account</string>
   <string name="account_settings">Account settings</string>
   <string name="notification_channel_settings">Manage notifications</string>
   <string name="battery_optimization_settings">Manage battery optimizations</string>
@@ -872,7 +872,7 @@ File %1$s contained %2$s.\n\n
   <string name="default_calendar">Default calendar</string>
   <string name="badges_description">Display a task count on Tasks launcher icon. Not all launchers support badges.</string>
   <string name="bundle_notifications_summary">Combine multiple notifications into a single notification</string>
-    <string name="repeat_monthly_same_day_each_month">on the same day each month</string>
+  <string name="repeat_monthly_same_day_each_month">on the same day each month</string>
   <string name="dont_sync">Don\'t sync</string>
 
   <string name="repeat_monthly_every_day_of_nth_week">every %1$s %2$s</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ecbe93c22..ff7628967 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,113 +1,114 @@
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- ========================================================== General  -->
-
-    <style name="popup_overlay" parent="ThemeOverlay.AppCompat.Light" />
-
-    <style name="SpinnerNoPadding" parent="Widget.AppCompat.TextView.SpinnerItem">
-        <item name="android:paddingLeft">0dp</item>
-        <item name="android:paddingRight">0dp</item>
-    </style>
-
-    <style name="TranslucentDialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-    </style>
-
-    <style name="TextBoxText">
-        <item name="android:textColor">?attr/asTextColor</item>
-    </style>
-
-    <style name="TaskEditTextPrimary">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textColorHint">?android:attr/textColorTertiary</item>
-        <item name="android:textSize">@dimen/task_edit_text_size</item>
-    </style>
-
-    <style name="WhiteToolbarTheme">
-        <item name="dark_status_bar">false</item>
-        <item name="overlay_theme">@style/WhiteToolbarOverlay</item>
-        <item name="actionBarPrimaryText">@color/white_100</item>
-        <item name="actionBarSecondaryText">@color/white_70</item>
-    </style>
-
-    <style name="BlackToolbarTheme">
-        <item name="dark_status_bar">true</item>
-        <item name="overlay_theme">@style/BlackToolbarOverlay</item>
-        <item name="actionBarPrimaryText">@color/black_87</item>
-        <item name="actionBarSecondaryText">@color/black_54</item>
-    </style>
-
-    <style name="WhiteTint">
-        <item name="fab_text">@color/white_100</item>
-    </style>
-
-    <style name="BlackTint">
-        <item name="fab_text">@color/black_87</item>
-    </style>
-
-    <style name="WhiteToolbarOverlay" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="colorControlNormal">@color/white_100</item>
-    </style>
-
-    <style name="BlackToolbarOverlay" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="colorControlNormal">@color/black_87</item>
-    </style>
-
-    <style name="TagSettingsRow">
-        <item name="android:paddingLeft">@dimen/keyline_first</item>
-        <item name="android:paddingRight">@dimen/keyline_first</item>
-        <item name="android:paddingStart" tools:ignore="NewApi">@dimen/keyline_first</item>
-        <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/keyline_first</item>
-        <item name="android:paddingTop">@dimen/keyline_first</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-    </style>
-
-    <!--================================================== General == -->
-
-    <style name="TextAppearance" parent="android:TextAppearance">
-        <item name="android:textColor">?attr/asTextColor</item>    
-    </style>
-
-    <!--=============================================== TaskListActivity == -->
-
-    <style name="divider">
-        <item name="android:background">@color/divider</item>
-    </style>
-
-    <style name="vertical_divider" parent="divider">
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_width">1dp</item>
-    </style>
-
-    <style name="horizontal_divider" parent="divider">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
-    </style>
-
-    <style name="task_edit_row_divider" parent="horizontal_divider">
-        <item name="android:layout_marginLeft">@dimen/keyline_content_inset</item>
-        <item name="android:layout_marginStart" tools:ignore="NewApi">@dimen/keyline_content_inset</item>
-        <item name="android:layout_gravity">end|bottom</item>
-    </style>
-
-    <style name="task_list_container">
-        <item name="android:elevation" tools:ignore="NewApi">@dimen/elevation_refresh_indicator</item>
-    </style>
-
-    <style name="priority_button_base">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:width">0dp</item>
-    </style>
-
-    <style name="priority_button" parent="priority_button_base">
-        <!-- hide janky selected item background on pre-lollipop devices -->
-        <item name="android:background">@android:color/transparent</item>
-    </style>
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+
+  <!-- ========================================================== General  -->
+
+  <style name="popup_overlay" parent="ThemeOverlay.AppCompat.Light"/>
+
+  <style name="SpinnerNoPadding" parent="Widget.AppCompat.TextView.SpinnerItem">
+    <item name="android:paddingLeft">0dp</item>
+    <item name="android:paddingRight">0dp</item>
+  </style>
+
+  <style name="TranslucentDialog" parent="Theme.AppCompat.Light.Dialog">
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:windowBackground">@android:color/transparent</item>
+    <item name="android:colorBackgroundCacheHint">@null</item>
+    <item name="android:windowIsTranslucent">true</item>
+  </style>
+
+  <style name="TextBoxText">
+    <item name="android:textColor">?attr/asTextColor</item>
+  </style>
+
+  <style name="TaskEditTextPrimary">
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
+    <item name="android:textColorHint">?android:attr/textColorTertiary</item>
+    <item name="android:textSize">@dimen/task_edit_text_size</item>
+  </style>
+
+  <style name="WhiteToolbarTheme">
+    <item name="dark_status_bar">false</item>
+    <item name="overlay_theme">@style/WhiteToolbarOverlay</item>
+    <item name="actionBarPrimaryText">@color/white_100</item>
+    <item name="actionBarSecondaryText">@color/white_70</item>
+  </style>
+
+  <style name="BlackToolbarTheme">
+    <item name="dark_status_bar">true</item>
+    <item name="overlay_theme">@style/BlackToolbarOverlay</item>
+    <item name="actionBarPrimaryText">@color/black_87</item>
+    <item name="actionBarSecondaryText">@color/black_54</item>
+  </style>
+
+  <style name="WhiteTint">
+    <item name="fab_text">@color/white_100</item>
+  </style>
+
+  <style name="BlackTint">
+    <item name="fab_text">@color/black_87</item>
+  </style>
+
+  <style name="WhiteToolbarOverlay" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+    <item name="colorControlNormal">@color/white_100</item>
+  </style>
+
+  <style name="BlackToolbarOverlay" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+    <item name="colorControlNormal">@color/black_87</item>
+  </style>
+
+  <style name="TagSettingsRow">
+    <item name="android:paddingLeft">@dimen/keyline_first</item>
+    <item name="android:paddingRight">@dimen/keyline_first</item>
+    <item name="android:paddingStart" tools:ignore="NewApi">@dimen/keyline_first</item>
+    <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/keyline_first</item>
+    <item name="android:paddingTop">@dimen/keyline_first</item>
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">wrap_content</item>
+  </style>
+
+  <!--================================================== General == -->
+
+  <style name="TextAppearance" parent="android:TextAppearance">
+    <item name="android:textColor">?attr/asTextColor</item>
+  </style>
+
+  <!--=============================================== TaskListActivity == -->
+
+  <style name="divider">
+    <item name="android:background">@color/divider</item>
+  </style>
+
+  <style name="vertical_divider" parent="divider">
+    <item name="android:layout_height">match_parent</item>
+    <item name="android:layout_width">1dp</item>
+  </style>
+
+  <style name="horizontal_divider" parent="divider">
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">1dp</item>
+  </style>
+
+  <style name="task_edit_row_divider" parent="horizontal_divider">
+    <item name="android:layout_marginLeft">@dimen/keyline_content_inset</item>
+    <item name="android:layout_marginStart" tools:ignore="NewApi">@dimen/keyline_content_inset
+    </item>
+    <item name="android:layout_gravity">end|bottom</item>
+  </style>
+
+  <style name="task_list_container">
+    <item name="android:elevation" tools:ignore="NewApi">@dimen/elevation_refresh_indicator</item>
+  </style>
+
+  <style name="priority_button_base">
+    <item name="android:layout_width">0dp</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_weight">1</item>
+    <item name="android:width">0dp</item>
+  </style>
+
+  <style name="priority_button" parent="priority_button_base">
+    <!-- hide janky selected item background on pre-lollipop devices -->
+    <item name="android:background">@android:color/transparent</item>
+  </style>
 
 </resources>
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index 86bec3943..e60a0b1b2 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="TasksBase" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="android:windowBackground">@null</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="asWindowBackground">@color/window_background</item>
-        <item name="asContentBackground">@color/content_background</item>
-        <item name="asTextColor">@color/text_primary</item>
-        <item name="asTextColorHint">@color/text_tertiary</item>
-        <item name="icon_tint">@color/icon_tint</item>
-        <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
-        <item name="dialogTheme">@style/TasksDialog</item>
-        <item name="android:dialogTheme">@style/TasksDialog</item>
-        <item name="alertDialogTheme">@style/TasksDialogAlert</item>
-        <item name="alpha_secondary">@dimen/alpha_secondary</item>
-        <item name="alpha_disabled">@dimen/alpha_disabled</item>
-        <item name="android:textColorPrimary">@color/text_primary</item>
-        <item name="android:textColorSecondary">@color/text_secondary</item>
-        <item name="android:textColorTertiary">@color/text_tertiary</item>
-        <item name="nnf_toolbarTheme">?attr/overlay_theme</item>
-        <item name="nnf_separator_color">@color/nnf_light_separator_color</item>
-        <item name="nnf_save_icon_color">?attr/colorAccent</item>
-        <item name="nnf_dir_icon_color">?attr/colorAccent</item>
-        <item name="card_elevation">2dp</item>
-    </style>
+  <style name="TasksBase" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <item name="android:windowBackground">@null</item>
+    <item name="windowActionModeOverlay">true</item>
+    <item name="asWindowBackground">@color/window_background</item>
+    <item name="asContentBackground">@color/content_background</item>
+    <item name="asTextColor">@color/text_primary</item>
+    <item name="asTextColorHint">@color/text_tertiary</item>
+    <item name="icon_tint">@color/icon_tint</item>
+    <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
+    <item name="dialogTheme">@style/TasksDialog</item>
+    <item name="android:dialogTheme">@style/TasksDialog</item>
+    <item name="alertDialogTheme">@style/TasksDialogAlert</item>
+    <item name="alpha_secondary">@dimen/alpha_secondary</item>
+    <item name="alpha_disabled">@dimen/alpha_disabled</item>
+    <item name="android:textColorPrimary">@color/text_primary</item>
+    <item name="android:textColorSecondary">@color/text_secondary</item>
+    <item name="android:textColorTertiary">@color/text_tertiary</item>
+    <item name="nnf_toolbarTheme">?attr/overlay_theme</item>
+    <item name="nnf_separator_color">@color/nnf_light_separator_color</item>
+    <item name="nnf_save_icon_color">?attr/colorAccent</item>
+    <item name="nnf_dir_icon_color">?attr/colorAccent</item>
+    <item name="card_elevation">2dp</item>
+  </style>
 
-    <style name="Tasks" parent="TasksBase" />
+  <style name="Tasks" parent="TasksBase"/>
 
-    <style name="TasksDialogAlert" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="android:windowBackground">@color/dialog_background</item>
-        <item name="colorAccent">?attr/colorAccentDialog</item>
-        <item name="asTextColor">@color/text_primary</item>
-        <item name="icon_tint">@color/icon_tint</item>
-    </style>
+  <style name="TasksDialogAlert" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
+    <item name="android:windowBackground">@color/dialog_background</item>
+    <item name="colorAccent">?attr/colorAccentDialog</item>
+    <item name="asTextColor">@color/text_primary</item>
+    <item name="icon_tint">@color/icon_tint</item>
+  </style>
 
-    <style name="TasksDialog" parent="@style/Theme.AppCompat.DayNight.Dialog">
-        <item name="android:windowBackground">@color/dialog_background</item>
-        <item name="colorAccent">?attr/colorAccentDialog</item>
-        <item name="asTextColor">@color/text_primary</item>
-        <item name="icon_tint">@color/icon_tint</item>
-    </style>
+  <style name="TasksDialog" parent="@style/Theme.AppCompat.DayNight.Dialog">
+    <item name="android:windowBackground">@color/dialog_background</item>
+    <item name="colorAccent">?attr/colorAccentDialog</item>
+    <item name="asTextColor">@color/text_primary</item>
+    <item name="icon_tint">@color/icon_tint</item>
+  </style>
 
-    <style name="ThemeBlack" parent="Tasks">
-        <item name="asWindowBackground">@color/grey_900</item>
-        <item name="asContentBackground">@android:color/black</item>
-    </style>
+  <style name="ThemeBlack" parent="Tasks">
+    <item name="asWindowBackground">@color/grey_900</item>
+    <item name="asContentBackground">@android:color/black</item>
+  </style>
 
-    <style name="Wallpaper" parent="Tasks">
-        <item name="asWindowBackground">@color/black_38</item>
-        <item name="asContentBackground">@color/black_54</item>
-        <item name="android:windowShowWallpaper">true</item>
-        <item name="card_elevation">0dp</item>
-    </style>
+  <style name="Wallpaper" parent="Tasks">
+    <item name="asWindowBackground">@color/black_38</item>
+    <item name="asContentBackground">@color/black_54</item>
+    <item name="android:windowShowWallpaper">true</item>
+    <item name="card_elevation">0dp</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_amber.xml b/app/src/main/res/values/theme_amber.xml
index 5f8a2cb5d..79565d0e2 100644
--- a/app/src/main/res/values/theme_amber.xml
+++ b/app/src/main/res/values/theme_amber.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Amber" parent="BlackToolbarTheme">
-        <item name="colorPrimary">@color/amber_500</item>
-        <item name="colorPrimaryDark">@color/amber_700</item>
-    </style>
+  <style name="Amber" parent="BlackToolbarTheme">
+    <item name="colorPrimary">@color/amber_500</item>
+    <item name="colorPrimaryDark">@color/amber_700</item>
+  </style>
 
-    <style name="AmberAccent" parent="BlackTint">
-        <item name="colorAccent">@color/amber_a400</item>
-        <item name="colorAccentDialog">@color/amber_a400</item>
-    </style>
+  <style name="AmberAccent" parent="BlackTint">
+    <item name="colorAccent">@color/amber_a400</item>
+    <item name="colorAccentDialog">@color/amber_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_blue.xml b/app/src/main/res/values/theme_blue.xml
index e0b7d33c7..a9e6852cb 100644
--- a/app/src/main/res/values/theme_blue.xml
+++ b/app/src/main/res/values/theme_blue.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Blue" parent="WhiteToolbarTheme">
-        <item name="colorPrimary">@color/blue_500</item>
-        <item name="colorPrimaryDark">@color/blue_700</item>
-    </style>
+  <style name="Blue" parent="WhiteToolbarTheme">
+    <item name="colorPrimary">@color/blue_500</item>
+    <item name="colorPrimaryDark">@color/blue_700</item>
+  </style>
 
-    <style name="BlueAccent" parent="WhiteTint">
-        <item name="colorAccent">@color/blue_a400</item>
-        <item name="colorAccentDialog">@color/blue_a400</item>
-    </style>
+  <style name="BlueAccent" parent="WhiteTint">
+    <item name="colorAccent">@color/blue_a400</item>
+    <item name="colorAccentDialog">@color/blue_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_blue_grey.xml b/app/src/main/res/values/theme_blue_grey.xml
index 7ae7c80ad..e7bb31f79 100644
--- a/app/src/main/res/values/theme_blue_grey.xml
+++ b/app/src/main/res/values/theme_blue_grey.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="BlueGrey" parent="WhiteToolbarTheme">
-        <item name="colorPrimary">@color/blue_grey_500</item>
-        <item name="colorPrimaryDark">@color/blue_grey_700</item>
-    </style>
+  <style name="BlueGrey" parent="WhiteToolbarTheme">
+    <item name="colorPrimary">@color/blue_grey_500</item>
+    <item name="colorPrimaryDark">@color/blue_grey_700</item>
+  </style>
 
-    <style name="BlueGreyAccent" parent="WhiteTint">
-        <item name="colorAccent">@color/blue_grey_400</item>
-        <item name="colorAccentDialog">@color/blue_grey_400</item>
-    </style>
+  <style name="BlueGreyAccent" parent="WhiteTint">
+    <item name="colorAccent">@color/blue_grey_400</item>
+    <item name="colorAccentDialog">@color/blue_grey_400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_brown.xml b/app/src/main/res/values/theme_brown.xml
index 0bc3a4aaa..69a1833e8 100644
--- a/app/src/main/res/values/theme_brown.xml
+++ b/app/src/main/res/values/theme_brown.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Brown" parent="WhiteToolbarTheme">
-        <item name="colorPrimary">@color/brown_500</item>
-        <item name="colorPrimaryDark">@color/brown_700</item>
-    </style>
+  <style name="Brown" parent="WhiteToolbarTheme">
+    <item name="colorPrimary">@color/brown_500</item>
+    <item name="colorPrimaryDark">@color/brown_700</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_cyan.xml b/app/src/main/res/values/theme_cyan.xml
index 99cf8ac19..52ffcfa37 100644
--- a/app/src/main/res/values/theme_cyan.xml
+++ b/app/src/main/res/values/theme_cyan.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Cyan" parent="BlackToolbarTheme">
-        <item name="colorPrimary">@color/cyan_500</item>
-        <item name="colorPrimaryDark">@color/cyan_700</item>
-    </style>
+  <style name="Cyan" parent="BlackToolbarTheme">
+    <item name="colorPrimary">@color/cyan_500</item>
+    <item name="colorPrimaryDark">@color/cyan_700</item>
+  </style>
 
-    <style name="CyanAccent" parent="BlackTint">
-        <item name="colorAccent">@color/cyan_a400</item>
-        <item name="colorAccentDialog">@color/cyan_a400</item>
-    </style>
+  <style name="CyanAccent" parent="BlackTint">
+    <item name="colorAccent">@color/cyan_a400</item>
+    <item name="colorAccentDialog">@color/cyan_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_dark_grey.xml b/app/src/main/res/values/theme_dark_grey.xml
index 7e333fb01..18c268aa7 100644
--- a/app/src/main/res/values/theme_dark_grey.xml
+++ b/app/src/main/res/values/theme_dark_grey.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="DarkGrey" parent="WhiteToolbarTheme">
-        <item name="colorPrimary">@color/grey_900</item>
-        <item name="colorPrimaryDark">@color/grey_statusbar</item>
-    </style>
+
+  <style name="DarkGrey" parent="WhiteToolbarTheme">
+    <item name="colorPrimary">@color/grey_900</item>
+    <item name="colorPrimaryDark">@color/grey_statusbar</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_deep_orange.xml b/app/src/main/res/values/theme_deep_orange.xml
index 89c12e552..3134a51d5 100644
--- a/app/src/main/res/values/theme_deep_orange.xml
+++ b/app/src/main/res/values/theme_deep_orange.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="DeepOrange" parent="WhiteToolbarTheme">
-        <item name="colorPrimary">@color/deep_orange_500</item>
-        <item name="colorPrimaryDark">@color/deep_orange_700</item>
-    </style>
+  <style name="DeepOrange" parent="WhiteToolbarTheme">
+    <item name="colorPrimary">@color/deep_orange_500</item>
+    <item name="colorPrimaryDark">@color/deep_orange_700</item>
+  </style>
 
-    <style name="DeepOrangeAccent" parent="WhiteTint">
-        <item name="colorAccent">@color/deep_orange_a400</item>
-        <item name="colorAccentDialog">@color/deep_orange_a400</item>
-    </style>
+  <style name="DeepOrangeAccent" parent="WhiteTint">
+    <item name="colorAccent">@color/deep_orange_a400</item>
+    <item name="colorAccentDialog">@color/deep_orange_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_deep_purple.xml b/app/src/main/res/values/theme_deep_purple.xml
index 0fc1ece09..900bbb597 100644
--- a/app/src/main/res/values/theme_deep_purple.xml
+++ b/app/src/main/res/values/theme_deep_purple.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="DeepPurple" parent="WhiteToolbarTheme">
-        <item name="colorPrimary">@color/deep_purple_500</item>
-        <item name="colorPrimaryDark">@color/deep_purple_700</item>
-    </style>
+  <style name="DeepPurple" parent="WhiteToolbarTheme">
+    <item name="colorPrimary">@color/deep_purple_500</item>
+    <item name="colorPrimaryDark">@color/deep_purple_700</item>
+  </style>
 
-    <style name="DeepPurpleAccent" parent="WhiteTint">
-        <item name="colorAccent">@color/deep_purple_a400</item>
-        <item name="colorAccentDialog">@color/deep_purple_a400</item>
-    </style>
+  <style name="DeepPurpleAccent" parent="WhiteTint">
+    <item name="colorAccent">@color/deep_purple_a400</item>
+    <item name="colorAccentDialog">@color/deep_purple_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_green.xml b/app/src/main/res/values/theme_green.xml
index eead67c43..6d468b1e5 100644
--- a/app/src/main/res/values/theme_green.xml
+++ b/app/src/main/res/values/theme_green.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Green" parent="BlackToolbarTheme">
-        <item name="colorPrimary">@color/green_500</item>
-        <item name="colorPrimaryDark">@color/green_700</item>
-    </style>
+  <style name="Green" parent="BlackToolbarTheme">
+    <item name="colorPrimary">@color/green_500</item>
+    <item name="colorPrimaryDark">@color/green_700</item>
+  </style>
 
-    <style name="GreenAccent" parent="BlackTint">
-        <item name="colorAccent">@color/green_a400</item>
-        <item name="colorAccentDialog">@color/green_a400</item>
-    </style>
+  <style name="GreenAccent" parent="BlackTint">
+    <item name="colorAccent">@color/green_a400</item>
+    <item name="colorAccentDialog">@color/green_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_grey.xml b/app/src/main/res/values/theme_grey.xml
index 69bd51678..f04171874 100644
--- a/app/src/main/res/values/theme_grey.xml
+++ b/app/src/main/res/values/theme_grey.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Grey" parent="BlackToolbarTheme">
-        <item name="colorPrimary">@color/grey_500</item>
-        <item name="colorPrimaryDark">@color/grey_700</item>
-    </style>
+  <style name="Grey" parent="BlackToolbarTheme">
+    <item name="colorPrimary">@color/grey_500</item>
+    <item name="colorPrimaryDark">@color/grey_700</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_indigo.xml b/app/src/main/res/values/theme_indigo.xml
index 9d24e23f0..1c2850627 100644
--- a/app/src/main/res/values/theme_indigo.xml
+++ b/app/src/main/res/values/theme_indigo.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Indigo" parent="WhiteToolbarTheme">
-        <item name="colorPrimary">@color/indigo_500</item>
-        <item name="colorPrimaryDark">@color/indigo_700</item>
-    </style>
+  <style name="Indigo" parent="WhiteToolbarTheme">
+    <item name="colorPrimary">@color/indigo_500</item>
+    <item name="colorPrimaryDark">@color/indigo_700</item>
+  </style>
 
-    <style name="IndigoAccent" parent="WhiteTint">
-        <item name="colorAccent">@color/indigo_a400</item>
-        <item name="colorAccentDialog">@color/indigo_a400</item>
-    </style>
+  <style name="IndigoAccent" parent="WhiteTint">
+    <item name="colorAccent">@color/indigo_a400</item>
+    <item name="colorAccentDialog">@color/indigo_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_light_blue.xml b/app/src/main/res/values/theme_light_blue.xml
index e5b4512e9..26f188875 100644
--- a/app/src/main/res/values/theme_light_blue.xml
+++ b/app/src/main/res/values/theme_light_blue.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="LightBlue" parent="BlackToolbarTheme">
-        <item name="colorPrimary">@color/light_blue_500</item>
-        <item name="colorPrimaryDark">@color/light_blue_700</item>
-    </style>
+  <style name="LightBlue" parent="BlackToolbarTheme">
+    <item name="colorPrimary">@color/light_blue_500</item>
+    <item name="colorPrimaryDark">@color/light_blue_700</item>
+  </style>
 
-    <style name="LightBlueAccent" parent="BlackTint">
-        <item name="colorAccent">@color/light_blue_a400</item>
-        <item name="colorAccentDialog">@color/light_blue_a400</item>
-    </style>
+  <style name="LightBlueAccent" parent="BlackTint">
+    <item name="colorAccent">@color/light_blue_a400</item>
+    <item name="colorAccentDialog">@color/light_blue_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_light_green.xml b/app/src/main/res/values/theme_light_green.xml
index ebe86c80c..92a7ec1b2 100644
--- a/app/src/main/res/values/theme_light_green.xml
+++ b/app/src/main/res/values/theme_light_green.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="LightGreen" parent="BlackToolbarTheme">
-        <item name="colorPrimary">@color/light_green_500</item>
-        <item name="colorPrimaryDark">@color/light_green_700</item>
-    </style>
+  <style name="LightGreen" parent="BlackToolbarTheme">
+    <item name="colorPrimary">@color/light_green_500</item>
+    <item name="colorPrimaryDark">@color/light_green_700</item>
+  </style>
 
-    <style name="LightGreenAccent" parent="BlackTint">
-        <item name="colorAccent">@color/light_green_a400</item>
-        <item name="colorAccentDialog">@color/light_green_a400</item>
-    </style>
+  <style name="LightGreenAccent" parent="BlackTint">
+    <item name="colorAccent">@color/light_green_a400</item>
+    <item name="colorAccentDialog">@color/light_green_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_lime.xml b/app/src/main/res/values/theme_lime.xml
index 5b56cc986..2c7ce486c 100644
--- a/app/src/main/res/values/theme_lime.xml
+++ b/app/src/main/res/values/theme_lime.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Lime" parent="BlackToolbarTheme">
-        <item name="colorPrimary">@color/lime_500</item>
-        <item name="colorPrimaryDark">@color/lime_700</item>
-    </style>
+  <style name="Lime" parent="BlackToolbarTheme">
+    <item name="colorPrimary">@color/lime_500</item>
+    <item name="colorPrimaryDark">@color/lime_700</item>
+  </style>
 
-    <style name="LimeAccent" parent="BlackTint">
-        <item name="colorAccent">@color/lime_a400</item>
-        <item name="colorAccentDialog">@color/lime_a400</item>
-    </style>
+  <style name="LimeAccent" parent="BlackTint">
+    <item name="colorAccent">@color/lime_a400</item>
+    <item name="colorAccentDialog">@color/lime_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_orange.xml b/app/src/main/res/values/theme_orange.xml
index f2b0d0ad0..9d0e3404d 100644
--- a/app/src/main/res/values/theme_orange.xml
+++ b/app/src/main/res/values/theme_orange.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Orange" parent="BlackToolbarTheme">
-        <item name="colorPrimary">@color/orange_500</item>
-        <item name="colorPrimaryDark">@color/orange_700</item>
-    </style>
+  <style name="Orange" parent="BlackToolbarTheme">
+    <item name="colorPrimary">@color/orange_500</item>
+    <item name="colorPrimaryDark">@color/orange_700</item>
+  </style>
 
-    <style name="OrangeAccent" parent="BlackTint">
-        <item name="colorAccent">@color/orange_a400</item>
-        <item name="colorAccentDialog">@color/orange_a400</item>
-    </style>
+  <style name="OrangeAccent" parent="BlackTint">
+    <item name="colorAccent">@color/orange_a400</item>
+    <item name="colorAccentDialog">@color/orange_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_pink.xml b/app/src/main/res/values/theme_pink.xml
index 5bbd29e19..34f1cd1ce 100644
--- a/app/src/main/res/values/theme_pink.xml
+++ b/app/src/main/res/values/theme_pink.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Pink" parent="WhiteToolbarTheme">
-        <item name="colorPrimary">@color/pink_500</item>
-        <item name="colorPrimaryDark">@color/pink_700</item>
-    </style>
+  <style name="Pink" parent="WhiteToolbarTheme">
+    <item name="colorPrimary">@color/pink_500</item>
+    <item name="colorPrimaryDark">@color/pink_700</item>
+  </style>
 
-    <style name="PinkAccent" parent="WhiteTint">
-        <item name="colorAccent">@color/pink_a400</item>
-        <item name="colorAccentDialog">@color/pink_a400</item>
-    </style>
+  <style name="PinkAccent" parent="WhiteTint">
+    <item name="colorAccent">@color/pink_a400</item>
+    <item name="colorAccentDialog">@color/pink_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_purple.xml b/app/src/main/res/values/theme_purple.xml
index e60d31229..68f5ed68c 100644
--- a/app/src/main/res/values/theme_purple.xml
+++ b/app/src/main/res/values/theme_purple.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Purple" parent="WhiteToolbarTheme">
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryDark">@color/purple_700</item>
-    </style>
+  <style name="Purple" parent="WhiteToolbarTheme">
+    <item name="colorPrimary">@color/purple_500</item>
+    <item name="colorPrimaryDark">@color/purple_700</item>
+  </style>
 
-    <style name="PurpleAccent" parent="WhiteTint">
-        <item name="colorAccent">@color/purple_a400</item>
-        <item name="colorAccentDialog">@color/purple_a400</item>
-    </style>
+  <style name="PurpleAccent" parent="WhiteTint">
+    <item name="colorAccent">@color/purple_a400</item>
+    <item name="colorAccentDialog">@color/purple_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_red.xml b/app/src/main/res/values/theme_red.xml
index 8b6ae0c12..972203e9a 100644
--- a/app/src/main/res/values/theme_red.xml
+++ b/app/src/main/res/values/theme_red.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Red" parent="WhiteToolbarTheme">
-        <item name="colorPrimary">@color/red_500</item>
-        <item name="colorPrimaryDark">@color/red_700</item>
-    </style>
+  <style name="Red" parent="WhiteToolbarTheme">
+    <item name="colorPrimary">@color/red_500</item>
+    <item name="colorPrimaryDark">@color/red_700</item>
+  </style>
 
-    <style name="RedAccent" parent="WhiteTint">
-        <item name="colorAccent">@color/red_a400</item>
-        <item name="colorAccentDialog">@color/red_a400</item>
-    </style>
+  <style name="RedAccent" parent="WhiteTint">
+    <item name="colorAccent">@color/red_a400</item>
+    <item name="colorAccentDialog">@color/red_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_teal.xml b/app/src/main/res/values/theme_teal.xml
index 47d1a7d93..54b9c75bd 100644
--- a/app/src/main/res/values/theme_teal.xml
+++ b/app/src/main/res/values/theme_teal.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Teal" parent="WhiteToolbarTheme">
-        <item name="colorPrimary">@color/teal_500</item>
-        <item name="colorPrimaryDark">@color/teal_700</item>
-    </style>
+  <style name="Teal" parent="WhiteToolbarTheme">
+    <item name="colorPrimary">@color/teal_500</item>
+    <item name="colorPrimaryDark">@color/teal_700</item>
+  </style>
 
-    <style name="TealAccent" parent="BlackTint">
-        <item name="colorAccent">@color/teal_a400</item>
-        <item name="colorAccentDialog">@color/teal_a400</item>
-    </style>
+  <style name="TealAccent" parent="BlackTint">
+    <item name="colorAccent">@color/teal_a400</item>
+    <item name="colorAccentDialog">@color/teal_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_yellow.xml b/app/src/main/res/values/theme_yellow.xml
index c375c57f4..79412b291 100644
--- a/app/src/main/res/values/theme_yellow.xml
+++ b/app/src/main/res/values/theme_yellow.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Yellow" parent="BlackToolbarTheme">
-        <item name="colorPrimary">@color/yellow_500</item>
-        <item name="colorPrimaryDark">@color/yellow_700</item>
-    </style>
+  <style name="Yellow" parent="BlackToolbarTheme">
+    <item name="colorPrimary">@color/yellow_500</item>
+    <item name="colorPrimaryDark">@color/yellow_700</item>
+  </style>
 
-    <style name="YellowAccent" parent="BlackTint">
-        <item name="colorAccent">@color/yellow_a400</item>
-        <item name="colorAccentDialog">@color/yellow_a400</item>
-    </style>
+  <style name="YellowAccent" parent="BlackTint">
+    <item name="colorAccent">@color/yellow_a400</item>
+    <item name="colorAccentDialog">@color/yellow_a400</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/backup_config.xml b/app/src/main/res/xml/backup_config.xml
index 7b39643a3..1df6a29be 100644
--- a/app/src/main/res/xml/backup_config.xml
+++ b/app/src/main/res/xml/backup_config.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <full-backup-content>
-  <exclude domain="sharedpref" path="evernote_jobs.xml" />
-  <exclude domain="database" path="evernote_jobs.db" />
+  <exclude
+    domain="sharedpref"
+    path="evernote_jobs.xml"/>
+  <exclude
+    domain="database"
+    path="evernote_jobs.db"/>
 </full-backup-content>
\ No newline at end of file
diff --git a/app/src/main/res/xml/file_provider_paths.xml b/app/src/main/res/xml/file_provider_paths.xml
index ae73680b4..8eb49a4bc 100644
--- a/app/src/main/res/xml/file_provider_paths.xml
+++ b/app/src/main/res/xml/file_provider_paths.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths>
-    <root-path name="root" path="." />
+  <root-path
+    name="root"
+    path="."/>
 </paths>
\ 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 79c751dd5..cfec4aa4b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,104 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory android:title="@string/theme">
-
-        <Preference
-            android:key="@string/p_theme"
-            android:title="@string/theme" />
-
-        <Preference
-            android:key="@string/p_theme_color"
-            android:title="@string/color" />
-
-        <Preference
-            android:key="@string/p_theme_accent"
-            android:title="@string/accent" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="@string/settings_general"
-        android:title="@string/settings_general">
-
-        <Preference
-            android:key="@string/EPr_appearance_header"
-            android:title="@string/EPr_appearance_header" />
-
-        <Preference
-            android:key="@string/notifications"
-            android:title="@string/notifications" />
-
-        <Preference android:title="@string/task_defaults">
-            <intent
-                android:targetClass="com.todoroo.astrid.core.DefaultsPreferences"
-                android:targetPackage="org.tasks" />
-        </Preference>
-
-        <Preference android:title="@string/date_and_time">
-            <intent
-                android:targetClass="org.tasks.preferences.DateTimePreferences"
-                android:targetPackage="org.tasks" />
-        </Preference>
-
-        <Preference
-            android:key="@string/synchronization"
-            android:title="@string/synchronization">
-            <intent
-                android:targetClass="org.tasks.sync.SynchronizationPreferences"
-                android:targetPackage="org.tasks" />
-        </Preference>
-
-        <Preference
-            android:key="@string/EPr_manage_header"
-            android:title="@string/EPr_manage_header" />
-
-        <Preference android:title="@string/miscellaneous">
-            <intent
-                android:targetClass="org.tasks.preferences.MiscellaneousPreferences"
-                android:targetPackage="org.tasks" />
-        </Preference>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:title="@string/backup_BPr_header">
-
-        <Preference
-            android:key="@string/p_backup_dir"
-            android:title="@string/backup_directory" />
-
-        <Preference
-            android:key="@string/backup_BAc_import"
-            android:title="@string/backup_BAc_import" />
-
-        <Preference
-            android:key="@string/backup_BAc_export"
-            android:title="@string/backup_BAc_export" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="@string/settings_localization"
-        android:title="@string/settings_localization">
-
-        <Preference
-            android:key="@string/p_language"
-            android:title="@string/language" />
-
-        <com.todoroo.astrid.ui.MultilineListPreference
-            android:defaultValue="-1"
-            android:key="@string/p_layout_direction"
-            android:title="@string/layout_direction"
-            android:entries="@array/layout_direction_entries"
-            android:entryValues="@array/layout_direction_values" />
-
-        <Preference android:title="@string/translations">
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:data="http://tasks.org/translations" />
-        </Preference>
-
-    </PreferenceCategory>
+  <PreferenceCategory android:title="@string/theme">
+
+    <Preference
+      android:key="@string/p_theme"
+      android:title="@string/theme"/>
+
+    <Preference
+      android:key="@string/p_theme_color"
+      android:title="@string/color"/>
+
+    <Preference
+      android:key="@string/p_theme_accent"
+      android:title="@string/accent"/>
+
+  </PreferenceCategory>
+
+  <PreferenceCategory
+    android:key="@string/settings_general"
+    android:title="@string/settings_general">
+
+    <Preference
+      android:key="@string/EPr_appearance_header"
+      android:title="@string/EPr_appearance_header"/>
+
+    <Preference
+      android:key="@string/notifications"
+      android:title="@string/notifications"/>
+
+    <Preference android:title="@string/task_defaults">
+      <intent
+        android:targetClass="com.todoroo.astrid.core.DefaultsPreferences"
+        android:targetPackage="org.tasks"/>
+    </Preference>
+
+    <Preference android:title="@string/date_and_time">
+      <intent
+        android:targetClass="org.tasks.preferences.DateTimePreferences"
+        android:targetPackage="org.tasks"/>
+    </Preference>
+
+    <Preference
+      android:key="@string/synchronization"
+      android:title="@string/synchronization">
+      <intent
+        android:targetClass="org.tasks.sync.SynchronizationPreferences"
+        android:targetPackage="org.tasks"/>
+    </Preference>
+
+    <Preference
+      android:key="@string/EPr_manage_header"
+      android:title="@string/EPr_manage_header"/>
+
+    <Preference android:title="@string/miscellaneous">
+      <intent
+        android:targetClass="org.tasks.preferences.MiscellaneousPreferences"
+        android:targetPackage="org.tasks"/>
+    </Preference>
+
+  </PreferenceCategory>
+
+  <PreferenceCategory
+    android:title="@string/backup_BPr_header">
+
+    <Preference
+      android:key="@string/p_backup_dir"
+      android:title="@string/backup_directory"/>
+
+    <Preference
+      android:key="@string/backup_BAc_import"
+      android:title="@string/backup_BAc_import"/>
+
+    <Preference
+      android:key="@string/backup_BAc_export"
+      android:title="@string/backup_BAc_export"/>
+
+  </PreferenceCategory>
+
+  <PreferenceCategory
+    android:key="@string/settings_localization"
+    android:title="@string/settings_localization">
+
+    <Preference
+      android:key="@string/p_language"
+      android:title="@string/language"/>
+
+    <com.todoroo.astrid.ui.MultilineListPreference
+      android:defaultValue="-1"
+      android:entries="@array/layout_direction_entries"
+      android:entryValues="@array/layout_direction_values"
+      android:key="@string/p_layout_direction"
+      android:title="@string/layout_direction"/>
+
+    <Preference android:title="@string/translations">
+      <intent
+        android:action="android.intent.action.VIEW"
+        android:data="http://tasks.org/translations"/>
+    </Preference>
+
+  </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_addons.xml b/app/src/main/res/xml/preferences_addons.xml
index eb68d1a1a..0db6b4851 100644
--- a/app/src/main/res/xml/preferences_addons.xml
+++ b/app/src/main/res/xml/preferences_addons.xml
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory
-        android:key="@string/get_plugins"
-        android:title="@string/get_plugins">
-
-        <Preference
-            android:selectable="false"
-            android:summary="@string/plugin_description" />
-
-        <Preference
-            android:key="@string/TLA_menu_donate"
-            android:summary="@string/donate_summary"
-            android:title="@string/TLA_menu_donate" />
-
-        <CheckBoxPreference
-            android:dependency="@string/p_purchased_themes"
-            android:disableDependentsState="true"
-            android:key="@string/p_purchased_themes"
-            android:summary="@string/themes_purchase_description"
-            android:title="@string/themes" />
-
-        <CheckBoxPreference
-            android:dependency="@string/p_purchased_dashclock"
-            android:disableDependentsState="true"
-            android:key="@string/p_purchased_dashclock"
-            android:summary="@string/dashclock_purchase_description"
-            android:title="@string/dashclock" />
-
-        <CheckBoxPreference
-            android:dependency="@string/p_purchased_tasker"
-            android:disableDependentsState="true"
-            android:key="@string/p_purchased_tasker"
-            android:summary="@string/tasker_description"
-            android:title="@string/tasker_locale" />
-
-    </PreferenceCategory>
+  <PreferenceCategory
+    android:key="@string/get_plugins"
+    android:title="@string/get_plugins">
+
+    <Preference
+      android:selectable="false"
+      android:summary="@string/plugin_description"/>
+
+    <Preference
+      android:key="@string/TLA_menu_donate"
+      android:summary="@string/donate_summary"
+      android:title="@string/TLA_menu_donate"/>
+
+    <CheckBoxPreference
+      android:dependency="@string/p_purchased_themes"
+      android:disableDependentsState="true"
+      android:key="@string/p_purchased_themes"
+      android:summary="@string/themes_purchase_description"
+      android:title="@string/themes"/>
+
+    <CheckBoxPreference
+      android:dependency="@string/p_purchased_dashclock"
+      android:disableDependentsState="true"
+      android:key="@string/p_purchased_dashclock"
+      android:summary="@string/dashclock_purchase_description"
+      android:title="@string/dashclock"/>
+
+    <CheckBoxPreference
+      android:dependency="@string/p_purchased_tasker"
+      android:disableDependentsState="true"
+      android:key="@string/p_purchased_tasker"
+      android:summary="@string/tasker_description"
+      android:title="@string/tasker_locale"/>
+
+  </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_appearance.xml b/app/src/main/res/xml/preferences_appearance.xml
index 4df304ec0..54c7c3d63 100644
--- a/app/src/main/res/xml/preferences_appearance.xml
+++ b/app/src/main/res/xml/preferences_appearance.xml
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/EPr_appearance_header">
-
-    <PreferenceCategory android:title="@string/task_list_options">
-
-        <com.todoroo.astrid.ui.MultilinePreference
-            android:key="@string/p_default_list"
-            android:title="@string/default_list" />
-
-        <Preference
-            android:defaultValue="16"
-            android:key="@string/p_fontSize"
-            android:title="@string/font_size" />
-
-        <Preference
-            android:defaultValue="16"
-            android:key="@string/p_rowPadding"
-            android:title="@string/row_spacing" />
-
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:defaultValue="false"
-            android:key="@string/p_fullTaskTitle"
-            android:title="@string/EPr_fullTask_title" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/EPr_edit_screen_options">
-        <Preference
-            android:key="@string/customize_edit_screen"
-            android:title="@string/customize_edit_screen"/>
-
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:defaultValue="false"
-            android:key="@string/p_back_button_saves_task"
-            android:title="@string/back_button_saves_task" />
-
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:defaultValue="true"
-            android:key="@string/p_show_task_edit_comments"
-            android:title="@string/EPr_show_task_edit_comments" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/EPr_filters_to_show_title">
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:defaultValue="true"
-            android:key="@string/p_show_today_filter"
-            android:title="@string/today" />
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:defaultValue="true"
-            android:key="@string/p_show_recently_modified_filter"
-            android:title="@string/BFE_Recent" />
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:defaultValue="true"
-            android:key="@string/p_show_not_in_list_filter"
-            android:title="@string/tag_FEx_untagged" />
-    </PreferenceCategory>
+  android:title="@string/EPr_appearance_header">
+
+  <PreferenceCategory android:title="@string/task_list_options">
+
+    <com.todoroo.astrid.ui.MultilinePreference
+      android:key="@string/p_default_list"
+      android:title="@string/default_list"/>
+
+    <Preference
+      android:defaultValue="16"
+      android:key="@string/p_fontSize"
+      android:title="@string/font_size"/>
+
+    <Preference
+      android:defaultValue="16"
+      android:key="@string/p_rowPadding"
+      android:title="@string/row_spacing"/>
+
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+      android:defaultValue="false"
+      android:key="@string/p_fullTaskTitle"
+      android:title="@string/EPr_fullTask_title"/>
+
+  </PreferenceCategory>
+
+  <PreferenceCategory android:title="@string/EPr_edit_screen_options">
+    <Preference
+      android:key="@string/customize_edit_screen"
+      android:title="@string/customize_edit_screen"/>
+
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+      android:defaultValue="false"
+      android:key="@string/p_back_button_saves_task"
+      android:title="@string/back_button_saves_task"/>
+
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+      android:defaultValue="true"
+      android:key="@string/p_show_task_edit_comments"
+      android:title="@string/EPr_show_task_edit_comments"/>
+
+  </PreferenceCategory>
+
+  <PreferenceCategory android:title="@string/EPr_filters_to_show_title">
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+      android:defaultValue="true"
+      android:key="@string/p_show_today_filter"
+      android:title="@string/today"/>
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+      android:defaultValue="true"
+      android:key="@string/p_show_recently_modified_filter"
+      android:title="@string/BFE_Recent"/>
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+      android:defaultValue="true"
+      android:key="@string/p_show_not_in_list_filter"
+      android:title="@string/tag_FEx_untagged"/>
+  </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_dashclock.xml b/app/src/main/res/xml/preferences_dashclock.xml
index c6c306b13..1616808a6 100644
--- a/app/src/main/res/xml/preferences_dashclock.xml
+++ b/app/src/main/res/xml/preferences_dashclock.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.todoroo.astrid.ui.MultilinePreference
-        android:key="@string/p_dashclock_filter"
-        android:title="@string/filter" />
+  <com.todoroo.astrid.ui.MultilinePreference
+    android:key="@string/p_dashclock_filter"
+    android:title="@string/filter"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_date_time.xml b/app/src/main/res/xml/preferences_date_time.xml
index 034ef6916..41ca7d994 100644
--- a/app/src/main/res/xml/preferences_date_time.xml
+++ b/app/src/main/res/xml/preferences_date_time.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <ListPreference
-        android:defaultValue="0"
-        android:entryValues="@array/day_of_week_values"
-        android:key="@string/p_start_of_week"
-        android:title="@string/start_of_week" />
+  <ListPreference
+    android:defaultValue="0"
+    android:entryValues="@array/day_of_week_values"
+    android:key="@string/p_start_of_week"
+    android:title="@string/start_of_week"/>
 
-    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-        android:defaultValue="false"
-        android:key="@string/p_use_native_datetime_pickers"
-        android:title="@string/use_native_datetime_pickers" />
+  <com.todoroo.astrid.ui.MultilineCheckboxPreference
+    android:defaultValue="false"
+    android:key="@string/p_use_native_datetime_pickers"
+    android:title="@string/use_native_datetime_pickers"/>
 
-    <org.tasks.ui.TimePreference
-        android:defaultValue="@integer/default_morning"
-        android:key="@string/p_date_shortcut_morning"
-        android:title="@string/date_shortcut_morning" />
+  <org.tasks.ui.TimePreference
+    android:defaultValue="@integer/default_morning"
+    android:key="@string/p_date_shortcut_morning"
+    android:title="@string/date_shortcut_morning"/>
 
-    <org.tasks.ui.TimePreference
-        android:defaultValue="@integer/default_afternoon"
-        android:key="@string/p_date_shortcut_afternoon"
-        android:title="@string/date_shortcut_afternoon" />
+  <org.tasks.ui.TimePreference
+    android:defaultValue="@integer/default_afternoon"
+    android:key="@string/p_date_shortcut_afternoon"
+    android:title="@string/date_shortcut_afternoon"/>
 
-    <org.tasks.ui.TimePreference
-        android:defaultValue="@integer/default_evening"
-        android:key="@string/p_date_shortcut_evening"
-        android:title="@string/date_shortcut_evening" />
+  <org.tasks.ui.TimePreference
+    android:defaultValue="@integer/default_evening"
+    android:key="@string/p_date_shortcut_evening"
+    android:title="@string/date_shortcut_evening"/>
 
-    <org.tasks.ui.TimePreference
-        android:defaultValue="@integer/default_night"
-        android:key="@string/p_date_shortcut_night"
-        android:title="@string/date_shortcut_night" />
+  <org.tasks.ui.TimePreference
+    android:defaultValue="@integer/default_night"
+    android:key="@string/p_date_shortcut_night"
+    android:title="@string/date_shortcut_night"/>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_debug.xml b/app/src/main/res/xml/preferences_debug.xml
index 43d02c3e8..5b247a1da 100644
--- a/app/src/main/res/xml/preferences_debug.xml
+++ b/app/src/main/res/xml/preferences_debug.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory
-        android:title="@string/debug">
+  <PreferenceCategory
+    android:title="@string/debug">
 
-        <Preference
-            android:title="@string/debug_unlock_purchases"
-            android:key="@string/debug_unlock_purchases" />
+    <Preference
+      android:key="@string/debug_unlock_purchases"
+      android:title="@string/debug_unlock_purchases"/>
 
-        <Preference
-            android:title="@string/debug_consume_purchases"
-            android:key="@string/debug_consume_purchases" />
+    <Preference
+      android:key="@string/debug_consume_purchases"
+      android:title="@string/debug_consume_purchases"/>
 
-        <CheckBoxPreference
-            android:title="@string/debug_strict_mode"
-            android:key="@string/p_strict_mode" />
+    <CheckBoxPreference
+      android:key="@string/p_strict_mode"
+      android:title="@string/debug_strict_mode"/>
 
-    </PreferenceCategory>
+  </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_defaults.xml b/app/src/main/res/xml/preferences_defaults.xml
index 3a1b0498d..850822f11 100644
--- a/app/src/main/res/xml/preferences_defaults.xml
+++ b/app/src/main/res/xml/preferences_defaults.xml
@@ -4,49 +4,49 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/task_defaults">
-    <com.todoroo.astrid.ui.MultilineListPreference
-        android:defaultValue="2"
-        android:entries="@array/EPr_default_importance"
-        android:entryValues="@array/EPr_default_importance_values"
-        android:key="@string/p_default_importance_key"
-        android:title="@string/EPr_default_importance_title" />
-    <com.todoroo.astrid.ui.MultilineListPreference
-        android:defaultValue="0"
-        android:entries="@array/EPr_default_urgency"
-        android:entryValues="@array/EPr_default_urgency_values"
-        android:key="@string/p_default_urgency_key"
-        android:title="@string/EPr_default_urgency_title" />
-    <Preference
-        android:key="@string/p_default_remote_list"
-        android:title="@string/default_sync" />
-    <com.todoroo.astrid.ui.MultilineListPreference
-        android:defaultValue="0"
-        android:entries="@array/EPr_default_hideUntil"
-        android:entryValues="@array/EPr_default_hideUntil_values"
-        android:key="@string/p_default_hideUntil_key"
-        android:title="@string/EPr_default_hideUntil_title" />
-    <com.todoroo.astrid.ui.MultilineListPreference
-        android:defaultValue="6"
-        android:entries="@array/EPr_default_reminders"
-        android:entryValues="@array/EPr_default_reminders_values"
-        android:key="@string/p_default_reminders_key"
-        android:title="@string/EPr_default_reminders_title" />
-    <com.todoroo.astrid.ui.MultilineListPreference
-        android:defaultValue="0"
-        android:entries="@array/EPr_reminder_random"
-        android:entryValues="@array/EPr_reminder_random_hours"
-        android:key="@string/p_rmd_default_random_hours"
-        android:title="@string/rmd_EPr_defaultRemind_title" />
-    <com.todoroo.astrid.ui.MultilineListPreference
-        android:defaultValue="0"
-        android:entries="@array/EPr_default_reminders_mode"
-        android:entryValues="@array/EPr_default_reminders_mode_values"
-        android:key="@string/p_default_reminders_mode_key"
-        android:title="@string/EPr_default_reminders_mode_title" />
-    <Preference
-        android:defaultValue="-1"
-        android:key="@string/gcal_p_default"
-        android:title="@string/default_calendar"
-        android:summary="@string/dont_add_to_calendar"/>
+  android:title="@string/task_defaults">
+  <com.todoroo.astrid.ui.MultilineListPreference
+    android:defaultValue="2"
+    android:entries="@array/EPr_default_importance"
+    android:entryValues="@array/EPr_default_importance_values"
+    android:key="@string/p_default_importance_key"
+    android:title="@string/EPr_default_importance_title"/>
+  <com.todoroo.astrid.ui.MultilineListPreference
+    android:defaultValue="0"
+    android:entries="@array/EPr_default_urgency"
+    android:entryValues="@array/EPr_default_urgency_values"
+    android:key="@string/p_default_urgency_key"
+    android:title="@string/EPr_default_urgency_title"/>
+  <Preference
+    android:key="@string/p_default_remote_list"
+    android:title="@string/default_sync"/>
+  <com.todoroo.astrid.ui.MultilineListPreference
+    android:defaultValue="0"
+    android:entries="@array/EPr_default_hideUntil"
+    android:entryValues="@array/EPr_default_hideUntil_values"
+    android:key="@string/p_default_hideUntil_key"
+    android:title="@string/EPr_default_hideUntil_title"/>
+  <com.todoroo.astrid.ui.MultilineListPreference
+    android:defaultValue="6"
+    android:entries="@array/EPr_default_reminders"
+    android:entryValues="@array/EPr_default_reminders_values"
+    android:key="@string/p_default_reminders_key"
+    android:title="@string/EPr_default_reminders_title"/>
+  <com.todoroo.astrid.ui.MultilineListPreference
+    android:defaultValue="0"
+    android:entries="@array/EPr_reminder_random"
+    android:entryValues="@array/EPr_reminder_random_hours"
+    android:key="@string/p_rmd_default_random_hours"
+    android:title="@string/rmd_EPr_defaultRemind_title"/>
+  <com.todoroo.astrid.ui.MultilineListPreference
+    android:defaultValue="0"
+    android:entries="@array/EPr_default_reminders_mode"
+    android:entryValues="@array/EPr_default_reminders_mode_values"
+    android:key="@string/p_default_reminders_mode_key"
+    android:title="@string/EPr_default_reminders_mode_title"/>
+  <Preference
+    android:defaultValue="-1"
+    android:key="@string/gcal_p_default"
+    android:summary="@string/dont_add_to_calendar"
+    android:title="@string/default_calendar"/>
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_help.xml b/app/src/main/res/xml/preferences_help.xml
index 7300a5bee..7a0e0f904 100644
--- a/app/src/main/res/xml/preferences_help.xml
+++ b/app/src/main/res/xml/preferences_help.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <Preference android:title="@string/source_code">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://github.com/tasks/tasks" />
-    </Preference>
+  <Preference android:title="@string/source_code">
+    <intent
+      android:action="android.intent.action.VIEW"
+      android:data="https://github.com/tasks/tasks"/>
+  </Preference>
 
-    <Preference android:title="@string/report_an_issue">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://github.com/tasks/tasks/issues" />
-    </Preference>
+  <Preference android:title="@string/report_an_issue">
+    <intent
+      android:action="android.intent.action.VIEW"
+      android:data="https://github.com/tasks/tasks/issues"/>
+  </Preference>
 
-    <Preference
-        android:key="@string/rate_tasks"
-        android:title="@string/rate_tasks">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="market://details?id=org.tasks" />
-    </Preference>
+  <Preference
+    android:key="@string/rate_tasks"
+    android:title="@string/rate_tasks">
+    <intent
+      android:action="android.intent.action.VIEW"
+      android:data="market://details?id=org.tasks"/>
+  </Preference>
 
-    <Preference
-        android:key="@string/contact_developer"
-        android:title="@string/contact_developer" />
+  <Preference
+    android:key="@string/contact_developer"
+    android:title="@string/contact_developer"/>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_misc.xml b/app/src/main/res/xml/preferences_misc.xml
index 72bf8dcb0..22a40b728 100644
--- a/app/src/main/res/xml/preferences_misc.xml
+++ b/app/src/main/res/xml/preferences_misc.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/miscellaneous">
+  android:title="@string/miscellaneous">
 
-    <Preference
-        android:key="@string/p_attachment_dir"
-        android:title="@string/attachment_directory" />
+  <Preference
+    android:key="@string/p_attachment_dir"
+    android:title="@string/attachment_directory"/>
 
-    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-        android:defaultValue="false"
-        android:key="@string/p_voiceRemindersEnabled"
-        android:summary="@string/EPr_voiceRemindersEnabled_desc_enabled"
-        android:title="@string/EPr_voiceRemindersEnabled_title" />
+  <com.todoroo.astrid.ui.MultilineCheckboxPreference
+    android:defaultValue="false"
+    android:key="@string/p_voiceRemindersEnabled"
+    android:summary="@string/EPr_voiceRemindersEnabled_desc_enabled"
+    android:title="@string/EPr_voiceRemindersEnabled_title"/>
 
-    <CheckBoxPreference
-        android:key="@string/p_calendar_reminders"
-        android:summary="@string/CRA_calendar_reminders_pref_desc_enabled"
-        android:title="@string/CRA_calendar_reminders_pref_title"
-        android:defaultValue="false"/>
+  <CheckBoxPreference
+    android:defaultValue="false"
+    android:key="@string/p_calendar_reminders"
+    android:summary="@string/CRA_calendar_reminders_pref_desc_enabled"
+    android:title="@string/CRA_calendar_reminders_pref_title"/>
 
-    <CheckBoxPreference
-        android:key="@string/p_end_at_deadline"
-        android:summaryOff="@string/EPr_cal_end_at_due_time"
-        android:summaryOn="@string/EPr_cal_start_at_due_time"
-        android:title="@string/EPr_cal_end_or_start_at_due_time"
-        android:defaultValue="true"/>
+  <CheckBoxPreference
+    android:defaultValue="true"
+    android:key="@string/p_end_at_deadline"
+    android:summaryOff="@string/EPr_cal_end_at_due_time"
+    android:summaryOn="@string/EPr_cal_start_at_due_time"
+    android:title="@string/EPr_cal_end_or_start_at_due_time"/>
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_oldtasks.xml b/app/src/main/res/xml/preferences_oldtasks.xml
index b6d55e5af..87afe4ba5 100644
--- a/app/src/main/res/xml/preferences_oldtasks.xml
+++ b/app/src/main/res/xml/preferences_oldtasks.xml
@@ -4,26 +4,26 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/EPr_manage_header">
+  android:title="@string/EPr_manage_header">
 
-    <com.todoroo.astrid.ui.MultilinePreference
-        android:key="@string/EPr_manage_purge_deleted"
-        android:title="@string/EPr_manage_purge_deleted" />
+  <com.todoroo.astrid.ui.MultilinePreference
+    android:key="@string/EPr_manage_purge_deleted"
+    android:title="@string/EPr_manage_purge_deleted"/>
 
-    <com.todoroo.astrid.ui.MultilinePreference
-        android:key="@string/EPr_manage_delete_completed_gcal"
-        android:title="@string/EPr_manage_delete_completed_gcal" />
+  <com.todoroo.astrid.ui.MultilinePreference
+    android:key="@string/EPr_manage_delete_completed_gcal"
+    android:title="@string/EPr_manage_delete_completed_gcal"/>
 
-    <com.todoroo.astrid.ui.MultilinePreference
-        android:key="@string/EPr_manage_delete_all_gcal"
-        android:title="@string/EPr_manage_delete_all_gcal" />
+  <com.todoroo.astrid.ui.MultilinePreference
+    android:key="@string/EPr_manage_delete_all_gcal"
+    android:title="@string/EPr_manage_delete_all_gcal"/>
 
-    <Preference
-        android:key="@string/EPr_reset_preferences"
-        android:title="@string/EPr_reset_preferences" />
+  <Preference
+    android:key="@string/EPr_reset_preferences"
+    android:title="@string/EPr_reset_preferences"/>
 
-    <Preference
-        android:key="@string/EPr_delete_task_data"
-        android:title="@string/EPr_delete_task_data" />
+  <Preference
+    android:key="@string/EPr_delete_task_data"
+    android:title="@string/EPr_delete_task_data"/>
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_privacy.xml b/app/src/main/res/xml/preferences_privacy.xml
index 6ca696606..ecaec7606 100644
--- a/app/src/main/res/xml/preferences_privacy.xml
+++ b/app/src/main/res/xml/preferences_privacy.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory
-        android:key="@string/privacy"
-        android:title="@string/privacy">
+  <PreferenceCategory
+    android:key="@string/privacy"
+    android:title="@string/privacy">
 
-        <Preference android:title="@string/privacy_policy">
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:data="http://tasks.org/privacy.html" />
-        </Preference>
+    <Preference android:title="@string/privacy_policy">
+      <intent
+        android:action="android.intent.action.VIEW"
+        android:data="http://tasks.org/privacy.html"/>
+    </Preference>
 
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="@string/p_collect_statistics"
-            android:summary="@string/send_anonymous_statistics_summary"
-            android:title="@string/send_anonymous_statistics" />
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/p_collect_statistics"
+      android:summary="@string/send_anonymous_statistics_summary"
+      android:title="@string/send_anonymous_statistics"/>
 
-    </PreferenceCategory>
+  </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_reminders.xml b/app/src/main/res/xml/preferences_reminders.xml
index cf734edca..7971d0ee5 100644
--- a/app/src/main/res/xml/preferences_reminders.xml
+++ b/app/src/main/res/xml/preferences_reminders.xml
@@ -4,115 +4,115 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tasks="http://schemas.android.com/apk/res-auto"
-    android:title="@string/notifications">
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tasks="http://schemas.android.com/apk/res-auto"
+  android:title="@string/notifications">
 
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="@string/p_rmd_enabled"
-        android:title="@string/enabled" />
-    <Preference
-        android:dependency="@string/p_rmd_enabled"
-        android:key="@string/notification_channel_settings"
-        android:title="@string/notification_channel_settings" />
-    <Preference
-        android:dependency="@string/p_rmd_enabled"
-        android:key="@string/battery_optimization_settings"
-        android:title="@string/battery_optimization_settings"
-        android:summary="@string/notification_disable_battery_optimizations_description" />
-    <RingtonePreference
-        android:defaultValue="content://settings/system/notification_sound"
-        android:dependency="@string/p_rmd_enabled"
-        android:key="@string/p_rmd_ringtone"
-        android:ringtoneType="notification"
-        android:showDefault="true"
-        android:showSilent="true"
-        android:title="@string/sound" />
-    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-        android:defaultValue="true"
-        android:dependency="@string/p_rmd_enabled"
-        android:key="@string/p_rmd_persistent"
-        android:summary="@string/persistent_notifications_description"
-        android:title="@string/persistent_notifications" />
-    <CheckBoxPreference
-        android:defaultValue="@bool/default_bundle_notifications"
-        android:dependency="@string/p_rmd_enabled"
-        android:key="@string/p_bundle_notifications"
-        android:title="@string/bundle_notifications"
-        android:summary="@string/bundle_notifications_summary" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:dependency="@string/p_rmd_enabled"
-        android:key="@string/p_rmd_vibrate"
-        android:title="@string/vibrations" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:dependency="@string/p_rmd_enabled"
-        android:key="@string/p_led_notification"
-        android:title="@string/led_notification"
-        android:summary="@string/hardware_support_required"/>
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:dependency="@string/p_rmd_enabled"
-        android:key="@string/p_field_missed_calls"
-        android:title="@string/missed_calls" />
-    <org.tasks.ui.TimePreference
-        android:defaultValue="@integer/default_remind_time"
-        android:dependency="@string/p_rmd_enabled"
-        android:key="@string/p_rmd_time"
-        android:title="@string/rmd_EPr_rmd_time_title"
-        tasks:summary="@string/rmd_EPr_rmd_time_desc" />
+  <CheckBoxPreference
+    android:defaultValue="true"
+    android:key="@string/p_rmd_enabled"
+    android:title="@string/enabled"/>
+  <Preference
+    android:dependency="@string/p_rmd_enabled"
+    android:key="@string/notification_channel_settings"
+    android:title="@string/notification_channel_settings"/>
+  <Preference
+    android:dependency="@string/p_rmd_enabled"
+    android:key="@string/battery_optimization_settings"
+    android:summary="@string/notification_disable_battery_optimizations_description"
+    android:title="@string/battery_optimization_settings"/>
+  <RingtonePreference
+    android:defaultValue="content://settings/system/notification_sound"
+    android:dependency="@string/p_rmd_enabled"
+    android:key="@string/p_rmd_ringtone"
+    android:ringtoneType="notification"
+    android:showDefault="true"
+    android:showSilent="true"
+    android:title="@string/sound"/>
+  <com.todoroo.astrid.ui.MultilineCheckboxPreference
+    android:defaultValue="true"
+    android:dependency="@string/p_rmd_enabled"
+    android:key="@string/p_rmd_persistent"
+    android:summary="@string/persistent_notifications_description"
+    android:title="@string/persistent_notifications"/>
+  <CheckBoxPreference
+    android:defaultValue="@bool/default_bundle_notifications"
+    android:dependency="@string/p_rmd_enabled"
+    android:key="@string/p_bundle_notifications"
+    android:summary="@string/bundle_notifications_summary"
+    android:title="@string/bundle_notifications"/>
+  <CheckBoxPreference
+    android:defaultValue="true"
+    android:dependency="@string/p_rmd_enabled"
+    android:key="@string/p_rmd_vibrate"
+    android:title="@string/vibrations"/>
+  <CheckBoxPreference
+    android:defaultValue="true"
+    android:dependency="@string/p_rmd_enabled"
+    android:key="@string/p_led_notification"
+    android:summary="@string/hardware_support_required"
+    android:title="@string/led_notification"/>
+  <CheckBoxPreference
+    android:defaultValue="false"
+    android:dependency="@string/p_rmd_enabled"
+    android:key="@string/p_field_missed_calls"
+    android:title="@string/missed_calls"/>
+  <org.tasks.ui.TimePreference
+    android:defaultValue="@integer/default_remind_time"
+    android:dependency="@string/p_rmd_enabled"
+    android:key="@string/p_rmd_time"
+    android:title="@string/rmd_EPr_rmd_time_title"
+    tasks:summary="@string/rmd_EPr_rmd_time_desc"/>
 
-    <PreferenceCategory android:title="@string/badges">
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="@string/p_badges_enabled"
-            android:title="@string/enabled"
-            android:summary="@string/badges_description" />
-        <com.todoroo.astrid.ui.MultilinePreference
-            android:dependency="@string/p_badges_enabled"
-            android:key="@string/p_badge_list"
-            android:title="@string/list" />
-    </PreferenceCategory>
+  <PreferenceCategory android:title="@string/badges">
+    <CheckBoxPreference
+      android:defaultValue="false"
+      android:key="@string/p_badges_enabled"
+      android:summary="@string/badges_description"
+      android:title="@string/enabled"/>
+    <com.todoroo.astrid.ui.MultilinePreference
+      android:dependency="@string/p_badges_enabled"
+      android:key="@string/p_badge_list"
+      android:title="@string/list"/>
+  </PreferenceCategory>
 
-    <PreferenceCategory
-        android:key="@string/geolocation_reminders"
-        android:title="@string/geolocation_reminders">
-        <com.todoroo.astrid.ui.MultilineListPreference
-            android:defaultValue="250"
-            android:dependency="@string/p_rmd_enabled"
-            android:entries="@array/geofence_radius_values"
-            android:entryValues="@array/geofence_radius_values"
-            android:key="@string/p_geofence_radius"
-            android:title="@string/geofence_radius_title" />
-        <com.todoroo.astrid.ui.MultilineListPreference
-            android:defaultValue="60"
-            android:dependency="@string/p_rmd_enabled"
-            android:entries="@array/geofence_responsiveness"
-            android:entryValues="@array/geofence_responsiveness_values"
-            android:key="@string/p_geofence_responsiveness"
-            android:title="@string/geofence_responsiveness_title" />
-    </PreferenceCategory>
+  <PreferenceCategory
+    android:key="@string/geolocation_reminders"
+    android:title="@string/geolocation_reminders">
+    <com.todoroo.astrid.ui.MultilineListPreference
+      android:defaultValue="250"
+      android:dependency="@string/p_rmd_enabled"
+      android:entries="@array/geofence_radius_values"
+      android:entryValues="@array/geofence_radius_values"
+      android:key="@string/p_geofence_radius"
+      android:title="@string/geofence_radius_title"/>
+    <com.todoroo.astrid.ui.MultilineListPreference
+      android:defaultValue="60"
+      android:dependency="@string/p_rmd_enabled"
+      android:entries="@array/geofence_responsiveness"
+      android:entryValues="@array/geofence_responsiveness_values"
+      android:key="@string/p_geofence_responsiveness"
+      android:title="@string/geofence_responsiveness_title"/>
+  </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/quiet_hours">
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:dependency="@string/p_rmd_enabled"
-            android:key="@string/p_rmd_enable_quiet"
-            android:summary="@string/quiet_hours_summary"
-            android:title="@string/enabled" />
-        <org.tasks.ui.TimePreference
-            android:defaultValue="@integer/default_quiet_hours_start"
-            android:dependency="@string/p_rmd_enable_quiet"
-            android:key="@string/p_rmd_quietStart"
-            android:title="@string/rmd_EPr_quiet_hours_start_title" />
-        <org.tasks.ui.TimePreference
-            android:defaultValue="@integer/default_quiet_hours_end"
-            android:dependency="@string/p_rmd_enable_quiet"
-            android:key="@string/p_rmd_quietEnd"
-            android:title="@string/rmd_EPr_quiet_hours_end_title" />
-    </PreferenceCategory>
+  <PreferenceCategory android:title="@string/quiet_hours">
+    <CheckBoxPreference
+      android:defaultValue="false"
+      android:dependency="@string/p_rmd_enabled"
+      android:key="@string/p_rmd_enable_quiet"
+      android:summary="@string/quiet_hours_summary"
+      android:title="@string/enabled"/>
+    <org.tasks.ui.TimePreference
+      android:defaultValue="@integer/default_quiet_hours_start"
+      android:dependency="@string/p_rmd_enable_quiet"
+      android:key="@string/p_rmd_quietStart"
+      android:title="@string/rmd_EPr_quiet_hours_start_title"/>
+    <org.tasks.ui.TimePreference
+      android:defaultValue="@integer/default_quiet_hours_end"
+      android:dependency="@string/p_rmd_enable_quiet"
+      android:key="@string/p_rmd_quietEnd"
+      android:title="@string/rmd_EPr_quiet_hours_end_title"/>
+  </PreferenceCategory>
 
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_synchronization.xml b/app/src/main/res/xml/preferences_synchronization.xml
index 8c16f0fef..7d098b1c0 100644
--- a/app/src/main/res/xml/preferences_synchronization.xml
+++ b/app/src/main/res/xml/preferences_synchronization.xml
@@ -4,41 +4,41 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/synchronization">
+  android:title="@string/synchronization">
 
-    <PreferenceCategory android:title="@string/gtasks_GPr_header">
+  <PreferenceCategory android:title="@string/gtasks_GPr_header">
 
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:defaultValue="false"
-            android:key="@string/sync_gtasks"
-            android:title="@string/enabled" />
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+      android:defaultValue="false"
+      android:key="@string/sync_gtasks"
+      android:title="@string/enabled"/>
 
-        <com.todoroo.astrid.ui.MultilinePreference
-            android:dependency="@string/sync_gtasks"
-            android:key="@string/sync_SPr_forget_key"
-            android:summary="@string/sync_SPr_forget_description"
-            android:title="@string/sync_SPr_forget">
-        </com.todoroo.astrid.ui.MultilinePreference>
+    <com.todoroo.astrid.ui.MultilinePreference
+      android:dependency="@string/sync_gtasks"
+      android:key="@string/sync_SPr_forget_key"
+      android:summary="@string/sync_SPr_forget_description"
+      android:title="@string/sync_SPr_forget">
+    </com.todoroo.astrid.ui.MultilinePreference>
 
-    </PreferenceCategory>
+  </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/CalDAV">
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="@string/p_sync_caldav"
-            android:title="@string/enabled" />
-    </PreferenceCategory>
+  <PreferenceCategory android:title="@string/CalDAV">
+    <CheckBoxPreference
+      android:defaultValue="false"
+      android:key="@string/p_sync_caldav"
+      android:title="@string/enabled"/>
+  </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/sync_SPr_interval_title">
-        <CheckBoxPreference
-          android:defaultValue="true"
-          android:key="@string/p_background_sync"
-          android:title="@string/enabled" />
-        <CheckBoxPreference
-          android:defaultValue="false"
-          android:dependency="@string/p_background_sync"
-          android:key="@string/p_background_sync_unmetered_only"
-          android:title="@string/background_sync_unmetered_only" />
-    </PreferenceCategory>
+  <PreferenceCategory android:title="@string/sync_SPr_interval_title">
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/p_background_sync"
+      android:title="@string/enabled"/>
+    <CheckBoxPreference
+      android:defaultValue="false"
+      android:dependency="@string/p_background_sync"
+      android:key="@string/p_background_sync_unmetered_only"
+      android:title="@string/background_sync_unmetered_only"/>
+  </PreferenceCategory>
 
 </PreferenceScreen>  
diff --git a/app/src/main/res/xml/preferences_tasker.xml b/app/src/main/res/xml/preferences_tasker.xml
index 42b651af6..23be7b62b 100644
--- a/app/src/main/res/xml/preferences_tasker.xml
+++ b/app/src/main/res/xml/preferences_tasker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.todoroo.astrid.ui.MultilinePreference
-        android:key="@string/filter"
-        android:title="@string/filter" />
+  <com.todoroo.astrid.ui.MultilinePreference
+    android:key="@string/filter"
+    android:title="@string/filter"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_widget.xml b/app/src/main/res/xml/preferences_widget.xml
index 8ea81bc91..64269f515 100644
--- a/app/src/main/res/xml/preferences_widget.xml
+++ b/app/src/main/res/xml/preferences_widget.xml
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.todoroo.astrid.ui.MultilinePreference
-        android:key="@string/p_widget_filter"
-        android:title="@string/filter" />
+  <com.todoroo.astrid.ui.MultilinePreference
+    android:key="@string/p_widget_filter"
+    android:title="@string/filter"/>
 
-    <com.todoroo.astrid.ui.MultilinePreference
-        android:key="@string/p_widget_theme"
-        android:title="@string/theme" />
+  <com.todoroo.astrid.ui.MultilinePreference
+    android:key="@string/p_widget_theme"
+    android:title="@string/theme"/>
 
-    <com.todoroo.astrid.ui.MultilinePreference
-        android:key="@string/p_widget_opacity"
-        android:title="@string/opacity" />
+  <com.todoroo.astrid.ui.MultilinePreference
+    android:key="@string/p_widget_opacity"
+    android:title="@string/opacity"/>
 
-    <PreferenceCategory
-        android:title="@string/widget_header_settings">
+  <PreferenceCategory
+    android:title="@string/widget_header_settings">
 
-        <CheckBoxPreference
-            android:title="@string/widget_show_header"
-            android:key="@string/p_widget_show_header" />
+    <CheckBoxPreference
+      android:key="@string/p_widget_show_header"
+      android:title="@string/widget_show_header"/>
 
-        <com.todoroo.astrid.ui.MultilinePreference
-            android:key="@string/p_widget_color"
-            android:title="@string/color" />
+    <com.todoroo.astrid.ui.MultilinePreference
+      android:key="@string/p_widget_color"
+      android:title="@string/color"/>
 
-        <CheckBoxPreference
-            android:key="@string/p_widget_show_settings"
-            android:title="@string/widget_show_settings" />
+    <CheckBoxPreference
+      android:key="@string/p_widget_show_settings"
+      android:title="@string/widget_show_settings"/>
 
-    </PreferenceCategory>
+  </PreferenceCategory>
 
-    <PreferenceCategory
-        android:title="@string/widget_row_settings">
+  <PreferenceCategory
+    android:title="@string/widget_row_settings">
 
-        <com.todoroo.astrid.ui.MultilinePreference
-            android:key="@string/p_widget_font_size"
-            android:title="@string/font_size" />
+    <com.todoroo.astrid.ui.MultilinePreference
+      android:key="@string/p_widget_font_size"
+      android:title="@string/font_size"/>
 
-        <CheckBoxPreference
-            android:key="@string/p_widget_show_due_date"
-            android:title="@string/widget_show_due_date" />
+    <CheckBoxPreference
+      android:key="@string/p_widget_show_due_date"
+      android:title="@string/widget_show_due_date"/>
 
-        <CheckBoxPreference
-            android:key="@string/p_widget_show_checkboxes"
-            android:title="@string/widget_show_checkboxes" />
+    <CheckBoxPreference
+      android:key="@string/p_widget_show_checkboxes"
+      android:title="@string/widget_show_checkboxes"/>
 
-    </PreferenceCategory>
+  </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/scrollable_widget_provider_info.xml b/app/src/main/res/xml/scrollable_widget_provider_info.xml
index a9d0137dd..c2532c9c3 100644
--- a/app/src/main/res/xml/scrollable_widget_provider_info.xml
+++ b/app/src/main/res/xml/scrollable_widget_provider_info.xml
@@ -3,13 +3,13 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:configure="org.tasks.widget.WidgetConfigActivity"
-    android:widgetCategory="keyguard|home_screen"
-    android:minWidth="110dp"
-    android:minHeight="110dp"
-    android:minResizeWidth="110dp"
-    android:minResizeHeight="110dp"
-    android:updatePeriodMillis="1800000"
-    android:initialLayout="@layout/scrollable_widget"
-    android:initialKeyguardLayout="@layout/scrollable_widget"
-    android:resizeMode="horizontal|vertical"
+  android:initialKeyguardLayout="@layout/scrollable_widget"
+  android:initialLayout="@layout/scrollable_widget"
+  android:minHeight="110dp"
+  android:minResizeHeight="110dp"
+  android:minResizeWidth="110dp"
+  android:minWidth="110dp"
+  android:resizeMode="horizontal|vertical"
+  android:updatePeriodMillis="1800000"
+  android:widgetCategory="keyguard|home_screen"
   tools:ignore="UnusedAttribute"/>
diff --git a/app/src/release/res/xml/google_analytics.xml b/app/src/release/res/xml/google_analytics.xml
index 1d132793a..12c090e76 100644
--- a/app/src/release/res/xml/google_analytics.xml
+++ b/app/src/release/res/xml/google_analytics.xml
@@ -1,46 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--suppress XmlUnboundNsPrefix -->
 <resources>
-    <string name="ga_trackingId">UA-43015607-3</string>
+  <string name="ga_trackingId">UA-43015607-3</string>
 
-    <bool name="ga_autoActivityTracking">true</bool>
-    <screenName name="com.todoroo.astrid.activity.TaskEditActivity">TaskEditActivity</screenName>
-    <screenName name="com.todoroo.astrid.files.AACRecordingActivity">AACRecordingActivity</screenName>
-    <screenName name="org.tasks.activities.AddAttachmentActivity">AddAttachmentActivity</screenName>
-    <screenName name="org.tasks.widget.ShortcutConfigActivity">ShortcutConfigActivity</screenName>
-    <screenName name="com.todoroo.astrid.activity.ShareLinkActivity">ShareLinkActivity</screenName>
-    <screenName name="org.tasks.reminders.NotificationActivity">NotificationActivity</screenName>
-    <screenName name="org.tasks.files.MyFilePickerActivity">MyFilePickerActivity</screenName>
-    <screenName name="org.tasks.reminders.MissedCallActivity">MissedCallActivity</screenName>
-    <screenName name="com.todoroo.astrid.gtasks.auth.GtasksLoginActivity">GtasksLoginActivity</screenName>
-    <screenName name="org.tasks.voice.VoiceCommandActivity">VoiceCommandActivity</screenName>
-    <screenName name="org.tasks.locale.ui.activity.TaskerSettingsActivity">TaskerSettingsActivity</screenName>
-    <screenName name="com.todoroo.astrid.activity.TaskListActivity">TaskListActivity</screenName>
-    <screenName name="org.tasks.activities.TagSettingsActivity">TagSettingsActivity</screenName>
-    <screenName name="org.tasks.reminders.SnoozeActivity">SnoozeActivity</screenName>
-    <screenName name="com.todoroo.astrid.core.CustomFilterActivity">CustomFilterActivity</screenName>
-    <screenName name="org.tasks.activities.CameraActivity">CameraActivity</screenName>
-    <screenName name="org.tasks.activities.CalendarSelectionActivity">CalendarSelectionActivity</screenName>
-    <screenName name="com.todoroo.astrid.gcal.CalendarReminderActivity">CalendarReminderActivity</screenName>
-    <screenName name="com.todoroo.astrid.activity.BeastModePreferences">BeastModePreferences</screenName>
-    <screenName name="org.tasks.activities.FilterSettingsActivity">FilterSettingsActivity</screenName>
-    <screenName name="org.tasks.activities.ColorPickerActivity">ColorPickerActivity</screenName>
-    <screenName name="org.tasks.activities.DateAndTimePickerActivity">DateAndTimePickerActivity</screenName>
-    <screenName name="org.tasks.activities.DatePickerActivity">DatePickerActivity</screenName>
-    <screenName name="org.tasks.activities.FilterSelectionActivity">FilterSelectionActivity</screenName>
-    <screenName name="org.tasks.activities.TimePickerActivity">TimePickerActivity</screenName>
-    <screenName name="org.tasks.files.FileExplore">FileExplore</screenName>
-    <screenName name="org.tasks.sync.SynchronizationPreferences">GtasksPreferences</screenName>
-    <screenName name="org.tasks.dashclock.DashClockSettings">DashClockSettings</screenName>
-    <screenName name="com.todoroo.astrid.core.DefaultsPreferences">DefaultsPreferences</screenName>
-    <screenName name="com.todoroo.astrid.core.OldTaskPreferences">OldTaskPreferences</screenName>
-    <screenName name="com.todoroo.astrid.reminders.ReminderPreferences">ReminderPreferences</screenName>
-    <screenName name="org.tasks.preferences.AppearancePreferences">AppearancePreferences</screenName>
-    <screenName name="org.tasks.preferences.BackupPreferences">BackupPreferences</screenName>
-    <screenName name="org.tasks.preferences.BasicPreferences">BasicPreferences</screenName>
-    <screenName name="org.tasks.preferences.DateTimePreferences">DateShortcutPreferences</screenName>
-    <screenName name="org.tasks.preferences.HelpAndFeedbackActivity">HelpAndFeedbackActivity</screenName>
-    <screenName name="org.tasks.preferences.MiscellaneousPreferences">MiscellaneousPreferences</screenName>
-    <screenName name="org.tasks.widget.WidgetConfigActivity">WidgetConfigActivity</screenName>
-    <screenName name="org.tasks.caldav.CaldavSettingsActivity">CaldavSettingsActivity</screenName>
+  <bool name="ga_autoActivityTracking">true</bool>
+  <screenName name="com.todoroo.astrid.activity.TaskEditActivity">TaskEditActivity</screenName>
+  <screenName name="com.todoroo.astrid.files.AACRecordingActivity">AACRecordingActivity</screenName>
+  <screenName name="org.tasks.activities.AddAttachmentActivity">AddAttachmentActivity</screenName>
+  <screenName name="org.tasks.widget.ShortcutConfigActivity">ShortcutConfigActivity</screenName>
+  <screenName name="com.todoroo.astrid.activity.ShareLinkActivity">ShareLinkActivity</screenName>
+  <screenName name="org.tasks.reminders.NotificationActivity">NotificationActivity</screenName>
+  <screenName name="org.tasks.files.MyFilePickerActivity">MyFilePickerActivity</screenName>
+  <screenName name="org.tasks.reminders.MissedCallActivity">MissedCallActivity</screenName>
+  <screenName name="com.todoroo.astrid.gtasks.auth.GtasksLoginActivity">GtasksLoginActivity
+  </screenName>
+  <screenName name="org.tasks.voice.VoiceCommandActivity">VoiceCommandActivity</screenName>
+  <screenName name="org.tasks.locale.ui.activity.TaskerSettingsActivity">TaskerSettingsActivity
+  </screenName>
+  <screenName name="com.todoroo.astrid.activity.TaskListActivity">TaskListActivity</screenName>
+  <screenName name="org.tasks.activities.TagSettingsActivity">TagSettingsActivity</screenName>
+  <screenName name="org.tasks.reminders.SnoozeActivity">SnoozeActivity</screenName>
+  <screenName name="com.todoroo.astrid.core.CustomFilterActivity">CustomFilterActivity</screenName>
+  <screenName name="org.tasks.activities.CameraActivity">CameraActivity</screenName>
+  <screenName name="org.tasks.activities.CalendarSelectionActivity">CalendarSelectionActivity
+  </screenName>
+  <screenName name="com.todoroo.astrid.gcal.CalendarReminderActivity">CalendarReminderActivity
+  </screenName>
+  <screenName name="com.todoroo.astrid.activity.BeastModePreferences">BeastModePreferences
+  </screenName>
+  <screenName name="org.tasks.activities.FilterSettingsActivity">FilterSettingsActivity</screenName>
+  <screenName name="org.tasks.activities.ColorPickerActivity">ColorPickerActivity</screenName>
+  <screenName name="org.tasks.activities.DateAndTimePickerActivity">DateAndTimePickerActivity
+  </screenName>
+  <screenName name="org.tasks.activities.DatePickerActivity">DatePickerActivity</screenName>
+  <screenName name="org.tasks.activities.FilterSelectionActivity">FilterSelectionActivity
+  </screenName>
+  <screenName name="org.tasks.activities.TimePickerActivity">TimePickerActivity</screenName>
+  <screenName name="org.tasks.files.FileExplore">FileExplore</screenName>
+  <screenName name="org.tasks.sync.SynchronizationPreferences">GtasksPreferences</screenName>
+  <screenName name="org.tasks.dashclock.DashClockSettings">DashClockSettings</screenName>
+  <screenName name="com.todoroo.astrid.core.DefaultsPreferences">DefaultsPreferences</screenName>
+  <screenName name="com.todoroo.astrid.core.OldTaskPreferences">OldTaskPreferences</screenName>
+  <screenName name="com.todoroo.astrid.reminders.ReminderPreferences">ReminderPreferences
+  </screenName>
+  <screenName name="org.tasks.preferences.AppearancePreferences">AppearancePreferences</screenName>
+  <screenName name="org.tasks.preferences.BackupPreferences">BackupPreferences</screenName>
+  <screenName name="org.tasks.preferences.BasicPreferences">BasicPreferences</screenName>
+  <screenName name="org.tasks.preferences.DateTimePreferences">DateShortcutPreferences</screenName>
+  <screenName name="org.tasks.preferences.HelpAndFeedbackActivity">HelpAndFeedbackActivity
+  </screenName>
+  <screenName name="org.tasks.preferences.MiscellaneousPreferences">MiscellaneousPreferences
+  </screenName>
+  <screenName name="org.tasks.widget.WidgetConfigActivity">WidgetConfigActivity</screenName>
+  <screenName name="org.tasks.caldav.CaldavSettingsActivity">CaldavSettingsActivity</screenName>
 </resources>
\ No newline at end of file