diff --git a/opentasks/src/main/java/org/dmfs/tasks/EditTaskActivity.java b/opentasks/src/main/java/org/dmfs/tasks/EditTaskActivity.java
index e91b4e66aa6547c67c3724817f1e40c001337d7c..3a2162f062245b4c9fb0e03591d4c57016644981 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/EditTaskActivity.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/EditTaskActivity.java
@@ -17,11 +17,20 @@
 package org.dmfs.tasks;
 
 import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+
+import androidx.core.content.res.ResourcesCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.fragment.app.Fragment;
 import androidx.core.app.NavUtils;
 import androidx.appcompat.app.ActionBar;
 
+import android.text.Html;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -56,6 +65,8 @@ public class EditTaskActivity extends BaseActivity
     private String mAuthority;
 
 
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
@@ -68,14 +79,16 @@ public class EditTaskActivity extends BaseActivity
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayShowHomeEnabled(false);
         actionBar.setDisplayHomeAsUpEnabled(true);
-        actionBar.setHomeAsUpIndicator(R.drawable.content_remove_light);
-        // actionBar.setDisplayShowTitleEnabled(false);
+        actionBar.setHomeAsUpIndicator(R.drawable.ic_baseline_close_24);
+
 
         Intent intent = getIntent();
         String action = intent.getAction();
 
         setActivityTitle(action);
 
+        actionBar.setTitle(Html.fromHtml("<font color='"+R.color.color_default_primary_text+"'>"+actionBar.getTitle() +"</font>"));
+
         if (savedInstanceState == null)
         {
             Bundle arguments = new Bundle();
@@ -177,6 +190,7 @@ public class EditTaskActivity extends BaseActivity
     public boolean onCreateOptionsMenu(Menu menu)
     {
         getMenuInflater().inflate(R.menu.edit_task_activity_menu, menu);
+
         return true;
     }
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/EditTaskFragment.java b/opentasks/src/main/java/org/dmfs/tasks/EditTaskFragment.java
index 07d31711f8bcbaa725f5616f40daa476221a07ee..59595f19b6763b92944baffa626c040b0933079c 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/EditTaskFragment.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/EditTaskFragment.java
@@ -29,6 +29,7 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -39,6 +40,7 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import org.dmfs.android.bolts.color.elementary.ValueColor;
@@ -160,8 +162,8 @@ public class EditTaskFragment extends SupportFragment implements LoaderManager.L
     private LinearLayout mTaskListBar;
     private Spinner mListSpinner;
     private String mAuthority;
+    private View viewAccountColor;
     private View mColorBar;
-
     private boolean mRestored;
 
     private int mListColor = -1;
@@ -211,6 +213,19 @@ public class EditTaskFragment extends SupportFragment implements LoaderManager.L
     }
 
 
+    @Override
+    public void onResume()
+    {
+        super.onResume();
+
+       viewAccountColor.setBackgroundColor(mListColor);
+
+    }
+
+
+
+
+
     @Override
     public void onAttach(Activity activity)
     {
@@ -269,7 +284,7 @@ public class EditTaskFragment extends SupportFragment implements LoaderManager.L
 
         mTaskListBar = (LinearLayout) inflater.inflate(R.layout.task_list_provider_bar, mHeader);
         mListSpinner = (Spinner) mTaskListBar.findViewById(R.id.task_list_spinner);
-
+        viewAccountColor = mTaskListBar.findViewById(R.id.viewAccountColor);
         mTaskListAdapter = new TasksListCursorSpinnerAdapter(mAppContext);
         mListSpinner.setAdapter(mTaskListAdapter);
 
@@ -634,27 +649,8 @@ public class EditTaskFragment extends SupportFragment implements LoaderManager.L
             percentage = Math.max(0, Math.min(Float.isNaN(percentage) ? 0 : percentage, 1));
         }
         int alpha = (int) ((0.5 + 0.5 * percentage) * 255);
+        viewAccountColor.setBackgroundColor(mListColor);
 
