diff --git a/res/drawable/button_drawable.xml b/res/drawable/button_drawable.xml
new file mode 100644
index 0000000000000000000000000000000000000000..49032fe1248db2c7c1b3a74bac4de9e0bf7b0ab0
--- /dev/null
+++ b/res/drawable/button_drawable.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:tint="@color/colorAccent">
+    <corners android:radius="4dp"/>
+</shape>
\ No newline at end of file
diff --git a/res/drawable/ic_account_circle.xml b/res/drawable/ic_account_circle.xml
index c85bb90b16a989dc1598ff66a860cad15dc30a28..7b55736ff7489d5de406bf7241ec69779e98af48 100644
--- a/res/drawable/ic_account_circle.xml
+++ b/res/drawable/ic_account_circle.xml
@@ -1,4 +1,4 @@
-<vector android:height="35dp" android:tint="@color/color_default_secondary_text"
+<vector android:height="35dp" android:tint="@color/icon_color"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="35dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
diff --git a/res/drawable/ic_add.xml b/res/drawable/ic_add.xml
index fe7c5414eafc724f16145ad2b4c10cdbc399ea80..9c6a2abe17dc413521232bbc5c5083019a5acb61 100644
--- a/res/drawable/ic_add.xml
+++ b/res/drawable/ic_add.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/color_default_secondary_text"
+<vector android:height="24dp" android:tint="@color/icon_color"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
index 65eedbc3c9e3fe3b8fabf8967c0bdd66ff19f988..afa5b58fa7beef8e5b7fc097a644f20a07b61da5 100644
--- a/res/drawable/ic_arrow_back.xml
+++ b/res/drawable/ic_arrow_back.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/color_default_blue1"
+<vector android:height="24dp" android:tint="@color/appbar_text_color"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
diff --git a/res/drawable/ic_baseline_calendar_dayofmonth.xml b/res/drawable/ic_baseline_calendar_dayofmonth.xml
index fd08d39ef8f0d2672b0ad01333851356250869dd..f750846400312afa3863564987623776dd9f9129 100644
--- a/res/drawable/ic_baseline_calendar_dayofmonth.xml
+++ b/res/drawable/ic_baseline_calendar_dayofmonth.xml
@@ -1,5 +1,5 @@
-<vector android:height="28dp" android:tint="?attr/colorControlNormal"
+<vector android:height="24dp" android:tint="@color/appbar_icon_color"
     android:viewportHeight="24" android:viewportWidth="24"
-    android:width="28dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M20,3h-1L19,1h-2v2L7,3L7,1L5,1v2L4,3c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,5c0,-1.1 -0.9,-2 -2,-2zM20,21L4,21L4,8h16v13z"/>
 </vector>
