diff --git a/app/src/main/res/color/cpp_wizard_button_selector_light.xml b/app/src/main/res/color/cpp_wizard_button_selector_light.xml
index 1a075fa8..05caf3b1 100644
--- a/app/src/main/res/color/cpp_wizard_button_selector_light.xml
+++ b/app/src/main/res/color/cpp_wizard_button_selector_light.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/cpp_material_light_darker" android:state_enabled="true" android:state_pressed="true" />
-    <item android:color="@color/cpp_material_light_disabled" android:state_enabled="false" />
-    <item android:color="@color/cpp_material_light" />
+    <item android:color="@color/teal_600" android:state_enabled="true" android:state_pressed="true" />
+    <item android:color="#c1d2ef" android:state_enabled="false" />
+    <item android:color="@color/teal_400" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/primary_button_selector.xml b/app/src/main/res/color/primary_button_selector.xml
deleted file mode 100644
index 4122a84b..00000000
--- a/app/src/main/res/color/primary_button_selector.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/cpp_metro_button_dark" android:state_enabled="true" android:state_pressed="true" />
-    <item android:color="@color/cpp_metro_button_dark" android:state_enabled="false" />
-    <item android:color="@color/cpp_metro_blue" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/material_blue_button.xml b/app/src/main/res/drawable-v21/material_blue_button.xml
index b76176c5..4aa5eb6b 100644
--- a/app/src/main/res/drawable-v21/material_blue_button.xml
+++ b/app/src/main/res/drawable-v21/material_blue_button.xml
@@ -26,7 +26,7 @@
     a:color="@color/ripple_material_dark">
     <item>
         <shape>
-            <solid a:color="@color/cpp_material_blue" />
+            <solid a:color="@color/blue_900" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable-v21/material_blue_button_lighter.xml b/app/src/main/res/drawable-v21/material_blue_button_lighter.xml
index 83ec9cd7..e411274c 100644
--- a/app/src/main/res/drawable-v21/material_blue_button_lighter.xml
+++ b/app/src/main/res/drawable-v21/material_blue_button_lighter.xml
@@ -26,7 +26,7 @@
     a:color="@color/ripple_material_dark">
     <item>
         <shape>
-            <solid a:color="@color/cpp_material_blue_lighter" />
+            <solid a:color="@color/blue_850" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable-v21/material_button_dark.xml b/app/src/main/res/drawable-v21/material_button_dark.xml
index 9547e45c..cf12f0e7 100644
--- a/app/src/main/res/drawable-v21/material_button_dark.xml
+++ b/app/src/main/res/drawable-v21/material_button_dark.xml
@@ -26,7 +26,7 @@
     a:color="@color/ripple_material_dark">
     <item>
         <shape>
-            <solid a:color="@color/cpp_metro_button" />
+            <solid a:color="@color/grey_900" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/material_button_dark_lighter.xml b/app/src/main/res/drawable-v21/material_button_dark_lighter.xml
index 91db8a6d..981c917c 100644
--- a/app/src/main/res/drawable-v21/material_button_dark_lighter.xml
+++ b/app/src/main/res/drawable-v21/material_button_dark_lighter.xml
@@ -26,7 +26,7 @@
     a:color="@color/ripple_material_dark">
     <item>
         <shape>
-            <solid a:color="@color/cpp_metro_button_lighter" />
+            <solid a:color="@color/grey_850" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/material_button_light.xml b/app/src/main/res/drawable-v21/material_button_light.xml
index 06b453e3..128dd08f 100644
--- a/app/src/main/res/drawable-v21/material_button_light.xml
+++ b/app/src/main/res/drawable-v21/material_button_light.xml
@@ -26,7 +26,7 @@
     a:color="@color/ripple_material_dark">
     <item>
         <shape>
-            <solid a:color="@color/cpp_metro_button_light" />
+            <solid a:color="@color/grey_800" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/pane.xml b/app/src/main/res/drawable-v21/material_button_light_darker.xml
similarity index 74%
rename from app/src/main/res/drawable/pane.xml
rename to app/src/main/res/drawable-v21/material_button_light_darker.xml
index 7778429d..981c917c 100644
--- a/app/src/main/res/drawable/pane.xml
+++ b/app/src/main/res/drawable-v21/material_button_light_darker.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
   ~ Copyright 2013 serso aka se.solovyev
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +22,11 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-    <solid a:color="@color/cpp_pane_bg" />
-    <corners a:radius="@dimen/cpp_button_corner" />
-</shape>
\ No newline at end of file
+<ripple xmlns:a="http://schemas.android.com/apk/res/android"
+    a:color="@color/ripple_material_dark">
+    <item>
+        <shape>
+            <solid a:color="@color/grey_850" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/material_button_light_primary.xml b/app/src/main/res/drawable-v21/material_button_light_primary.xml
index 2bdd0c08..a5184695 100644
--- a/app/src/main/res/drawable-v21/material_button_light_primary.xml
+++ b/app/src/main/res/drawable-v21/material_button_light_primary.xml
@@ -26,7 +26,7 @@
     a:color="@color/ripple_material_dark">
     <item>
         <shape>
