diff --git a/android-app/src/main/java/org/solovyev/android/calculator/plot/AbstractCalculatorPlotFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/plot/AbstractCalculatorPlotFragment.java
index 1fe3c14f..cce737de 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/plot/AbstractCalculatorPlotFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/plot/AbstractCalculatorPlotFragment.java
@@ -110,7 +110,7 @@ public abstract class AbstractCalculatorPlotFragment extends CalculatorFragment
 		super.onCreate(in);
 
 		if (isPaneFragment()) {
-			this.bgColor = getResources().getColor(R.color.cpp_pane_background);
+			this.bgColor = getResources().getColor(R.color.cpp_pane_bg);
 		} else {
 			this.bgColor = getResources().getColor(android.R.color.transparent);
 		}
diff --git a/android-app/src/main/res/drawable/material_blue_button.xml b/android-app/src/main/res/drawable/material_blue_button.xml
new file mode 100644
index 00000000..7ed947d8
--- /dev/null
+++ b/android-app/src/main/res/drawable/material_blue_button.xml
@@ -0,0 +1,35 @@
+<?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" a:drawable="@drawable/metro_button_pressed" />
+
+	<item>
+		<shape>
+			<solid a:color="@color/cpp_material_blue" />
+		</shape>
+	</item>
+
+</selector>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/material_button_dark.xml b/android-app/src/main/res/drawable/material_button_dark.xml
new file mode 100644
index 00000000..bb98c45d
--- /dev/null
+++ b/android-app/src/main/res/drawable/material_button_dark.xml
@@ -0,0 +1,35 @@
+<?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" a:drawable="@drawable/metro_button_pressed" />
+
+	<item>
+		<shape>
+			<solid a:color="@color/cpp_metro_button" />
+		</shape>
+	</item>
+
+</selector>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/material_button_light.xml b/android-app/src/main/res/drawable/material_button_light.xml
new file mode 100644
index 00000000..569abf86
--- /dev/null
+++ b/android-app/src/main/res/drawable/material_button_light.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:state_pressed="true" a:drawable="@drawable/metro_button_pressed" />
+
+	<item>
+		<shape>
+			<solid a:color="@color/cpp_metro_button_light" />
+		</shape>
+	</item>
+
+</selector>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/material_button_light_primary.xml b/android-app/src/main/res/drawable/material_button_light_primary.xml
new file mode 100644
index 00000000..ff384506
--- /dev/null
+++ b/android-app/src/main/res/drawable/material_button_light_primary.xml
@@ -0,0 +1,35 @@
+<?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" a:drawable="@drawable/metro_button_pressed" />
+
+	<item>
+		<shape>
+			<solid a:color="@color/cpp_material_light" />
+		</shape>
+	</item>
+
+</selector>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/pane_background.xml b/android-app/src/main/res/drawable/pane.xml
similarity index 95%
rename from android-app/src/main/res/drawable/pane_background.xml
rename to android-app/src/main/res/drawable/pane.xml
index 9926010f..1c594d5b 100644
--- a/android-app/src/main/res/drawable/pane_background.xml
+++ b/android-app/src/main/res/drawable/pane.xml
@@ -21,6 +21,6 @@
   -->
 
 <shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<solid a:color="@color/cpp_pane_background"/>
+	<solid a:color="@color/cpp_pane_bg"/>
 	<corners a:radius="@dimen/cpp_button_corner"/>
 </shape>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/pane_light.xml b/android-app/src/main/res/drawable/pane_light.xml
new file mode 100644
index 00000000..1276a008
--- /dev/null
+++ b/android-app/src/main/res/drawable/pane_light.xml
@@ -0,0 +1,26 @@
+<?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
+  -->
+
+<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
diff --git a/android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml b/android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
index 203ea75c..a2371790 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
@@ -23,6 +23,7 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
 	a:orientation="vertical"