diff --git a/res/drawable/ic_colorpicker.xml b/res/drawable/ic_colorpicker.xml
index 56097317ff7ada413d81a00be2e4568a88f265fb..418be80e85677c5aa116a8ca563b1e62f8615308 100644
--- a/res/drawable/ic_colorpicker.xml
+++ b/res/drawable/ic_colorpicker.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/color_default_blue1"
+<vector android:height="24dp" android:tint="@color/appbar_icon_color"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
diff --git a/res/drawable/ic_create.xml b/res/drawable/ic_create.xml
index 7edd0d24b48486acc17dcbcfa422f673a4ded417..ea1dc07dc6653d3b5161699f6459b0b46a1bef3e 100644
--- a/res/drawable/ic_create.xml
+++ b/res/drawable/ic_create.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/color_default_secondary_text"
+<vector android:height="24dp" android:tint="@color/icon_color"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
diff --git a/res/drawable/ic_delete_event.xml b/res/drawable/ic_delete_event.xml
index 0f54fac45963866bc4d2fecbab8b0dceb5f79cab..fadc29db299c21cc9f25ecd7a0fac7f77c39154e 100644
--- a/res/drawable/ic_delete_event.xml
+++ b/res/drawable/ic_delete_event.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/color_default_blue1"
+<vector android:height="24dp" android:tint="@color/appbar_icon_color"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
diff --git a/res/drawable/ic_description.xml b/res/drawable/ic_description.xml
index 9a8032321896234b6d1248420c87cc93e0f0a278..3b3cfc6cb3bd07678b863810770cbf45544c83b2 100644
--- a/res/drawable/ic_description.xml
+++ b/res/drawable/ic_description.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/color_default_secondary_text"
+<vector android:height="24dp" android:tint="@color/icon_color"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
diff --git a/res/drawable/ic_edit_event.xml b/res/drawable/ic_edit_event.xml
index bd6c5ea4bb00b49d2f9ef63c0fd3fc8b5d092511..db28c372a0d53d915bba894de8c2b568d0f5d839 100644
--- a/res/drawable/ic_edit_event.xml
+++ b/res/drawable/ic_edit_event.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/color_default_blue1"
+<vector android:height="24dp" android:tint="@color/appbar_icon_color"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
diff --git a/res/drawable/ic_info_outline.xml b/res/drawable/ic_info_outline.xml
index 8f6eec51634b52df0d5f9d6c007f50cfe128dd1c..2c8666e91e27137d833b3353b4d73933a90734d6 100755
--- a/res/drawable/ic_info_outline.xml
+++ b/res/drawable/ic_info_outline.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/color_default_secondary_text"
+<vector android:height="24dp" android:tint="@color/icon_color"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
diff --git a/res/drawable/ic_menu_cancel.xml b/res/drawable/ic_menu_cancel.xml
index 2f0d622a041244817dbae8660da04030477d1e4b..8099e3af98d2fe93d9e01cdb94b8822245c3e9d9 100644
--- a/res/drawable/ic_menu_cancel.xml
+++ b/res/drawable/ic_menu_cancel.xml
@@ -1,5 +1,5 @@
-<vector android:height="36dp" android:tint="@color/color_default_blue1"
+<vector android:height="24dp" android:tint="@color/appbar_text_color"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/res/drawable/ic_menu_navigator.xml b/res/drawable/ic_menu_navigator.xml
index ddd88a311141dc7e01912c22439580a0dc5e62d1..f10a32f12aa5ab119318ea28cc69e103989b665f 100644
--- a/res/drawable/ic_menu_navigator.xml
+++ b/res/drawable/ic_menu_navigator.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/color_default_blue1"
+<vector android:height="24dp" android:tint="@color/appbar_text_color"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
diff --git a/res/drawable/ic_save_event.xml b/res/drawable/ic_save_event.xml
index cd15e02015b76acd89f3533629aa9125c322e6c3..361fc0d661a30413cfa86ab7c7fe7059410370db 100644
--- a/res/drawable/ic_save_event.xml
+++ b/res/drawable/ic_save_event.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/color_default_blue1"
+<vector android:height="24dp" android:tint="@color/appbar_icon_color"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z"/>
diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml
index fc42a77b06f0d17b3b530021c5f14de1a2e5d583..5d99a5a67b17be1968986db4f89b712d85d8fd12 100644
--- a/res/drawable/ic_settings.xml
+++ b/res/drawable/ic_settings.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/color_default_secondary_text"
+<vector android:height="24dp" android:tint="@color/icon_color"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
diff --git a/res/drawable/ic_share_event.xml b/res/drawable/ic_share_event.xml
index 254cfc0aee5d90160869fcb09536432c0bf88c6c..f2777172d8241f82a9a7a670c3fce017c1437260 100644
--- a/res/drawable/ic_share_event.xml
+++ b/res/drawable/ic_share_event.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/color_default_blue1"
+<vector android:height="24dp" android:tint="@color/appbar_icon_color"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
diff --git a/res/drawable/menu_selector.xml b/res/drawable/menu_selector.xml
index 97aecb03f9d92098a5677485d2d05fc615c7788e..1f421e802e9d1e9a49b4ad362dfd19125ef86f48 100644
--- a/res/drawable/menu_selector.xml
+++ b/res/drawable/menu_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/colorAccent" android:state_checked="true" />
-    <item android:color="@color/color_default_secondary_text" android:state_checked="false" />
+    <item android:color="@color/icon_color" android:state_checked="false" />
 </selector>
\ No newline at end of file
diff --git a/res/drawable/today_icon.xml b/res/drawable/today_icon.xml
index 87b7d69f10b7016563b3e8773a590aa53aa4a259..dc982f307e91cc6cc6d7e1a806fb6344e47204d6 100644
--- a/res/drawable/today_icon.xml
+++ b/res/drawable/today_icon.xml
@@ -18,11 +18,9 @@
     <item
         android:id="@+id/today_icon_background"
         android:drawable="@drawable/ic_baseline_calendar_dayofmonth"