-            <solid a:color="@color/cpp_material_light" />
+            <solid a:color="@color/teal_400" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/pane_light.xml b/app/src/main/res/drawable-v21/material_button_light_primary_darker.xml
similarity index 74%
rename from app/src/main/res/drawable/pane_light.xml
rename to app/src/main/res/drawable-v21/material_button_light_primary_darker.xml
index c73d603a..dbc7ad02 100644
--- a/app/src/main/res/drawable/pane_light.xml
+++ b/app/src/main/res/drawable-v21/material_button_light_primary_darker.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
   ~ Copyright 2013 serso aka se.solovyev
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +22,11 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-    <solid a:color="@color/cpp_pane_bg_light" />
-    <corners a:radius="@dimen/cpp_button_corner" />
-</shape>
\ No newline at end of file
+<ripple xmlns:a="http://schemas.android.com/apk/res/android"
+    a:color="@color/ripple_material_dark">
+    <item>
+        <shape>
+            <solid a:color="@color/teal_500" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/metro_widget_button.xml b/app/src/main/res/drawable-v21/metro_widget_button.xml
index a9fe9a0c..7ee5f89f 100644
--- a/app/src/main/res/drawable-v21/metro_widget_button.xml
+++ b/app/src/main/res/drawable-v21/metro_widget_button.xml
@@ -23,6 +23,6 @@
   -->
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
-    a:color="@color/cpp_widget_ripple">
+    a:color="@color/ripple_material_dark">
     <item a:drawable="@drawable/metro_blue_button_shape" />
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/metro_widget_button_dark.xml b/app/src/main/res/drawable-v21/metro_widget_button_dark.xml
index df1a7a7e..941daee5 100644
--- a/app/src/main/res/drawable-v21/metro_widget_button_dark.xml
+++ b/app/src/main/res/drawable-v21/metro_widget_button_dark.xml
@@ -23,6 +23,6 @@
   -->
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
-    a:color="@color/cpp_widget_ripple">
+    a:color="@color/ripple_material_dark">
     <item a:drawable="@drawable/metro_button_dark_shape" />
 </ripple>
diff --git a/app/src/main/res/drawable-v21/metro_widget_button_light.xml b/app/src/main/res/drawable-v21/metro_widget_button_light.xml
index 3d7da06d..ee88b312 100644
--- a/app/src/main/res/drawable-v21/metro_widget_button_light.xml
+++ b/app/src/main/res/drawable-v21/metro_widget_button_light.xml
@@ -23,6 +23,6 @@
   -->
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
-    a:color="@color/cpp_widget_ripple">
+    a:color="@color/ripple_material_dark">
     <item a:drawable="@drawable/metro_button_light_shape" />
 </ripple>
diff --git a/app/src/main/res/drawable/material_blue_button.xml b/app/src/main/res/drawable/material_blue_button.xml
index 078ae191..0846505a 100644
--- a/app/src/main/res/drawable/material_blue_button.xml
+++ b/app/src/main/res/drawable/material_blue_button.xml
@@ -26,13 +26,13 @@
 
     <item a:state_pressed="true">
         <shape>
-            <solid a:color="@color/cpp_material_blue_lighter" />
+            <solid a:color="@color/blue_800" />
         </shape>
     </item>
 
     <item>
         <shape>
-            <solid a:color="@color/cpp_material_blue" />
+            <solid a:color="@color/blue_900" />
         </shape>
     </item>
 
diff --git a/app/src/main/res/drawable/material_blue_button_lighter.xml b/app/src/main/res/drawable/material_blue_button_lighter.xml
index 4f544546..5f27ae6e 100644
--- a/app/src/main/res/drawable/material_blue_button_lighter.xml
+++ b/app/src/main/res/drawable/material_blue_button_lighter.xml
@@ -26,13 +26,13 @@
 
     <item a:state_pressed="true">
         <shape>