-        int newColor = new BlendColor(new ValueColor(mListColor), new DarkenedForStatusBar(mListColor), alpha).argb();
-        ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar();
-        actionBar.setBackgroundDrawable(new ColorDrawable(newColor));
-
-        // this is a workaround to ensure the new color is applied on all devices, some devices show a transparent ActionBar if we don't do that.
-        actionBar.setDisplayShowTitleEnabled(false);
-        actionBar.setDisplayShowTitleEnabled(true);
-
-        if (VERSION.SDK_INT >= 21)
-        {
-            Window window = getActivity().getWindow();
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(new Mixed(newColor, mListColor).argb());
-            // window.setNavigationBarColor(mixColors(newColor, mListColor));
-        }
-        mTaskListBar.setBackgroundColor(mListColor);
-        if (mColorBar != null)
-        {
-            mColorBar.setBackgroundColor(mListColor);
-        }
     }
 
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/QuickAddDialogFragment.java b/opentasks/src/main/java/org/dmfs/tasks/QuickAddDialogFragment.java
index a17fca8af376a2e8000a15c412aa032230d83474..110cd2278e91fd4de54fa816c548ccb15dca96f8 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/QuickAddDialogFragment.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/QuickAddDialogFragment.java
@@ -135,7 +135,7 @@ public class QuickAddDialogFragment extends SupportDialogFragment
 
     private boolean mClosing;
 
-    private View mColorBackground;
+    private View viewAccountColor;
     private Spinner mListSpinner;
 
     private EditText mEditText;
@@ -220,9 +220,9 @@ public class QuickAddDialogFragment extends SupportDialogFragment
             }
         }
 
-        mColorBackground = view.findViewById(R.id.color_background);
-        mColorBackground.setBackgroundColor(mLastColor);
-
+     //   mColorBackground = view.findViewById(R.id.color_background);
+        //mColorBackground.setBackgroundColor(mLastColor);
+        viewAccountColor=view.findViewById(R.id.viewAccountColor);
         mListSpinner = (Spinner) view.findViewById(R.id.task_list_spinner);
         mTaskListAdapter = new TasksListCursorSpinnerAdapter(getActivity(), R.layout.list_spinner_item_selected_quick_add, R.layout.list_spinner_item_dropdown);
         mListSpinner.setAdapter(mTaskListAdapter);
@@ -327,7 +327,8 @@ public class QuickAddDialogFragment extends SupportDialogFragment
     {
         Cursor c = (Cursor) parent.getItemAtPosition(position);
         mLastColor = TaskFieldAdapters.LIST_COLOR.get(c);
-        mColorBackground.setBackgroundColor(mLastColor);
+        viewAccountColor.setBackgroundColor(mLastColor);
+
         mSelectedListId = id;
 
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/utils/TasksListCursorSpinnerAdapter.java b/opentasks/src/main/java/org/dmfs/tasks/utils/TasksListCursorSpinnerAdapter.java
index da64335f7631f46482815102d621728e8ea18d66..18b9f90101104732eb4153c4d141a391575e4880 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/utils/TasksListCursorSpinnerAdapter.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/utils/TasksListCursorSpinnerAdapter.java
@@ -112,7 +112,11 @@ public class TasksListCursorSpinnerAdapter extends CursorAdapter implements Spin
         }
 
         TextView listName = (TextView) convertView.findViewById(R.id.task_list_name);
+        listName.setTextColor(mContext.getResources().getColor(R.color.color_default_primary_text));
         TextView accountName = (TextView) convertView.findViewById(R.id.task_list_account_name);
+        if(null!=accountName){
+            accountName.setTextColor(mContext.getResources().getColor(R.color.color_default_secondary_text));
+        }
         Cursor cursor = (Cursor) getItem(position);
 
         listName.setText(cursor.getString(mTaskNameColumn));
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 eeb45237b6838874deeb1d74775964e7e3c9efd0..d5806f4b683c03158eab6f247bab3eae9fdbdd8d 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldEditor.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldEditor.java
@@ -16,6 +16,7 @@
 
 package org.dmfs.tasks.widget;
 
+import android.app.AlertDialog;
 import android.app.DatePickerDialog;
 import android.app.DatePickerDialog.OnDateSetListener;
 import android.app.Dialog;
@@ -38,6 +39,7 @@ import android.widget.DatePicker;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.NumberPicker;
+import android.widget.TextView;
 import android.widget.TimePicker;
 
 import org.dmfs.tasks.R;
@@ -72,7 +74,7 @@ public final class TimeFieldEditor extends AbstractFieldEditor implements OnDate
     /**
      * The buttons to show the current date and time and to launch the date & time pickers.
      */