-        android:gravity="center"
-        android:bottom="4dp"/>
+        android:gravity="center"/>
     <item
         android:id="@+id/today_icon_day"
         android:drawable="@drawable/ic_baseline_calendar_dayofmonth"
-        android:gravity="center"
-        android:bottom="4dp"/>
+        android:gravity="center" />
 </layer-list>
diff --git a/res/layout-sw600dp/agenda_day.xml b/res/layout-sw600dp/agenda_day.xml
index 3603c6732d339dd1a9cddcf5ec962fe9063dc97a..9fb78b4eb0291033ff647436b22297f01f68f509 100644
--- a/res/layout-sw600dp/agenda_day.xml
+++ b/res/layout-sw600dp/agenda_day.xml
@@ -16,7 +16,7 @@
 <GridLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="@color/agenda_day_bar_background_color"
-    android:backgroundTint="@color/colorPrimaryDark"
+    android:backgroundTint="@color/agenda_day_bar_background_color"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:columnCount="2"
diff --git a/res/layout/agenda_day.xml b/res/layout/agenda_day.xml
index 93d0908602143c18d998d6aade3d748988425217..463d9500ff170a1d0e6d78f0101cc0824b6dbbb7 100644
--- a/res/layout/agenda_day.xml
+++ b/res/layout/agenda_day.xml
@@ -18,7 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="@color/agenda_day_bar_background_color"
     android:orientation="vertical"
-    android:backgroundTint="@color/colorPrimaryDark"
+    android:backgroundTint="@color/agenda_day_bar_background_color"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
     <View
@@ -36,7 +36,7 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_marginLeft="16dip"
-        android:background="@color/colorPrimaryDark"
+        android:background="@color/agenda_day_bar_background_color"
         android:layout_height="wrap_content"
         android:minHeight="48dip">
         <TextView
diff --git a/res/layout/all_in_one_material.xml b/res/layout/all_in_one_material.xml
index e598901eeffc5ae60af92a58db62dd4cdfe083d2..6f5fd131b5dd769e2b37f7be0d49b7866ac90b4e 100644
--- a/res/layout/all_in_one_material.xml
+++ b/res/layout/all_in_one_material.xml
@@ -29,9 +29,12 @@
                 style="@style/Widget.CalendarAppTheme.ActionBar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:elevation="4dp"
                 app:popupTheme="@style/Widget.CalendarAppTheme.ActionBar.PopupTheme"
                 android:minHeight="?attr/actionBarSize"
-                app:titleTextColor="@color/color_default_primary_text"/>
+                app:titleTextColor="@color/appbar_text_color"
+                app:subtitleTextColor="@color/appbar_text_color"
+                android:theme="@style/Widget.CalendarAppTheme.ActionBar"/>
         </com.google.android.material.appbar.AppBarLayout>
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -40,7 +43,8 @@
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/fab_margin"
             app:srcCompat="@drawable/ic_add_event"
-            android:backgroundTint="@color/colorPrimaryDark"
+            android:tint="@color/colorPrimary"
+            android:background="@color/colorAccent"
             app:borderWidth="0dp"
             android:layout_gravity="bottom|end"
             app:layout_anchorGravity="bottom|right|end" />
@@ -52,6 +56,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:fitsSystemWindows="true"
+        android:background="@color/navigation_drawer_color"
         app:menu="@menu/calendar_view"
         app:itemTextColor="@drawable/menu_selector"
         app:itemIconTint="@drawable/menu_selector"
diff --git a/res/layout/app_bar.xml b/res/layout/app_bar.xml
index 9c3eb315ce252894cb1e1cdbb6908ef4582142b1..2ef7f617785f3d6af4bd46f17a1199d508cfdd3f 100644
--- a/res/layout/app_bar.xml
+++ b/res/layout/app_bar.xml
@@ -4,9 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
     style="@style/Widget.CalendarAppTheme.ActionBar"