-            <solid a:color="@color/cpp_material_blue_lighter_lighter" />
+            <solid a:color="@color/blue_800" />
         </shape>
     </item>
 
     <item>
         <shape>
-            <solid a:color="@color/cpp_material_blue_lighter" />
+            <solid a:color="@color/blue_850" />
         </shape>
     </item>
 
diff --git a/app/src/main/res/drawable/material_button_dark.xml b/app/src/main/res/drawable/material_button_dark.xml
index d9334162..610a3db0 100644
--- a/app/src/main/res/drawable/material_button_dark.xml
+++ b/app/src/main/res/drawable/material_button_dark.xml
@@ -28,7 +28,7 @@
 
     <item>
         <shape>
-            <solid a:color="@color/cpp_metro_button" />
+            <solid a:color="@color/grey_900" />
         </shape>
     </item>
 
diff --git a/app/src/main/res/drawable/material_button_dark_lighter.xml b/app/src/main/res/drawable/material_button_dark_lighter.xml
index 319cb1ed..ef145a86 100644
--- a/app/src/main/res/drawable/material_button_dark_lighter.xml
+++ b/app/src/main/res/drawable/material_button_dark_lighter.xml
@@ -28,7 +28,7 @@
 
     <item>
         <shape>
-            <solid a:color="@color/cpp_metro_button_lighter" />
+            <solid a:color="@color/grey_850" />
         </shape>
     </item>
 
diff --git a/app/src/main/res/drawable/material_button_light.xml b/app/src/main/res/drawable/material_button_light.xml
index b217f7af..5e858ed1 100644
--- a/app/src/main/res/drawable/material_button_light.xml
+++ b/app/src/main/res/drawable/material_button_light.xml
@@ -27,7 +27,7 @@
 
     <item>
         <shape>
-            <solid a:color="@color/cpp_metro_button_light" />
+            <solid a:color="@color/grey_800" />
         </shape>
     </item>
 
diff --git a/app/src/main/res/drawable/material_button_light_darker.xml b/app/src/main/res/drawable/material_button_light_darker.xml
new file mode 100644
index 00000000..77dc1816
--- /dev/null
+++ b/app/src/main/res/drawable/material_button_light_darker.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+<selector xmlns:a="http://schemas.android.com/apk/res/android">
+
+    <item a:drawable="@drawable/material_button_pressed" a:state_pressed="true" />
+
+    <item>
+        <shape>
+            <solid a:color="@color/grey_850" />
+        </shape>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/material_button_light_primary.xml b/app/src/main/res/drawable/material_button_light_primary.xml
index 491f6ce2..fe12e0cc 100644
--- a/app/src/main/res/drawable/material_button_light_primary.xml
+++ b/app/src/main/res/drawable/material_button_light_primary.xml
@@ -26,13 +26,13 @@
 
     <item a:state_pressed="true">
         <shape>
-            <solid a:color="@color/cpp_material_light_darker" />
+            <solid a:color="@color/teal_600" />
         </shape>
     </item>
 
     <item>
         <shape>
-            <solid a:color="@color/cpp_material_light" />
+            <solid a:color="@color/teal_400" />
         </shape>
     </item>
 
diff --git a/app/src/main/res/drawable/material_button_light_primary_darker.xml b/app/src/main/res/drawable/material_button_light_primary_darker.xml
new file mode 100644
index 00000000..26459f54
--- /dev/null
+++ b/app/src/main/res/drawable/material_button_light_primary_darker.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<selector xmlns:a="http://schemas.android.com/apk/res/android">
+
+    <item a:state_pressed="true">
+        <shape>
+            <solid a:color="@color/teal_600" />
+        </shape>
+    </item>
+
+    <item>
+        <shape>
+            <solid a:color="@color/teal_500" />
+        </shape>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/metro_blue_button_shape.xml b/app/src/main/res/drawable/metro_blue_button_shape.xml
index 3d2eab7a..98ffd8f7 100644
--- a/app/src/main/res/drawable/metro_blue_button_shape.xml
+++ b/app/src/main/res/drawable/metro_blue_button_shape.xml
@@ -25,7 +25,7 @@
     a:insetRight="@dimen/cpp_button_padding"
     a:insetTop="@dimen/cpp_button_padding">
     <shape>
