diff --git a/res/drawable/color_picker_preview_background.xml b/res/drawable/color_picker_preview_background.xml
index b1cedc5..1820cba 100644
--- a/res/drawable/color_picker_preview_background.xml
+++ b/res/drawable/color_picker_preview_background.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2022
+    SPDX-License-Identifier: Apache-2.0
+-->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="6dp" />
+       android:shape="rectangle">
+    <corners android:radius="@*android:dimen/config_dialogCornerRadius" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/color_picker_seekbar_background.xml b/res/drawable/color_picker_seekbar_background.xml
index 36076ab..34edc81 100644
--- a/res/drawable/color_picker_seekbar_background.xml
+++ b/res/drawable/color_picker_seekbar_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="5dp" />
+    <corners android:radius="@*android:dimen/config_dialogCornerRadius" />
     <gradient android:type="linear" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/color_picker_seekbar_thumb.xml b/res/drawable/color_picker_seekbar_thumb.xml
index 2c58a6a3..eb1ee27 100644
--- a/res/drawable/color_picker_seekbar_thumb.xml
+++ b/res/drawable/color_picker_seekbar_thumb.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="#FFFFFF">
+        android:color="#FFFFFF">
     <item>
         <shape android:shape="oval">
-            <solid android:color="?android:attr/colorPrimaryDark" />
-            <size android:width="20dp"
-                android:height="20dp" />
+            <solid android:color="?android:attr/colorAccent" />
+            <size android:width="20dp" android:height="20dp" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
index 3087a13..6ebf955 100644
--- a/res/values-night/styles.xml
+++ b/res/values-night/styles.xml
@@ -13,10 +13,8 @@
 
 <resources>
     <style name="ColorPickerStyle" parent="Theme.MaterialComponents.BottomSheetDialog">
-        <item name="colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="colorPrimaryDark">@*android:color/primary_device_default_settings_light</item>
+        <item name="colorPrimary">@*android:color/primary_device_default_dark</item>
+        <item name="colorPrimaryDark">@*android:color/surface_highlight_light</item>
         <item name="colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
-        <item name="android:textColorPrimary">#FFFFFF</item>
     </style>
 </resources>
diff --git a/res/values/cherish_styles.xml b/res/values/cherish_styles.xml
index 28ba04c..8b813f9 100644
--- a/res/values/cherish_styles.xml
+++ b/res/values/cherish_styles.xml
@@ -25,11 +25,11 @@
     <color name="option_border_default">#5f6368</color>
 	
 	<style name="ColorPickerStyle" parent="Theme.MaterialComponents.BottomSheetDialog">
-        <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
-        <item name="colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="colorPrimary">@*android:color/surface_highlight_light</item>
+        <item name="colorPrimaryDark">@*android:color/primary_device_default_dark</item>
         <item name="colorAccent">@*android:color/accent_device_default_light</item>
         <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
-        <item name="android:textColorPrimary">#000000</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="ColorPickerSeekBarStyle" parent="Widget.AppCompat.SeekBar">
@@ -46,7 +46,7 @@
         <item name="android:paddingTop">12dp</item>
         <item name="android:paddingBottom">12dp</item>
         <item name="android:buttonTint">?android:attr/colorAccent</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="ColorPickerButtonStyle">
@@ -54,7 +54,7 @@
         <item name="android:minWidth">0dp</item>
         <item name="android:minHeight">0dp</item>
         <item name="android:padding">8dp</item>
-        <item name="android:textColor">?android:attr/colorAccent</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="ColorPickerEditTextStyle">