+    android:elevation="4dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?attr/actionBarSize"
-    app:titleTextColor="@color/color_default_primary_text"
+    app:titleTextColor="@color/appbar_text_color"
     app:theme="@style/Widget.CalendarAppTheme.ActionBar"
     app:titleTextAppearance="?attr/settings_titleText"/>
diff --git a/res/layout/edit_event_all.xml b/res/layout/edit_event_all.xml
index 57813d16c468a55e43d0ab977b183dabdbb98529..f26e71fae806a4ceeb36209063c45dad9bda0174 100644
--- a/res/layout/edit_event_all.xml
+++ b/res/layout/edit_event_all.xml
@@ -46,23 +46,28 @@
             app:constraint_referenced_ids="timezone_icon,timezone_button" />
 
         <!-- CALENDARS SELECTOR for new events -->
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/title"
-            style="@style/TextAppearance.EditEvent"
-            android:layout_width="0dp"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/title_row"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="48dp"
-            android:layout_marginEnd="32dp"
-            android:layout_marginTop="8dp"
-            android:background="@null"
-            android:focusable="true"
-            android:hint="@string/hint_what"
-            android:inputType="textAutoCorrect|textCapSentences"
-            android:minHeight="36dp"
-            android:singleLine="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:paddingTop="10dp">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="48dp"
+                android:layout_marginEnd="32dp"
+                android:layout_marginTop="8dp"
+                android:focusable="true"
+                android:hint="@string/hint_what"
+                android:inputType="textAutoCorrect|textCapSentences"
+                android:minHeight="36dp"
+                android:singleLine="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"/>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <View
             android:id="@+id/view"
@@ -70,7 +75,7 @@
             android:layout_marginTop="8dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/title" />
+            app:layout_constraintTop_toBottomOf="@+id/title_row" />
 
         <ImageView
             android:id="@+id/calendar_selector_group_icon"
@@ -175,7 +180,7 @@
             android:id="@+id/is_all_day"
             android:layout_width="wrap_content"
             android:layout_height="24dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginEnd="30dp"
             android:contentDescription="@string/accessibility_all_day"
             android:gravity="center_vertical|end"
             android:thumb="@drawable/thumb_selector"
diff --git a/res/layout/edit_event_custom_actionbar.xml b/res/layout/edit_event_custom_actionbar.xml
index bad5ca704d16f642df6699d4cbcff1342fc912f7..7b6bcac6762b247f533a03aed510650659e07082 100644
--- a/res/layout/edit_event_custom_actionbar.xml
+++ b/res/layout/edit_event_custom_actionbar.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2011 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,49 +12,28 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:divider="?android:attr/dividerVertical"
-    android:dividerPadding="4dp"
-    android:showDividers="middle"
-    android:baselineAligned="false"
-    android:orientation="horizontal"
-    android:weightSum="2" >
-    <FrameLayout
-        android:layout_weight="1"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content" >
-        <TextView
-            android:id="@+id/action_cancel"
-            style="@style/EditEventCustomActionButtonText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:drawableStart="@drawable/ic_menu_cancel"
-            android:drawablePadding="5dp"
-            android:text="@string/discard_label"
-            android:gravity="center"
-            android:textSize="16sp" />
-    </FrameLayout>
+    android:layout_height="?attr/actionBarSize">
+
+    <ImageView
+        android:id="@+id/action_cancel"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_gravity="start"
+        android:src="@drawable/ic_menu_cancel"
+        />
     <!-- id must match corresponding menu item id -->
 
     <!-- id must match corresponding menu item id -->