-        <solid a:color="@color/cpp_metro_blue" />
+        <solid a:color="@color/blue_900" />
         <corners a:radius="@dimen/cpp_button_corner" />
     </shape>
 </inset>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/metro_button_dark_shape.xml b/app/src/main/res/drawable/metro_button_dark_shape.xml
index 536bcd39..2f78b88c 100644
--- a/app/src/main/res/drawable/metro_button_dark_shape.xml
+++ b/app/src/main/res/drawable/metro_button_dark_shape.xml
@@ -27,7 +27,7 @@
     a:insetTop="@dimen/cpp_button_padding">
 
     <shape>
-        <solid a:color="@color/cpp_metro_button" />
+        <solid a:color="@color/grey_900" />
         <corners a:radius="@dimen/cpp_button_corner" />
     </shape>
 </inset>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/metro_button_green_shape.xml b/app/src/main/res/drawable/metro_button_green_shape.xml
index ac556c42..8cd8ac64 100644
--- a/app/src/main/res/drawable/metro_button_green_shape.xml
+++ b/app/src/main/res/drawable/metro_button_green_shape.xml
@@ -26,7 +26,7 @@
     a:insetRight="@dimen/cpp_button_padding"
     a:insetTop="@dimen/cpp_button_padding">
     <shape>
-        <solid a:color="@color/cpp_metro_green" />
+        <solid a:color="@color/green_800" />
         <corners a:radius="@dimen/cpp_button_corner" />
     </shape>
 </inset>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/metro_button_light.xml b/app/src/main/res/drawable/metro_button_light.xml
index b244d178..e55c0f3e 100644
--- a/app/src/main/res/drawable/metro_button_light.xml
+++ b/app/src/main/res/drawable/metro_button_light.xml
@@ -25,6 +25,5 @@
 <selector xmlns:a="http://schemas.android.com/apk/res/android">
 
     <item a:drawable="@drawable/metro_button_pressed" a:state_pressed="true" />
-
     <item a:drawable="@drawable/metro_button_light_shape" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/metro_button_light_shape.xml b/app/src/main/res/drawable/metro_button_light_shape.xml
index 30295c7a..d0b6d80a 100644
--- a/app/src/main/res/drawable/metro_button_light_shape.xml
+++ b/app/src/main/res/drawable/metro_button_light_shape.xml
@@ -26,7 +26,7 @@
     a:insetRight="@dimen/cpp_button_padding"
     a:insetTop="@dimen/cpp_button_padding">
     <shape>
-        <solid a:color="@color/cpp_metro_button_light" />
+        <solid a:color="@color/grey_800" />
         <corners a:radius="@dimen/cpp_button_corner" />
     </shape>
 </inset>
diff --git a/app/src/main/res/drawable/metro_button_purple_shape.xml b/app/src/main/res/drawable/metro_button_purple_shape.xml
index 39175983..a9bdbb48 100644
--- a/app/src/main/res/drawable/metro_button_purple_shape.xml
+++ b/app/src/main/res/drawable/metro_button_purple_shape.xml
@@ -26,7 +26,7 @@
     a:insetRight="@dimen/cpp_button_padding"
     a:insetTop="@dimen/cpp_button_padding">
     <shape>
-        <solid a:color="@color/cpp_metro_purple" />
+        <solid a:color="@color/pink_900" />
         <corners a:radius="@dimen/cpp_button_corner" />
     </shape>
 </inset>
diff --git a/app/src/main/res/layout-land/cpp_app_keyboard.xml b/app/src/main/res/layout-land/cpp_app_keyboard.xml
index e735a01d..87a764fe 100644
--- a/app/src/main/res/layout-land/cpp_app_keyboard.xml
+++ b/app/src/main/res/layout-land/cpp_app_keyboard.xml
@@ -73,7 +73,7 @@
 
         <include layout="@layout/cpp_app_button_minus" />
 
-        <include layout="@layout/cpp_app_button_round_brackets" />
+        <include layout="@layout/cpp_app_button_history" />
 
     </LinearLayout>
 
@@ -98,7 +98,7 @@
 
         <include layout="@layout/cpp_app_button_dot" />
 
-        <include layout="@layout/cpp_app_button_history" />
+        <include layout="@layout/cpp_app_button_round_brackets" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/cpp_app_keyboard.xml b/app/src/main/res/layout/cpp_app_keyboard.xml
index 24d264ce..82df8998 100644
--- a/app/src/main/res/layout/cpp_app_keyboard.xml
+++ b/app/src/main/res/layout/cpp_app_keyboard.xml
@@ -102,12 +102,12 @@
         a:layout_height="0dp"
         a:layout_weight="1">
 