@@ -56,7 +57,7 @@
 			a:layout_marginBottom="10dp"
 			a:background="?attr/cpp_main_bg">
 
-			<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:c="http://schemas.android.com/apk/res-auto"
+			<org.solovyev.android.calculator.drag.DirectionDragButton
 				a:id="@+id/wizard_mode_button"
 				a:text="7"
 				c:directionTextScale="0.5"
diff --git a/android-app/src/main/res/values/attributes.xml b/android-app/src/main/res/values/attributes.xml
index 3b4eb506..1a74c798 100644
--- a/android-app/src/main/res/values/attributes.xml
+++ b/android-app/src/main/res/values/attributes.xml
@@ -28,6 +28,7 @@
 	<attr name="cpp_button_style_control_image" format="reference"/>
 	<attr name="cpp_button_style_operation" 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_toolbar_theme" format="reference"/>
 
diff --git a/android-app/src/main/res/values/colors.xml b/android-app/src/main/res/values/colors.xml
index 4557a146..9df54cf1 100644
--- a/android-app/src/main/res/values/colors.xml
+++ b/android-app/src/main/res/values/colors.xml
@@ -33,14 +33,13 @@
 	<color name="cpp_button_text_ce">#ffffffff</color>
 	<color name="cpp_selected_angle_unit_text">#ffffff99</color>
 	<color name="cpp_main_bg">#101010</color>
-	<color name="cpp_main_light_bg">#fff6f1ef</color>
+	<color name="cpp_main_bg_light">#fff6f1ef</color>
 	<color name="cpp_wizard_primary">#FAFAFA</color>
 	<color name="cpp_wizard_secondary">#9E9E9E</color>
 	<color name="cpp_wizard_overscroll">#FAFAFA</color>
 	<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_pane_background">@color/cpp_material_grey</color>
 	<color name="cpp_metro_button_dark">#ff000000</color>
 	<color name="cpp_metro_button">@color/cpp_material_grey</color>
 	<color name="cpp_metro_button_light">@color/cpp_material_grey_light</color>
@@ -61,4 +60,8 @@
 	<color name="cpp_material_grey_light">#393939</color>
 	<color name="cpp_material_actionbar">@color/cpp_material_grey</color>
 	<color name="cpp_material_actionbar_light">@color/cpp_material_grey_light</color>
+
+	<color name="cpp_pane_bg">@color/cpp_material_grey</color>
+	<color name="cpp_pane_bg_light">#ffeae5e3</color>
+
 </resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/dimens.xml b/android-app/src/main/res/values/dimens.xml
index 2aac1c0b..08171cd9 100644
--- a/android-app/src/main/res/values/dimens.xml
+++ b/android-app/src/main/res/values/dimens.xml
@@ -22,7 +22,7 @@
 
 	<dimen name="cpp_display_text_size">25sp</dimen>
 	<dimen name="cpp_editor_text_size">25sp</dimen>
-	<dimen name="cpp_pane_margin">5dp</dimen>
+	<dimen name="cpp_pane_margin">3dp</dimen>
 	<dimen name="cpp_pane_padding">0dp</dimen>
 	<dimen name="cpp_li_text_size">16sp</dimen>
 	<dimen name="cpp_li_secondary_text_size">14sp</dimen>
diff --git a/android-app/src/main/res/values/styles.xml b/android-app/src/main/res/values/styles.xml
index c794fda1..c2fbd64f 100644
--- a/android-app/src/main/res/values/styles.xml
+++ b/android-app/src/main/res/values/styles.xml
@@ -22,20 +22,6 @@
 
 <resources>
 
-	<style name="cpp_window_title">
-		<item name="android:singleLine">true</item>
-		<item name="android:textAppearance">@style/cpp_text_appearance_window_title</item>
-		<item name="android:shadowColor">#BB000000</item>
-		<item name="android:shadowRadius">2.75</item>
-	</style>
-
-	<style name="cpp_text_appearance_window_title">
-		<item name="android:textColor">#fff</item>
-		<item name="android:textSize">14sp</item>
-		<item name="android:textStyle">bold</item>
-	</style>
-
-
 	<style name="cpp_default_text_size">
 		<item name="android:textSize">@dimen/cpp_text_size</item>
 	</style>
