diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a20ef393ebc6b35dbbe4ca08ea098275751bc81c..e3f27d1ac92b0eb3ed1aae161e224c85398a2de9 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,7 +5,6 @@
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
     <option name="WRAP_COMMENTS" value="true" />
     <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
       <option name="VALUE_RESOURCE_FILE_SETTINGS">
         <value>
           <option name="WRAP_ATTRIBUTES" value="2" />
@@ -15,11 +14,6 @@
     <JavaCodeStyleSettings>
       <option name="FIELD_NAME_PREFIX" value="m" />
       <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-        <value />
-      </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="android" withSubpackages="true" static="false" />
@@ -50,8 +44,6 @@
     </JavaCodeStyleSettings>
     <XML>
       <option name="XML_ATTRIBUTE_WRAP" value="2" />
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
       <option name="XML_KEEP_WHITE_SPACES_INSIDE_CDATA" value="true" />
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eb2873e7ed57bab6887aec5b9785a87c916facee
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/opentasks/e-ui-sdk.jar b/opentasks/e-ui-sdk.jar
index e55401fc4a7cf2d30a750a642f60090b2f5822ee..4fe4cb0cb7123d5d3e771f29886f0d295b0388a4 100644
Binary files a/opentasks/e-ui-sdk.jar and b/opentasks/e-ui-sdk.jar differ
diff --git a/opentasks/src/main/AndroidManifest.xml b/opentasks/src/main/AndroidManifest.xml
index dc14275230758d586665bc732301d88bf0a042f0..42341a7799691b8265edb92539b28211766972bd 100644
--- a/opentasks/src/main/AndroidManifest.xml
+++ b/opentasks/src/main/AndroidManifest.xml
@@ -42,7 +42,7 @@
                 android:name=".ViewTaskActivity"
                 android:label="@string/title_task_detail"
                 android:parentActivityName=".TaskListActivity"
-                android:theme="@style/OpenTasksAppTheme"
+                android:theme="@style/OpenTasksAppThemeWhiteBackButton"
                 android:windowSoftInputMode="adjustResize">
             <intent-filter android:label="edit">
                 <action android:name="android.intent.action.VIEW" />
@@ -145,7 +145,7 @@
                 android:name=".SyncSettingsActivity"
                 android:label="@string/title_activity_settings"
                 android:parentActivityName=".TaskListActivity"
-                android:theme="@style/AppTheme">
+                android:theme="@style/AboutTheme">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="org.dmfs.tasks.TaskListActivity" />
@@ -155,7 +155,7 @@
                 android:name=".AboutActivity"
                 android:label="@string/title_activity_about"
                 android:parentActivityName=".TaskListActivity"
-                android:theme="@style/AppTheme">
+                android:theme="@style/AboutTheme">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="org.dmfs.tasks.TaskListActivity" />
@@ -265,7 +265,7 @@
                 android:name=".dashclock.DashClockPreferenceActivity"
                 android:exported="true"
                 android:label="@string/title_task_list"
-                android:theme="@style/AppTheme" />
+                android:theme="@style/AboutTheme" />
 
         <!-- Manage List -->
         <activity
@@ -299,7 +299,7 @@
         <activity
                 android:name=".AppSettingsActivity"
                 android:label="@string/title_activity_settings"
-                android:theme="@style/AppTheme" />
+                android:theme="@style/AboutTheme" />
 
         <!-- Notification -->
         <receiver
diff --git a/opentasks/src/main/java/org/dmfs/tasks/AboutActivity.java b/opentasks/src/main/java/org/dmfs/tasks/AboutActivity.java
index 38a74c229d6bbdfa3e7ba9d94f419f9c0cbdf8b5..7462bd50a4d7bd911c3f934368d9c692b0c8e001 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/AboutActivity.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/AboutActivity.java
@@ -9,12 +9,16 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Html;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
 import android.widget.TextView;
 
 import org.dmfs.tasks.utils.BaseActivity;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 
 import static org.dmfs.tasks.TaskListActivity.color_default_primary_text;
@@ -22,41 +26,22 @@ import static org.dmfs.tasks.TaskListActivity.color_default_primary_text;
 
 public class AboutActivity extends BaseActivity {
 
-
-
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
 
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.color_default_blue1)));
 
         getFragmentManager()
                 .beginTransaction()
                 .replace(R.id.about_container,
                         new AboutFragment())
                 .commit();
-        getSupportActionBar().setHomeAsUpIndicator(changeBackArrowColor(this, R.color.color_default_blue1));
-        String title=getResources().getString(R.string.title_activity_about);
-        getSupportActionBar().setTitle(Html.fromHtml("<font color='#007FFF'>"+title+" </font>"));
-        getSupportActionBar().getThemedContext();
-
-       // getSupportActionBar().setTitle(Html.fromHtml("<font color='#ffffff'> About </font>"));
-
-
+        String title = getResources().getString(R.string.title_activity_about);
+        SpannableString spannableString = new SpannableString(title);
+        spannableString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getApplicationContext(), R.color.color_default_primary_text)), 0, title.length(),
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        getSupportActionBar().setTitle(spannableString);
     }
-    public static Drawable changeBackArrowColor(Context context, int color) {
-        String resName;
-        int res;
-
-        resName = Build.VERSION.SDK_INT >= 23 ? "abc_ic_ab_back_material" : "abc_ic_ab_back_mtrl_am_alpha";
-        res = context.getResources().getIdentifier(resName, "drawable", context.getPackageName());
-        final Drawable upArrow = context.getResources().getDrawable(res);
-        upArrow.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
-
-        return upArrow;
-    }
-
 }
diff --git a/opentasks/src/main/java/org/dmfs/tasks/EditTaskActivity.java b/opentasks/src/main/java/org/dmfs/tasks/EditTaskActivity.java
index 3a2162f062245b4c9fb0e03591d4c57016644981..d3a0ab815912620dc184a5bcdbcfe10b03bf5777 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/EditTaskActivity.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/EditTaskActivity.java
@@ -22,6 +22,7 @@ import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 
+import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.fragment.app.Fragment;
@@ -29,6 +30,7 @@ import androidx.core.app.NavUtils;
 import androidx.appcompat.app.ActionBar;
 
 import android.text.Html;
+import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.util.Log;
@@ -87,7 +89,9 @@ public class EditTaskActivity extends BaseActivity
 
         setActivityTitle(action);
 