-        <include layout="@layout/cpp_app_button_round_brackets" />
-
         <include layout="@layout/cpp_app_button_0" />
 
         <include layout="@layout/cpp_app_button_dot" />
 
+        <include layout="@layout/cpp_app_button_round_brackets" />
+
         <include layout="@layout/cpp_app_button_plus" />
 
         <include layout="@layout/cpp_app_button_history" />
diff --git a/app/src/main/res/values/attributes.xml b/app/src/main/res/values/attributes.xml
index 2e2d8fa5..4e7d901b 100644
--- a/app/src/main/res/values/attributes.xml
+++ b/app/src/main/res/values/attributes.xml
@@ -28,7 +28,6 @@
     <attr name="cpp_button_style_operation" format="reference" />
     <attr name="cpp_button_style_operation_highlighted" format="reference" />
     <attr name="cpp_main_bg" format="reference" />
-    <attr name="cpp_pane_bg" format="reference" />
     <attr name="cpp_fab_bg" format="reference" />
     <attr name="cpp_wizard_button_bg" format="reference" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a14325b9..7d060afc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -35,33 +35,27 @@
     <color name="cpp_wizard_button_normal">#424242</color>
     <color name="cpp_wizard_button_disabled">#616161</color>
     <color name="cpp_wizard_button_pressed">#757575</color>
-    <color name="cpp_metro_button_dark">#ff000000</color>
-    <color name="cpp_metro_button">@color/grey_900</color>
-    <color name="cpp_metro_button_lighter">@color/grey_850</color>
-    <color name="cpp_metro_button_light">@color/grey_800</color>
-    <color name="cpp_metro_blue">#10648c</color>
-    <color name="cpp_material_blue">#0a4766</color>
-    <color name="cpp_material_blue_lighter">#0d5980</color>
-    <color name="cpp_material_blue_lighter_lighter">#0f6b99</color>
-    <color name="cpp_material_light">#ff37b295</color>
-    <color name="cpp_material_light_darker">#ff309e84</color>
-    <color name="cpp_material_light_disabled">#c1d2ef</color>
-    <color name="cpp_metro_green">#088e3a</color>
-    <color name="cpp_metro_purple">#651456</color>
     <color name="cpp_widget_cursor">#ff707070</color>
-    <color name="cpp_widget_ripple">#40ffffff</color>
 
     <color name="cpp_wizard_disabled_text">#66ffffff</color>
+    <color name="cpp_material_accent">#fafafa</color>
 
-    <color name="cpp_material_accent">#FAFAFA</color>
-    <color name="cpp_material_actionbar">@color/grey_900</color>
-    <color name="cpp_material_actionbar_light">@color/grey_800</color>
+    <color name="black">#000000</color>
 
-    <color name="cpp_pane_bg">@color/grey_900</color>
-    <color name="cpp_pane_bg_light">#ffeae5e3</color>
-    <color name="grey_900">#212121</color>
-    <color name="grey_950">#101010</color>
     <color name="grey_800">#424242</color>
     <color name="grey_850">#313131</color>
+    <color name="grey_900">#212121</color>
+    <color name="grey_950">#101010</color>
+
+    <color name="blue_900">#0D47A1</color>
+    <color name="blue_800">#1565C0</color>
+    <color name="blue_850">#1156B1</color>
+
+    <color name="teal_400">#26A69A</color>
+    <color name="teal_500">#009688</color>
+    <color name="teal_600">#00897B</color>
+
+    <color name="green_800">#2e7d32</color>
+    <color name="pink_900">#880e4f</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 531caa58..6b9010ff 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -212,48 +212,12 @@
         <item name="android:textAppearance">@android:style/TextAppearance.Medium</item>
     </style>
 