-    private Button mDatePickerButton, mTimePickerButton;
+    private TextView mDatePickerButton, mTimePickerButton;
 
     /**
      * The button to clear the current date.
@@ -137,8 +139,8 @@ public final class TimeFieldEditor extends AbstractFieldEditor implements OnDate
     protected void onFinishInflate()
     {
         super.onFinishInflate();
-        mDatePickerButton = (Button) findViewById(R.id.task_date_picker);
-        mTimePickerButton = (Button) findViewById(R.id.task_time_picker);
+        mDatePickerButton = (TextView) findViewById(R.id.task_date_picker);
+        mTimePickerButton = (TextView) findViewById(R.id.task_time_picker);
         mClearDateButton = (ImageButton) findViewById(R.id.task_time_picker_remove);
         if (mDatePickerButton != null)
         {
@@ -202,7 +204,7 @@ public final class TimeFieldEditor extends AbstractFieldEditor implements OnDate
             }
             else
             {
-                dialog = new TimePickerDialog(getContext(), TimeFieldEditor.this, mDateTime.hour, mDateTime.minute, mIs24hour);
+                dialog = new TimePickerDialog(getContext(), R.style.MyAppTheme_datePicker, TimeFieldEditor.this, mDateTime.hour, mDateTime.minute, mIs24hour);
             }
             dialog.show();
         }
@@ -439,7 +441,7 @@ public final class TimeFieldEditor extends AbstractFieldEditor implements OnDate
             // get holo picker
             DatePickerDialog dialog =
                     new DatePickerDialog(getContext(),
-                            R.style.DatePickerHolo, TimeFieldEditor.this, mDateTime.year, mDateTime.month,
+                            R.style.MyAppTheme_datePicker, TimeFieldEditor.this, mDateTime.year, mDateTime.month,
                     mDateTime.monthDay);
             //dialog.getWindow().setBackgroundDrawable(new ColorDrawable(0));
 
@@ -483,7 +485,7 @@ public final class TimeFieldEditor extends AbstractFieldEditor implements OnDate
         }
         else
         {
-            return new DatePickerDialog(getContext(), TimeFieldEditor.this, mDateTime.year, mDateTime.month, mDateTime.monthDay);
+            return new DatePickerDialog(getContext(), R.style.MyAppTheme_datePicker, TimeFieldEditor.this, mDateTime.year, mDateTime.month, mDateTime.monthDay);
         }
     }
 }
diff --git a/opentasks/src/main/res/drawable/ic_baseline_close_24.xml b/opentasks/src/main/res/drawable/ic_baseline_close_24.xml
new file mode 100644
index 0000000000000000000000000000000000000000..94b7a8279906b902d06c4a45716d36e68fc6286e
--- /dev/null
+++ b/opentasks/src/main/res/drawable/ic_baseline_close_24.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright 2021 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/color_default_blue1">
+  <path
+      android:fillColor="@android:color/white"
+      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/layout/fragment_quick_add_dialog.xml b/opentasks/src/main/res/layout/fragment_quick_add_dialog.xml
index f021be295b994eed8fa332d1602e0c80972544a8..e942cc0e32bcc17c1224cc9ba9635bec0110dcde 100644
--- a/opentasks/src/main/res/layout/fragment_quick_add_dialog.xml
+++ b/opentasks/src/main/res/layout/fragment_quick_add_dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/edit_name"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -32,6 +33,7 @@
                 android:padding="4dp">
 
             <EditText
+                    app:backgroundTint="@color/dark_gray"
                     android:id="@android:id/input"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
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 ff996feb2bce629d7cd7ab85cc674c46f3f24f5b..7fee28d6e18c9347bba679fe69b2e0b49499f422 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
@@ -21,7 +21,7 @@
                 android:gravity="center_vertical"
                 android:padding="8dp"
                 android:text="@string/menu_add_task"
-                android:textColor="@android:color/white"/>
+                android:textColor="@color/color_default_primary_text"/>
 
         <ImageView
                 android:id="@android:id/edit"
@@ -30,15 +30,32 @@
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:padding="8dp"
+                android:tint="@color/color_default_blue1"
                 android:src="@drawable/content_edit"/>
     </LinearLayout>
 
-    <Spinner
-            android:id="@+id/task_list_spinner"
+    <LinearLayout
+            android:gravity="center"
+            android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:spinnerMode="dropdown"/>
+            android:layout_height="wrap_content">
+
+        <View
+                android:layout_marginLeft="8dp"
+                android:id="@+id/viewAccountColor"
+                android:background="@color/translucent_white"
+                android:layout_width="14dp"
+                android:layout_height="14dp"/>
+        <Spinner
+                android:backgroundTint="@color/color_default_secondary_text"
+                android:id="@+id/task_list_spinner"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:spinnerMode="dropdown"/>
+
+
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/opentasks/src/main/res/layout/fragment_task_edit_detail.xml b/opentasks/src/main/res/layout/fragment_task_edit_detail.xml
index d6041da4f06c02d3e9931aead58d7bdcdbd170c5..fa221af4607c1d4fe7bd541e1c13e9244ed403df 100644
--- a/opentasks/src/main/res/layout/fragment_task_edit_detail.xml
+++ b/opentasks/src/main/res/layout/fragment_task_edit_detail.xml
@@ -10,6 +10,7 @@
             android:orientation="vertical">
 
         <View
+                android:background="@color/primary"
                 android:id="@+id/headercolorbar"
                 style="@style/actionColorBar"
                 android:layout_width="fill_parent"/>
diff --git a/opentasks/src/main/res/layout/list_spinner_item_selected_quick_add.xml b/opentasks/src/main/res/layout/list_spinner_item_selected_quick_add.xml
index ca650e4e557bd45f2f62ee02e746a7fc4944775b..e9440d711acd00878bc50d3fd5c6e5e27a118b87 100644
--- a/opentasks/src/main/res/layout/list_spinner_item_selected_quick_add.xml
+++ b/opentasks/src/main/res/layout/list_spinner_item_selected_quick_add.xml
@@ -11,6 +11,6 @@
             android:ellipsize="end"
             android:singleLine="true"
             android:textAppearance="@android:style/TextAppearance.Medium"
-            android:textColor="#c0ffffff"/>
+            android:textColor="@color/color_default_primary_text"/>
 
 </LinearLayout>
\ No newline at end of file
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 c34cca9c908c4dc30804e7357cad0a61682cbb7e..a5dfa5dbbbe1da7a1bcad71c89418b2c0ed5fe0a 100644
--- a/opentasks/src/main/res/layout/task_list_provider_bar.xml
+++ b/opentasks/src/main/res/layout/task_list_provider_bar.xml
@@ -3,13 +3,48 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingLeft="16sp"
-        android:paddingRight="16sp">
-
-    <Spinner
-            android:id="@+id/task_list_spinner"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:spinnerMode="dropdown"/>
+      >
+
+    <View
+            android:background="@color/color_default_blue1"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"/>
+    <LinearLayout
+            android:paddingLeft="16sp"
+            android:paddingRight="16sp"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <LinearLayout
+
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+            <View
+                    android:layout_marginTop="15dp"
+                    android:layout_marginRight="5dp"
+                    android:id="@+id/viewAccountColor"
+                    android:background="@color/holo_blue"
+                    android:layout_width="14dp"
+                    android:layout_height="14dp"/>
+
+            <Spinner
+                    android:backgroundTint="@color/color_default_secondary_text"
+                    android:id="@+id/task_list_spinner"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:spinnerMode="dropdown"/>
+        </LinearLayout>
+        <View
+
+                android:background="@color/light_gray"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"/>
+
+
+    </LinearLayout>
+
 
 </LinearLayout>
\ No newline at end of file
diff --git a/opentasks/src/main/res/layout/time_field_editor.xml b/opentasks/src/main/res/layout/time_field_editor.xml
index 586f0d24a5092b78d21d0323435563603136dc31..3c3d426e0252eb37a2e5ffd50c91e04022e5a6b5 100644
--- a/opentasks/src/main/res/layout/time_field_editor.xml
+++ b/opentasks/src/main/res/layout/time_field_editor.xml
@@ -11,7 +11,8 @@
             android:layout_gravity="center_vertical"
             android:orientation="horizontal">
 
-        <Button
+        <TextView
+                android:hint="Select Date"
                 android:id="@+id/task_date_picker"
                 style="@style/TextAppearance.EditTask_SpinnerButton"
                 android:layout_width="0px"
@@ -19,7 +20,8 @@
                 android:layout_weight="5"
                 android:gravity="center|left"/>
 
-        <Button
+        <TextView
+                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/menu/edit_task_activity_menu.xml b/opentasks/src/main/res/menu/edit_task_activity_menu.xml
index 50ebb0b809395d818c64ca36ba57d646cba89314..6675b29b7ddbbcf2ee107d2383eea3181c0596bd 100644
--- a/opentasks/src/main/res/menu/edit_task_activity_menu.xml
+++ b/opentasks/src/main/res/menu/edit_task_activity_menu.xml
@@ -5,6 +5,7 @@
             android:id="@+id/editor_action_save"
             android:orderInCategory="100"
             android:title="@string/action_save"
+            
             app:showAsAction="always|withText"/>
 
 </menu>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-v21/styles.xml b/opentasks/src/main/res/values-v21/styles.xml
index 4251795c95555ab6e6768dcb591de5f7512987d3..9992b6083b28fef86568a20b5deee76dce51571a 100644
--- a/opentasks/src/main/res/values-v21/styles.xml
+++ b/opentasks/src/main/res/values-v21/styles.xml
@@ -3,7 +3,7 @@
     <!-- ActionBar styles -->
     <style name="ActionBar"
             parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
-        <item name="background">?attr/colorPrimary</item>
+        <item name="background">@color/primary</item>
         <item name="displayOptions">showTitle</item>
         <item name="icon">@color/color_default_primary_text</item>
         <item name="android:elevation">0dp</item>
diff --git a/opentasks/src/main/res/values/colors.xml b/opentasks/src/main/res/values/colors.xml
index dc31ef515a307dbef0701a8e79a01814635e2658..ce8be682ad74d8ab3537429c80e57714957cf0c8 100644
--- a/opentasks/src/main/res/values/colors.xml
+++ b/opentasks/src/main/res/values/colors.xml
@@ -39,8 +39,8 @@
 
 <!--     Our primary color - a nice shade of teal-->
 
-   <color name="primary">@lineageos.platform:color/color_default_foreground</color>
-    <color name="primary_dark">@lineageos.platform:color/color_default_foreground</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>
diff --git a/opentasks/src/main/res/values/styles.xml b/opentasks/src/main/res/values/styles.xml
index f262ac8fae0ed342e9b55952d353e4185506a387..3a588125295cbb5711480597717da9f250d21bb3 100644
--- a/opentasks/src/main/res/values/styles.xml
+++ b/opentasks/src/main/res/values/styles.xml
@@ -30,7 +30,7 @@
     <!-- ActionBar styles -->
     <style name="ActionBar"
             parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
-        <item name="background">?attr/colorPrimary</item>
+        <item name="background">@color/primary</item>
         <item name="displayOptions">showTitle</item>
         <item name="icon">@color/color_default_primary_text</item>
         <item name="actionBarItemBackground">@drawable/selectable_background_white</item>
@@ -67,6 +67,21 @@
     <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>
+        <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:textAllCaps">true</item>
+        <item name="android:textStyle">bold</item>
+    </style>
     <style name="task_progressbar"
             parent="android:Widget.Holo.ProgressBar.Horizontal"/>
 
@@ -138,9 +153,21 @@
 
     <style name="DetailsTheme"
             parent="AppTheme">
-        <item name="windowActionBarOverlay">true</item>
+       <item name="windowActionBarOverlay">true</item>
         <item name="android:actionBarStyle">@style/DetailsActionBar</item>
         <item name="android:windowContentOverlay">@null</item>
+
+        <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>
+    </style>
+
+    <style name="MyActionBar" parent="@android:style/Widget.Holo.Light.ActionBar">
+        <item name="android:background">@color/primary</item>
     </style>
 
     <style name="btn_remove">
@@ -255,7 +282,7 @@
         <item name="android:textColor">#FF333333</item>
         <item name="colorPrimary">@color/primary</item>
         <item name="android:windowTitleStyle">@style/window_title_style</item>
-        <item name="android:textColorSecondary">@color/color_default_blue1</item>
+        <item name="android:textColorSecondary">@color/color_default_primary_text</item>
     </style>
 
     <style name="AppThemeDialog"