-        actionBar.setTitle(Html.fromHtml("<font color='"+R.color.color_default_primary_text+"'>"+actionBar.getTitle() +"</font>"));
+        SpannableString spannableString = new SpannableString(actionBar.getTitle());
+        spannableString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getApplicationContext(), R.color.color_default_primary_text)), 0, actionBar.getTitle().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        actionBar.setTitle(spannableString);
 
         if (savedInstanceState == null)
         {
diff --git a/opentasks/src/main/java/org/dmfs/tasks/ManageListActivity.java b/opentasks/src/main/java/org/dmfs/tasks/ManageListActivity.java
index bcc9398507a1834c9a2dfcf790b47c9bcba226d7..1396a4743adde91120f6f073a4ffc9265972e9e2 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/ManageListActivity.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/ManageListActivity.java
@@ -234,7 +234,8 @@ public class ManageListActivity extends BaseActivity implements OnClickListener,
         // click on delete
         else if (android.R.id.button2 == v.getId())
         {
-            final AlertDialog dialog = new AlertDialog.Builder(this).setTitle(getString(R.string.task_list_delete_dialog_title, mListName))
+            final AlertDialog dialog = new AlertDialog.Builder(this, R.style.customAlertDialog)
+                    .setTitle(getString(R.string.task_list_delete_dialog_title, mListName))
                     .setMessage(R.string.task_list_delete_dialog_message).setPositiveButton(R.string.activity_manage_list_btn_delete, this)
                     .setNegativeButton(android.R.string.cancel, this).create();
             // changes the color of the delete list button to red
diff --git a/opentasks/src/main/java/org/dmfs/tasks/SettingsListFragment.java b/opentasks/src/main/java/org/dmfs/tasks/SettingsListFragment.java
index 540845add14d942d4fa676540b1abeca841fa139..8ec1c64e3e845dcfdb57a2dbd7cd2594c3a33eab 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/SettingsListFragment.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/SettingsListFragment.java
@@ -151,7 +151,8 @@ public class SettingsListFragment extends ListFragment implements AbsListView.On
     {
         super.onResume();
         // create a new dialog, that shows accounts for inserting task lists
-        mChooseAccountToAddListDialog = new AlertDialog.Builder(getActivity()).setTitle(R.string.task_list_settings_dialog_account_title)
+        mChooseAccountToAddListDialog = new AlertDialog.Builder(getActivity(), R.style.customAlertDialog)
+                .setTitle(R.string.task_list_settings_dialog_account_title)
                 .setAdapter(mAccountAdapter, this).create();
     }
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/SyncSettingsActivity.java b/opentasks/src/main/java/org/dmfs/tasks/SyncSettingsActivity.java
index b1549b0ea6beaf277610db5461b41cd44f174178..806ace81c7c415f10757ad1334a16519aa05b462 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/SyncSettingsActivity.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/SyncSettingsActivity.java
@@ -30,6 +30,9 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
 import android.text.Html;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
 import android.view.View;
 import android.widget.Button;
 
@@ -42,35 +45,28 @@ import org.dmfs.tasks.utils.BaseActivity;
  *
  * @author Arjun Naik<arjun@arjunnaik.in>
  */
-public class SyncSettingsActivity extends BaseActivity
-{
+public class SyncSettingsActivity extends BaseActivity {
+
     private FragmentManager mManager;
     private SettingsListFragment mCurrentFrag;
 
 
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
         // Show the Up button in the action bar.
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setHomeAsUpIndicator(changeBackArrowColor(this, R.color.color_default_blue1));
 
         mManager = getSupportFragmentManager();
         showVisibleListsFragment();
-
-
-
-
     }
 
 
     /**
      * This function displays the list of providers which can be visible or hidden in {@link TaskListFragment}.
      */
-    public void showVisibleListsFragment()
-    {
+    public void showVisibleListsFragment() {
         SettingsListFragment syncedListFragment = new SettingsListFragment();
         Bundle args = new Bundle();
         args.putStringArray(SettingsListFragment.LIST_STRING_PARAMS, new String[] { "1" });
@@ -81,8 +77,11 @@ public class SyncSettingsActivity extends BaseActivity
         syncedListFragment.setArguments(args);
         mManager.beginTransaction().replace(R.id.visible_task_list_fragment, syncedListFragment).commit();
         mCurrentFrag = syncedListFragment;
-        String title=getResources().getString(R.string.title_activity_settings);
-        getSupportActionBar().setTitle(Html.fromHtml("<font color='#007FFF'>"+title+" </font>"));
+        String title = getResources().getString(R.string.title_activity_settings);
+        SpannableString spannableString = new SpannableString(title);
+        spannableString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getApplicationContext(), R.color.color_default_primary_text)), 0, title.length(),
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        getSupportActionBar().setTitle(spannableString);
         getSupportActionBar().getThemedContext().setTheme(R.style.settingToolbarTheme);
     }
 
@@ -90,8 +89,7 @@ public class SyncSettingsActivity extends BaseActivity
     /**
      * This function displays the list of providers which can be synced.
      */
-    public void showSyncedListsFragment()
-    {
+    public void showSyncedListsFragment() {
         SettingsListFragment syncedListFragment = new SettingsListFragment();
         Bundle args = new Bundle();
         args.putStringArray(SettingsListFragment.LIST_STRING_PARAMS, null);
@@ -102,11 +100,13 @@ public class SyncSettingsActivity extends BaseActivity
         syncedListFragment.setArguments(args);
         mManager.beginTransaction().replace(R.id.visible_task_list_fragment, syncedListFragment).commit();
         mCurrentFrag = syncedListFragment;
-       // getSupportActionBar().setTitle(R.string.synced_task_lists);
 
-        String title=getResources().getString(R.string.synced_task_lists);
-        getSupportActionBar().setTitle(Html.fromHtml("<font color='#007FFF'>"+title+" </font>"));
         getSupportActionBar().getThemedContext().setTheme(R.style.settingToolbarTheme);
+        String title = getResources().getString(R.string.synced_task_lists);
+        SpannableString spannableString = new SpannableString(title);
+        spannableString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getApplicationContext(), R.color.color_default_primary_text)), 0, title.length(),
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        getSupportActionBar().setTitle(spannableString);
     }
 
 
@@ -118,8 +118,7 @@ public class SyncSettingsActivity extends BaseActivity
      * @param v
      *         Reference to the {@link Button} which was clicked is passed as a {@link View} object.
      */
-    public void showSyncedList(View v)
-    {
+    public void showSyncedList(View v) {
         mCurrentFrag.saveListState();
         // Call a function to indicate to the fragment that the state change to the list have been saved(clear the hashmap).
         mCurrentFrag.doneSaveListState();
@@ -135,8 +134,7 @@ public class SyncSettingsActivity extends BaseActivity
      * @param v
      *         Reference to the {@link Button} which was clicked is passed as a {@link View} object.
      */
-    public void onSaveUpdated(View v)
-    {
+    public void onSaveUpdated(View v) {
         mCurrentFrag.saveListState();
         showVisibleListsFragment();
 
@@ -150,21 +148,7 @@ public class SyncSettingsActivity extends BaseActivity
      * @param v
      *         Reference to the {@link Button} which was clicked is passed as a {@link View} object.
      */
-    public void onCancelUpdated(View v)
-    {
+    public void onCancelUpdated(View v) {
         showVisibleListsFragment();
     }
-
-    public static Drawable changeBackArrowColor(Context context, int color) {
-        String resName;
-        int res;
-
-        resName = Build.VERSION.SDK_INT >= 23 ? "abc_ic_ab_back_material" : "abc_ic_ab_back_mtrl_am_alpha";
-        res = context.getResources().getIdentifier(resName, "drawable", context.getPackageName());
-        final Drawable upArrow = context.getResources().getDrawable(res);
-        upArrow.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
-
-        return upArrow;
-    }
-
 }
diff --git a/opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java b/opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java
index a0abf889ed6118c794eb689597cc5cd95723a4c2..86310566ca4dea4f4f3e8cbf6edbf3a2ce821351 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java
@@ -21,57 +21,31 @@ import android.app.SearchManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
-import android.content.res.TypedArray;
-
 import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-
-import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.tabs.TabLayout;
-
-import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.core.view.MenuItemCompat;
-import androidx.core.view.MenuItemCompat.OnActionExpandListener;
-import androidx.viewpager.widget.ViewPager;
-import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.SearchView.OnQueryTextListener;
-import androidx.appcompat.widget.Toolbar;
-
-import android.text.Html;
-import android.util.Log;
-import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.TextView;
+
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
 
 import org.dmfs.android.bolts.color.Color;
-import org.dmfs.android.bolts.color.colors.AccentColor;
 import org.dmfs.android.bolts.color.colors.PrimaryColor;
 import org.dmfs.android.bolts.color.elementary.ValueColor;
 import org.dmfs.android.retentionmagic.annotations.Retain;
+import org.dmfs.jems.single.adapters.Unchecked;
 import org.dmfs.provider.tasks.AuthorityUtil;
 import org.dmfs.tasks.contract.TaskContract.Tasks;
 import org.dmfs.tasks.groupings.AbstractGroupingFactory;
@@ -85,9 +59,23 @@ import org.dmfs.tasks.model.ContentSet;
 import org.dmfs.tasks.utils.BaseActivity;
 import org.dmfs.tasks.utils.ExpandableGroupDescriptor;
 import org.dmfs.tasks.utils.SearchHistoryHelper;
-import org.dmfs.jems.single.adapters.Unchecked;
 import org.dmfs.tasks.utils.colors.DarkenedForStatusBar;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.SearchView.OnQueryTextListener;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.view.MenuItemCompat;
+import androidx.core.view.MenuItemCompat.OnActionExpandListener;
+import androidx.core.widget.ImageViewCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.viewpager.widget.ViewPager;
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
+
 
 /**
  * An activity representing a list of Tasks. This activity has different presentations for handset and tablet-size devices. On handsets, the activity presents a
@@ -104,8 +92,8 @@ import org.dmfs.tasks.utils.colors.DarkenedForStatusBar;
  *
  * @author Tobias Reinsch <tobias@dmfs.org>
  */
-public class TaskListActivity extends BaseActivity implements TaskListFragment.Callbacks, ViewTaskFragment.Callback {
-
+public class TaskListActivity extends BaseActivity implements TaskListFragment.Callbacks, ViewTaskFragment.Callback
+{
     /**
      * Tells the activity to display the details of the task with the URI from the intent data.
      **/
@@ -204,11 +192,14 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
     public static int color_default_primary;
     Toolbar toolbar;
 
+
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState)
+    {
         super.onCreate(savedInstanceState);
 
-        if (mLastUsedColor == android.graphics.Color.TRANSPARENT) {
+        if (mLastUsedColor == android.graphics.Color.TRANSPARENT)
+        {
             // no saved color, use the primary color
             mLastUsedColor = new PrimaryColor(this).argb();
         }
@@ -218,8 +209,10 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
         resolveIntentAction(getIntent());
 
-        if (mSelectedTaskUri != null) {
-            if (!mTwoPane && mShouldSwitchToDetail) {
+        if (mSelectedTaskUri != null)
+        {
+            if (!mTwoPane && mShouldSwitchToDetail)
+            {
                 Intent viewTaskIntent = new Intent(Intent.ACTION_VIEW);
                 viewTaskIntent.setData(mSelectedTaskUri);
                 viewTaskIntent.putExtra(ViewTaskActivity.EXTRA_COLOR, mLastUsedColor);
@@ -227,7 +220,9 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
                 mShouldSwitchToDetail = false;
                 mTransientState = true;
             }
-        } else {
+        }
+        else
+        {
             mShouldSwitchToDetail = false;
         }
 
@@ -239,25 +234,29 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
         mAuthority = AuthorityUtil.taskAuthority(this);
         mSearchHistoryHelper = new SearchHistoryHelper(this);
 
-        if (findViewById(R.id.task_detail_container) != null) {
+        if (findViewById(R.id.task_detail_container) != null)
+        {
             /* Note: 'savedInstanceState == null' is not used here as would be usual with fragments, because of the case of when rotation means
             switching from one-pane mode to two-pane mode on small tablets and the fragment has to added. To cover that case as well, the fragment is always replaced. */
             replaceTaskDetailsFragment(
                     mSelectedTaskUri == null ?
                             EmptyTaskFragment.newInstance(new ValueColor(mLastUsedColor))
                             : ViewTaskFragment.newInstance(mSelectedTaskUri, new ValueColor(mLastUsedColor)));
-        } else {
+        }
+        else
+        {
             // When rotating the screen means switching from two-pane to single-pane mode (on small tablets), remove the obsolete fragment that gets recreated by FragmentManager:
             FragmentManager fragmentManager = getSupportFragmentManager();
             Fragment detailFragment = fragmentManager.findFragmentByTag(DETAILS_FRAGMENT_TAG);
-            if (detailFragment != null) {
+            if (detailFragment != null)
+            {
                 fragmentManager.beginTransaction().remove(detailFragment).commit();
             }
         }
 
-        mGroupingFactories = new AbstractGroupingFactory[]{
+        mGroupingFactories = new AbstractGroupingFactory[] {
                 new ByList(mAuthority, this), new ByDueDate(mAuthority), new ByStartDate(mAuthority),
-                new ByPriority(mAuthority, this), new ByProgress(mAuthority), new BySearch(mAuthority, mSearchHistoryHelper)};
+                new ByPriority(mAuthority, this), new ByProgress(mAuthority), new BySearch(mAuthority, mSearchHistoryHelper) };
 
         mPagerAdapter = new Unchecked<>(() -> new TaskGroupPagerAdapter(getSupportFragmentManager(), mGroupingFactories, this, R.xml.listview_tabs)).value();
 
@@ -266,14 +265,19 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
         int currentPageIndex = mPagerAdapter.getPagePosition(mCurrentPageId);
 
-        if (currentPageIndex >= 0) {
+        if (currentPageIndex >= 0)
+        {
             mCurrentPagePosition = currentPageIndex;
             mViewPager.setCurrentItem(currentPageIndex);
-            if (mCurrentPageId == R.id.task_group_search) {
-                if (mSearchItem != null) {
+            if (mCurrentPageId == R.id.task_group_search)
+            {
+                if (mSearchItem != null)
+                {
                     // that's actually quite impossible to happen
                     MenuItemCompat.expandActionView(mSearchItem);
-                } else {
+                }
+                else
+                {
                     mAutoExpandSearchView = true;
                 }
             }
@@ -285,42 +289,50 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
         mTabs.setupWithViewPager(mViewPager);
         setupTabIcons();
 
-
-
-        mTabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+        mTabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener()
+        {
             @Override
-            public void onTabSelected(TabLayout.Tab tab) {
+            public void onTabSelected(TabLayout.Tab tab)
+            {
                 tab.getIcon().setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_IN);
             }
 
+
             @Override
-            public void onTabUnselected(TabLayout.Tab tab) {
+            public void onTabUnselected(TabLayout.Tab tab)
+            {
                 tab.getIcon().setColorFilter(getResources().getColor(R.color.dark_gray), PorterDuff.Mode.SRC_IN);
             }
 
+
             @Override
-            public void onTabReselected(TabLayout.Tab tab) {
+            public void onTabReselected(TabLayout.Tab tab)
+            {
 
             }
         });
 
-
-        mViewPager.addOnPageChangeListener(new OnPageChangeListener() {
+        mViewPager.addOnPageChangeListener(new OnPageChangeListener()
+        {
 
             @Override
-            public void onPageSelected(int position) {
+            public void onPageSelected(int position)
+            {
                 mSelectedTaskUri = null;
                 mCurrentPagePosition = position;
 
                 int newPageId = mPagerAdapter.getPageId(mCurrentPagePosition);
 
-                if (newPageId == R.id.task_group_search) {
+                if (newPageId == R.id.task_group_search)
+                {
                     int oldPageId = mCurrentPageId;
                     mCurrentPageId = newPageId;
 
                     // store the page position we're coming from
                     mPreviousPagePosition = mPagerAdapter.getPagePosition(oldPageId);
-                } else if (mCurrentPageId == R.id.task_group_search) {
+                }
+                else if (mCurrentPageId == R.id.task_group_search)
+                {
                     // we've been on the search page before, so commit the search and close the search view
                     mSearchHistoryHelper.commitSearch();
                     mHandler.post(mSearchUpdater);
@@ -333,48 +345,39 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
 
             @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels)
+            {
             }
 
 
             @Override
-            public void onPageScrollStateChanged(int state) {
-                if (state == ViewPager.SCROLL_STATE_IDLE && mCurrentPageId == R.id.task_group_search) {
+            public void onPageScrollStateChanged(int state)
+            {
+                if (state == ViewPager.SCROLL_STATE_IDLE && mCurrentPageId == R.id.task_group_search)
+                {
                     // the search page is selected now, expand the search view
-                    mHandler.postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            MenuItemCompat.expandActionView(mSearchItem);
-                        }
-                    }, 50);
+                    mHandler.postDelayed(() -> MenuItemCompat.expandActionView(mSearchItem), 50);
                 }
             }
-
         });
 
         mFloatingActionButton = (FloatingActionButton) findViewById(R.id.floating_action_button);
 
-        if (mFloatingActionButton != null) {
-            mFloatingActionButton.setOnClickListener(new OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    onAddNewTask();
-                }
-            });
+        if (mFloatingActionButton != null)
+        {
+            mFloatingActionButton.setOnClickListener(v -> onAddNewTask());
         }
 
-        ACCENT_COLOR=fetchAccentColor(this);
-        //mFloatingActionButton.setBackgroundTintList(ColorStateList.valueOf(darkenColor20(color_default_blue1)));
+        ACCENT_COLOR = fetchAccentColor(this);
         mFloatingActionButton.setBackgroundTintList(ColorStateList.valueOf(color_default_primary));
 
-        this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-
     }
 
 
-    private void setupTabIcons() {
-        for (int i = 0, count = mPagerAdapter.getCount(); i < count; ++i) {
+    private void setupTabIcons()
+    {
+        for (int i = 0, count = mPagerAdapter.getCount(); i < count; ++i)
+        {
             mTabs.getTabAt(i).setIcon(mPagerAdapter.getTabIcon(i));
             mTabs.getTabAt(i).getIcon().setColorFilter(getResources().getColor(R.color.dark_gray), PorterDuff.Mode.SRC_IN);
         }
@@ -382,7 +385,8 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
 
     @Override
-    protected void onResume() {
+    protected void onResume()
+    {
         updateTitle(mCurrentPageId);
         mTabs.getTabAt(mTabs.getSelectedTabPosition()).getIcon().setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_IN);
         super.onResume();
@@ -390,14 +394,16 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
 
     @Override
-    protected void onNewIntent(Intent intent) {
+    protected void onNewIntent(Intent intent)
+    {
         resolveIntentAction(intent);
         super.onNewIntent(intent);
     }
 
 
     @Override
-    protected void onDestroy() {
+    protected void onDestroy()
+    {
         super.onDestroy();
         mSearchHistoryHelper.close();
     }
@@ -407,16 +413,22 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
      * Callback method from {@link TaskListFragment.Callbacks} indicating that the item with the given ID was selected.
      */
     @Override
-    public void onItemSelected(@NonNull Uri uri, @NonNull Color taskListColor, boolean forceReload, int pagePosition) {
+    public void onItemSelected(@NonNull Uri uri, @NonNull Color taskListColor, boolean forceReload, int pagePosition)
+    {
         // only accept selections from the current visible task fragment or the activity itself
-        if (pagePosition == -1 || pagePosition == mCurrentPagePosition) {
-            if (mTwoPane) {
-                if (forceReload) {
+        if (pagePosition == -1 || pagePosition == mCurrentPagePosition)
+        {
+            if (mTwoPane)
+            {
+                if (forceReload)
+                {
                     mSelectedTaskUri = uri;
                     mShouldSwitchToDetail = false;
                 }
                 replaceTaskDetailsFragment(ViewTaskFragment.newInstance(uri, taskListColor));
-            } else if (forceReload) {
+            }
+            else if (forceReload)
+            {
                 mSelectedTaskUri = uri;
 
                 // In single-pane mode, simply start the detail activity
@@ -432,10 +444,13 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
 
     @Override
-    public void onItemRemoved(@NonNull Uri taskUri) {
-        if (taskUri.equals(mSelectedTaskUri)) {
+    public void onItemRemoved(@NonNull Uri taskUri)
+    {
+        if (taskUri.equals(mSelectedTaskUri))
+        {
             mSelectedTaskUri = null;
-            if (mTwoPane) {
+            if (mTwoPane)
+            {
                 replaceTaskDetailsFragment(EmptyTaskFragment.newInstance(new ValueColor(mLastUsedColor)));
             }
         }
@@ -443,7 +458,8 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
 
     @Override
-    public void onAddNewTask() {
+    public void onAddNewTask()
+    {
         Intent editTaskIntent = new Intent(Intent.ACTION_INSERT);
         editTaskIntent.setData(Tasks.getContentUri(mAuthority));
         startActivityForResult(editTaskIntent, REQUEST_CODE_NEW_TASK);
@@ -451,9 +467,12 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
 
     @Override
-    public ExpandableGroupDescriptor getGroupDescriptor(int pageId) {
-        for (AbstractGroupingFactory factory : mGroupingFactories) {
-            if (factory.getId() == pageId) {
+    public ExpandableGroupDescriptor getGroupDescriptor(int pageId)
+    {
+        for (AbstractGroupingFactory factory : mGroupingFactories)
+        {
+            if (factory.getId() == pageId)
+            {
                 return factory.getExpandableGroupDescriptor();
             }
         }
@@ -461,10 +480,12 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
     }
 
 
-    private void replaceTaskDetailsFragment(@NonNull Fragment fragment) {
+    private void replaceTaskDetailsFragment(@NonNull Fragment fragment)
+    {
         FragmentManager fragmentManager = getSupportFragmentManager();
         // only change state if the state has not been saved yet, otherwise just drop it
-        if (!fragmentManager.isStateSaved()) {
+        if (!fragmentManager.isStateSaved())
+        {
             fragmentManager.beginTransaction()
                     .setCustomAnimations(0, R.anim.openttasks_fade_exit, 0, 0)
                     .replace(R.id.task_detail_container, fragment, DETAILS_FRAGMENT_TAG).commit();
@@ -472,8 +493,10 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
     }
 
 
-    private void updateTitle(int pageId) {
-        switch (pageId) {
+    private void updateTitle(int pageId)
+    {
+        switch (pageId)
+        {
             case R.id.task_group_by_list:
                 getSupportActionBar().setTitle(R.string.task_group_title_list);
                 break;
@@ -497,21 +520,27 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
     }
 
 
-    private void resolveIntentAction(Intent intent) {
+    private void resolveIntentAction(Intent intent)
+    {
         // check which task should be selected
-        if (intent.getBooleanExtra(EXTRA_DISPLAY_TASK, false)) {
+        if (intent.getBooleanExtra(EXTRA_DISPLAY_TASK, false))
+        {
             mShouldSwitchToDetail = true;
             mSelectedTaskUri = intent.getData();
         }
 
-        if (intent.getBooleanExtra(EXTRA_DISPLAY_TASK, false) && intent.getBooleanExtra(EXTRA_FORCE_LIST_SELECTION, true) && mTwoPane) {
+        if (intent.getBooleanExtra(EXTRA_DISPLAY_TASK, false) && intent.getBooleanExtra(EXTRA_FORCE_LIST_SELECTION, true) && mTwoPane)
+        {
             mShouldSwitchToDetail = true;
             mSelectedTaskUriOnLaunch = intent.getData();
             mShouldSelectTaskListItem = true;
-            if (mPagerAdapter != null) {
+            if (mPagerAdapter != null)
+            {
                 mPagerAdapter.notifyDataSetChanged();
             }
-        } else {
+        }
+        else
+        {
             mSelectedTaskUriOnLaunch = null;
             mShouldSelectTaskListItem = false;
         }
@@ -519,8 +548,10 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
 
     @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        if (resultCode == RESULT_OK && intent != null && intent.getData() != null) {
+    public void onActivityResult(int requestCode, int resultCode, Intent intent)
+    {
+        if (resultCode == RESULT_OK && intent != null && intent.getData() != null)
+        {
             // Use the same flow to display the new task as if it was opened from the widget
             Intent displayIntent = new Intent(this, TaskListActivity.class);
             displayIntent.putExtra(TaskListActivity.EXTRA_DISPLAY_TASK, !intent.getBooleanExtra(EditTaskFragment.KEY_NEW_TASK, false));
@@ -538,10 +569,12 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
 
     @Override
-    public void onTaskEditRequested(@NonNull Uri taskUri, ContentSet data) {
+    public void onTaskEditRequested(@NonNull Uri taskUri, ContentSet data)
+    {
         Intent editTaskIntent = new Intent(Intent.ACTION_EDIT);
         editTaskIntent.setData(taskUri);
-        if (data != null) {
+        if (data != null)
+        {
             Bundle extraBundle = new Bundle();
             extraBundle.putParcelable(EditTaskActivity.EXTRA_DATA_CONTENT_SET, data);
             editTaskIntent.putExtra(EditTaskActivity.EXTRA_DATA_BUNDLE, extraBundle);
@@ -551,11 +584,13 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
 
     @Override
-    public void onTaskDeleted(@NonNull Uri taskUri) {
-        if (taskUri.equals(mSelectedTaskUri)) // Only the selected task can be deleted on the UI, but just to be safe
-        {
+    public void onTaskDeleted(@NonNull Uri taskUri)
+    {
+        if (taskUri.equals(mSelectedTaskUri))
+        { // Only the selected task can be deleted on the UI, but just to be safe
             mSelectedTaskUri = null;
-            if (mTwoPane) {
+            if (mTwoPane)
+            {
                 // empty the detail fragment
                 replaceTaskDetailsFragment(EmptyTaskFragment.newInstance(new ValueColor(mLastUsedColor)));
             }
@@ -565,7 +600,8 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
 
     @Override
-    public void onTaskCompleted(@NonNull Uri taskUri) {
+    public void onTaskCompleted(@NonNull Uri taskUri)
+    {
         /* TODO We delegate to onTaskDeleted() which was used previously for this event, too.
         This causes the removal of details view, but the task is selected again if completed tasks are shown. This causes a flash. */
         onTaskDeleted(taskUri);
@@ -574,18 +610,22 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
     @SuppressLint("NewApi")
     @Override
-    public void onListColorLoaded(@NonNull Color color) {
+    public void onListColorLoaded(@NonNull Color color)
+    {
         mLastUsedColor = color.argb();
-        if (mTwoPane) {
+        if (mTwoPane)
+        {
             int colorInt = color.argb();
             getSupportActionBar().setBackgroundDrawable(new ColorDrawable(colorInt));
             mTabs.setBackgroundColor(colorInt);
 
-            if (mAppBarLayout != null) {
+            if (mAppBarLayout != null)
+            {
                 mAppBarLayout.setBackgroundColor(colorInt);
             }
 
-            if (VERSION.SDK_INT >= 21) {
+            if (VERSION.SDK_INT >= 21)
+            {
                 Window window = getWindow();
                 window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
                 window.setStatusBarColor(new DarkenedForStatusBar(color).argb());
@@ -595,12 +635,14 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
+    public boolean onCreateOptionsMenu(Menu menu)
+    {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.task_list_activity_menu, menu);
 
         MenuItem addItem = menu.findItem(R.id.menu_add_task);
-        if (addItem != null && mFloatingActionButton != null) {
+        if (addItem != null && mFloatingActionButton != null)
+        {
             // hide menu option to add a task if we have a floating action button
             addItem.setVisible(false);
         }
@@ -613,19 +655,28 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
         int id = item.getItemId();
-        if (id == R.id.menu_add_task) {
+        if (id == R.id.menu_add_task)
+        {
             onAddNewTask();
             return true;
-        } else if (item.getItemId() == R.id.menu_visible_list) {
+        }
+        else if (item.getItemId() == R.id.menu_visible_list)
+        {
             Intent settingsIntent = new Intent(getBaseContext(), SyncSettingsActivity.class);
             startActivity(settingsIntent);
             return true;
-        } else if (item.getItemId() == R.id.opentasks_menu_app_settings) {
-            if (VERSION.SDK_INT < 26) {
+        }
+        else if (item.getItemId() == R.id.opentasks_menu_app_settings)
+        {
+            if (VERSION.SDK_INT < 26)
+            {
                 startActivity(new Intent(this, AppSettingsActivity.class));
-            } else {
+            }
+            else
+            {
                 // for now just open the notification settings, which is all we currently support anyway
                 Intent intent = new Intent();
                 intent.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
@@ -633,60 +684,79 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
                 startActivity(intent);
             }
             return true;
-        } else if (item.getItemId() == R.id.opentasks_menu_app_about) {
+        }
+        else if (item.getItemId() == R.id.opentasks_menu_app_about)
+        {
             startActivity(new Intent(this, AboutActivity.class));
             return true;
-        } else {
+        }
+        else
+        {
             return super.onOptionsItemSelected(item);
         }
     }
 
 
-    private void hideSearchActionView() {
+    private void hideSearchActionView()
+    {
         MenuItemCompat.collapseActionView(mSearchItem);
     }
 
 
-    public void setupSearch(Menu menu) {
+    public void setupSearch(Menu menu)
+    {
         mSearchItem = menu.findItem(R.id.search);
-        MenuItemCompat.setOnActionExpandListener(mSearchItem, new OnActionExpandListener() {
+        MenuItemCompat.setOnActionExpandListener(mSearchItem, new OnActionExpandListener()
+        {
 
             @Override
-            public boolean onMenuItemActionExpand(MenuItem item) {
+            public boolean onMenuItemActionExpand(MenuItem item)
+            {
                 // always allow expansion of the search action view
                 return mCurrentPageId == R.id.task_group_search;
             }
 
 
             @Override
-            public boolean onMenuItemActionCollapse(MenuItem item) {
+            public boolean onMenuItemActionCollapse(MenuItem item)
+            {
                 // return to previous view
-                if (mPreviousPagePosition >= 0 && mCurrentPageId == R.id.task_group_search) {
+                if (mPreviousPagePosition >= 0 && mCurrentPageId == R.id.task_group_search)
+                {
                     mViewPager.setCurrentItem(mPreviousPagePosition);
                     mCurrentPageId = mPagerAdapter.getPageId(mPreviousPagePosition);
                 }
                 return mPreviousPagePosition >= 0 || mCurrentPageId != R.id.task_group_search;
             }
         });
-        SearchView searchView = (SearchView) MenuItemCompat.getActionView(mSearchItem);
-        EditText searchText=(EditText) searchView.findViewById(R.id.search_src_text);
+        SearchView searchView = (SearchView) mSearchItem.getActionView();
+        EditText searchText = searchView.findViewById(R.id.search_src_text);
         ImageView searchClose = searchView.findViewById(R.id.search_close_btn);
         searchClose.setImageResource(R.drawable.ic_close);
+        ImageView searchIcon = searchView.findViewById(R.id.search_mag_icon);
+        searchIcon.setImageDrawable(null);
+        ImageViewCompat.setImageTintList(searchIcon, ColorStateList.valueOf(ContextCompat.getColor(this, R.color.accent)));
+
+        searchView.findViewById(R.id.search_plate).setBackground(null);
 
         searchText.setHintTextColor(getResources().getColor(R.color.dark_gray));
         searchText.setTextColor(getResources().getColor(R.color.color_default_primary_text));
         searchText.setBackground(ContextCompat.getDrawable(this, R.drawable.rounded_edittext));
         SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
-        if (null != searchManager) {
+        if (null != searchManager)
+        {
             searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
         }
 
         searchView.setQueryHint(getString(R.string.menu_search_hint));
         searchView.setIconified(true);
-        searchView.setOnQueryTextListener(new OnQueryTextListener() {
+        searchView.setIconifiedByDefault(false);
+        searchView.setOnQueryTextListener(new OnQueryTextListener()
+        {
 
             @Override
-            public boolean onQueryTextSubmit(String query) {
+            public boolean onQueryTextSubmit(String query)
+            {
                 // persist current search
                 mSearchHistoryHelper.commitSearch();
                 mHandler.post(mSearchUpdater);
@@ -695,16 +765,21 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
 
 
             @Override
-            public boolean onQueryTextChange(String query) {
-                if (mCurrentPageId != R.id.task_group_search) {
+            public boolean onQueryTextChange(String query)
+            {
+                if (mCurrentPageId != R.id.task_group_search)
+                {
                     return true;
                 }
 
                 mHandler.removeCallbacks(mSearchUpdater);
-                if (query.length() > 0) {
+                if (query.length() > 0)
+                {
                     mSearchHistoryHelper.updateSearch(query);
                     mHandler.postDelayed(mSearchUpdater, SEARCH_UPDATE_DELAY);
-                } else {
+                }
+                else
+                {
                     mSearchHistoryHelper.removeCurrentSearch();
                     mHandler.post(mSearchUpdater);
                 }
@@ -712,7 +787,8 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
             }
         });
 
-        if (mAutoExpandSearchView) {
+        if (mAutoExpandSearchView)
+        {
             mSearchItem.expandActionView();
         }
 
@@ -722,10 +798,12 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
     /**
      * Notifies the search fragment of an update.
      */
-    private final Runnable mSearchUpdater = new Runnable() {
+    private final Runnable mSearchUpdater = new Runnable()
+    {
 
         @Override
-        public void run() {
+        public void run()
+        {
             TaskListFragment fragment = (TaskListFragment) mPagerAdapter.instantiateItem(mViewPager, mViewPager.getCurrentItem());
             fragment.notifyDataSetChanged(true);
             fragment.expandCurrentSearchGroup();
@@ -733,52 +811,67 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C
     };
 
 
-    public Uri getSelectedTaskUri() {
-        if (mShouldSelectTaskListItem) {
+    public Uri getSelectedTaskUri()
+    {
+        if (mShouldSelectTaskListItem)
+        {
             return mSelectedTaskUriOnLaunch;
         }
         return null;
     }
 
 
-    public boolean isInTransientState() {
+    public boolean isInTransientState()
+    {
         return mTransientState;
     }
 
+
     /*
      * get Accent color from OS
      * */
-    private int fetchAccentColor(Context context) {
-
-        color_default_primary_text=ContextCompat.getColor(context, R.color.color_default_primary_text);
-       ACCENT_COLOR=ContextCompat.getColor(context, R.color.accent);
-        color_default_blue1=ContextCompat.getColor(context, R.color.color_default_blue1);
-        color_default_green1=ContextCompat.getColor(context, R.color.color_default_green1);
-        color_default_primary=ContextCompat.getColor(context, R.color.primary);
+    private int fetchAccentColor(Context context)
+    {
+
+        color_default_primary_text = ContextCompat.getColor(context, R.color.color_default_primary_text);
+        ACCENT_COLOR = ContextCompat.getColor(context, R.color.accent);
+        color_default_blue1 = ContextCompat.getColor(context, R.color.color_default_blue1);
+        color_default_green1 = ContextCompat.getColor(context, R.color.color_default_green1);
+        color_default_primary = ContextCompat.getColor(context, R.color.primary);
         //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color_accent));
         getSupportActionBar().getThemedContext();
         toolbar.setTitleTextColor(color_default_primary_text);
-        setOverflowButtonColor(toolbar, color_default_primary_text);
+        setOverflowButtonColor(toolbar, ACCENT_COLOR);
 
         return ACCENT_COLOR;
     }
 
-    @ColorInt int darkenColor(@ColorInt int color) {
+
+    @ColorInt
+    int darkenColor(@ColorInt int color)
+    {
         float[] hsv = new float[3];
         android.graphics.Color.colorToHSV(color, hsv);
         hsv[2] *= 0.8f;
         return android.graphics.Color.HSVToColor(hsv);
     }
-    @ColorInt int darkenColor20(@ColorInt int color) {
+
+
+    @ColorInt
+    int darkenColor20(@ColorInt int color)
+    {
         float[] hsv = new float[3];
         android.graphics.Color.colorToHSV(color, hsv);
         hsv[2] *= 0.6f;
         return android.graphics.Color.HSVToColor(hsv);
     }
 
-    public static void setOverflowButtonColor(final Toolbar toolbar, final int color) {
+
+    public static void setOverflowButtonColor(final Toolbar toolbar, final int color)
+    {
         Drawable drawable = toolbar.getOverflowIcon();
-        if(drawable != null) {
+        if (drawable != null)
+        {
             drawable = DrawableCompat.wrap(drawable);
             DrawableCompat.setTint(drawable.mutate(), color);
             toolbar.setOverflowIcon(drawable);
diff --git a/opentasks/src/main/java/org/dmfs/tasks/TaskListFragment.java b/opentasks/src/main/java/org/dmfs/tasks/TaskListFragment.java
index fbbb192aa27988d31168f45b83904937ee3d3cc6..21988a55e62b448f8b587d90ec9ee39bcab86c6f 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/TaskListFragment.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/TaskListFragment.java
@@ -576,25 +576,17 @@ public class TaskListFragment extends SupportFragment
      */
     private void removeTask(final Uri taskUri, final String taskTitle)
     {
-        new AlertDialog.Builder(getActivity()).setTitle(R.string.confirm_delete_title).setCancelable(true)
-                .setNegativeButton(android.R.string.cancel, new OnClickListener()
-                {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which)
-                    {
-                        // nothing to do here
-                    }
-                }).setPositiveButton(android.R.string.ok, new OnClickListener()
-        {
-            @Override
-            public void onClick(DialogInterface dialog, int which)
-            {
-                // TODO: remove the task in a background task
-                mAppContext.getContentResolver().delete(taskUri, null, null);
-                Snackbar.make(mExpandableListView, getString(R.string.toast_task_deleted, taskTitle), Snackbar.LENGTH_SHORT).show();
-                mCallbacks.onItemRemoved(taskUri);
-            }
-        }).setMessage(getString(R.string.confirm_delete_message_with_title, taskTitle)).create().show();
+        new AlertDialog.Builder(getActivity(), R.style.customAlertDialog)
+                .setTitle(R.string.confirm_delete_title)
+                .setCancelable(true)
+                .setNegativeButton(android.R.string.cancel, (dialog, which) -> {
+                    // nothing to do here
+                }).setPositiveButton(android.R.string.ok, (dialog, which) -> {
+                    // TODO: remove the task in a background task
+                    mAppContext.getContentResolver().delete(taskUri, null, null);
+                    Snackbar.make(mExpandableListView, getString(R.string.toast_task_deleted, taskTitle), Snackbar.LENGTH_SHORT).show();
+                    mCallbacks.onItemRemoved(taskUri);
+                }).setMessage(getString(R.string.confirm_delete_message_with_title, taskTitle)).create().show();
     }
 
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/ViewTaskActivity.java b/opentasks/src/main/java/org/dmfs/tasks/ViewTaskActivity.java
index 2a9b0e66ca1e37d63a27de57c8753452373e1422..ccfe035b4da43c3b9170a5f3d9744dd77bd892e2 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/ViewTaskActivity.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/ViewTaskActivity.java
@@ -156,12 +156,11 @@ public class ViewTaskActivity extends BaseActivity implements ViewTaskFragment.C
     @Override
     public void onListColorLoaded(@NonNull Color color)
     {
-
         if (VERSION.SDK_INT >= 21)
         {
             Window window = getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(new DarkenedForStatusBar(color).argb());
+            window.setStatusBarColor(color.argb());
         }
     }
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/ViewTaskFragment.java b/opentasks/src/main/java/org/dmfs/tasks/ViewTaskFragment.java
index 8b3539c791053fd14bb4557fc76ef5286346d96f..58f304904618dad0f6709ec0059c00073878f05b 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/ViewTaskFragment.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/ViewTaskFragment.java
@@ -26,6 +26,8 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.database.ContentObserver;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
@@ -525,6 +527,14 @@ public class ViewTaskFragment extends SupportFragment
                     item.setIcon(R.drawable.ic_pin_white_24dp);
                 }
             }
+
+            for(int i = 0; i < menu.size(); i++){
+                Drawable drawable = menu.getItem(i).getIcon();
+                if(drawable != null) {
+                    drawable.mutate();
+                    drawable.setColorFilter(getResources().getColor(android.R.color.white), PorterDuff.Mode.SRC_ATOP);
+                }
+            }
         }
     }
 
@@ -550,7 +560,9 @@ public class ViewTaskFragment extends SupportFragment
         }
         else if (itemId == R.id.delete_task)
         {
-            new AlertDialog.Builder(getActivity()).setTitle(R.string.confirm_delete_title).setCancelable(true)
+            new AlertDialog.Builder(getActivity(), R.style.customAlertDialog)
+                    .setTitle(R.string.confirm_delete_title)
+                    .setCancelable(true)
                     .setNegativeButton(android.R.string.cancel, new OnClickListener()
                     {
                         @Override
@@ -644,7 +656,6 @@ public class ViewTaskFragment extends SupportFragment
     private void updateColor()
     {
         mAppBar.setBackgroundColor(mListColor);
-
         if (mShowFloatingActionButton && mFloatingActionButton.getVisibility() == View.VISIBLE)
         {
             mFloatingActionButton.setBackgroundTintList(ColorStateList.valueOf(new AdjustedForFab(mListColor).argb()));
diff --git a/opentasks/src/main/java/org/dmfs/tasks/homescreen/TaskListWidgetUpdaterService.java b/opentasks/src/main/java/org/dmfs/tasks/homescreen/TaskListWidgetUpdaterService.java
index 323675984a314468ddc8ee63f687e2e83547e3eb..ea8b9c8e50557308ed8f04a092ffafb50c28d162 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/homescreen/TaskListWidgetUpdaterService.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/homescreen/TaskListWidgetUpdaterService.java
@@ -241,7 +241,7 @@ public class TaskListWidgetUpdaterService extends RemoteViewsService
                 }
                 else
                 {
-                    row.setTextColor(android.R.id.text1, mResources.getColor(R.color.lighter_gray));
+                    row.setTextColor(android.R.id.text1, mResources.getColor(R.color.holo_green_light));
                 }
             }
             else
diff --git a/opentasks/src/main/java/org/dmfs/tasks/utils/permission/dialog/PermissionRequestDialogFragment.java b/opentasks/src/main/java/org/dmfs/tasks/utils/permission/dialog/PermissionRequestDialogFragment.java
index 313062fde9512cdcf0eabde8f99afae038edc9dc..6130fa3af3ec52fdfd61e6310a2e166c32c7b9c2 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/utils/permission/dialog/PermissionRequestDialogFragment.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/utils/permission/dialog/PermissionRequestDialogFragment.java
@@ -67,7 +67,7 @@ public final class PermissionRequestDialogFragment extends DialogFragment
                                 new ManifestAppName(getContext()).value())));
         messageView.setMovementMethod(LinkMovementMethod.getInstance());
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.customAlertDialog)
                 .setTitle(R.string.opentasks_permission_request_dialog_getaccounts_title)
                 .setView(messageView);
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldView.java b/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldView.java
index 215bdee5d81d00be1d17f3a800d2b27b520e893d..16fddfcad12bd3216409e17274b7c4cec9683c0a 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldView.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldView.java
@@ -123,7 +123,7 @@ public class CheckListFieldView extends AbstractFieldView implements OnCheckedCh
             {
                 mCurrentValue.get(i).checked = isChecked;
                 ((TextView) mContainer.getChildAt(i).findViewById(android.R.id.title)).setTextAppearance(getContext(),
-                        isChecked ? R.style.checklist_checked_item_text : R.style.dark_text);
+                        isChecked ? R.style.dark_text : R.style.checklist_unchecked_item_text);
                 if (mValues != null)
                 {
                     mAdapter.validateAndSet(mValues, mCurrentValue);
@@ -238,42 +238,30 @@ public class CheckListFieldView extends AbstractFieldView implements OnCheckedCh
 
         // configure the title
         final EditText text = (EditText) itemView.findViewById(android.R.id.title);
-        text.setTextAppearance(getContext(), item.checked ? R.style.checklist_checked_item_text : R.style.dark_text);
+        text.setTextAppearance(getContext(), item.checked ? R.style.dark_text : R.style.checklist_unchecked_item_text);
         text.setText(item.text);
-        text.setOnFocusChangeListener(new OnFocusChangeListener()
-        {
+        text.setOnFocusChangeListener((v, hasFocus) -> {
+            itemView.findViewById(R.id.drag_handle).setVisibility(hasFocus ? View.INVISIBLE : View.VISIBLE);
+            itemView.findViewById(R.id.remove_item).setVisibility(hasFocus ? View.VISIBLE : View.INVISIBLE);
 
-            @Override
-            public void onFocusChange(View v, boolean hasFocus)
+            String newText = text.getText().toString();
+            if (!hasFocus && !newText.equals(item.text) && mValues != null && !mCurrentValue.equals(mAdapter.get(mValues)))
             {
-                itemView.findViewById(R.id.drag_handle).setVisibility(hasFocus ? View.INVISIBLE : View.VISIBLE);
-                itemView.findViewById(R.id.remove_item).setVisibility(hasFocus ? View.VISIBLE : View.INVISIBLE);
-
-                String newText = text.getText().toString();
-                if (!hasFocus && !newText.equals(item.text) && mValues != null && !mCurrentValue.equals(mAdapter.get(mValues)))
-                {
-                    item.text = newText;
-                    mAdapter.validateAndSet(mValues, mCurrentValue);
-                }
+                item.text = newText;
+                mAdapter.validateAndSet(mValues, mCurrentValue);
             }
         });
         text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES);
         text.setMaxLines(100);
         text.setHorizontallyScrolling(false);
-        text.setOnEditorActionListener(new OnEditorActionListener()
-        {
-
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event)
+        text.setOnEditorActionListener((v, actionId, event) -> {
+            if (actionId == EditorInfo.IME_ACTION_NEXT)
             {
-                if (actionId == EditorInfo.IME_ACTION_NEXT)
-                {
-                    int pos = mContainer.indexOfChild(itemView);
-                    insertEmptyItem(pos + 1);
-                    return true;
-                }
-                return false;
+                int pos = mContainer.indexOfChild(itemView);
+                insertEmptyItem(pos + 1);
+                return true;
             }
+            return false;
         });
         text.setImeOptions(EditorInfo.IME_ACTION_NEXT);
 
@@ -303,17 +291,12 @@ public class CheckListFieldView extends AbstractFieldView implements OnCheckedCh
         // bind the remove button
         View removeButton = itemView.findViewById(R.id.remove_item);
         removeButton.setTag(item);
-        removeButton.setOnClickListener(new OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                mImm.hideSoftInputFromWindow(text.getWindowToken(), 0);
-                mCurrentValue.remove(v.getTag());
+        removeButton.setOnClickListener(v -> {
+            mImm.hideSoftInputFromWindow(text.getWindowToken(), 0);
+            mCurrentValue.remove(v.getTag());
 
-                mAdapter.validateAndSet(mValues, mCurrentValue);
-                mContainer.removeDragView(itemView);
-            }
+            mAdapter.validateAndSet(mValues, mCurrentValue);
+            mContainer.removeDragView(itemView);
         });
     }
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldViewLegacy.java b/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldViewLegacy.java
index 96c1f99b20b210d3342171dcbc8a6a431154ee79..ad0f1ce92fb26902f3238f4fd05adcc3879d6de0 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldViewLegacy.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldViewLegacy.java
@@ -101,7 +101,7 @@ public class CheckListFieldViewLegacy extends AbstractFieldView implements OnChe
             if (mContainer.getChildAt(i) == buttonView)
             {
                 mCurrentValue.get(i).checked = isChecked;
-                buttonView.setTextAppearance(getContext(), isChecked ? R.style.checklist_checked_item_text : R.style.dark_text);
+                buttonView.setTextAppearance(getContext(), isChecked ? R.style.dark_text : R.style.checklist_unchecked_item_text);
                 if (mValues != null)
                 {
                     mAdapter.validateAndSet(mValues, mCurrentValue);
@@ -161,7 +161,7 @@ public class CheckListFieldViewLegacy extends AbstractFieldView implements OnChe
             checkbox.setChecked(item.checked);
             checkbox.setOnCheckedChangeListener(CheckListFieldViewLegacy.this);
 
-            checkbox.setTextAppearance(context, item.checked ? R.style.checklist_checked_item_text : R.style.dark_text);
+            checkbox.setTextAppearance(context, item.checked ? R.style.dark_text : R.style.checklist_unchecked_item_text);
             checkbox.setText(item.text);
 
             ++count;
diff --git a/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldEditor.java b/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldEditor.java
index d5806f4b683c03158eab6f247bab3eae9fdbdd8d..36269e51e42e048c289615c3268d4a7b07600736 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldEditor.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldEditor.java
@@ -447,7 +447,6 @@ public final class TimeFieldEditor extends AbstractFieldEditor implements OnDate
 
             // change divider color
             DatePicker dpView = dialog.getDatePicker();
-            dpView.setBackgroundColor(TaskListActivity.ACCENT_COLOR);
 
             LinearLayout llFirst = (LinearLayout) dpView.getChildAt(0);
             LinearLayout llSecond = (LinearLayout) llFirst.getChildAt(0);
diff --git a/opentasks/src/main/res/color/due_date_text.xml b/opentasks/src/main/res/color/due_date_text.xml
index f7fd2c3398dc30aad2b4659e6b0c09f8f89af0ff..670efec8ce8ebad70b2e66697473fd2172d0ec96 100644
--- a/opentasks/src/main/res/color/due_date_text.xml
+++ b/opentasks/src/main/res/color/due_date_text.xml
@@ -1,7 +1,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_activated="true"
-            android:color="@android:color/white"/>
+            android:color="@color/primary_dark"/>
     <item android:state_activated="false"
             android:color="@color/dark_gray"/>
 
diff --git a/opentasks/src/main/res/color/overdue_date_text.xml b/opentasks/src/main/res/color/overdue_date_text.xml
index 4ff73b9808c1892ace8ceb2492b4e06e682c325a..327bd473f2d00eec990b1fcf3451a86ffc7c442a 100644
--- a/opentasks/src/main/res/color/overdue_date_text.xml
+++ b/opentasks/src/main/res/color/overdue_date_text.xml
@@ -1,7 +1,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_activated="true"
-            android:color="@android:color/white"/>
+            android:color="@color/color_default_primary_text"/>
     <item android:state_activated="false"
             android:color="@color/material_red"/>
 
diff --git a/opentasks/src/main/res/color/task_list_subtitle_text.xml b/opentasks/src/main/res/color/task_list_subtitle_text.xml
new file mode 100644
index 0000000000000000000000000000000000000000..af2a29fe9453ac2a3c2c53bc9c676539bf5406e4
--- /dev/null
+++ b/opentasks/src/main/res/color/task_list_subtitle_text.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_activated="true"
+            android:color="@color/color_default_primary_text"/>
+    <item android:state_activated="false"
+            android:color="@color/color_default_secondary_text"/>
+
+</selector>
\ No newline at end of file
diff --git a/opentasks/src/main/res/color/task_list_title_text.xml b/opentasks/src/main/res/color/task_list_title_text.xml
index 1793a1428f747c5be19b3aba9e5c392e9e8faa5c..af2a29fe9453ac2a3c2c53bc9c676539bf5406e4 100644
--- a/opentasks/src/main/res/color/task_list_title_text.xml
+++ b/opentasks/src/main/res/color/task_list_title_text.xml
@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_activated="true"
-            android:color="@android:color/white"/>
+            android:color="@color/color_default_primary_text"/>
     <item android:state_activated="false"
-            android:color="@color/darker_gray"/>
+            android:color="@color/color_default_secondary_text"/>
 
 </selector>
\ No newline at end of file
diff --git a/opentasks/src/main/res/drawable/custom_seekbar.xml b/opentasks/src/main/res/drawable/custom_seekbar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..73edfaa855c268ed687dba5d45a2cf6ff5f9f89b
--- /dev/null
+++ b/opentasks/src/main/res/drawable/custom_seekbar.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/primary_dark" />
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape android:shape="rectangle">
+                <solid android:color="@color/accent" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/opentasks/src/main/res/drawable/ic_arrow_back.xml b/opentasks/src/main/res/drawable/ic_arrow_back.xml
index 1f54acb8d2e76be192da5f782d81e5387240a5d5..619f9d2f5f18c59e25b57b8012e8a7cda26ee907 100644
--- a/opentasks/src/main/res/drawable/ic_arrow_back.xml
+++ b/opentasks/src/main/res/drawable/ic_arrow_back.xml
@@ -19,7 +19,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="@color/color_default_primary_text">
+    android:tint="@color/accent">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
diff --git a/opentasks/src/main/res/drawable/ic_arrow_back_accent.xml b/opentasks/src/main/res/drawable/ic_arrow_back_accent.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1e9a046bc32929d32d0c31153bc5e993550c79d1
--- /dev/null
+++ b/opentasks/src/main/res/drawable/ic_arrow_back_accent.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright 2020 dmfs GmbH
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="@color/accent">
+    <path
+            android:fillColor="@color/accent"
+            android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/opentasks/src/main/res/drawable/ic_close.xml b/opentasks/src/main/res/drawable/ic_close.xml
index 5d35c8f45d14ca38072eb9c0bd72f104c49406c9..bf53b5bf7c18d0fbc4b186ddc47afa9adc43cc37 100644
--- a/opentasks/src/main/res/drawable/ic_close.xml
+++ b/opentasks/src/main/res/drawable/ic_close.xml
@@ -19,8 +19,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="@color/color_default_primary_text">
+    android:tint="@color/accent">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@color/accent"
       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/opentasks/src/main/res/drawable/light_gray.xml b/opentasks/src/main/res/drawable/light_gray.xml
index c2a7f14d4c90927251ef6967f26e71bbab76accd..f8ada52324e07d1dcd305e5082650d02fe9b1e3f 100644
--- a/opentasks/src/main/res/drawable/light_gray.xml
+++ b/opentasks/src/main/res/drawable/light_gray.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
         android:shape="rectangle">
 
-    <solid android:color="@color/light_gray"/>
+    <solid android:color="@color/color_divider"/>
 
 </shape>
\ No newline at end of file
diff --git a/opentasks/src/main/res/drawable/overlay_bottom.xml b/opentasks/src/main/res/drawable/overlay_bottom.xml
index 3d3bce3faabdf47f617788966ef13ac28df79fb3..4af6bb9595cfffbdda62fe2a7519e1fea75e0739 100644
--- a/opentasks/src/main/res/drawable/overlay_bottom.xml
+++ b/opentasks/src/main/res/drawable/overlay_bottom.xml
@@ -5,9 +5,9 @@
         <shape android:shape="rectangle">
             <gradient
                     android:angle="270"
-                    android:centerColor="#ffe0e0e0"
-                    android:endColor="#fff0f0f0"
-                    android:startColor="#ffd8d8d8"/>
+                    android:centerColor="@color/color_divider"
+                    android:endColor="@color/color_divider"
+                    android:startColor="@color/color_divider"/>
         </shape>
     </item>
     <item
diff --git a/opentasks/src/main/res/drawable/overlay_top.xml b/opentasks/src/main/res/drawable/overlay_top.xml
index 5839215ad236872393a724501cff935ccbc215d5..559f5e2575bdb6afd222d344540bb31fd1e6f2ed 100644
--- a/opentasks/src/main/res/drawable/overlay_top.xml
+++ b/opentasks/src/main/res/drawable/overlay_top.xml
@@ -5,9 +5,9 @@
         <shape android:shape="rectangle">
             <gradient
                     android:angle="90"
-                    android:centerColor="#ffe0e0e0"
-                    android:endColor="#fff0f0f0"
-                    android:startColor="#ffd8d8d8"/>
+                    android:centerColor="@color/color_divider"
+                    android:endColor="@color/color_divider"
+                    android:startColor="@color/color_divider"/>
         </shape>
     </item>
     <item
diff --git a/opentasks/src/main/res/drawable/rounded_edittext.xml b/opentasks/src/main/res/drawable/rounded_edittext.xml
index 99f06d559eb996702a9272482447b010380ee7c8..643a32b251d042174a5d7874d217481c0a871c6e 100644
--- a/opentasks/src/main/res/drawable/rounded_edittext.xml
+++ b/opentasks/src/main/res/drawable/rounded_edittext.xml
@@ -3,7 +3,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
         android:shape="rectangle" android:padding="15dp">
 
-    <solid android:color="#FFFFFF" />
+    <solid android:color="@color/primary_dark" />
     <corners
             android:bottomRightRadius="5dp"
             android:bottomLeftRadius="5dp"
diff --git a/opentasks/src/main/res/drawable/task_progress_background_shade.xml b/opentasks/src/main/res/drawable/task_progress_background_shade.xml
index cfd9abe1027b7cb78d26483017c6623232a1161d..d04116eec2bd1159003ab5a68c5f0a72576cf3c5 100644
--- a/opentasks/src/main/res/drawable/task_progress_background_shade.xml
+++ b/opentasks/src/main/res/drawable/task_progress_background_shade.xml
@@ -7,7 +7,7 @@
                     android:angle="180"
                     android:centerColor="#00000000"
                     android:endColor="#00000000"
-                    android:startColor="#0a000000"/>
+                    android:startColor="@color/task_progress_start_color"/>
         </shape>
     </item>
 
diff --git a/opentasks/src/main/res/drawable/widget_list_item_bg.xml b/opentasks/src/main/res/drawable/widget_list_item_bg.xml
index 6e3e9a9c50b7890e7cd903fc6673bf8ee4337219..ad22e6ffea906ef7b1d8e929632854cb22406e0c 100644
--- a/opentasks/src/main/res/drawable/widget_list_item_bg.xml
+++ b/opentasks/src/main/res/drawable/widget_list_item_bg.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@color/translucent_grey"
+    <item android:drawable="@color/translucent_bg"
             android:state_focused="false"
             android:state_pressed="false"/>
-    <item android:drawable="@color/holo_blue"
+    <item android:drawable="@color/accent"
             android:state_focused="true"
             android:state_pressed="true"/>
-    <item android:drawable="@color/holo_blue"/>
+    <item android:drawable="@color/accent"/>
 </selector>
\ No newline at end of file
diff --git a/opentasks/src/main/res/drawable/widget_task_add_button_bg.xml b/opentasks/src/main/res/drawable/widget_task_add_button_bg.xml
index 6d19a125005555a8754aacaed7535652c5ca946b..3aacd8c7eab8ea7e5e1f292625145deab3b5e87f 100644
--- a/opentasks/src/main/res/drawable/widget_task_add_button_bg.xml
+++ b/opentasks/src/main/res/drawable/widget_task_add_button_bg.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="@color/translucent_grey"
+    <item android:drawable="@color/translucent_bg"
             android:state_focused="false"
             android:state_pressed="false"/>
     <item android:drawable="@drawable/list_activated_holo"
diff --git a/opentasks/src/main/res/layout/account_list_item_dialog.xml b/opentasks/src/main/res/layout/account_list_item_dialog.xml
index c34d487bc27bc822808e60e9afe297964002bb37..5c51692ec7651d30ed3645eb3addf63a5c19e93a 100644
--- a/opentasks/src/main/res/layout/account_list_item_dialog.xml
+++ b/opentasks/src/main/res/layout/account_list_item_dialog.xml
@@ -13,7 +13,7 @@
             android:layout_marginLeft="24dp"
             android:layout_marginStart="24dp"
             android:src="@drawable/ic_24_account_circle_black50"
-            android:tint="?attr/colorAccent"/>
+            android:tint="@color/accent"/>
 
     <LinearLayout
             android:layout_width="match_parent"
diff --git a/opentasks/src/main/res/layout/activity_manage_task_list.xml b/opentasks/src/main/res/layout/activity_manage_task_list.xml
index 693ef2efccdaa6af4917729c1fffffeec564a9ab..3a398da5a05b22401b54bc4e6fbdde9e2769a036 100644
--- a/opentasks/src/main/res/layout/activity_manage_task_list.xml
+++ b/opentasks/src/main/res/layout/activity_manage_task_list.xml
@@ -94,7 +94,7 @@
                 android:minWidth="0dp"
                 android:text="@string/activity_manage_list_btn_save"
                 android:textAppearance="@style/TextAppearance.AppCompat.Button"
-                android:textColor="?attr/colorAccent"/>
+                android:textColor="@color/accent"/>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/opentasks/src/main/res/layout/activity_settings.xml b/opentasks/src/main/res/layout/activity_settings.xml
index 68b0a4bdbda1a5933eba08ef53faddad23867289..60a5aaee51b0bd6b119a6a1f160db4fce103bc20 100644
--- a/opentasks/src/main/res/layout/activity_settings.xml
+++ b/opentasks/src/main/res/layout/activity_settings.xml
@@ -2,4 +2,4 @@
         android:id="@+id/visible_task_list_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background_material_light"/>
+        android:background="@color/color_default_background"/>
diff --git a/opentasks/src/main/res/layout/activity_task_detail.xml b/opentasks/src/main/res/layout/activity_task_detail.xml
index 31b7fc5ccf400459a123edb38bf6ad829d1383df..35da0fc2a574dcf6b65be0db019a89fcbba93083 100644
--- a/opentasks/src/main/res/layout/activity_task_detail.xml
+++ b/opentasks/src/main/res/layout/activity_task_detail.xml
@@ -3,6 +3,5 @@
         android:id="@+id/task_detail_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white"
         android:fitsSystemWindows="true"
         tools:ignore="MergeRootFrame"/>
diff --git a/opentasks/src/main/res/layout/activity_task_editor.xml b/opentasks/src/main/res/layout/activity_task_editor.xml
index 5f475962cd9ad0a2b671ccc1e2d1872ad53942aa..34bf8a7e472a7af9a281d1b512a4e867b4314c62 100644
--- a/opentasks/src/main/res/layout/activity_task_editor.xml
+++ b/opentasks/src/main/res/layout/activity_task_editor.xml
@@ -3,5 +3,4 @@
         android:id="@+id/add_task_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white"
         tools:ignore="MergeRootFrame"/>
diff --git a/opentasks/src/main/res/layout/activity_task_list.xml b/opentasks/src/main/res/layout/activity_task_list.xml
index 898489463bdba499470ee7165f47ea46dbaa707c..6528adecc57d6ed38a66cdd46b9149a2963d9f02 100644
--- a/opentasks/src/main/res/layout/activity_task_list.xml
+++ b/opentasks/src/main/res/layout/activity_task_list.xml
@@ -7,22 +7,22 @@
     <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+            >
 
         <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
-                app:collapseIcon="@drawable/ic_arrow_back"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+                android:background="?attr/colorPrimaryDark"
+                app:collapseIcon="@drawable/ic_arrow_back_accent"
+                app:popupTheme="@style/actionBarPopUpTheme"/>
 
         <com.google.android.material.tabs.TabLayout
                 android:id="@+id/tabs"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:tabGravity="fill"
-                app:tabIndicatorColor="@color/color_default_blue1"
+                app:tabIndicatorColor="@color/accent"
                 app:tabIconTint="@color/tab_icon"
 
                 app:tabIndicatorHeight="8dp"
@@ -42,7 +42,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_margin="16dp"
-            android:tint="@color/color_default_blue1"
+            android:tint="@color/accent"
             app:layout_anchor="@id/pager"
             app:layout_anchorGravity="bottom|right|end"
             android:src="@drawable/ic_action_add"/>
diff --git a/opentasks/src/main/res/layout/activity_task_twopane.xml b/opentasks/src/main/res/layout/activity_task_twopane.xml
index d9fe8a15663ea600faaf8843300177a05d0919dc..cdbf9c5d2924ef703b6e57b2179bbee360cbf0b6 100644
--- a/opentasks/src/main/res/layout/activity_task_twopane.xml
+++ b/opentasks/src/main/res/layout/activity_task_twopane.xml
@@ -8,7 +8,6 @@
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:elevation="0dp">
 
         <androidx.appcompat.widget.Toolbar
@@ -16,14 +15,14 @@
                 android:layout_width="432dp"
                 android:layout_height="?attr/actionBarSize"
                 android:background="?attr/colorPrimary"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+                app:popupTheme="@style/actionBarPopUpTheme"/>
 
         <com.google.android.material.tabs.TabLayout
                 android:id="@+id/tabs"
                 android:layout_width="432dp"
                 android:layout_height="wrap_content"
                 app:tabGravity="fill"
-                app:tabIndicatorColor="@android:color/white"
+                app:tabIndicatorColor="@color/accent"
                 app:tabIndicatorHeight="8dp"
                 app:tabMode="fixed"/>
     </com.google.android.material.appbar.AppBarLayout>
@@ -39,6 +38,7 @@
             android:layout_marginLeft="432dp"
             android:layout_marginRight="96dp"
             android:layout_marginStart="432dp"
+            android:backgroundTint="@color/color_default_background"
             android:background="@drawable/opentasks_popup_background_mtrl_mult"/>
 
     <androidx.viewpager.widget.ViewPager xmlns:tools="http://schemas.android.com/tools"
@@ -55,6 +55,7 @@
             android:layout_gravity="center"
             android:layout_margin="16dp"
             app:layout_anchor="@id/appbar"
+            android:tint="@color/accent"
             app:layout_anchorGravity="bottom|right|end"
             android:src="@drawable/ic_action_add"/>
 
diff --git a/opentasks/src/main/res/layout/activity_task_twopane_small.xml b/opentasks/src/main/res/layout/activity_task_twopane_small.xml
index 837d1aadb61ae4253eaff6b3e455276c43d099df..51cf0aa5bc70187a7de196f96fee2b3cfd884be8 100644
--- a/opentasks/src/main/res/layout/activity_task_twopane_small.xml
+++ b/opentasks/src/main/res/layout/activity_task_twopane_small.xml
@@ -8,7 +8,6 @@
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:elevation="0dp">
 
         <androidx.appcompat.widget.Toolbar
@@ -16,14 +15,14 @@
                 android:layout_width="@dimen/opentasks_two_pane_list_width"
                 android:layout_height="?attr/actionBarSize"
                 android:background="?attr/colorPrimary"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+                app:popupTheme="@style/actionBarPopUpTheme"/>
 
         <com.google.android.material.tabs.TabLayout
                 android:id="@+id/tabs"
                 android:layout_width="@dimen/opentasks_two_pane_list_width"
                 android:layout_height="wrap_content"
                 app:tabGravity="fill"
-                app:tabIndicatorColor="@android:color/white"
+                app:tabIndicatorColor="@color/accent"
                 app:tabIndicatorHeight="8dp"
                 app:tabMode="fixed"/>
     </com.google.android.material.appbar.AppBarLayout>
@@ -38,6 +37,7 @@
             android:layout_marginLeft="@dimen/opentasks_two_pane_list_width"
             android:layout_marginStart="@dimen/opentasks_two_pane_list_width"
             android:layout_marginBottom="-8dp"
+            android:backgroundTint="@color/color_default_background"
             android:background="@drawable/opentasks_popup_background_mtrl_mult"/>
 
 
diff --git a/opentasks/src/main/res/layout/activity_widget_configuration.xml b/opentasks/src/main/res/layout/activity_widget_configuration.xml
index 0dc3ed2982d77d9ce96e117ef3e1801d92e8495d..951077b2fb9cd206d5bc37ceea43d65eeba334b9 100644
--- a/opentasks/src/main/res/layout/activity_widget_configuration.xml
+++ b/opentasks/src/main/res/layout/activity_widget_configuration.xml
@@ -3,5 +3,4 @@
         android:id="@+id/task_list_selection_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white"
         tools:ignore="MergeRootFrame"/>
diff --git a/opentasks/src/main/res/layout/boolean_field_editor.xml b/opentasks/src/main/res/layout/boolean_field_editor.xml
index 5bec2b7b3cadbc9f9c3233467bcab2d783200f64..066cc8acb4d331d10faa32b8f0eb9b8135beaf1a 100644
--- a/opentasks/src/main/res/layout/boolean_field_editor.xml
+++ b/opentasks/src/main/res/layout/boolean_field_editor.xml
@@ -16,6 +16,7 @@
             android:layout_gravity="center"
             android:layout_margin="0dp"
             android:padding="0dp"
+            android:buttonTint="@color/accent"
             android:duplicateParentState="true"/>
 
     <TextView
diff --git a/opentasks/src/main/res/layout/boolean_field_view.xml b/opentasks/src/main/res/layout/boolean_field_view.xml
index db272aa4db05f2803fb2666b473a683a40626da0..947c6ab76117537290f1f529b11fef15daf08979 100644
--- a/opentasks/src/main/res/layout/boolean_field_view.xml
+++ b/opentasks/src/main/res/layout/boolean_field_view.xml
@@ -6,8 +6,9 @@
     <TextView
             android:id="@android:id/icon"
             style="@style/details_label_icon"
+            android:drawableTint="@color/color_default_primary_text"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content" />
 
     <LinearLayout
             android:layout_width="match_parent"
@@ -21,14 +22,15 @@
                 android:layout_gravity="center"
                 android:layout_marginTop="2dip"
                 android:clickable="false"
-                android:focusable="false"/>
+                android:focusable="false"
+                android:buttonTint="@color/accent" />
 
         <TextView
                 android:id="@android:id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:textIsSelectable="false"/>
+                android:textIsSelectable="false" />
     </LinearLayout>
 
 </org.dmfs.tasks.widget.BooleanFieldView>
\ No newline at end of file
diff --git a/opentasks/src/main/res/layout/checklist_field_editor_element.xml b/opentasks/src/main/res/layout/checklist_field_editor_element.xml
index 01c54cbdee82ae219ae8cf88100a5c5b444adc7e..1bfbfc3d87e4635c8489e7f178bbf86ebe4ea410 100644
--- a/opentasks/src/main/res/layout/checklist_field_editor_element.xml
+++ b/opentasks/src/main/res/layout/checklist_field_editor_element.xml
@@ -8,7 +8,8 @@
     <CheckBox
             android:id="@android:id/checkbox"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:buttonTint="@color/accent" />
 
     <EditText
             android:id="@android:id/text1"
diff --git a/opentasks/src/main/res/layout/checklist_field_view.xml b/opentasks/src/main/res/layout/checklist_field_view.xml
index 431e2b4ea87937797ae3d9691bbe42302efc3e05..e56c452b2cf02c2153c76d463d1e24be878d3439 100644
--- a/opentasks/src/main/res/layout/checklist_field_view.xml
+++ b/opentasks/src/main/res/layout/checklist_field_view.xml
@@ -9,9 +9,10 @@
     <TextView
             android:id="@android:id/icon"
             style="@style/details_label_icon"
+            android:drawableTint="@color/color_default_primary_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="8dp"/>
+            android:padding="8dp" />
 
     <com.jmedeisis.draglinearlayout.DragLinearLayout
             android:id="@+id/checklist"
@@ -35,12 +36,13 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="8dp"
-                    android:src="@drawable/ic_24_plus_black50"/>
+                    android:tint="@color/color_default_primary_text"
+                    android:src="@drawable/ic_24_plus_black50" />
 
             <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/opentasks_checklist_add_item"/>
+                    android:text="@string/opentasks_checklist_add_item" />
         </LinearLayout>
     </com.jmedeisis.draglinearlayout.DragLinearLayout>
 
diff --git a/opentasks/src/main/res/layout/checklist_field_view_element.xml b/opentasks/src/main/res/layout/checklist_field_view_element.xml
index abcfa4e6834ea377a1f5b487b7d780f116025b2c..5e23ddb4696a2666954333dcc8ddc1111a96302f 100644
--- a/opentasks/src/main/res/layout/checklist_field_view_element.xml
+++ b/opentasks/src/main/res/layout/checklist_field_view_element.xml
@@ -5,7 +5,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="-4dp"
         android:layout_marginStart="-4dp"
-        android:background="#e0ffffff"
+        android:background="@color/color_default_background"
         android:clipChildren="false"
         android:clipToPadding="false">
 
@@ -15,6 +15,7 @@
             android:layout_height="40dp"
             android:clipChildren="false"
             android:clipToPadding="false"
+            android:buttonTint="@color/accent"
             android:padding="8dp"/>
 
     <ImageView
@@ -24,6 +25,7 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:padding="8dp"
+            android:tint="@color/color_default_primary_text"
             android:src="@drawable/ic_24_drag_handle_black50"/>
 
     <ImageView
@@ -33,6 +35,7 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:padding="8dp"
+            android:tint="@color/color_default_primary_text"
             android:src="@drawable/ic_24_cancel_circle_black50"
             android:visibility="invisible"/>
 
@@ -45,7 +48,6 @@
             android:layout_toLeftOf="@id/drag_handle"
             android:layout_toRightOf="@android:id/checkbox"
             android:layout_toStartOf="@id/drag_handle"
-            android:background="@android:color/white"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:hint="@string/opentasks_checklist_empty_item_hint"
diff --git a/opentasks/src/main/res/layout/choices_field_view.xml b/opentasks/src/main/res/layout/choices_field_view.xml
index 087301fd8ff1787247606926c7a2986c682881d7..34b9eceaa6fd605c3a2a89f5496e0080e03a822f 100644
--- a/opentasks/src/main/res/layout/choices_field_view.xml
+++ b/opentasks/src/main/res/layout/choices_field_view.xml
@@ -5,6 +5,7 @@
     <TextView
             android:id="@android:id/icon"
             style="@style/details_label_icon"
+            android:drawableTint="@color/color_default_primary_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
diff --git a/opentasks/src/main/res/layout/fragment_input_text_dialog.xml b/opentasks/src/main/res/layout/fragment_input_text_dialog.xml
index f1c2f613e9757ef05e7e76cf8ea4b62dea8d699e..cd3560fff8beb702f25f5145f3f6aa1ae8914163 100644
--- a/opentasks/src/main/res/layout/fragment_input_text_dialog.xml
+++ b/opentasks/src/main/res/layout/fragment_input_text_dialog.xml
@@ -4,7 +4,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:orientation="vertical"
-        android:background="@color/background_material_light"
+        android:background="@color/color_default_background"
         android:padding="8dp">
 
     <TextView
@@ -14,6 +14,7 @@
             android:layout_height="wrap_content"
             android:gravity="start|left|center_vertical"
             android:padding="16dp"
+            android:textColor="@color/color_default_primary_text"
             android:text=""/>
 
     <TextView
@@ -23,6 +24,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
+            android:textColor="@color/color_default_secondary_text"
             android:visibility="gone"/>
 
     <EditText
@@ -36,6 +38,8 @@
             android:hint="@string/task_list_name_dialog_hint"
             android:imeOptions="actionDone"
             android:inputType="textCapSentences"
+            android:textColor="@color/color_default_primary_text"
+            android:textColorHint="@color/color_default_secondary_text"
             android:minWidth="240dp"
             android:textCursorDrawable="@null"/>
 
@@ -63,7 +67,7 @@
                 android:layout_height="wrap_content"
                 android:text="@android:string/cancel"
                 android:textAppearance="@style/TextAppearance.AppCompat.Button"
-                android:textColor="?attr/colorAccent"/>
+                android:textColor="@color/accent"/>
 
         <TextView
                 android:id="@android:id/button1"
@@ -72,7 +76,7 @@
                 android:layout_height="wrap_content"
                 android:text="@android:string/ok"
                 android:textAppearance="@style/TextAppearance.AppCompat.Button"
-                android:textColor="?attr/colorAccent"/>
+                android:textColor="@color/accent"/>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/opentasks/src/main/res/layout/fragment_quick_add_dialog.xml b/opentasks/src/main/res/layout/fragment_quick_add_dialog.xml
index e942cc0e32bcc17c1224cc9ba9635bec0110dcde..fdac96e9d3c3e3e999c899b974849d15c552071d 100644
--- a/opentasks/src/main/res/layout/fragment_quick_add_dialog.xml
+++ b/opentasks/src/main/res/layout/fragment_quick_add_dialog.xml
@@ -5,7 +5,6 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:background="@android:color/white"
         android:orientation="vertical"
         android:padding="0dp">
 
@@ -41,6 +40,8 @@
                     android:hint="@string/task_title"
                     android:imeOptions="actionDone"
                     android:inputType="textCapSentences"
+                    android:textColor="@color/color_default_primary_text"
+                    android:textColorHint="@color/color_default_secondary_text"
                     android:minWidth="240dp"/>
 
             <LinearLayout
@@ -72,10 +73,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                android:drawableTint="@color/color_default_primary_text"
                 android:drawableLeft="@drawable/ic_checkmark_light"
                 android:drawableStart="@drawable/ic_checkmark_light"
                 android:gravity="center"
                 android:text="@string/quick_add_task_created"
+                android:textColor="@color/color_default_primary_text"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:visibility="invisible"/>
     </FrameLayout>
diff --git a/opentasks/src/main/res/layout/fragment_quick_add_dialog_header.xml b/opentasks/src/main/res/layout/fragment_quick_add_dialog_header.xml
index 7fee28d6e18c9347bba679fe69b2e0b49499f422..8d12ff1588249f1a1b170f1ebef487aea76df2b4 100644
--- a/opentasks/src/main/res/layout/fragment_quick_add_dialog_header.xml
+++ b/opentasks/src/main/res/layout/fragment_quick_add_dialog_header.xml
@@ -30,7 +30,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:padding="8dp"
-                android:tint="@color/color_default_blue1"
+                android:tint="@color/accent"
                 android:src="@drawable/content_edit"/>
     </LinearLayout>
 
diff --git a/opentasks/src/main/res/layout/fragment_task_view_detail.xml b/opentasks/src/main/res/layout/fragment_task_view_detail.xml
index 0172b8870e2bde7d595cb5cd58e5e7ff702534d5..5684f0155ec1021945666f4bdc7597062f647a1b 100644
--- a/opentasks/src/main/res/layout/fragment_task_view_detail.xml
+++ b/opentasks/src/main/res/layout/fragment_task_view_detail.xml
@@ -5,6 +5,7 @@
 
     <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
+            android:background="@color/primary_dark"
             style="@style/opentasks_details_appbar">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
@@ -14,8 +15,7 @@
                 android:minHeight="?attr/actionBarSize"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
-            <org.dmfs.tasks.widget.TaskView xmlns:android="http://schemas.android.com/apk/res/android"
-                    xmlns:app="http://schemas.android.com/apk/res-auto"
+            <org.dmfs.tasks.widget.TaskView
                     android:id="@+id/toolbar_content"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -46,12 +46,12 @@
                             android:ellipsize="end"
                             android:lineSpacingMultiplier="1.1"
                             android:maxLines="3"
-                            android:textColor="#ffffffff"
-                            android:textColorLink="#d0ffffff"
-                            android:textSize="28sp"/>
+                            android:textColor="@android:color/white"
+                            android:textColorLink="@android:color/darker_gray"
+                            android:textSize="28sp" />
                 </org.dmfs.tasks.widget.TextFieldView>
 
-                <org.dmfs.tasks.widget.TimeFieldView xmlns:android="http://schemas.android.com/apk/res/android"
+                <org.dmfs.tasks.widget.TimeFieldView
                         style="@style/task_widget"
                         android:orientation="vertical"
                         android:paddingEnd="56dp"
@@ -72,15 +72,15 @@
                             android:drawableStart="@drawable/ic_tab_due"
                             android:gravity="center_vertical"
                             android:includeFontPadding="false"
-                            android:textColor="#ffffffff"
-                            android:textSize="18sp"/>
+                            android:textColor="@android:color/white"
+                            android:textSize="18sp" />
 
                     <TextView
                             android:id="@android:id/text2"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="44dp"
-                            android:textColor="#ffffffff"/>
+                            android:textColor="@android:color/darker_gray" />
 
                     <LinearLayout
                             android:id="@+id/buttons"
@@ -99,7 +99,7 @@
                                 android:drawablePadding="8dp"
                                 android:drawableStart="@drawable/ic_detail_delay_1d"
                                 android:text="@string/button_add_one_day"
-                                android:textColor="#a0ffffff"/>
+                                android:textColor="@android:color/white" />
 
                         <TextView
                                 android:id="@+id/button_add_one_hour"
@@ -111,14 +111,14 @@
                                 android:drawablePadding="8dp"
                                 android:drawableStart="@drawable/ic_detail_delay_1h"
                                 android:text="@string/button_add_one_hour"
-                                android:textColor="#a0ffffff"/>
+                                android:textColor="@android:color/white" />
                     </LinearLayout>
                 </org.dmfs.tasks.widget.TimeFieldView>
             </org.dmfs.tasks.widget.TaskView>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.core.widget.NestedScrollView
             android:id="@+id/scrollView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -127,9 +127,9 @@
         <LinearLayout
                 android:id="@+id/content"
                 android:layout_width="match_parent"
-                android:background="@android:color/white"
+                android:background="@color/color_default_background"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"/>
+                android:orientation="vertical" />
     </androidx.core.widget.NestedScrollView>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -140,7 +140,7 @@
             android:layout_margin="16dp"
             android:src="@drawable/ic_action_complete"
             app:layout_anchor="@id/appbar"
-            app:layout_anchorGravity="bottom|right|end"/>
+            app:layout_anchorGravity="bottom|right|end" />
 
     <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
@@ -148,7 +148,7 @@
             android:layout_height="?attr/actionBarSize"
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:layout_anchor="@id/toolbar_content"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
+            app:popupTheme="@style/actionBarPopUpTheme">
 
         <TextView
                 android:id="@+id/toolbar_title"
@@ -160,7 +160,7 @@
                 android:singleLine="true"
                 android:text=""
                 android:textColor="@android:color/white"
-                android:textSize="24sp"/>
+                android:textSize="24sp" />
     </androidx.appcompat.widget.Toolbar>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/opentasks/src/main/res/layout/integer_choices_spinner_item.xml b/opentasks/src/main/res/layout/integer_choices_spinner_item.xml
index 9e9dbbf143e1c981b189a8094c2c7422b386f193..9267b601f0523e3ff0e9c8fdf59c94642dbfcf32 100644
--- a/opentasks/src/main/res/layout/integer_choices_spinner_item.xml
+++ b/opentasks/src/main/res/layout/integer_choices_spinner_item.xml
@@ -4,6 +4,7 @@
         android:layout_height="wrap_content"
         android:minHeight="48dip"
         android:orientation="horizontal"
+        android:background="@color/primary_dark"
         android:padding="4dip">
 
     <ImageView
diff --git a/opentasks/src/main/res/layout/list_spinner_item_dropdown.xml b/opentasks/src/main/res/layout/list_spinner_item_dropdown.xml
index c6f33103dcbc54caca22221f97a4698189855bc2..37fcc73716f44fdb9a899a955dc355738db8f986 100644
--- a/opentasks/src/main/res/layout/list_spinner_item_dropdown.xml
+++ b/opentasks/src/main/res/layout/list_spinner_item_dropdown.xml
@@ -3,7 +3,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:background="@android:color/white"
+        android:background="@color/primary_dark"
         android:padding="5sp">
 
     <View
diff --git a/opentasks/src/main/res/layout/opentasks_location_field_view.xml b/opentasks/src/main/res/layout/opentasks_location_field_view.xml
index 85880561db74b025cf54e82089d9607550ccdcd5..0c49f1edd82832d6f72a5fa9611658a20fb17064 100644
--- a/opentasks/src/main/res/layout/opentasks_location_field_view.xml
+++ b/opentasks/src/main/res/layout/opentasks_location_field_view.xml
@@ -9,6 +9,7 @@
             android:id="@android:id/icon"
             style="@style/details_label_icon"
             android:textIsSelectable="false"
+            android:drawableTint="@color/color_default_primary_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
diff --git a/opentasks/src/main/res/layout/percentage_field_editor.xml b/opentasks/src/main/res/layout/percentage_field_editor.xml
index 7302bd0708c222e71eb5d0e700a41a97ce166ba7..d5374984c37eeb0179aeee721931ec7e84e8de72 100644
--- a/opentasks/src/main/res/layout/percentage_field_editor.xml
+++ b/opentasks/src/main/res/layout/percentage_field_editor.xml
@@ -2,7 +2,7 @@
 <org.dmfs.tasks.widget.PercentageFieldEditor xmlns:android="http://schemas.android.com/apk/res/android"
         style="@style/task_edit_widget">
 
-    <include layout="@layout/editor_header"/>
+    <include layout="@layout/editor_header" />
 
     <LinearLayout
             android:layout_width="fill_parent"
@@ -17,7 +17,11 @@
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dip"
-                android:layout_weight="1"/>
+                android:thumbTint="@color/accent"
+                android:progressDrawable="@drawable/custom_seekbar"
+                android:maxHeight="3dp"
+                android:minHeight="3dp"
+                android:layout_weight="1" />
 
         <TextView
                 android:id="@+id/text"
@@ -25,7 +29,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="4dip"
-                android:layout_marginRight="4dip"/>
+                android:layout_marginRight="4dip" />
     </LinearLayout>
 
 </org.dmfs.tasks.widget.PercentageFieldEditor>
\ No newline at end of file
diff --git a/opentasks/src/main/res/layout/percentage_field_view.xml b/opentasks/src/main/res/layout/percentage_field_view.xml
index 4e63a68f9d0643389c2e7c94382d224964406256..3ac599de3df9c6cccb42d5d46a06617399322be4 100644
--- a/opentasks/src/main/res/layout/percentage_field_view.xml
+++ b/opentasks/src/main/res/layout/percentage_field_view.xml
@@ -5,8 +5,9 @@
     <TextView
             android:id="@android:id/icon"
             style="@style/details_label_icon"
+            android:drawableTint="@color/color_default_primary_text"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content" />
 
     <LinearLayout
             android:layout_width="fill_parent"
@@ -20,7 +21,11 @@
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dip"
-                android:layout_weight="1"/>
+                android:thumbTint="@color/accent"
+                android:progressDrawable="@drawable/custom_seekbar"
+                android:maxHeight="3dp"
+                android:minHeight="3dp"
+                android:layout_weight="1" />
 
         <TextView
                 android:id="@+id/text"
@@ -29,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="4dip"
                 android:layout_marginRight="4dip"
-                android:gravity="center_vertical"/>
+                android:gravity="center_vertical" />
     </LinearLayout>
 
 </org.dmfs.tasks.widget.PercentageFieldView>
\ No newline at end of file
diff --git a/opentasks/src/main/res/layout/task_list_element.xml b/opentasks/src/main/res/layout/task_list_element.xml
index d8254e82a5677f9e8836f3b0e932f0b559f02bac..ee976803b5d4c043a828ee19347f35cc27d586bb 100644
--- a/opentasks/src/main/res/layout/task_list_element.xml
+++ b/opentasks/src/main/res/layout/task_list_element.xml
@@ -20,7 +20,7 @@
         <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="#FFC0C0C0"
+                android:background="@color/color_default_background"
                 android:minHeight="?android:attr/listPreferredItemHeight">
 
             <TextView
@@ -30,12 +30,13 @@
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
                     android:drawableLeft="@drawable/navigation_accept"
+                    android:drawableTint="@color/color_default_primary_text"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:padding="8dp"
                     android:text="@string/fling_task_complete"
                     android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="#fff"
+                    android:textColor="@color/color_default_primary_text"
                     android:visibility="gone"/>
 
             <TextView
@@ -46,11 +47,12 @@
                     android:layout_centerVertical="true"
                     android:drawablePadding="8dp"
                     android:drawableRight="@drawable/content_edit"
+                    android:drawableTint="@color/color_default_primary_text"
                     android:gravity="center_vertical"
                     android:padding="8dp"
                     android:text="@string/fling_task_edit"
                     android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="#fff"
+                    android:textColor="@color/color_default_primary_text"
                     android:visibility="gone"/>
         </RelativeLayout>
 
@@ -189,7 +191,7 @@
                             android:ellipsize="end"
                             android:maxLines="2"
                             android:textAppearance="?android:attr/textAppearanceSmall"
-                            android:textColor="@color/abc_secondary_text_material_light"
+                            android:textColor="@color/task_list_subtitle_text"
                             android:textSize="12sp"
                             android:visibility="gone"/>
                 </LinearLayout>
diff --git a/opentasks/src/main/res/layout/task_list_group.xml b/opentasks/src/main/res/layout/task_list_group.xml
index 6ee029bf8ab4ee9a8ef24c9e6d6d7f384bc016dd..1192351dda3b58b48654d19eb1d79f8b2f561a0d 100644
--- a/opentasks/src/main/res/layout/task_list_group.xml
+++ b/opentasks/src/main/res/layout/task_list_group.xml
@@ -3,7 +3,7 @@
         style="@style/task_group_list_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#fff0f0f0"
+        android:background="@color/color_default_background"
         android:paddingLeft="@dimen/task_list_left_margin"
         android:paddingRight="@dimen/task_list_right_margin">
 
@@ -97,6 +97,7 @@
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
             android:padding="8dp"
+            android:tint="@color/color_default_primary_text"
             android:src="@drawable/ic_24_plus_black50"
             android:visibility="gone"/>
 
diff --git a/opentasks/src/main/res/layout/task_list_group_single_line.xml b/opentasks/src/main/res/layout/task_list_group_single_line.xml
index fdae24376448a8047f2136e990ce380a1484e46b..e3b27a7f52d257effcf3a1c1ece4db02f977f275 100644
--- a/opentasks/src/main/res/layout/task_list_group_single_line.xml
+++ b/opentasks/src/main/res/layout/task_list_group_single_line.xml
@@ -3,7 +3,7 @@
         style="@style/task_group_list_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#fff0f0f0"
+        android:background="@color/color_default_background"
         android:paddingBottom="8dp"
         android:paddingLeft="@dimen/task_list_left_margin"
         android:paddingRight="@dimen/task_list_right_margin"
@@ -46,6 +46,7 @@
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
             android:padding="8dp"
+            android:tint="@color/color_default_primary_text"
             android:src="@drawable/ic_24_plus_black50"
             android:visibility="gone"/>
 
diff --git a/opentasks/src/main/res/layout/task_list_provider_bar.xml b/opentasks/src/main/res/layout/task_list_provider_bar.xml
index a5dfa5dbbbe1da7a1bcad71c89418b2c0ed5fe0a..8de685ee03a19994bc5e87bbc6ae779862f83c95 100644
--- a/opentasks/src/main/res/layout/task_list_provider_bar.xml
+++ b/opentasks/src/main/res/layout/task_list_provider_bar.xml
@@ -5,10 +5,6 @@
         android:orientation="vertical"
       >
 
-    <View
-            android:background="@color/color_default_blue1"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"/>
     <LinearLayout
             android:paddingLeft="16sp"
             android:paddingRight="16sp"
diff --git a/opentasks/src/main/res/layout/task_list_widget.xml b/opentasks/src/main/res/layout/task_list_widget.xml
index d976b6676d7f0dd16fb3bb7aa619099af230041f..4736be451031d4934fcee0a7a900a2be7ebcd54c 100644
--- a/opentasks/src/main/res/layout/task_list_widget.xml
+++ b/opentasks/src/main/res/layout/task_list_widget.xml
@@ -8,7 +8,6 @@
     <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/translucent_black"
             android:orientation="horizontal">
 
         <Button
@@ -20,7 +19,7 @@
                 android:gravity="center_vertical"
                 android:padding="5sp"
                 android:text="@string/task_list_widget_title"
-                android:textColor="@android:color/white"
+                android:textColor="@color/color_default_primary_text"
                 android:textSize="16sp"/>
 
         <ImageButton
@@ -30,6 +29,7 @@
                 android:background="?android:attr/selectableItemBackground"
                 android:contentDescription="@string/activity_add_task_title"
                 android:src="@drawable/content_new_light"
+                android:tint="@color/color_default_primary_text"
                 android:padding="4dp"/>
     </LinearLayout>
 
diff --git a/opentasks/src/main/res/layout/task_list_widget_item.xml b/opentasks/src/main/res/layout/task_list_widget_item.xml
index 1ff44ff9b466e20a2e1c1fa5cf9a729a933643c3..725376f6ce40d92f1c0063d97640e755a26e3eca 100644
--- a/opentasks/src/main/res/layout/task_list_widget_item.xml
+++ b/opentasks/src/main/res/layout/task_list_widget_item.xml
@@ -30,7 +30,7 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="5dip"
                 android:layout_marginRight="5sp"
-                android:textColor="@color/dark_gray"
+                android:textColor="@color/color_default_secondary_text"
                 android:textIsSelectable="false"
                 android:textSize="14sp"/>
 
@@ -45,7 +45,7 @@
                 android:layout_toRightOf="@id/task_list_color"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:textColor="@android:color/white"
+                android:textColor="@color/color_default_primary_text"
                 android:textIsSelectable="false"
                 android:textSize="14sp"/>
     </RelativeLayout>
diff --git a/opentasks/src/main/res/layout/text_field_view.xml b/opentasks/src/main/res/layout/text_field_view.xml
index b6d5df5e950a8da3c438a6817b53738ef4db6109..62ef94fddf5d3eeba0d7b7a10b26ff7f0c490b6f 100644
--- a/opentasks/src/main/res/layout/text_field_view.xml
+++ b/opentasks/src/main/res/layout/text_field_view.xml
@@ -5,6 +5,7 @@
     <TextView
             android:id="@android:id/icon"
             style="@style/details_label_icon"
+            android:drawableTint="@color/color_default_primary_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
diff --git a/opentasks/src/main/res/layout/time_field_editor.xml b/opentasks/src/main/res/layout/time_field_editor.xml
index 3c3d426e0252eb37a2e5ffd50c91e04022e5a6b5..2d692294d6aed04f9acf5a2f9e802eae577bd4cc 100644
--- a/opentasks/src/main/res/layout/time_field_editor.xml
+++ b/opentasks/src/main/res/layout/time_field_editor.xml
@@ -21,7 +21,7 @@
                 android:gravity="center|left"/>
 
         <TextView
-                android:hint="Select time"
+                android:hint="Select Time"
                 android:id="@+id/task_time_picker"
                 style="@style/TextAppearance.EditTask_SpinnerButton"
                 android:layout_width="0px"
diff --git a/opentasks/src/main/res/layout/time_field_view.xml b/opentasks/src/main/res/layout/time_field_view.xml
index 1e72914d90405282b6cbe3091418482d0f98a811..926c13622e54f393eb321094925b163d11ae50d6 100644
--- a/opentasks/src/main/res/layout/time_field_view.xml
+++ b/opentasks/src/main/res/layout/time_field_view.xml
@@ -5,8 +5,9 @@
     <TextView
             android:id="@android:id/icon"
             style="@style/details_label_icon"
+            android:drawableTint="@color/color_default_primary_text"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content" />
 
     <LinearLayout
             android:layout_width="match_parent"
@@ -17,13 +18,13 @@
                 android:id="@android:id/text1"
                 style="@style/field_view_text_value"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
 
         <TextView
                 android:id="@android:id/text2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="#ff808080"/>
+                android:textColor="@color/color_default_secondary_text" />
 
         <LinearLayout
                 android:id="@+id/buttons"
@@ -37,7 +38,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="@string/button_add_one_day"/>
+                    android:text="@string/button_add_one_day" />
 
             <TextView
                     android:id="@+id/button_add_one_hour"
@@ -45,7 +46,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="@string/button_add_one_hour"/>
+                    android:text="@string/button_add_one_hour" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/opentasks/src/main/res/layout/url_field_view.xml b/opentasks/src/main/res/layout/url_field_view.xml
index 7f093025dff826cf66b393d00b963be6322e9df0..43b4e31034a3bd87b388b085411faea9fabb476a 100644
--- a/opentasks/src/main/res/layout/url_field_view.xml
+++ b/opentasks/src/main/res/layout/url_field_view.xml
@@ -5,6 +5,7 @@
     <TextView
             android:id="@android:id/icon"
             style="@style/details_label_icon"
+            android:drawableTint="@color/color_default_primary_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
diff --git a/opentasks/src/main/res/layout/visible_task_list_item.xml b/opentasks/src/main/res/layout/visible_task_list_item.xml
index d32a3795dbaf7676e46a3d9edcee28f322279c6f..862b570d8722a640cb4a835cd2a4ea868e7dc04f 100644
--- a/opentasks/src/main/res/layout/visible_task_list_item.xml
+++ b/opentasks/src/main/res/layout/visible_task_list_item.xml
@@ -37,7 +37,7 @@
             android:clickable="true"
             android:padding="12dp"
             android:src="@drawable/ic_24_settings_black50"
-            android:tint="?attr/colorAccent"/>
+            android:tint="@color/accent"/>
 
     <TextView
             android:id="@android:id/text1"
diff --git a/opentasks/src/main/res/values-large-land/styles.xml b/opentasks/src/main/res/values-large-land/styles.xml
index ac496c92dd6c965e960add1cf561f8eb90fc346c..afd3c4d015ad12a8a3d74d772b1fb773169be86c 100644
--- a/opentasks/src/main/res/values-large-land/styles.xml
+++ b/opentasks/src/main/res/values-large-land/styles.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <style name="edit_detail_ll">
-        <item name="android:background">@android:color/white</item>
+        <item name="android:background">@color/color_default_primary_text</item>
         <item name="android:layout_width">600dp</item>
     </style>
 
diff --git a/opentasks/src/main/res/values-large/styles.xml b/opentasks/src/main/res/values-large/styles.xml
index 850581ef09426f55c74db003a335175916642473..e8321d57052e01faa4cebcdeda0aa28946ae8dce 100644
--- a/opentasks/src/main/res/values-large/styles.xml
+++ b/opentasks/src/main/res/values-large/styles.xml
@@ -8,12 +8,12 @@
     </style>
 
     <style name="edit_detail_ll">
-        <item name="android:background">@android:color/white</item>
+        <item name="android:background">@color/color_default_primary_text</item>
         <item name="android:layout_width">fill_parent</item>
     </style>
 
     <style name="task_list_container">
-        <item name="android:background">@android:color/white</item>
+        <item name="android:background">@color/color_default_background</item>
     </style>
 
     <style name="task_list_item_date"
diff --git a/opentasks/src/main/res/values-night-v27/styles.xml b/opentasks/src/main/res/values-night-v27/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c6505f9c86209bf5f09dbab0fa5f06a1132ccb7f
--- /dev/null
+++ b/opentasks/src/main/res/values-night-v27/styles.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="OpenTasksAppTheme" parent="OpenTasksAppBaseTheme">
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="AppTheme" parent="AppBaseTheme">
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="AboutTheme" parent="AboutBaseTheme">
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-night/styles.xml b/opentasks/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..310a63ccabe32f226d5cf8abeebdb22758ac9d28
--- /dev/null
+++ b/opentasks/src/main/res/values-night/styles.xml
@@ -0,0 +1,3 @@
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="actionBarPopUpTheme" parent="ThemeOverlay.AppCompat.Dark" />
+</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-sw600dp-land/styles.xml b/opentasks/src/main/res/values-sw600dp-land/styles.xml
index ac496c92dd6c965e960add1cf561f8eb90fc346c..afd3c4d015ad12a8a3d74d772b1fb773169be86c 100644
--- a/opentasks/src/main/res/values-sw600dp-land/styles.xml
+++ b/opentasks/src/main/res/values-sw600dp-land/styles.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <style name="edit_detail_ll">
-        <item name="android:background">@android:color/white</item>
+        <item name="android:background">@color/color_default_primary_text</item>
         <item name="android:layout_width">600dp</item>
     </style>
 
diff --git a/opentasks/src/main/res/values-sw600dp/styles.xml b/opentasks/src/main/res/values-sw600dp/styles.xml
index 850581ef09426f55c74db003a335175916642473..e8321d57052e01faa4cebcdeda0aa28946ae8dce 100644
--- a/opentasks/src/main/res/values-sw600dp/styles.xml
+++ b/opentasks/src/main/res/values-sw600dp/styles.xml
@@ -8,12 +8,12 @@
     </style>
 
     <style name="edit_detail_ll">
-        <item name="android:background">@android:color/white</item>
+        <item name="android:background">@color/color_default_primary_text</item>
         <item name="android:layout_width">fill_parent</item>
     </style>
 
     <style name="task_list_container">
-        <item name="android:background">@android:color/white</item>
+        <item name="android:background">@color/color_default_background</item>
     </style>
 
     <style name="task_list_item_date"
diff --git a/opentasks/src/main/res/values-v27/styles.xml b/opentasks/src/main/res/values-v27/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..464491f032ed6ad9cc84e86321d133cdba149f96
--- /dev/null
+++ b/opentasks/src/main/res/values-v27/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="OpenTasksAppTheme"
+            parent="OpenTasksAppBaseTheme">
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+
+    <style name="AppTheme" parent="AppBaseTheme">
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+
+    <style name="AboutTheme" parent="AboutBaseTheme">
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values/colors.xml b/opentasks/src/main/res/values/colors.xml
index ce8be682ad74d8ab3537429c80e57714957cf0c8..b1d1e84c9d7210b19ab4f8ae944b7162b0ce3b9f 100644
--- a/opentasks/src/main/res/values/colors.xml
+++ b/opentasks/src/main/res/values/colors.xml
@@ -7,10 +7,10 @@
     <color name="darker_gray">#FF333333</color>
     <color name="translucent_black">#CC000000</color>
     <color name="translucent_white">#22FFFFFF</color>
-    <color name="translucent_grey">#BB222222</color>
+    <color name="translucent_bg">@color/color_default_background</color>
     <color name="holo_blue">#CC33B5E5</color>
-    <color name="priority_green">#4caf50</color>
-    <color name="priority_red">#f44336</color>
+    <color name="priority_green">@lineageos.platform:color/color_default_green1</color>
+    <color name="priority_red">@lineageos.platform:color/color_default_red1</color>
     <color name="priority_yellow">#ffc107</color>
     <color name="list_background_pressed">#11000000</color>
     <color name="list_background_activated">#33000000</color>
@@ -26,40 +26,28 @@
     <!-- A dark Holo shade of green -->
     <color name="holo_green_dark">#ff669900</color>
     <!-- A dark Holo shade of red -->
-    <color name="holo_red_dark">#ffcc0000</color>
+    <color name="holo_red_dark">@lineageos.platform:color/color_default_red1</color>
     <!-- A Holo shade of purple -->
     <color name="holo_purple">#ffaa66cc</color>
     <!-- A light Holo shade of orange -->
     <color name="holo_orange_light">#ffffbb33</color>
     <!-- A dark Holo shade of orange -->
-    <color name="holo_orange_dark">#ffff8800</color>
+    <color name="holo_orange_dark">@lineageos.platform:color/color_default_orange1</color>
     <!-- A really bright Holo shade of blue -->
-    <color name="holo_blue_bright">#ff00ddff</color>
-    <color name="material_red">#f44336</color>
+    <color name="holo_blue_bright">@lineageos.platform:color/color_default_blue1</color>
+    <color name="material_red">@lineageos.platform:color/color_default_red1</color>
+    <color name="task_progress_start_color">#1f808080</color>
 
-<!--     Our primary color - a nice shade of teal-->
+    <!--     Our primary color - a nice shade of teal-->
 
-   <color name="primary">@lineageos.platform:color/color_default_primary</color>
+    <color name="primary">@lineageos.platform:color/color_default_primary</color>
     <color name="primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
     <color name="accent">@lineageos.platform:color/color_default_accent</color>
     <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
     <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
     <color name="color_default_background">@lineageos.platform:color/color_default_background</color>
-    <color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</color>
+    <color name="color_default_blue1">@lineageos.platform:color/color_default_accent</color>
     <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
     <color name="color_default_green1">@lineageos.platform:color/color_default_green1</color>
-
-
-<!--    <color name="primary">#FFFFFF</color>-->
-<!--    <color name="primary_dark">#FFFFFF</color>-->
-<!--    <color name="accent">#007FFF</color>-->
-<!--    <color name="color_default_primary_text">#000000</color>-->
-<!--    <color name="color_default_secondary_text">#000000</color>-->
-<!--    <color name="color_default_background">#FAFAFA</color>-->
-<!--    <color name="color_default_blue1">#007FFF</color>-->
-<!--    <color name="color_default_gray2">#848484</color>-->
-<!--    <color name="color_default_green1">#38D874</color>-->
-
-
-
+    <color name="color_divider">@lineageos.platform:color/color_default_divider</color>
 </resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values/styles.xml b/opentasks/src/main/res/values/styles.xml
index 3a588125295cbb5711480597717da9f250d21bb3..6a65b0df765d4b416175ffc81b4e99dbd3d2d642 100644
--- a/opentasks/src/main/res/values/styles.xml
+++ b/opentasks/src/main/res/values/styles.xml
@@ -3,34 +3,52 @@
     <!-- DOWN from here: former v14 styles.xml content -->
 
     <style name="OpenTasksAppBaseTheme"
-            parent="@style/Theme.AppCompat.Light.NoActionBar">
-
-
+            parent="@style/Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:windowContentOverlay">@null</item>
         <item name="searchViewStyle">@style/WhiteSearchViewStyle</item>
         <item name="autoCompleteTextViewStyle">@style/cursorColor</item>
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
+        <item name="colorAccent">@color/accent</item>
         <item name="windowActionModeOverlay">true</item>
 
-
+        <item name="android:textColorPrimary">@color/abc_primary_text_material_light</item>
+        <item name="actionMenuTextColor">@color/abc_primary_text_material_light</item>
+        <item name="android:textColorSecondary">@color/abc_secondary_text_material_light</item>
+        <item name="android:windowTitleStyle">@style/window_title_style</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:navigationBarColor">@color/primary_dark</item>
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_accent</item>
+        <item name="actionOverflowButtonStyle">@style/actionWhiteOverflowButtonStyle</item>
+        <item name="android:timePickerDialogTheme">@style/MyAppTheme_datePicker</item>
     </style>
 
 
     <style name="AppBaseTheme"
-            parent="@style/Theme.AppCompat.Light.DarkActionBar">
+            parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
         <item name="actionBarStyle">@style/ActionBar</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:actionBarWidgetTheme">@style/actionBarWidgetTheme</item>
         <item name="android:actionBarItemBackground">@drawable/selectable_background_white</item>
         <item name="searchViewStyle">@style/WhiteSearchViewStyle</item>
         <item name="autoCompleteTextViewStyle">@style/cursorColor</item>
+
+        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="android:windowTitleStyle">@style/window_title_style</item>
+        <item name="android:textColorSecondary">@color/color_default_primary_text</item>
+        <item name="android:navigationBarColor">@color/primary_dark</item>
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_accent</item>
+        <item name="actionOverflowButtonStyle">@style/actionOverflowButtonStyle</item>
     </style>
 
     <!-- ActionBar styles -->
     <style name="ActionBar"
             parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
-        <item name="background">@color/primary</item>
+        <item name="background">@color/primary_dark</item>
         <item name="displayOptions">showTitle</item>
         <item name="icon">@color/color_default_primary_text</item>
         <item name="actionBarItemBackground">@drawable/selectable_background_white</item>
@@ -67,18 +85,22 @@
     <style name="DatePickerHolo"
             parent="@android:style/Theme.Holo.Light.Dialog"/>
 
-    <style name="MyAppTheme_datePicker" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/color_default_blue1</item>
-        <item name="colorControlActivated">@color/color_default_blue1</item>
-        <item name="android:selectableItemBackgroundBorderless">@color/primary</item>
-        <item name="colorControlHighlight">@color/color_default_primary_text</item>
+    <style name="MyAppTheme_datePicker" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
+        <item name="colorAccent">@color/accent</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:alertDialogTheme">@style/customAlertButton</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
+        <item name="android:textColorPrimaryInverse">@android:color/white</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
         <item name="android:buttonBarNegativeButtonStyle">@style/DatePickerTheme.ButtonBarNegativeButtonStyle</item>
         <item name="android:buttonBarPositiveButtonStyle">@style/DatePickerTheme.ButtonBarNegativeButtonStyle</item>
-
     </style>
+
     <style name="DatePickerTheme.ButtonBarNegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
-        <item name="android:textColor">@color/color_default_blue1</item>
-        <item name="android:textSize">14dp</item>
+        <item name="android:textColor">@color/accent</item>
+        <item name="android:textSize">14sp</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textStyle">bold</item>
     </style>
@@ -91,11 +113,11 @@
     <style name="TextAppearance.EditTask_Spinner"
             parent="android:style/Widget.Holo.Light.Spinner">
         <item name="android:textSize">18sp</item>
-        <item name="android:textColor">#FF333333</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
 
     <style name="dark_text">
-        <item name="android:textColor">#FF333333</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
 
     <style name="detail_label_text">
@@ -119,7 +141,7 @@
         <item name="android:scrollbarStyle">insideOverlay</item>
         <item name="android:scrollbarSize">20dp</item>
         <item name="android:divider">@null</item>
-        <item name="android:background">#fff0f0f0</item>
+        <item name="android:background">@color/color_default_background</item>
     </style>
 
     <style name="task_list_item_divider">
@@ -160,10 +182,9 @@
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="actionMenuTextColor">@color/color_default_blue1</item>
-        <item name="android:textColorPrimary">@color/color_default_blue1</item>
-        <item name="colorAccent">@color/color_default_primary_text</item>
+        <item name="actionMenuTextColor">@color/accent</item>
+        <item name="android:textColorPrimary">@color/accent</item>
+        <item name="colorAccent">@color/accent</item>
     </style>
 
     <style name="MyActionBar" parent="@android:style/Widget.Holo.Light.ActionBar">
@@ -232,14 +253,14 @@
     <style name="dialog_text_title"
             parent="android:Widget.Holo.Light.TextView">
         <item name="android:textAppearance">@android:style/TextAppearance.Medium</item>
-        <item name="android:textColor">#C0000000</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">20sp</item>
     </style>
 
     <style name="dialog_button_secondary"
             parent="dialog_button_primary">
-        <item name="android:textColor">#90000000</item>
+        <item name="android:textColor">@color/color_default_secondary_text</item>
     </style>
 
     <style name="actionColorBar">
@@ -250,18 +271,11 @@
     <!-- UP: former v11+v14, DOWN: former default-->
 
     <style name="OpenTasksAppTheme"
-            parent="OpenTasksAppBaseTheme">
-        <item name="android:textColorPrimary">@color/abc_primary_text_material_light</item>
-        <item name="actionMenuTextColor">@color/abc_primary_text_material_light</item>
-        <item name="android:textColorSecondary">@color/abc_secondary_text_material_light</item>
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="colorAccent">@color/accent</item>
-        <item name="android:windowTitleStyle">@style/window_title_style</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
+            parent="OpenTasksAppBaseTheme" />
 
-       <!-- <item name="actionOverflowButtonStyle">@style/actionOverflowButtonStyle</item>-->
+    <style name="OpenTasksAppThemeWhiteBackButton" parent="OpenTasksAppTheme">
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted.White</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
     <style name="AppTheme.ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
@@ -273,29 +287,47 @@
 
     <!-- This style is where you define the tint color of your overflow menu button -->
     <style name="actionOverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">@color/color_default_primary_text</item>
+        <item name="android:tint">@color/accent</item>
+    </style>
+
+    <style name="actionWhiteOverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:tint">@android:color/white</item>
     </style>
 
 
     <style name="AppTheme"
-            parent="AppBaseTheme">
-        <item name="android:textColor">#FF333333</item>
+            parent="AppBaseTheme" />
+
+    <style name="AboutBaseTheme" parent="@style/Theme.AppCompat.DayNight">
+        <item name="actionBarStyle">@style/ActionBar</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:actionBarWidgetTheme">@style/actionBarWidgetTheme</item>
+        <item name="android:actionBarItemBackground">@drawable/selectable_background_white</item>
+        <item name="searchViewStyle">@style/WhiteSearchViewStyle</item>
+        <item name="autoCompleteTextViewStyle">@style/cursorColor</item>
+
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="android:windowTitleStyle">@style/window_title_style</item>
         <item name="android:textColorSecondary">@color/color_default_primary_text</item>
+        <item name="android:navigationBarColor">@color/primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/primary_dark</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_accent</item>
+        <item name="actionOverflowButtonStyle">@style/actionOverflowButtonStyle</item>
     </style>
 
+    <style name="AboutTheme" parent="AboutBaseTheme" />
+
     <style name="AppThemeDialog"
-            parent="@style/Theme.AppCompat.Light.Dialog">
-        <item name="android:textColor">#FF333333</item>
+            parent="@style/Theme.AppCompat.DayNight.Dialog">
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="colorPrimary">@color/primary</item>
-        <!-- <item name="android:background">@color/background_material_light</item> -->
-        <!-- <item name="android:windowTitleStyle">@style/window_dialog_title_style</item> -->
     </style>
 
     <style name="window_dialog_title_style">
         <item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</item>
-        <item name="android:background">@color/background_material_light</item>
+        <item name="android:background">@color/color_default_background</item>
     </style>
 
     <style name="window_title_style">
@@ -303,8 +335,8 @@
     </style>
 
     <style name="ActivityDefault">
-        <item name="android:background">@android:color/white</item>
-        <item name="android:textColor">@android:color/darker_gray</item>
+        <item name="android:background">@color/color_default_background</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
 
     <style name="legacyEditText"
@@ -323,7 +355,7 @@
     <!-- Styles for main task list -->
 
     <style name="task_list_container">
-        <item name="android:background">@android:color/white</item>
+        <item name="android:background">@color/color_default_background</item>
     </style>
 
     <style name="task_group_list_item"/>
@@ -381,15 +413,15 @@
 
     <style name="dialog_button_stacked_secondary"
             parent="dialog_button_stacked_primary">
-        <item name="android:textColor">#90000000</item>
+        <item name="android:textColor">@color/color_default_secondary_text</item>
     </style>
 
-    <style name="checklist_checked_item_text">
-        <item name="android:textColor">#ff808080</item>
+    <style name="checklist_unchecked_item_text">
+        <item name="android:textColor">@color/color_default_secondary_text</item>
     </style>
 
     <style name="Theme.MaterialDialog"
-            parent="@style/Theme.AppCompat.Light.Dialog">
+            parent="@style/Theme.AppCompat.DayNight.Dialog">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
@@ -421,7 +453,30 @@
 
     <style name="settingToolbarTheme">
         <!-- Used to tint the back arrow, menu and spinner arrow -->
-        <item name="colorControlNormal">@color/color_default_blue1</item> //red
+        <item name="colorControlNormal">@color/accent</item>
     </style>
 
+    <style name="actionBarPopUpTheme" parent="ThemeOverlay.AppCompat.Light" />
+
+    <style name="customAlertDialog" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
+        <item name="colorAccent">@color/accent</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:alertDialogTheme">@style/customAlertButton</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
+    </style>
+
+    <style name="customAlertButton" parent="android:style/Widget.Button">
+        <item name="android:background">@color/color_default_background</item>
+        <item name="android:textColor">@color/accent</item>
+    </style>
+
+    <style name="Toolbar.Button.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
+        <item name="tint">@color/accent</item>
+    </style>
+
+    <style name="Toolbar.Button.Navigation.Tinted.White" parent="Widget.AppCompat.Toolbar.Button.Navigation">
+        <item name="tint">@android:color/white</item>
+    </style>
 </resources>
\ No newline at end of file