-    <style name="CppPane.Multipane.Left" parent="CppPane.Multipane">
-        <item name="android:layout_marginLeft">0dp</item>
-    </style>
-
-    <style name="CppPane.Multipane.Right" parent="CppPane.Multipane">
-        <item name="android:layout_marginRight">0dp</item>
-    </style>
-
-    <style name="CppPane.Multipane" parent="CppPane">
-        <item name="android:padding">5dp</item>
-        <item name="android:layout_marginLeft">@dimen/cpp_pane_margin</item>
-        <item name="android:layout_marginTop">@dimen/cpp_pane_margin</item>
-        <item name="android:layout_marginRight">@dimen/cpp_pane_margin</item>
-        <item name="android:layout_marginBottom">@dimen/cpp_pane_margin</item>
-    </style>
-
-    <style name="CppPane">
-        <item name="android:padding">0dp</item>
-        <item name="android:background">?attr/cpp_pane_bg</item>
-        <item name="android:orientation">horizontal</item>
-    </style>
-
-    <style name="CppPane.Transparent.Bottom" parent="CppPane.Transparent">
-        <item name="android:layout_marginTop">@dimen/cpp_pane_margin</item>
-    </style>
-
-    <style name="CppPane.Transparent" parent="CppPane">
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:padding">0dp</item>
-    </style>
-
     <style name="CppMain">
         <item name="android:baselineAligned">false</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_width">match_parent</item>
     </style>
 
-    <style name="CppMain.Multipane" parent="CppMain">
-        <item name="android:paddingRight">0dp</item>
-        <item name="android:paddingBottom">0dp</item>
-    </style>
-
     <style name="CppFragment">
         <item name="android:layout_margin">0dp</item>
         <item name="android:padding">0dp</item>
@@ -334,13 +298,13 @@
     </style>
 
     <style name="CppToolbar" parent="@style/Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/cpp_material_actionbar</item>
+        <item name="android:background">@color/grey_900</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
     </style>
 
     <style name="CppToolbar.Light" parent="CppToolbar">
-        <item name="android:background">@color/cpp_material_actionbar_light</item>
+        <item name="android:background">@color/grey_800</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
     </style>
 
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index f18e3ad9..ccd77681 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -23,15 +23,14 @@
 <resources>
 
     <style name="Cpp.Theme" parent="@style/Theme.AppCompat.NoActionBar">
-        <item name="colorPrimary">@color/cpp_metro_button</item>
-        <item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
+        <item name="colorPrimary">@color/grey_900</item>
+        <item name="colorPrimaryDark">@color/black</item>
         <item name="colorAccent">@color/cpp_material_accent</item>
 
         <item name="android:windowBackground">@color/cpp_main_bg</item>
 
         <item name="cpp_main_bg">@color/cpp_main_bg</item>
-        <item name="cpp_pane_bg">@drawable/pane</item>
-        <item name="cpp_fab_bg">@color/grey_900</item>
+        <item name="cpp_fab_bg">@color/blue_900</item>
         <item name="cpp_text_color">@color/cpp_text</item>
         <item name="cpp_text_color_error">@color/cpp_text_error</item>
         <item name="cpp_card_style">@style/CardView.Dark</item>
@@ -50,8 +49,8 @@
     <style name="Cpp.Theme.Dialog" parent="@style/Theme.AppCompat.DialogWhenLarge">
         <item name="android:windowBackground">@color/cpp_main_bg</item>
 
-        <item name="colorPrimary">@color/cpp_metro_button</item>
-        <item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
+        <item name="colorPrimary">@color/grey_900</item>
+        <item name="colorPrimaryDark">@color/black</item>
         <item name="colorAccent">@color/cpp_material_accent</item>
 
         <item name="windowNoTitle">true</item>
@@ -60,8 +59,7 @@
         <item name="android:windowIsTranslucent">true</item>
 
         <item name="cpp_main_bg">@color/cpp_main_bg</item>
-        <item name="cpp_pane_bg">@drawable/pane</item>
-        <item name="cpp_fab_bg">@color/grey_900</item>
+        <item name="cpp_fab_bg">@color/blue_900</item>
         <item name="cpp_text_color">@color/cpp_text</item>
         <item name="cpp_text_color_error">@color/cpp_text_error</item>
         <item name="cpp_toolbar_style">@style/CppToolbar</item>
@@ -70,13 +68,12 @@
     </style>
 
     <style name="Cpp.Theme.Dialog.Alert" parent="@style/Theme.AppCompat.Dialog.Alert">
-        <item name="colorPrimary">@color/cpp_metro_button</item>
-        <item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
+        <item name="colorPrimary">@color/grey_900</item>
+        <item name="colorPrimaryDark">@color/black</item>
         <item name="colorAccent">@color/cpp_material_accent</item>
 
         <item name="cpp_main_bg">@color/cpp_main_bg</item>
-        <item name="cpp_pane_bg">@drawable/pane</item>
-        <item name="cpp_fab_bg">@color/grey_900</item>
+        <item name="cpp_fab_bg">@color/blue_900</item>
         <item name="cpp_text_color">@color/cpp_text</item>
         <item name="cpp_text_color_error">@color/cpp_text_error</item>
         <item name="cpp_toolbar_style">@style/CppToolbar</item>