-    <FrameLayout
-        android:layout_weight="1"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content" >
-        <TextView
-            android:id="@+id/action_done"
-            style="@style/EditEventCustomActionButtonText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:drawableStart="@drawable/ic_menu_done"
-            android:drawablePadding="5dp"
-            android:text="@string/save_label"
-            android:gravity="center"
-            android:textSize="16sp" />
-    </FrameLayout>
-</LinearLayout>
+    <Button
+        android:id="@+id/action_done"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_gravity="end"
+        android:layout_marginEnd="10dp"
+        android:text="@string/save_label"
+        android:textColor="@color/colorPrimary"
+        android:background="@drawable/button_drawable"/>
+</androidx.appcompat.widget.Toolbar>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index b14414d392fbb78c17f94e296f4644fb2ac70ff9..ff5ebb4bdfa55b5719cc0f2d46097a3c966a7d84 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="color_non_focus_item_bg">#808080</color>
+    <color name="color_non_focus_item_bg">#2e2e2e</color>
+    <color name="colorAccent">#5db2ff</color>
+    <color name="colorPrimary">#121212</color>
+    <color name="calendar_grid_line_inner_horizontal_color">#1fffffff</color>
+    <color name="calendar_grid_line_inner_vertical_color">#1fffffff</color>
+    <color name="icon_color">#bdffffff</color>
+    <color name="appbar_text_color">#deffffff</color>
+    <color name="popup_background">#2e2e2e</color>
+    <color name="month_grid_lines">#1fffffff</color>
+    <color name="date_strip_bg">#2e2e2e</color>
+    <color name="navigation_drawer_color">#363636</color>
+    <color name="month_today_number">#de000000</color>
+    <color name="appbar_icon_color">#99ffffff</color>
 </resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 722227bfe1c4f58822f9e47427ffefaa83f8b072..cb575c4813fb7b2b0ae4eb0239ebaf20d44a2f17 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,19 +19,24 @@
 -->
 <resources>
 
-    <color name="colorPrimary">@lineageos.platform:color/color_default_primary</color>
+    <color name="colorPrimary">#ffffff</color>
     <color name="colorPrimaryDark">@lineageos.platform:color/color_default_primary_dark</color>
-    <color name="colorAccent">@lineageos.platform:color/color_default_accent</color>
+    <color name="colorAccent">#0086ff</color>
     <color name="color_default_blue1">@color/colorAccent</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_view_on_accent">@lineageos.platform:color/color_default_view_on_accent</color>
-    <color name="color_default_blue_lite">@lineageos.platform:color/color_default_selector</color>
+    <color name="color_default_blue_lite">#145db2ff</color>
     <color name="color_gray2">@lineageos.platform:color/color_default_gray2</color>
-    <color name="popup_background">@lineageos.platform:color/color_default_foreground</color>
-    <color name="date_strip_bg">@lineageos.platform:color/color_default_foreground2</color>
+    <color name="popup_background">#ffffff</color>
+    <color name="date_strip_bg">#eeeeee</color>
+    <color name="icon_color">#99000000</color>
+    <color name="appbar_text_color">#de000000</color>
+    <color name="appbar_icon_color">#99000000</color>
 
-    <color name="color_non_focus_item_bg">#fafafa</color>
+    <color name="navigation_drawer_color">#ffffff</color>
+
+    <color name="color_non_focus_item_bg">#f0f0f0</color>
     <color name="color_label_bg">@color/date_strip_bg</color>
     <color name="colorOrangePrimary">#f1922d</color>
     <color name="colorOrangePrimaryDark">#b36f28</color>
@@ -58,7 +63,7 @@
     <color name="today_highlight_color">#0033b5e5</color>
 
     <!-- The app wide background color -->
-    <color name="background_color">@lineageos.platform:color/color_default_background</color>
+    <color name="background_color">@color/colorPrimary</color>
     <color name="foreground_color">@lineageos.platform:color/color_default_foreground</color>
     <color name="event_background">#ffc3d9ff</color>
     <color name="panel_text_foreground">@color/foreground_color</color>
@@ -82,8 +87,8 @@
     <color name="calendar_grid_area_selected">@color/colorAccent</color>
 
 
-    <color name="calendar_grid_line_inner_horizontal_color">#FFCCCCCC</color>
-    <color name="calendar_grid_line_inner_vertical_color">#FFCCCCCC</color>
+    <color name="calendar_grid_line_inner_horizontal_color">#14212121</color>
+    <color name="calendar_grid_line_inner_vertical_color">#14212121</color>
     <color name="calendar_grid_line_highlight_color">#ff707070</color>
 
     <color name="mini_month_bg_color">@color/background_color</color>
@@ -101,7 +106,7 @@
     <color name="month_event_extra_other_color">#4C999999</color>
     <color name="month_saturday">@color/color_gray2</color>
     <color name="month_sunday">@color/color_gray2</color>
-    <color name="month_grid_lines">#ffdedede</color>
+    <color name="month_grid_lines">#14212121</color>
     <color name="month_other_month_day_number">@color/color_default_secondary_text</color>
 
     <!-- Background Color of the selected week for the mini calendar on the tablet size -->