@@ -193,7 +179,7 @@
 	</style>
 
 	<style name="CppFragmentTitle">
-		<item name="android:textColor">@android:color/white</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
 		<item name="android:textSize">@dimen/cpp_fragment_title_text_size</item>
 		<item name="android:paddingLeft">@dimen/cpp_pane_margin</item>
 	</style>
@@ -201,8 +187,10 @@
 	<style name="CppPaneStyle">
 		<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>
 		<item name="android:padding">@dimen/cpp_pane_padding</item>
-		<item name="android:background">@drawable/pane_background</item>
+		<item name="android:background">?attr/cpp_pane_bg</item>
 	</style>
 
 	<style name="CppPaneStyle.Transparent" parent="CppPaneStyle">
@@ -276,7 +264,6 @@
 	<style name="CppListView">
 		<item name="android:id">@android:id/list</item>
 		<item name="android:dividerHeight">1px</item>
-		<item name="android:divider">@color/cpp_list_divider</item>
 		<item name="android:cacheColorHint">@android:color/transparent</item>
 		<item name="android:layout_height">match_parent</item>
 		<item name="android:layout_width">match_parent</item>
diff --git a/android-app/src/main/res/values/theme.xml b/android-app/src/main/res/values/theme.xml
index 04729a6a..99085e72 100644
--- a/android-app/src/main/res/values/theme.xml
+++ b/android-app/src/main/res/values/theme.xml
@@ -37,6 +37,7 @@
 		<item name="android:actionBarStyle">@style/CppActionBar</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/cpp_material_grey</item>
 		<item name="android:textColorPrimary">@color/cpp_text</item>
 		<item name="android:textColorPrimaryInverse">@color/cpp_text_error</item>
@@ -57,13 +58,14 @@
 		<item name="android:windowCloseOnTouchOutside">false</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/cpp_material_grey</item>
 		<item name="android:textColorPrimary">@color/cpp_text</item>
 		<item name="android:textColorPrimaryInverse">@color/cpp_text_error</item>
 	</style>
 
 	<style name="Cpp.Theme.Light" parent="@style/Theme.AppCompat.Light.DarkActionBar">
-		<item name="android:windowBackground">@color/cpp_main_light_bg</item>
+		<item name="android:windowBackground">@color/cpp_main_bg_light</item>
 
 		<item name="colorPrimary">@color/cpp_material_light</item>
 		<item name="android:colorPrimary">@color/cpp_material_light</item>
@@ -75,14 +77,15 @@
 		<item name="actionBarStyle">@style/CppActionBar.Light</item>
 		<item name="android:actionBarStyle">@style/CppActionBar.Light</item>
 
-		<item name="cpp_main_bg">@color/cpp_main_light_bg</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="android:textColorPrimary">@color/cpp_text_inverse</item>
 		<item name="android:textColorPrimaryInverse">@color/cpp_text_error_inverse</item>
 	</style>
 
 	<style name="Cpp.Theme.Light.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
-		<item name="android:windowBackground">@color/cpp_main_light_bg</item>
+		<item name="android:windowBackground">@color/cpp_main_bg_light</item>
 
 		<item name="colorPrimary">@color/cpp_material_light</item>
 		<item name="android:colorPrimary">@color/cpp_material_light</item>
@@ -97,7 +100,8 @@
 		<item name="android:windowActionBar">false</item>
 		<item name="android:windowCloseOnTouchOutside">false</item>
 
-		<item name="cpp_main_bg">@color/cpp_main_light_bg</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="android:textColorPrimary">@color/cpp_text_inverse</item>
 		<item name="android:textColorPrimaryInverse">@color/cpp_text_error_inverse</item>