@@ -87,13 +84,12 @@
     <style name="Cpp.Theme.Light" parent="@style/Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowBackground">@color/cpp_main_bg_light</item>
 
-        <item name="colorPrimary">@color/cpp_material_light</item>
-        <item name="colorPrimaryDark">@color/cpp_material_light</item>
-        <item name="colorAccent">@color/cpp_material_light</item>
+        <item name="colorPrimary">@color/teal_400</item>
+        <item name="colorPrimaryDark">@color/teal_400</item>
+        <item name="colorAccent">@color/teal_400</item>
 
         <item name="cpp_main_bg">@color/cpp_main_bg_light</item>
-        <item name="cpp_pane_bg">@drawable/pane_light</item>
-        <item name="cpp_fab_bg">@color/cpp_material_light</item>
+        <item name="cpp_fab_bg">@color/teal_400</item>
         <item name="cpp_text_color">@color/cpp_text_inverse</item>
         <item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
         <item name="cpp_card_style">@style/CardView.Light</item>
@@ -105,9 +101,9 @@
     <style name="Cpp.Theme.Light.Dialog" parent="@style/Theme.AppCompat.Light.DialogWhenLarge">
         <item name="android:windowBackground">@color/cpp_main_bg_light</item>
 
-        <item name="colorPrimary">@color/cpp_material_light</item>
-        <item name="colorPrimaryDark">@color/cpp_material_light</item>
-        <item name="colorAccent">@color/cpp_material_light</item>
+        <item name="colorPrimary">@color/teal_400</item>
+        <item name="colorPrimaryDark">@color/teal_400</item>
+        <item name="colorAccent">@color/teal_400</item>
 
         <item name="windowNoTitle">true</item>
         <item name="android:windowNoTitle">true</item>
@@ -115,8 +111,7 @@
         <item name="android:windowIsTranslucent">true</item>
 
         <item name="cpp_main_bg">@color/cpp_main_bg_light</item>
-        <item name="cpp_pane_bg">@drawable/pane_light</item>
-        <item name="cpp_fab_bg">@color/cpp_material_light</item>
+        <item name="cpp_fab_bg">@color/teal_400</item>
         <item name="cpp_text_color">@color/cpp_text_inverse</item>
         <item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
         <item name="cpp_toolbar_style">@style/CppToolbar.Light</item>
@@ -125,13 +120,12 @@
     </style>
 
     <style name="Cpp.Theme.Light.Dialog.Alert" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorPrimary">@color/cpp_material_light</item>
-        <item name="colorPrimaryDark">@color/cpp_material_light</item>
-        <item name="colorAccent">@color/cpp_material_light</item>
+        <item name="colorPrimary">@color/teal_400</item>
+        <item name="colorPrimaryDark">@color/teal_400</item>
+        <item name="colorAccent">@color/teal_400</item>
 
         <item name="cpp_main_bg">@color/cpp_main_bg_light</item>
-        <item name="cpp_pane_bg">@drawable/pane_light</item>
-        <item name="cpp_fab_bg">@color/cpp_material_light</item>
+        <item name="cpp_fab_bg">@color/teal_400</item>
         <item name="cpp_text_color">@color/cpp_text_inverse</item>
         <item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
         <item name="cpp_toolbar_style">@style/CppToolbar.Light</item>
diff --git a/app/src/main/res/values/theme_material_light.xml b/app/src/main/res/values/theme_material_light.xml
index 3eae45b3..f592d0e1 100644
--- a/app/src/main/res/values/theme_material_light.xml
+++ b/app/src/main/res/values/theme_material_light.xml
@@ -26,11 +26,19 @@
         <item name="android:background">@drawable/material_button_light</item>
     </style>
 
+    <style name="CppKeyboardButton.Material.Light.Digit.Highlighted" parent="CppKeyboardButton">
+        <item name="android:background">@drawable/material_button_light_darker</item>
+    </style>
+
     <style name="CppKeyboardButton.Material.Light.Operation" parent="CppKeyboardButton.Material.Digit">
         <item name="android:background">@drawable/material_button_light_primary</item>
         <item name="directionTextAlpha">0.7</item>
     </style>
 