@@ -115,7 +120,7 @@
     <color name="month_dna_conflict_time_color">@color/color_default_secondary_text</color>
 
     <color name="event_center">@color/colorAccent</color>
-    <color name="edit_event_separator">@lineageos.platform:color/color_default_divider</color>
+    <color name="edit_event_separator">@android:color/transparent</color>
     <color name="edit_event_small">@color/background_color</color>
     <color name="black">#000000</color>
 
@@ -132,7 +137,7 @@
     <!-- Text color of non-declined events in agenda view -->
     <color name="agenda_item_standard_color">@color/color_default_primary_text</color>
     <!-- Background Color of present/future events in agenda view  -->
-    <color name="agenda_day_bar_background_color">@color/colorPrimaryDark</color>
+    <color name="agenda_day_bar_background_color">@color/color_non_focus_item_bg</color>
     <!-- Background Color of past events in agenda view  -->
     <color name="agenda_past_days_bar_background_color">#FFDDDDDD</color>
     <!-- Color of the separator between the past and the present/future in agenda view  -->
@@ -150,7 +155,7 @@
     <!-- Light color of text in the calendar view selection menu -->
     <color name="calendar_view_switch_menu_text_color_light">@color/color_default_secondary_text</color>
     <!-- Color of the separator between items in the agenda list -->
-    <color name="agenda_list_separator_color">#FFBBBBBB</color>
+    <color name="agenda_list_separator_color">@android:color/transparent</color>
     <!-- Text color of a selected items in the agenda list - trumps all other text colors -->
     <color name="agenda_selected_background_color">@color/colorAccent</color>
     <!-- Background color of a selected items in the agenda list -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 490a6f7f1271c81450ecd3b7fa712669764b66e0..1a2d523159da0e777868a2e36de23379fa189a93 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -56,4 +56,11 @@
     <dimen name="recurrence_picker_width">300dp</dimen>
 
     <dimen name="fab_margin">16dp</dimen>
+    <dimen name="current_date_bg_size">13dp</dimen>
+    <dimen name="current_date_circle_x">15dp</dimen>
+    <dimen name="current_date_circle_single_x">12dp</dimen>
+    <dimen name="current_date_circle_y">5dp</dimen>
+    <dimen name="current_date_text_x">7dp</dimen>
+    <dimen name="current_date_text_y">5dp</dimen>
+    <dimen name="current_date_text_event_margin">3dp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6e808c74a768d25088b087e4375019ad84234703..d7f670e612f143988cfe0f61fd8e3f91af83fef7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -77,14 +77,9 @@
 
     <style name="Widget.CalendarAppTheme.ActionBar" parent="Widget.AppCompat.ActionBar">
         <item name="android:background">@color/colorPrimaryDark</item>
-        <item name="android:theme">@style/ThemeOverlay.CalendarAppTheme.ActionBar</item>
-
-    </style>
-
-    <style name="ThemeOverlay.CalendarAppTheme.ActionBar" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
-        <item name="android:textColorPrimary">@color/colorAccent</item>
-        <item name="android:textColorSecondary">@color/colorAccent</item>
-        <item name="android:editTextColor">@color/color_default_primary_text</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="android:editTextColor">@color/appbar_text_color</item>
+        <item name="colorControlNormal">@color/appbar_icon_color</item>
     </style>
 
 
