commit 840ad93ee874a5ef1d93d141fe187bf1d7dcd6be
Author: leszek <leszek@koltunski.pl>
Date:   Wed May 8 16:53:20 2024 +0200

    major progress with colors in styles

diff --git a/src/main/java/org/distorted/dialogs/RubikDialogTutorial.java b/src/main/java/org/distorted/dialogs/RubikDialogTutorial.java
index a681d441..7bb29a93 100644
--- a/src/main/java/org/distorted/dialogs/RubikDialogTutorial.java
+++ b/src/main/java/org/distorted/dialogs/RubikDialogTutorial.java
@@ -108,7 +108,7 @@ public class RubikDialogTutorial extends RubikDialogAbstract
 
       LinearLayout layout = view.findViewById(R.id.tutLayout);
 
-      int colorB = getResources().getColor(R.color.light_grey);
+      int colorB = getResources().getColor(R.color.lightGrey);
       int colorT = getResources().getColor(R.color.white);
 
       int numTuts = tutorials.length;
diff --git a/src/main/java/org/distorted/helpers/ObjectGridCreator.java b/src/main/java/org/distorted/helpers/ObjectGridCreator.java
index ff1e6f9a..e22ffb49 100644
--- a/src/main/java/org/distorted/helpers/ObjectGridCreator.java
+++ b/src/main/java/org/distorted/helpers/ObjectGridCreator.java
@@ -189,7 +189,7 @@ public class ObjectGridCreator
     params.rightMargin = m;
     view.setLayoutParams(params);
 
-    view.setBackgroundResource(R.color.dark_grey);
+    view.setBackgroundResource(R.color.darkGrey);
 
     int p = (int)(TITLE_PADDING*height);
     view.setPadding( p,p,p,p );
@@ -208,7 +208,7 @@ public class ObjectGridCreator
     params.leftMargin = m;
     params.rightMargin = m;
     view.setLayoutParams(params);
-    view.setBackgroundResource(R.color.dark_grey);
+    view.setBackgroundResource(R.color.darkGrey);
     view.setGravity(Gravity.CENTER);
 
     int size = (int)(TEXT_SIZE*height);