+    <style name="CppKeyboardButton.Material.Light.Operation.Highlighted" parent="CppKeyboardButton.Material.Light.Operation">
+        <item name="android:background">@drawable/material_button_light_primary_darker</item>
+    </style>
+
     <style name="CppKeyboardButton.Material.Light.Control" parent="CppKeyboardButton.Material.Light.Digit" />
 
     <style name="CppHeaderButton.Material.Light" parent="CppKeyboardButton.Material.Light.Control">
@@ -60,21 +68,25 @@
     <style name="Cpp.Theme.Material.Light" parent="Cpp.Theme.Light">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
+        <item name="cpp_button_style_control_highlighted">@style/CppKeyboardButton.Material.Light.Digit.Highlighted</item>
         <item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation</item>
+        <item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Material.Light.Operation.Highlighted</item>
     </style>
 
     <style name="Cpp.Theme.Material.Light.Dialog" parent="Cpp.Theme.Light.Dialog">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
-        <item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation
-        </item>
+        <item name="cpp_button_style_control_highlighted">@style/CppKeyboardButton.Material.Light.Digit.Highlighted</item>
+        <item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation</item>
+        <item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Material.Light.Operation.Highlighted</item>
     </style>
 
     <style name="Cpp.Theme.Material.Light.Dialog.Alert" parent="Cpp.Theme.Light.Dialog.Alert">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
-        <item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation
-        </item>
+        <item name="cpp_button_style_control_highlighted">@style/CppKeyboardButton.Material.Light.Digit.Highlighted</item>
+        <item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation</item>
+        <item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Material.Light.Operation.Highlighted</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_metro_blue.xml b/app/src/main/res/values/theme_metro_blue.xml
index 92c1a488..ea090aa4 100644
--- a/app/src/main/res/values/theme_metro_blue.xml
+++ b/app/src/main/res/values/theme_metro_blue.xml
@@ -66,7 +66,9 @@
     <style name="Cpp.Theme.Metro.Blue" parent="Cpp.Theme">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Metro.Blue.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Metro.Blue.Control</item>
+        <item name="cpp_button_style_control_highlighted">@style/CppKeyboardButton.Metro.Blue.Control</item>
         <item name="cpp_button_style_operation">@style/CppKeyboardButton.Metro.Blue.Operation</item>
+        <item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Metro.Blue.Operation</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_metro_green.xml b/app/src/main/res/values/theme_metro_green.xml
index 54e15e57..d62211b5 100644
--- a/app/src/main/res/values/theme_metro_green.xml
+++ b/app/src/main/res/values/theme_metro_green.xml
@@ -22,12 +22,14 @@
 
 <resources>
 
-    <style name="metro_green_operation_button_style" parent="CppKeyboardButton.Metro.Blue.Digit">
+    <style name="CppKeyboardButton.Metro.Green.Operation" parent="CppKeyboardButton.Metro.Blue.Digit">
         <item name="android:background">@drawable/metro_button_green</item>
     </style>
 
     <style name="Cpp.Theme.Metro.Green" parent="Cpp.Theme.Metro.Blue">
-        <item name="cpp_button_style_operation">@style/metro_green_operation_button_style</item>
+        <item name="cpp_button_style_operation">@style/CppKeyboardButton.Metro.Green.Operation</item>
+        <item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Metro.Green.Operation</item>
+        <item name="cpp_fab_bg">@color/green_800</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_metro_purple.xml b/app/src/main/res/values/theme_metro_purple.xml
index ba4f3b7c..5e3693f0 100644
--- a/app/src/main/res/values/theme_metro_purple.xml
+++ b/app/src/main/res/values/theme_metro_purple.xml
@@ -22,12 +22,14 @@
 
 <resources>
 
-    <style name="metro_purple_operation_button_style" parent="CppKeyboardButton.Metro.Blue.Digit">
+    <style name="CppKeyboardButton.Metro.Purple.Digit" parent="CppKeyboardButton.Metro.Blue.Digit">
         <item name="android:background">@drawable/metro_button_purple</item>
     </style>
 
     <style name="Cpp.Theme.Metro.Purple" parent="Cpp.Theme.Metro.Blue">
-        <item name="cpp_button_style_operation">@style/metro_purple_operation_button_style</item>
+        <item name="cpp_button_style_operation">@style/CppKeyboardButton.Metro.Purple.Digit</item>
+        <item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Metro.Purple.Digit</item>
+        <item name="cpp_fab_bg">@color/pink_900</item>
     </style>
 
 </resources>
\ No newline at end of file