diff --git a/src/com/android/calendar/DayOfMonthDrawable.java b/src/com/android/calendar/DayOfMonthDrawable.java
index ab0bf18b2725a45158915d2f7420fc210b2516cf..7f6c843fd9b9ab8b00de30bcbe01cb92e2f7ed9c 100644
--- a/src/com/android/calendar/DayOfMonthDrawable.java
+++ b/src/com/android/calendar/DayOfMonthDrawable.java
@@ -44,7 +44,7 @@ public class DayOfMonthDrawable extends Drawable {
         mTextSize = c.getResources().getDimension(R.dimen.today_icon_text_size);
         mPaint = new Paint();
         mPaint.setAlpha(255);
-        mPaint.setColor(c.getResources().getColor(R.color.colorAccent));
+        mPaint.setColor(c.getResources().getColor(R.color.appbar_icon_color));
         mPaint.setTypeface(Typeface.DEFAULT_BOLD);
         mPaint.setTextSize(mTextSize);
         mPaint.setTextAlign(Paint.Align.CENTER);
diff --git a/src/com/android/calendar/month/MonthWeekEventsView.java b/src/com/android/calendar/month/MonthWeekEventsView.java
index 7d028175b2864c3e4e2cd7123fcaefc682048076..c48b962ed9ed2e53d3d0c3501cb25703c03c2aa2 100644
--- a/src/com/android/calendar/month/MonthWeekEventsView.java
+++ b/src/com/android/calendar/month/MonthWeekEventsView.java
@@ -28,6 +28,7 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
+import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.provider.CalendarContract.Attendees;
@@ -564,14 +565,6 @@ public class MonthWeekEventsView extends SimpleWeekView {
             canvas.drawRect(r, p);
         }
         if (mHasToday) {
-            int selectedColor = ContextCompat.getColor(mContext, DynamicTheme.getColorId(DynamicTheme.getPrimaryColor(mContext)));
-
-            if (Utils.getSharedPreference(mContext, "pref_theme", "light").equals("light")) {
-                p.setColor(selectedColor);
-                p.setAlpha(72);
-            } else {
-                p.setColor(mMonthBGTodayColor);
-            }
             r.left = computeDayLeftPosition(mTodayIndex);
             r.right = computeDayLeftPosition(mTodayIndex + 1);
             canvas.drawRect(r, p);
@@ -624,21 +617,42 @@ public class MonthWeekEventsView extends SimpleWeekView {
         Time time = new Time(mTimeZone);
         time.setJulianDay(julianMonday);
 
+        int current_date_text_x=getResources().getDimensionPixelSize(R.dimen.current_date_text_x);
+        int current_date_text_y=getResources().getDimensionPixelSize(R.dimen.current_date_text_y);
+        int current_date_event_margin=getResources().getDimensionPixelSize(R.dimen.current_date_text_event_margin);
+
         for (; i < numCount; i++) {
+            x = computeDayLeftPosition(i - offset) - (mSidePaddingMonthNumber);
             if (mHasToday && todayIndex == i) {
-                mMonthNumPaint.setColor(mMonthNumTodayColor);
-                mMonthNumPaint.setFakeBoldText(isBold = true);
+                mMonthNumPaint.setFakeBoldText(isBold = false);
                 if (i + 1 < numCount) {
                     // Make sure the color will be set back on the next
                     // iteration
                     isFocusMonth = !mFocusDay[i + 1];
                 }
+                mMonthNumPaint.setColor(getContext().getResources().getColor(R.color.color_default_blue1));
+                int current_date_bg_size=getResources().getDimensionPixelSize(R.dimen.current_date_bg_size);
+
+                //check text width & height to calculate circle cx and cy values
+                Rect bounds = new Rect();
+                mMonthNumPaint.getTextBounds(mDayNumbers[i], 0, mDayNumbers[i].length(), bounds);
+
+                int text_height =  bounds.height();
+                int text_width =  bounds.width();
+
+                canvas.drawCircle(x - current_date_text_x - (text_width / 2),
+                        y + current_date_text_y - (text_height / 2) - current_date_event_margin,
+                        current_date_bg_size, mMonthNumPaint);
+                mMonthNumPaint.setColor(mMonthNumTodayColor);
             } else if (mFocusDay[i] != isFocusMonth) {
                 isFocusMonth = mFocusDay[i];
                 mMonthNumPaint.setColor(isFocusMonth ? mMonthNumColor : mMonthNumOtherColor);
             }
-            x = computeDayLeftPosition(i - offset) - (mSidePaddingMonthNumber);
-            canvas.drawText(mDayNumbers[i], x, y, mMonthNumPaint);
+            double relation = Math.sqrt(canvas.getWidth() * canvas.getHeight());
+            mMonthNumPaint.setTextSize((int)relation / 12);
+
+            canvas.drawText(mDayNumbers[i], x-current_date_text_x,
+                    y+current_date_text_y - current_date_event_margin, mMonthNumPaint);
             if (isBold) {
                 mMonthNumPaint.setFakeBoldText(isBold = false);
             }