diff --git a/src/main/java/org/distorted/main/MainActivity.java b/src/main/java/org/distorted/main/MainActivity.java
index d9633cb2..ad04fe43 100644
--- a/src/main/java/org/distorted/main/MainActivity.java
+++ b/src/main/java/org/distorted/main/MainActivity.java
@@ -364,7 +364,7 @@ public class MainActivity extends BaseActivity implements RubikNetwork.Updatee,
 
     public void onSettings(View v)
       {
-      int sw = (int)(340*mDensity + 0.5f);
+      int sw = (int)(345*mDensity + 0.5f);
       int sh = (int)(188*mDensity + 0.5f);
 
       int vw = v.getWidth();
diff --git a/src/main/java/org/distorted/main/MainObjectPopup.java b/src/main/java/org/distorted/main/MainObjectPopup.java
index db315b1f..a4177abc 100644
--- a/src/main/java/org/distorted/main/MainObjectPopup.java
+++ b/src/main/java/org/distorted/main/MainObjectPopup.java
@@ -185,8 +185,8 @@ public class MainObjectPopup
     {
     RubikScores scores = RubikScores.getInstance();
     Resources res = act.getResources();
-    ColorStateList colorG = ColorStateList.valueOf(res.getColor(R.color.green));
-    ColorStateList colorD = ColorStateList.valueOf(res.getColor(R.color.dark_grey));
+    ColorStateList colorG = ColorStateList.valueOf(res.getColor(R.color.normalGreen));
+    ColorStateList colorD = ColorStateList.valueOf(res.getColor(R.color.darkGrey));
 
     int layoutWidth = (int)(width*MENU_WIDTH);
     int levelHeight = (int)(width*BUTTON_HEIGHT);
diff --git a/src/main/res/drawable/tab_background_selected.xml b/src/main/res/drawable/tab_background_selected.xml
index de60829a..f9206c33 100644
--- a/src/main/res/drawable/tab_background_selected.xml
+++ b/src/main/res/drawable/tab_background_selected.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
-    <solid android:color="@color/grey"/>
+    <solid android:color="?normalC"/>
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/tab_background_unselected.xml b/src/main/res/drawable/tab_background_unselected.xml
index 842d787d..c943f911 100644
--- a/src/main/res/drawable/tab_background_unselected.xml
+++ b/src/main/res/drawable/tab_background_unselected.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
-    <solid android:color="@color/dark_grey"/>
+    <solid android:color="?darkC"/>
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/ui_spinner.xml b/src/main/res/drawable/ui_spinner.xml
index 9f2beb84..f93725e8 100644
--- a/src/main/res/drawable/ui_spinner.xml
+++ b/src/main/res/drawable/ui_spinner.xml
@@ -4,10 +4,10 @@
         <layer-list>
             <item>
                 <shape android:shape="rectangle">
-                    <solid android:color="@color/light_grey" />
+                    <solid android:color="?lightC" />
                     <corners android:radius="6dip" />
                     <stroke
-                        android:color="@color/grey"
+                        android:color="?normalC"
                         android:width="2dp"/>
                 </shape>
             </item>
diff --git a/src/main/res/layout-ldrtl/info.xml b/src/main/res/layout-ldrtl/info.xml
index d81f6010..d49f6f8a 100644
--- a/src/main/res/layout-ldrtl/info.xml
+++ b/src/main/res/layout-ldrtl/info.xml
@@ -16,7 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1.0"
-        android:background="@color/light_grey"
+        android:background="?lightC"
         android:orientation="vertical" >
 
         <LinearLayout
@@ -26,7 +26,7 @@
             android:layout_weight="1"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:background="@color/grey"
+            android:background="?normalC"
             android:orientation="horizontal">
 
             <TextView
@@ -61,7 +61,7 @@
             android:layout_weight="1"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:background="@color/grey"
+            android:background="?normalC"
             android:orientation="horizontal">
 
             <TextView
@@ -127,7 +127,7 @@
             android:layout_weight="1"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:background="@color/grey"
+            android:background="?normalC"
             android:orientation="horizontal">
 
             <TextView
@@ -162,7 +162,7 @@
             android:layout_weight="1"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:background="@color/grey"
+            android:background="?normalC"
             android:orientation="horizontal">
 
             <TextView
@@ -198,7 +198,7 @@
         android:layout_height="100dp"
         android:layout_gravity="end"
         android:orientation="horizontal"
-        android:background="@color/light_grey">
+        android:background="?lightC">
     </LinearLayout>
 
 </LinearLayout>
diff --git a/src/main/res/layout/bandaged.xml b/src/main/res/layout/bandaged.xml
index d4fc8b05..de4b5405 100644
--- a/src/main/res/layout/bandaged.xml
+++ b/src/main/res/layout/bandaged.xml
@@ -9,7 +9,7 @@
         android:id="@+id/bandagedCreatorTopView"
         android:layout_width="match_parent"
         android:layout_height="100dp"
-        android:background="@color/light_grey"
+        android:background="?lightC"
         android:orientation="horizontal">
 
         <HorizontalScrollView
diff --git a/src/main/res/layout/bandaged_pane.xml b/src/main/res/layout/bandaged_pane.xml
index e1d4194f..ced548bd 100644
--- a/src/main/res/layout/bandaged_pane.xml
+++ b/src/main/res/layout/bandaged_pane.xml
@@ -3,7 +3,7 @@
     android:id="@+id/bandagedCreatorObjectPane"
     android:layout_width="200dp"
     android:layout_height="match_parent"
-    android:background="@color/light_grey"
+    android:background="?lightC"
     android:orientation="vertical">
 
     <ImageView
diff --git a/src/main/res/layout/config.xml b/src/main/res/layout/config.xml
index 6aca6f14..f737192d 100644
--- a/src/main/res/layout/config.xml
+++ b/src/main/res/layout/config.xml
@@ -3,7 +3,7 @@
     android:id="@+id/mainLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/light_grey"
+    android:background="?lightC"
     android:orientation="vertical">
 
     <org.distorted.config.ConfigSurfaceView
@@ -22,7 +22,7 @@
         android:layout_marginBottom="5dp"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:background="@color/grey"
+        android:background="?normalC"
         android:orientation="vertical" >
 
         <LinearLayout
@@ -93,7 +93,7 @@
         android:gravity="center"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:background="@color/grey"
+        android:background="?normalC"
         android:orientation="vertical" >
     </LinearLayout>
 
@@ -103,7 +103,7 @@
         android:layout_height="100dp"
         android:layout_gravity="end"
         android:orientation="horizontal"
-        android:background="@color/light_grey">
+        android:background="?lightC">
     </LinearLayout>
 
 </LinearLayout>
diff --git a/src/main/res/layout/dialog_about.xml b/src/main/res/layout/dialog_about.xml
index 1287262f..4b9f4376 100644
--- a/src/main/res/layout/dialog_about.xml
+++ b/src/main/res/layout/dialog_about.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/grey"
+    android:background="?normalC"
     android:orientation="vertical">
 
     <LinearLayout
@@ -12,7 +12,7 @@
         android:gravity="center|fill_horizontal"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
-        android:background="@color/dark_grey"
+        android:background="?darkC"
         android:orientation="horizontal">
 
         <ImageView
@@ -31,7 +31,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center|fill_horizontal"
-            android:background="@color/dark_grey"
+            android:background="?darkC"
             android:orientation="vertical">
 
             <TextView
@@ -56,7 +56,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="5dp"
-        android:background="@color/dark_grey"
+        android:background="?darkC"
         android:orientation="horizontal">
 
         <ImageView
@@ -75,7 +75,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center|fill_horizontal"
-            android:background="@color/dark_grey"
+            android:background="?darkC"
             android:orientation="vertical">
 
             <TextView
@@ -110,7 +110,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="5dp"
-        android:background="@color/dark_grey"
+        android:background="?darkC"
         android:orientation="horizontal">
 
         <ImageView
@@ -157,7 +157,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="5dp"
-        android:background="@color/dark_grey"
+        android:background="?darkC"
         android:orientation="horizontal">
 
         <ImageView
diff --git a/src/main/res/layout/dialog_creators_pane.xml b/src/main/res/layout/dialog_creators_pane.xml
index 3f999aeb..e5638189 100644
--- a/src/main/res/layout/dialog_creators_pane.xml
+++ b/src/main/res/layout/dialog_creators_pane.xml
@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="@color/medium_grey"
+	android:background="?mediumC"
 	android:padding="8dp"
 	android:orientation="horizontal">
 
diff --git a/src/main/res/layout/dialog_delete_object.xml b/src/main/res/layout/dialog_delete_object.xml
index 76f51bd4..3b484446 100644
--- a/src/main/res/layout/dialog_delete_object.xml
+++ b/src/main/res/layout/dialog_delete_object.xml
@@ -12,7 +12,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="0dp"
-        android:background="@color/grey"
+        android:background="?normalC"
         android:orientation="vertical">
 
          <TextView
diff --git a/src/main/res/layout/dialog_error.xml b/src/main/res/layout/dialog_error.xml
index a69f86ff..1ec520b1 100644
--- a/src/main/res/layout/dialog_error.xml
+++ b/src/main/res/layout/dialog_error.xml
@@ -6,7 +6,7 @@
     android:layout_marginLeft="10dp"
     android:layout_marginRight="10dp"
     android:layout_marginTop="0dp"
-    android:background="@color/grey"
+    android:background="?normalC"
     android:orientation="vertical">
 
     <TextView
diff --git a/src/main/res/layout/dialog_message.xml b/src/main/res/layout/dialog_message.xml
index f7bff814..afb0f919 100644
--- a/src/main/res/layout/dialog_message.xml
+++ b/src/main/res/layout/dialog_message.xml
@@ -5,7 +5,7 @@
     android:layout_marginLeft="10dp"
     android:layout_marginTop="0dp"
     android:layout_marginRight="10dp"
-    android:background="@color/grey"
+    android:background="?normalC"
     android:gravity="center|fill_horizontal">
 
     <TextView
diff --git a/src/main/res/layout/dialog_new_record.xml b/src/main/res/layout/dialog_new_record.xml
index 0029a47f..6de765bf 100644
--- a/src/main/res/layout/dialog_new_record.xml
+++ b/src/main/res/layout/dialog_new_record.xml
@@ -12,7 +12,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="0dp"
-        android:background="@color/grey"
+        android:background="?normalC"
         android:orientation="vertical">
 
         <TextView
diff --git a/src/main/res/layout/dialog_pattern_child_item.xml b/src/main/res/layout/dialog_pattern_child_item.xml
index 3c058a86..5d347702 100644
--- a/src/main/res/layout/dialog_pattern_child_item.xml
+++ b/src/main/res/layout/dialog_pattern_child_item.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/child"
-        android:background="@color/dark_grey"
+        android:background="?darkC"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="5sp"
diff --git a/src/main/res/layout/dialog_pattern_single.xml b/src/main/res/layout/dialog_pattern_single.xml
index 07c22448..2d812f71 100644
--- a/src/main/res/layout/dialog_pattern_single.xml
+++ b/src/main/res/layout/dialog_pattern_single.xml
@@ -9,7 +9,7 @@
 
     <ExpandableListView
         android:id="@+id/patternListView"
-        android:background="@color/grey"
+        android:background="?normalC"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginBottom="10dp"
diff --git a/src/main/res/layout/dialog_pattern_tab.xml b/src/main/res/layout/dialog_pattern_tab.xml
index 49e13d68..fe4bdb33 100644
--- a/src/main/res/layout/dialog_pattern_tab.xml
+++ b/src/main/res/layout/dialog_pattern_tab.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/patternListView"
-    android:background="@color/grey"
+    android:background="?normalC"
     android:paddingLeft="0dp"
     android:paddingRight="0dp"
     android:paddingTop="10dp"
diff --git a/src/main/res/layout/dialog_privacy.xml b/src/main/res/layout/dialog_privacy.xml
index 3c9b3d05..b4f08f5c 100644
--- a/src/main/res/layout/dialog_privacy.xml
+++ b/src/main/res/layout/dialog_privacy.xml
@@ -6,7 +6,7 @@
     android:layout_marginLeft="10dp"
     android:layout_marginRight="10dp"
     android:layout_marginTop="0dp"
-    android:background="@color/grey"
+    android:background="?normalC"
     android:orientation="vertical">
 
     <TextView
diff --git a/src/main/res/layout/dialog_save_object.xml b/src/main/res/layout/dialog_save_object.xml
index 424e8773..05ba06d6 100644
--- a/src/main/res/layout/dialog_save_object.xml
+++ b/src/main/res/layout/dialog_save_object.xml
@@ -12,7 +12,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="0dp"
-        android:background="@color/grey"
+        android:background="?normalC"
         android:orientation="vertical">
 
          <TextView
diff --git a/src/main/res/layout/dialog_scores_scramble_title.xml b/src/main/res/layout/dialog_scores_scramble_title.xml
index cf71ec07..7192ac60 100644
--- a/src/main/res/layout/dialog_scores_scramble_title.xml
+++ b/src/main/res/layout/dialog_scores_scramble_title.xml
@@ -3,7 +3,7 @@
     android:id="@+id/scoresScrambleLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/grey"
+    android:background="?normalC"
 
     android:paddingBottom="0dp"
     android:paddingTop="0dp"
@@ -17,7 +17,7 @@
         android:layout_height="wrap_content"
         android:textSize="24sp"
         android:gravity="center"
-        android:background="@color/grey"
+        android:background="?normalC"
         android:paddingBottom="0dp"
         android:paddingTop="0dp"
         android:paddingLeft="5dp"
diff --git a/src/main/res/layout/dialog_set_name.xml b/src/main/res/layout/dialog_set_name.xml
index a2c38fce..cff5b613 100644
--- a/src/main/res/layout/dialog_set_name.xml
+++ b/src/main/res/layout/dialog_set_name.xml
@@ -12,7 +12,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="0dp"
-        android:background="@color/grey"
+        android:background="?normalC"
         android:orientation="vertical">
 
         <TextView
diff --git a/src/main/res/layout/dialog_settings.xml b/src/main/res/layout/dialog_settings.xml
index ef6dc88c..6e886c32 100644
--- a/src/main/res/layout/dialog_settings.xml
+++ b/src/main/res/layout/dialog_settings.xml
@@ -11,7 +11,7 @@
         android:gravity="center|fill_horizontal"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
-        android:background="@color/grey"
+        android:background="?normalC"
         android:orientation="vertical">
 
         <LinearLayout
diff --git a/src/main/res/layout/dialog_solved.xml b/src/main/res/layout/dialog_solved.xml
index 89ae86fa..6ba9baee 100644
--- a/src/main/res/layout/dialog_solved.xml
+++ b/src/main/res/layout/dialog_solved.xml
@@ -12,7 +12,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="0dp"
-        android:background="@color/grey"
+        android:background="?normalC"
         android:orientation="vertical">
 
         <TextView
diff --git a/src/main/res/layout/dialog_solver_error.xml b/src/main/res/layout/dialog_solver_error.xml
index 8a2f2e93..f95b1c61 100644
--- a/src/main/res/layout/dialog_solver_error.xml
+++ b/src/main/res/layout/dialog_solver_error.xml
@@ -12,7 +12,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="0dp"
-        android:background="@color/grey"
+        android:background="?normalC"
         android:orientation="vertical">
 
         <TextView
diff --git a/src/main/res/layout/dialog_solvers_pane.xml b/src/main/res/layout/dialog_solvers_pane.xml
index ac8c3f7b..12ba1041 100644
--- a/src/main/res/layout/dialog_solvers_pane.xml
+++ b/src/main/res/layout/dialog_solvers_pane.xml
@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="@color/medium_grey"
+	android:background="?mediumC"
 	android:padding="8dp"
 	android:orientation="horizontal">
 
diff --git a/src/main/res/layout/dialog_stars_explain.xml b/src/main/res/layout/dialog_stars_explain.xml
index 096ac81c..864df22a 100644
--- a/src/main/res/layout/dialog_stars_explain.xml
+++ b/src/main/res/layout/dialog_stars_explain.xml
@@ -4,12 +4,12 @@
     android:layout_height="fill_parent"
     android:gravity="center|fill_horizontal"
     android:padding="10dp"
-    android:background="@color/grey"
+    android:background="?normalC"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/stars_dialog_explain"
-        android:background="@color/dark_grey"
+        android:background="?darkC"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="start"
diff --git a/src/main/res/layout/dialog_stars_status.xml b/src/main/res/layout/dialog_stars_status.xml
index d457d0dc..39b625c5 100644
--- a/src/main/res/layout/dialog_stars_status.xml
+++ b/src/main/res/layout/dialog_stars_status.xml
@@ -4,7 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:gravity="center|fill_horizontal"
-    android:background="@color/grey"
+    android:background="?normalC"
     android:orientation="vertical">
 
     <LinearLayout
@@ -14,7 +14,7 @@
         android:padding="5dp"
         android:gravity="center"
         android:layout_marginTop="10dp"
-        android:background="@color/light_grey"
+        android:background="?lightC"
         android:orientation="vertical">
 
         <TextView
@@ -42,7 +42,7 @@
         android:layout_height="80dp"
         android:padding="5dp"
         android:layout_marginTop="10dp"
-        android:background="@color/light_grey"
+        android:background="?lightC"
         android:orientation="horizontal">
 
         <ImageView
@@ -71,7 +71,7 @@
         android:layout_height="80dp"
         android:padding="5dp"
         android:layout_marginTop="10dp"
-        android:background="@color/light_grey"
+        android:background="?lightC"
         android:orientation="horizontal">
 
         <ImageView
@@ -100,7 +100,7 @@
         android:layout_height="80dp"
         android:padding="5dp"
         android:layout_marginTop="10dp"
-        android:background="@color/light_grey"
+        android:background="?lightC"
         android:orientation="horizontal">
 
         <ImageView
diff --git a/src/main/res/layout/dialog_tutorial_row.xml b/src/main/res/layout/dialog_tutorial_row.xml
index 99297e2d..630eef4f 100644
--- a/src/main/res/layout/dialog_tutorial_row.xml
+++ b/src/main/res/layout/dialog_tutorial_row.xml
@@ -3,7 +3,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:gravity="center|fill_horizontal"
-    android:background="@color/grey"
+    android:background="?normalC"
     android:orientation="vertical">
 
     <TextView
@@ -18,7 +18,7 @@
         android:paddingLeft="2dp"
         android:paddingRight="2dp"
         android:maxLines="1"
-        android:background="@color/dark_grey"/>
+        android:background="?darkC"/>
 
     <LinearLayout
         android:id="@+id/tutorialLayout"
@@ -28,7 +28,7 @@
         android:layout_marginRight="10dp"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:background="@color/dark_grey"
+        android:background="?darkC"
         android:orientation="horizontal">
 
         <ImageView
diff --git a/src/main/res/layout/dialog_updates_pane.xml b/src/main/res/layout/dialog_updates_pane.xml
index bba813e7..ce3891a4 100644
--- a/src/main/res/layout/dialog_updates_pane.xml
+++ b/src/main/res/layout/dialog_updates_pane.xml
@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="@color/medium_grey"
+	android:background="?mediumC"
 	android:padding="8dp"
 	android:orientation="horizontal"
 	android:baselineAligned="false">
diff --git a/src/main/res/layout/dialog_whatsnew_pane.xml b/src/main/res/layout/dialog_whatsnew_pane.xml
index 0fb71dce..34f5c57f 100644
--- a/src/main/res/layout/dialog_whatsnew_pane.xml
+++ b/src/main/res/layout/dialog_whatsnew_pane.xml
@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="@color/medium_grey"
+	android:background="?mediumC"
 	android:padding="8dp"
 	android:orientation="vertical">
 
diff --git a/src/main/res/layout/exit_app.xml b/src/main/res/layout/exit_app.xml
index 508c7108..f5879f5a 100644
--- a/src/main/res/layout/exit_app.xml
+++ b/src/main/res/layout/exit_app.xml
@@ -5,7 +5,7 @@
     android:layout_marginLeft="10dp"
     android:layout_marginTop="0dp"
     android:layout_marginRight="10dp"
-    android:background="@color/grey"
+    android:background="?normalC"
     android:gravity="center|fill_horizontal">
 
     <TextView
diff --git a/src/main/res/layout/info.xml b/src/main/res/layout/info.xml
index d59b7ad8..7485a9a5 100644
--- a/src/main/res/layout/info.xml
+++ b/src/main/res/layout/info.xml
@@ -16,7 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1.0"
-        android:background="@color/light_grey"
+        android:background="?lightC"
         android:orientation="vertical" >
 
         <LinearLayout
@@ -26,7 +26,7 @@
             android:layout_weight="1"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:background="@color/grey"
+            android:background="?normalC"
             android:orientation="horizontal">
 
             <TextView
@@ -61,7 +61,7 @@
             android:layout_weight="1"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:background="@color/grey"
+            android:background="?normalC"
             android:orientation="horizontal">
 
             <TextView
@@ -127,7 +127,7 @@
             android:layout_weight="1"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:background="@color/grey"
+            android:background="?normalC"
             android:orientation="horizontal">
 
             <TextView
@@ -162,7 +162,7 @@
             android:layout_weight="1"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:background="@color/grey"
+            android:background="?normalC"
             android:orientation="horizontal">
 
             <TextView
@@ -198,7 +198,7 @@
         android:layout_height="100dp"
         android:layout_gravity="end"
         android:orientation="horizontal"
-        android:background="@color/light_grey">
+        android:background="?lightC">
     </LinearLayout>
 
 </LinearLayout>
diff --git a/src/main/res/layout/main.xml b/src/main/res/layout/main.xml
index 6a64899e..1b05caf1 100644
--- a/src/main/res/layout/main.xml
+++ b/src/main/res/layout/main.xml
@@ -13,7 +13,7 @@
         android:layout_weight="0.00"
         android:gravity="center"
         android:orientation="horizontal"
-        android:background="?darkBackground">
+        android:background="?darkC">
     </LinearLayout>
 
     <LinearLayout
@@ -24,7 +24,7 @@
         android:gravity="center"
         android:weightSum="1.0"
         android:orientation="horizontal"
-        android:background="?darkBackground"
+        android:background="?darkC"
         android:baselineAligned="false">
 
         <LinearLayout
@@ -94,7 +94,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="0.84"
-        android:background="?lightBackground">
+        android:background="?lightC">
     </ScrollView>
 
     <LinearLayout
@@ -103,7 +103,7 @@
         android:layout_height="0dp"
         android:layout_weight="0.08"
         android:orientation="horizontal"
-        android:background="?darkBackground">
+        android:background="?darkC">
 
         <RelativeLayout
             android:id="@+id/bottomLayout"
diff --git a/src/main/res/layout/object_popup.xml b/src/main/res/layout/object_popup.xml
index 5b203c8e..92c51e4b 100644
--- a/src/main/res/layout/object_popup.xml
+++ b/src/main/res/layout/object_popup.xml
@@ -14,7 +14,7 @@
       android:paddingRight="10dp"
       android:paddingLeft="10dp"
       android:singleLine="true"
-      android:backgroundTint="@color/dark_grey"
+      android:backgroundTint="?darkC"
       android:gravity="center"/>
 
    <Button
@@ -25,7 +25,7 @@
       android:paddingRight="10dp"
       android:paddingLeft="10dp"
       android:singleLine="true"
-      android:backgroundTint="@color/dark_grey"
+      android:backgroundTint="?darkC"
       android:gravity="center"/>
 
    <Button
@@ -36,7 +36,7 @@
       android:paddingRight="10dp"
       android:paddingLeft="10dp"
       android:singleLine="true"
-      android:backgroundTint="@color/dark_grey"
+      android:backgroundTint="?darkC"
       android:gravity="center"/>
 
    <Button
@@ -47,7 +47,7 @@
         android:paddingRight="10dp"
         android:paddingLeft="10dp"
         android:singleLine="true"
-        android:backgroundTint="@color/dark_grey"
+        android:backgroundTint="?darkC"
         android:gravity="center"/>
 
     <Button
@@ -58,7 +58,7 @@
         android:paddingRight="10dp"
         android:paddingLeft="10dp"
         android:singleLine="true"
-        android:backgroundTint="@color/dark_grey"
+        android:backgroundTint="?darkC"
         android:gravity="center"/>
 
    <TextView
@@ -81,7 +81,7 @@
            android:layout_height="wrap_content"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
         <Button
            android:id="@+id/level1"
            android:text="@string/level1"
@@ -89,7 +89,7 @@
            android:layout_height="wrap_content"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
         <Button
            android:id="@+id/level2"
            android:text="@string/level2"
@@ -97,7 +97,7 @@
            android:layout_height="wrap_content"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
    </LinearLayout>
 
    <LinearLayout
@@ -113,7 +113,7 @@
            android:layout_height="wrap_content"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
         <Button
            android:id="@+id/level4"
            android:text="@string/level4"
@@ -121,7 +121,7 @@
            android:layout_height="wrap_content"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
         <Button
            android:id="@+id/level5"
            android:text="@string/level5"
@@ -129,7 +129,7 @@
            android:layout_height="wrap_content"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
    </LinearLayout>
 
    <LinearLayout
@@ -145,7 +145,7 @@
            android:layout_height="wrap_content"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
         <Button
            android:id="@+id/level7"
            android:text="@string/level7"
@@ -153,7 +153,7 @@
            android:layout_height="wrap_content"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
         <Button
            android:id="@+id/levelM"
            android:text="@string/levelM"
@@ -161,6 +161,6 @@
            android:layout_height="wrap_content"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/popup_menu.xml b/src/main/res/layout/popup_menu.xml
index a9668ded..2a224551 100644
--- a/src/main/res/layout/popup_menu.xml
+++ b/src/main/res/layout/popup_menu.xml
@@ -15,7 +15,7 @@
       android:paddingRight="10dp"
       android:paddingLeft="10dp"
       android:singleLine="true"
-      android:backgroundTint="@color/dark_grey"
+      android:backgroundTint="?darkC"
       android:gravity="center"/>
 
    <Button
@@ -27,7 +27,7 @@
       android:paddingRight="10dp"
       android:paddingLeft="10dp"
       android:singleLine="true"
-      android:backgroundTint="@color/dark_grey"
+      android:backgroundTint="?darkC"
       android:gravity="center"/>
 
    <Button
@@ -39,7 +39,7 @@
       android:paddingRight="10dp"
       android:paddingLeft="10dp"
       android:singleLine="true"
-      android:backgroundTint="@color/dark_grey"
+      android:backgroundTint="?darkC"
       android:gravity="center"/>
 
    <Button
@@ -51,7 +51,7 @@
       android:paddingRight="10dp"
       android:paddingLeft="10dp"
       android:singleLine="true"
-      android:backgroundTint="@color/dark_grey"
+      android:backgroundTint="?darkC"
       android:gravity="center"/>
 
    <Button
@@ -63,7 +63,7 @@
       android:paddingRight="10dp"
       android:paddingLeft="10dp"
       android:singleLine="true"
-      android:backgroundTint="@color/dark_grey"
+      android:backgroundTint="?darkC"
       android:gravity="center"/>
 
    <Button
@@ -75,7 +75,7 @@
       android:paddingRight="10dp"
       android:paddingLeft="10dp"
       android:singleLine="true"
-      android:backgroundTint="@color/dark_grey"
+      android:backgroundTint="?darkC"
       android:gravity="center"/>
 
    <Button
@@ -87,7 +87,7 @@
       android:paddingRight="10dp"
       android:paddingLeft="10dp"
       android:singleLine="true"
-      android:backgroundTint="@color/dark_grey"
+      android:backgroundTint="?darkC"
       android:gravity="center"/>
 
    <TextView
@@ -112,7 +112,7 @@
            android:layout_height="30dp"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
         <Button
            android:id="@+id/level2"
            android:text="@string/level2"
@@ -120,7 +120,7 @@
            android:layout_height="30dp"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
         <Button
            android:id="@+id/level3"
            android:text="@string/level3"
@@ -128,7 +128,7 @@
            android:layout_height="30dp"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
    </LinearLayout>
 
    <LinearLayout
@@ -145,7 +145,7 @@
            android:layout_height="30dp"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
         <Button
            android:id="@+id/level5"
            android:text="@string/level5"
@@ -153,7 +153,7 @@
            android:layout_height="30dp"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
         <Button
            android:id="@+id/level6"
            android:text="@string/level6"
@@ -161,7 +161,7 @@
            android:layout_height="30dp"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
    </LinearLayout>
 
    <LinearLayout
@@ -178,7 +178,7 @@
            android:layout_height="30dp"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
         <Button
            android:id="@+id/level8"
            android:text="@string/level8"
@@ -186,7 +186,7 @@
            android:layout_height="30dp"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
         <Button
            android:id="@+id/levelM"
            android:text="@string/levelM"
@@ -194,6 +194,6 @@
            android:layout_height="30dp"
            android:paddingRight="10dp"
            android:paddingLeft="10dp"
-           android:backgroundTint="@color/dark_grey"/>
+           android:backgroundTint="?darkC"/>
    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/popup_object.xml b/src/main/res/layout/popup_object.xml
index f334b8b4..e7d612c0 100644
--- a/src/main/res/layout/popup_object.xml
+++ b/src/main/res/layout/popup_object.xml
@@ -22,7 +22,7 @@
        android:id="@+id/bottomLayout"
        android:layout_width="match_parent"
        android:layout_height="60dp"
-       android:background="@color/grey"
+       android:background="?normalC"
        android:paddingEnd="10dp"
        android:paddingStart="10dp">
 
diff --git a/src/main/res/layout/settings_popup.xml b/src/main/res/layout/settings_popup.xml
index bd17e474..eb76e22d 100644
--- a/src/main/res/layout/settings_popup.xml
+++ b/src/main/res/layout/settings_popup.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:text="@string/settings_title"
         android:textSize="34sp"
-        android:background="@color/light_grey"
+        android:background="?lightC"
         android:gravity="center"/>
 
    <GridLayout
diff --git a/src/main/res/layout/settings_popup_android25.xml b/src/main/res/layout/settings_popup_android25.xml
index af85a715..d87f8efb 100644
--- a/src/main/res/layout/settings_popup_android25.xml
+++ b/src/main/res/layout/settings_popup_android25.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:text="@string/settings_title"
         android:textSize="34sp"
-        android:background="@color/light_grey"
+        android:background="?lightC"
         android:gravity="center"/>
 
    <GridLayout
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index cf51fe2d..800d29f9 100755
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -90,6 +90,15 @@
     <string name="config_corner">Ecken</string>
     <string name="config_no_support">Das aktuelle Puzzle unterstützt keine Farbanpassung.</string>
 
+    <string name="config_message">Berühre die Aufkleber, um ihre Farbe zu ändern.</string>
+    <string name="bandage_message">Verbinden Sie den Würfel, indem Sie ihn berühren.</string>
+    <string name="solver_message">Richte eine verschlüsselte Position ein, indem du die Sticker berührst.</string>
+
+    <string name="theme">Thema</string>
+    <string name="theme_white">Weiß</string>
+    <string name="theme_grey">Grau</string>
+    <string name="theme_green">Grün</string>
+
     <string name="sort_classic">Klassisch</string>
     <string name="sort_shape">Form</string>
     <string name="sort_difficulty">Schwierigkeit</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 56aece84..0cc6177d 100755
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -90,6 +90,15 @@
     <string name="config_corner">Esquinas</string>
     <string name="config_no_support">El cubo actual no admite el ajuste de colores.</string>
 
+    <string name="config_message">Toca las pegatinas para cambiar su color.</string>
+    <string name="bandage_message">Venda el cubo tocándolo.</string>
+    <string name="solver_message">Establece la posición de revuelto tocando las pegatinas.</string>
+
+    <string name="theme">Tema</string>
+    <string name="theme_white">Blanco</string>
+    <string name="theme_grey">Gris</string>
+    <string name="theme_green">Verde</string>
+
     <string name="sort_classic">Clásico</string>
     <string name="sort_shape">Forma</string>
     <string name="sort_difficulty">Dificultad</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 4a24c384..32b7d596 100755
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -90,6 +90,15 @@
     <string name="config_corner">Coins</string>
     <string name="config_no_support">Le cube actuel ne prend pas en charge le réglage des couleurs.</string>
 
+    <string name="config_message">Touchez les autocollants pour changer leur couleur.</string>
+    <string name="bandage_message">Panser le cube en le touchant.</string>
+    <string name="solver_message">Mettre en place une position brouillée en touchant les autocollants.</string>
+
+    <string name="theme">Thème</string>
+    <string name="theme_white">Blanc</string>
+    <string name="theme_grey">Gris</string>
+    <string name="theme_green">Vert</string>
+
     <string name="sort_classic">Classique</string>
     <string name="sort_shape">Forme</string>
     <string name="sort_difficulty">Difficulté</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 85f1bd98..fd2a068e 100755
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -90,6 +90,15 @@
     <string name="config_corner">角</string>
     <string name="config_no_support">現在のキューブは色の調整をサポートしていません。</string>
 
+    <string name="config_message">ステッカーをタッチすると色が変わります。</string>
+    <string name="bandage_message">キューブをタッチして包帯を巻きます。</string>
+    <string name="solver_message">シールをタッチして、スクランブルポジションを設定します。</string>
+
+    <string name="theme">テーマ</string>
+    <string name="theme_white">ホワイト</string>
+    <string name="theme_grey">グレー</string>
+    <string name="theme_green">グリーン</string>
+
     <string name="sort_classic">古典学</string>
     <string name="sort_shape">形</string>
     <string name="sort_difficulty">困難</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index ed0189ec..07bebe56 100755
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -90,6 +90,15 @@
     <string name="config_corner">모서리</string>
     <string name="config_no_support">현재 큐브는 색상 조정을 지원하지 않습니다.</string>
 
+    <string name="config_message">스티커를 터치하여 색상을 변경합니다.</string>
+    <string name="bandage_message">큐브를 터치하여 붕대를 감습니다.</string>
+    <string name="solver_message">스티커를 터치하여 스크램블 위치를 설정합니다.</string>
+
+    <string name="theme">테마</string>
+    <string name="theme_white">흰색</string>
+    <string name="theme_grey">회색</string>
+    <string name="theme_green">녹색</string>
+
     <string name="sort_classic">전통적인</string>
     <string name="sort_shape">모양</string>
     <string name="sort_difficulty">어려움</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index a6638392..6601a89d 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -90,6 +90,15 @@
     <string name="config_corner">Rogi</string>
     <string name="config_no_support">Bieżąca kostka nie wspomaga zmieniania kolorów.</string>
 
+    <string name="config_message">Aby zmienic kolor naklejki, dotknij jej.</string>
+    <string name="bandage_message">Żeby zabandażować kostkę, dotknij jej.</string>
+    <string name="solver_message">Dotknij naklejki żeby zmienić jej kolor i tym samym ustawić pozycję początkową.</string>
+
+    <string name="theme">Styl</string>
+    <string name="theme_white">Bialy</string>
+    <string name="theme_grey">Szary</string>
+    <string name="theme_green">Zielony</string>
+
     <string name="sort_classic">Klasycznie</string>
     <string name="sort_shape">Kształt</string>
     <string name="sort_difficulty">Trudność</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 8128155e..46f83ee3 100755
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -90,6 +90,15 @@
     <string name="config_corner">Углы</string>
     <string name="config_no_support">Текущий куб не поддерживает настройку цветов.</string>
 
+    <string name="config_message">Прикоснитесь к наклейкам, чтобы изменить их цвет.</string>
+    <string name="bandage_message">Перевяжите кубик, прикоснувшись к нему.</string>
+    <string name="solver_message">Установите скремблированную позицию, касаясь наклеек.</string>
+
+    <string name="theme">Тема</string>
+    <string name="theme_white">Белый</string>
+    <string name="theme_grey">Серый</string>
+    <string name="theme_green">Зеленый</string>
+
     <string name="sort_classic">Классик</string>
     <string name="sort_shape">Форма</string>
     <string name="sort_difficulty">Сложность</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index cabfdd57..29a90d16 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -90,6 +90,15 @@
     <string name="config_corner">角</string>
     <string name="config_no_support">目前拼图不支持调整颜色。</string>
 
+    <string name="config_message">触摸贴纸可改变其颜色。</string>
+    <string name="bandage_message">通过触摸来包扎魔方。</string>
+    <string name="solver_message">通过触摸贴纸来设置拼图位置。</string>
+
+    <string name="theme">主题</string>
+    <string name="theme_white">白色</string>
+    <string name="theme_grey">灰色</string>
+    <string name="theme_green">绿色</string>
+
     <string name="sort_classic">經典的</string>
     <string name="sort_shape">形狀</string>
     <string name="sort_difficulty">困难</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 83db0f1a..b130630f 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -90,6 +90,15 @@
     <string name="config_corner">角</string>
     <string name="config_no_support">目前拼圖不支援調整顏色。</string>
 
+    <string name="config_message">觸摸貼紙以更改其顏色。</string>
+    <string name="bandage_message">透過觸摸立方體來包紮它。</string>
+    <string name="solver_message">透過觸控貼紙設定打亂位置。</string>
+
+    <string name="theme">主題</string>
+    <string name="theme_white">白色的</string>
+    <string name="theme_grey">灰色的</string>
+    <string name="theme_green">綠色的</string>
+
     <string name="sort_classic">经典的</string>
     <string name="sort_shape">形状</string>
     <string name="sort_difficulty">困難</string>
diff --git a/src/main/res/values/attr.xml b/src/main/res/values/attr.xml
index 680ed657..340d8b66 100644
--- a/src/main/res/values/attr.xml
+++ b/src/main/res/values/attr.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-<attr name="darkBackground" format="reference|color" />
-<attr name="lightBackground" format="reference|color" />
+<attr name="darkC" format="reference|color" />
+<attr name="normalC" format="reference|color" />
+<attr name="mediumC" format="reference|color" />
+<attr name="lightC" format="reference|color" />
 
 </resources>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 93625bfa..e3b4185d 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -4,13 +4,21 @@
     <color name="colorPrimaryDark">#00574B</color>
     <color name="colorAccent">#D81B60</color>
     <color name="red">#ffff0000</color>
-    <color name="dark_green">#ff009900</color>
-    <color name="green">#ff00cc00</color>
-    <color name="dark_grey">#ff222222</color>
-    <color name="grey">#ff333333</color>
-    <color name="light_grey">#ff555555</color>
-    <color name="medium_grey">#ff444444</color>
     <color name="black">#ff010101</color>
-    <color name="dark_white">#ffe0e0e0</color>
     <color name="white">#ffffffff</color>
+
+    <color name="darkGreen">#ff009900</color>
+    <color name="normalGreen">#ff00aa00</color>
+    <color name="mediumGreen">#ff00bb00</color>
+    <color name="lightGreen">#ff00cc00</color>
+
+    <color name="darkGrey">#ff222222</color>
+    <color name="normalGrey">#ff333333</color>
+    <color name="mediumGrey">#ff444444</color>
+    <color name="lightGrey">#ff555555</color>
+
+    <color name="darkWhite">#ffd0d0d0</color>
+    <color name="normalWhite">#ffe0e0e0</color>
+    <color name="mediumWhite">#fff0f0f0</color>
+    <color name="lightWhite">#ffffffff</color>
 </resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index b8684057..b9d9793a 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -13,18 +13,24 @@
    </style>
 
    <style name="GreyTheme" parent="@style/BaseMaterialThemeNoActionBar">
-        <item name="darkBackground">@color/dark_grey</item>
-        <item name="lightBackground">@color/grey</item>
+        <item name="darkC">@color/darkGrey</item>
+        <item name="normalC">@color/normalGrey</item>
+        <item name="mediumC">@color/mediumGrey</item>
+        <item name="lightC">@color/lightGrey</item>
    </style>
 
    <style name="WhiteTheme" parent="@style/BaseMaterialThemeNoActionBar">
-        <item name="darkBackground">@color/dark_white</item>
-        <item name="lightBackground">@color/white</item>
+        <item name="darkC">@color/darkWhite</item>
+        <item name="normalC">@color/normalWhite</item>
+        <item name="mediumC">@color/mediumWhite</item>
+        <item name="lightC">@color/lightWhite</item>
    </style>
 
    <style name="GreenTheme" parent="@style/BaseMaterialThemeNoActionBar">
-        <item name="darkBackground">@color/dark_green</item>
-        <item name="lightBackground">@color/green</item>
+        <item name="darkC">@color/darkGreen</item>
+        <item name="normalC">@color/normalGreen</item>
+        <item name="mediumC">@color/mediumGreen</item>
+        <item name="lightC">@color/lightGreen</item>
    </style>
 
    <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
@@ -36,9 +42,9 @@
    </style>
 
    <style name="ButtonStyleTextColor">
-      <item name="colorOnPrimary">@color/white</item>
-      <item name="colorOnSecondary">@color/dark_grey</item>
-      <item name="colorOnSurface">@color/light_grey</item>
+      <item name="colorOnPrimary">@color/normalWhite</item>
+      <item name="colorOnSecondary">@color/darkGrey</item>
+      <item name="colorOnSurface">@color/lightGrey</item>
    </style>
 
 </resources>