From c46a276f3fdfc87aca8ee0f8cf94c4b581585f65 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Sat, 7 Feb 2015 18:06:03 +0100
Subject: [PATCH] Themes refactored

---
 android-app/src/main/AndroidManifest.xml      |  20 +-
 .../android/calculator/Preferences.java       |  14 +-
 .../main/res/layout-land/main_calculator.xml  |   2 +-
 .../layout-land/main_calculator_mobile.xml    |   2 +-
 .../res/layout-large-land/main_calculator.xml |  10 +-
 .../main/res/layout-large/cpp_app_display.xml |   6 +-
 .../main/res/layout-large/cpp_app_editor.xml  |   6 +-
 .../main/res/layout-large/main_calculator.xml |  10 +-
 .../layout-xlarge-land/main_calculator.xml    |  10 +-
 .../res/layout-xlarge/cpp_app_display.xml     |   6 +-
 .../main/res/layout-xlarge/cpp_app_editor.xml |   6 +-
 .../res/layout-xlarge/main_calculator.xml     |  10 +-
 .../src/main/res/layout/about_fragment.xml    |   6 +-
 .../src/main/res/layout/cpp_app_button_0.xml  |   2 +-
 .../src/main/res/layout/cpp_app_button_1.xml  |   2 +-
 .../src/main/res/layout/cpp_app_button_2.xml  |   2 +-
 .../src/main/res/layout/cpp_app_button_3.xml  |   2 +-
 .../src/main/res/layout/cpp_app_button_4.xml  |   2 +-
 .../src/main/res/layout/cpp_app_button_5.xml  |   2 +-
 .../src/main/res/layout/cpp_app_button_6.xml  |   2 +-
 .../src/main/res/layout/cpp_app_button_7.xml  |   2 +-
 .../src/main/res/layout/cpp_app_button_8.xml  |   2 +-
 .../src/main/res/layout/cpp_app_button_9.xml  |   2 +-
 .../main/res/layout/cpp_app_button_clear.xml  |   2 +-
 .../main/res/layout/cpp_app_button_copy.xml   |   2 +-
 .../res/layout/cpp_app_button_division.xml    |   2 +-
 .../main/res/layout/cpp_app_button_donate.xml |   2 +-
 .../main/res/layout/cpp_app_button_dot.xml    |   2 +-
 .../main/res/layout/cpp_app_button_empty.xml  |   2 +-
 .../main/res/layout/cpp_app_button_equals.xml |   2 +-
 .../main/res/layout/cpp_app_button_erase.xml  |   2 +-
 .../res/layout/cpp_app_button_functions.xml   |   2 +-
 .../res/layout/cpp_app_button_history.xml     |   2 +-
 .../main/res/layout/cpp_app_button_left.xml   |   2 +-
 .../main/res/layout/cpp_app_button_minus.xml  |   2 +-
 .../layout/cpp_app_button_multiplication.xml  |   2 +-
 .../res/layout/cpp_app_button_operators.xml   |   2 +-
 .../main/res/layout/cpp_app_button_paste.xml  |   2 +-
 .../main/res/layout/cpp_app_button_plus.xml   |   2 +-
 .../main/res/layout/cpp_app_button_right.xml  |   2 +-
 .../layout/cpp_app_button_round_brackets.xml  |   2 +-
 .../main/res/layout/cpp_app_button_vars.xml   |   2 +-
 .../src/main/res/layout/cpp_app_display.xml   |   2 +-
 .../res/layout/cpp_app_display_mobile.xml     |   2 +-
 .../src/main/res/layout/cpp_app_editor.xml    |   4 +-
 .../main/res/layout/cpp_app_editor_mobile.xml |   4 +-
 .../src/main/res/layout/cpp_dialog.xml        |   2 +-
 .../main/res/layout/cpp_dialog_fragment.xml   |   2 +-
 .../layout/cpp_fixable_messages_dialog.xml    |   2 +-
 .../src/main/res/layout/cpp_plot_fragment.xml |   4 +-
 .../cpp_plot_function_settings_dialog.xml     |   2 +-
 .../cpp_plot_function_settings_fragment.xml   |   2 +-
 .../layout/cpp_plot_functions_fragment.xml    |   4 +-
 .../res/layout/cpp_plot_range_fragment.xml    |   2 +-
 .../layout/cpp_purchase_dialog_fragment.xml   |   2 +-
 .../src/main/res/layout/cpp_wizard.xml        |   2 +-
 .../layout/cpp_wizard_step_drag_button.xml    |   2 +-
 android-app/src/main/res/layout/feedback.xml  |   2 +-
 .../src/main/res/layout/history_fragment.xml  |   8 +-
 .../src/main/res/layout/history_item.xml      |   2 +-
 .../src/main/res/layout/main_calculator.xml   |   2 +-
 .../res/layout/main_calculator_mobile.xml     |   2 +-
 .../src/main/res/layout/main_empty.xml        |   2 +-
 .../main/res/layout/main_empty_multi_pane.xml |   2 +-
 .../res/layout/math_entities_fragment.xml     |   8 +-
 .../src/main/res/layout/math_entity.xml       |   2 +-
 .../main/res/layout/matrix_edit_fragment.xml  |   4 +-
 .../src/main/res/layout/notespp_announce.xml  |   2 +-
 .../src/main/res/layout/onscreen_display.xml  |   2 +-
 .../src/main/res/layout/onscreen_editor.xml   |   2 +-
 .../res/layout/release_notes_fragment.xml     |   2 +-
 .../main/res/layout/saved_history_item.xml    |   2 +-
 .../src/main/res/layout/vars_fragment.xml     |   8 +-
 .../src/main/res/layout/widget_editor.xml     |   2 +-
 .../widget_layout_lockscreen_collapsed.xml    |   2 +-
 android-app/src/main/res/values-v21/theme.xml |   8 +-
 .../main/res/values-v21/theme_material.xml    |  33 ++--
 .../src/main/res/values/attributes.xml        |  15 +-
 android-app/src/main/res/values/styles.xml    | 113 +++++++++---
 android-app/src/main/res/values/theme.xml     |  27 ++-
 .../src/main/res/values/theme_gray.xml        | 173 ------------------
 .../src/main/res/values/theme_metro_blue.xml  |  22 +--
 .../src/main/res/values/theme_metro_green.xml |   2 +-
 .../main/res/values/theme_metro_purple.xml    |   2 +-
 ...heme_light_blue.xml => theme_old_blue.xml} |  18 +-
 .../src/main/res/values/theme_old_gray.xml    |  55 ++++++
 ...{theme_violet.xml => theme_old_violet.xml} |  18 +-
 87 files changed, 346 insertions(+), 400 deletions(-)
 delete mode 100644 android-app/src/main/res/values/theme_gray.xml
 rename android-app/src/main/res/values/{theme_light_blue.xml => theme_old_blue.xml} (60%)
 create mode 100644 android-app/src/main/res/values/theme_old_gray.xml
 rename android-app/src/main/res/values/{theme_violet.xml => theme_old_violet.xml} (60%)

diff --git a/android-app/src/main/AndroidManifest.xml b/android-app/src/main/AndroidManifest.xml
index a5dddd38..491b5f15 100644
--- a/android-app/src/main/AndroidManifest.xml
+++ b/android-app/src/main/AndroidManifest.xml
@@ -46,11 +46,11 @@
 		<activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:launchMode="singleTop" android:name=".CalculatorActivityMobile" android:windowSoftInputMode="adjustPan"/>
 
 		<!-- settings must use action bar icon-->
-		<activity android:icon="@drawable/ab_icon" android:label="@string/c_app_settings" android:name=".preferences.PreferencesActivity" android:theme="@style/Theme.Settings"/>
+		<activity android:icon="@drawable/ab_icon" android:label="@string/c_app_settings" android:name=".preferences.PreferencesActivity" android:theme="@style/Cpp.Theme.Settings"/>
 
 		<activity android:label="@string/c_history" android:name=".history.CalculatorHistoryActivity"/>
 
-		<activity android:excludeFromRecents="true" android:finishOnTaskLaunch="true" android:label="@string/calculation_messages_dialog_title" android:launchMode="singleTask" android:name=".FixableMessagesDialog" android:theme="@style/cpp_metro_blue_dialog_theme"/>
+		<activity android:excludeFromRecents="true" android:finishOnTaskLaunch="true" android:label="@string/calculation_messages_dialog_title" android:launchMode="singleTask" android:name=".FixableMessagesDialog" android:theme="@style/Cpp.Theme.Dialog.Material"/>
 
 		<activity android:label="@string/c_about" android:name=".about.CalculatorAboutActivity"/>
 
@@ -60,20 +60,20 @@
 
 		<activity android:label="@string/c_vars_and_constants" android:name=".math.edit.CalculatorVarsActivity"/>
 		<activity android:name=".CalculatorWikiActivity"/>
-		<activity android:launchMode="singleTop" android:name=".wizard.WizardActivity" android:theme="@style/Theme.Wizard">
+		<activity android:launchMode="singleTop" android:name=".wizard.WizardActivity" android:theme="@style/Cpp.Theme.Wizard">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 			</intent-filter>
 		</activity>
 
 		<activity android:hardwareAccelerated="false" android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/>
-		<activity android:label="@string/cpp_plot_functions" android:name=".plot.CalculatorPlotFunctionsActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/>
-		<activity android:label="@string/cpp_plot_function_settings" android:name=".plot.CalculatorPlotFunctionSettingsActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/>
-		<activity android:label="@string/cpp_plot_range" android:name=".plot.CalculatorPlotRangeActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/>
+		<activity android:label="@string/cpp_plot_functions" android:name=".plot.CalculatorPlotFunctionsActivity" android:theme="@style/Cpp.Theme.Dialog.Material"/>
+		<activity android:label="@string/cpp_plot_function_settings" android:name=".plot.CalculatorPlotFunctionSettingsActivity" android:theme="@style/Cpp.Theme.Dialog.Material"/>
+		<activity android:label="@string/cpp_plot_range" android:name=".plot.CalculatorPlotRangeActivity" android:theme="@style/Cpp.Theme.Dialog.Material"/>
 
-		<activity android:label="@string/cpp_purchase_title" android:name=".preferences.PurchaseDialogActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/>
+		<activity android:label="@string/cpp_purchase_title" android:name=".preferences.PurchaseDialogActivity" android:theme="@style/Cpp.Theme.Dialog.Material"/>
 
-		<activity android:name=".CalculatorDialogActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/>
+		<activity android:name=".CalculatorDialogActivity" android:theme="@style/Cpp.Theme.Dialog.Material"/>
 
 		<!-- todo serso: strings-->
 		<activity android:label="@string/c_plot_graph" android:name=".matrix.CalculatorMatrixActivity">
@@ -89,11 +89,11 @@
 		</activity>
 
 		<!-- settings must use action bar icon-->
-		<activity android:icon="@drawable/ab_icon" android:label="@string/c_settings" android:name=".plot.PlotPreferenceActivity" android:theme="@style/Theme.Settings"/>
+		<activity android:icon="@drawable/ab_icon" android:label="@string/c_settings" android:name=".plot.PlotPreferenceActivity" android:theme="@style/Cpp.Theme.Settings"/>
 
 		<!-- ONSCREEN CONFIG -->
 
-		<activity android:icon="@drawable/icon_onscreen" android:label="@string/c_app_name_on_screen" android:launchMode="singleInstance" android:name=".onscreen.CalculatorOnscreenStartActivity" android:theme="@style/cpp_metro_blue_dialog_theme">
+		<activity android:icon="@drawable/icon_onscreen" android:label="@string/c_app_name_on_screen" android:launchMode="singleInstance" android:name=".onscreen.CalculatorOnscreenStartActivity" android:theme="@style/Cpp.Theme.Dialog.Material">
 
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java b/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java
index 5eb1a880..ced401c6 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java
@@ -101,13 +101,13 @@ public final class Preferences {
 
 		public static enum Theme {
 
-			default_theme(R.style.cpp_gray_theme, R.style.Theme_Wizard),
-			violet_theme(R.style.cpp_violet_theme, R.style.Theme_Wizard),
-			light_blue_theme(R.style.cpp_light_blue_theme, R.style.Theme_Wizard),
-			metro_blue_theme(R.style.cpp_metro_blue_theme, R.style.Theme_Wizard),
-			metro_purple_theme(R.style.cpp_metro_purple_theme, R.style.Theme_Wizard),
-			metro_green_theme(R.style.cpp_metro_green_theme, R.style.Theme_Wizard),
-			material_theme(R.style.cpp_material_theme, R.style.Theme_Wizard),
+			default_theme(R.style.Cpp_Theme_Gray, R.style.Cpp_Theme_Wizard),
+			violet_theme(R.style.Cpp_Theme_Violet, R.style.Cpp_Theme_Wizard),
+			light_blue_theme(R.style.Cpp_Theme_Blue, R.style.Cpp_Theme_Wizard),
+			metro_blue_theme(R.style.cpp_metro_blue_theme, R.style.Cpp_Theme_Wizard),
+			metro_purple_theme(R.style.cpp_metro_purple_theme, R.style.Cpp_Theme_Wizard),
+			metro_green_theme(R.style.cpp_metro_green_theme, R.style.Cpp_Theme_Wizard),
+			material_theme(R.style.Cpp_Theme_Material, R.style.Cpp_Theme_Wizard),
 			;
 
 			private final int themeId;
diff --git a/android-app/src/main/res/layout-land/main_calculator.xml b/android-app/src/main/res/layout-land/main_calculator.xml
index 22e0e676..439d9af0 100644
--- a/android-app/src/main/res/layout-land/main_calculator.xml
+++ b/android-app/src/main/res/layout-land/main_calculator.xml
@@ -24,7 +24,7 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_layout"
 			  a:orientation="vertical"
-			  style="?cpp_main_layout_style">
+			  style="@style/CppMain">
 
 	<include layout="@layout/main_first_pane"/>
 
diff --git a/android-app/src/main/res/layout-land/main_calculator_mobile.xml b/android-app/src/main/res/layout-land/main_calculator_mobile.xml
index 010d17a0..0d0a9616 100644
--- a/android-app/src/main/res/layout-land/main_calculator_mobile.xml
+++ b/android-app/src/main/res/layout-land/main_calculator_mobile.xml
@@ -24,7 +24,7 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_layout"
 			  a:orientation="vertical"
-			  style="?cpp_main_layout_style">
+			  style="@style/CppMain">
 
 	<include layout="@layout/main_first_pane_mobile"/>
 
diff --git a/android-app/src/main/res/layout-large-land/main_calculator.xml b/android-app/src/main/res/layout-large-land/main_calculator.xml
index 6d1335c3..964055e8 100644
--- a/android-app/src/main/res/layout-large-land/main_calculator.xml
+++ b/android-app/src/main/res/layout-large-land/main_calculator.xml
@@ -24,7 +24,7 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_layout"
 			  a:orientation="vertical"
-			  style="?cpp_main_multi_pane_layout_style">
+			  style="@style/CppMain.Multipane">
 
 	<LinearLayout
 			a:layout_height="0dp"
@@ -44,14 +44,14 @@
 					a:id="@+id/editorContainer"
 					a:layout_height="0dp"
 					a:layout_width="match_parent"
-					style="?cpp_pane_style"
+					style="@style/CppPaneStyle"
 					a:layout_weight="1"/>
 
 			<FrameLayout
 					a:id="@+id/displayContainer"
 					a:layout_height="0dp"
 					a:layout_width="match_parent"
-					style="?cpp_pane_style"
+					style="@style/CppPaneStyle"
 					a:layout_weight="1"/>
 
 		</LinearLayout>
@@ -62,7 +62,7 @@
 				a:layout_width="0dp"
 				a:layout_weight="1"
 				a:orientation="vertical"
-				style="?cpp_pane_style"/>
+				style="@style/CppPaneStyle"/>
 
 	</LinearLayout>
 
@@ -71,6 +71,6 @@
 			a:layout_height="0dp"
 			a:layout_width="match_parent"
 			a:layout_weight="2"
-			style="?cpp_pane_style_transparent"/>
+			style="@style/CppPaneStyle.Transparent"/>
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout-large/cpp_app_display.xml b/android-app/src/main/res/layout-large/cpp_app_display.xml
index 58045b62..a092ad2d 100644
--- a/android-app/src/main/res/layout-large/cpp_app_display.xml
+++ b/android-app/src/main/res/layout-large/cpp_app_display.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent">
 
@@ -32,11 +32,11 @@
 			a:id="@+id/fragment_title"
 			a:layout_height="wrap_content"
 			a:layout_width="match_parent"
-			style="?cpp_fragment_title_style"/>
+			style="@style/CppFragmentTitle"/>
 
 	<org.solovyev.android.calculator.AndroidCalculatorDisplayView
 			a:id="@+id/calculator_display"
-			style="@style/cpp_display_style"
+			style="@style/CppText.Display"
 			a:inputType="textMultiLine"
 			a:maxLines="3"
 			a:scrollHorizontally="false"
diff --git a/android-app/src/main/res/layout-large/cpp_app_editor.xml b/android-app/src/main/res/layout-large/cpp_app_editor.xml
index 888e7b86..5d790225 100644
--- a/android-app/src/main/res/layout-large/cpp_app_editor.xml
+++ b/android-app/src/main/res/layout-large/cpp_app_editor.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent">
 
@@ -32,11 +32,11 @@
 			a:id="@+id/fragment_title"
 			a:layout_height="wrap_content"
 			a:layout_width="match_parent"
-			style="?cpp_fragment_title_style"/>
+			style="@style/CppFragmentTitle"/>
 
 	<org.solovyev.android.calculator.AndroidCalculatorEditorView
 			a:id="@+id/calculator_editor"
-			style="@style/cpp_editor_style"
+			style="@style/CppText.Editor"
 			a:textIsSelectable="true"
 			a:singleLine="false"
 			a:scrollbars="vertical"
diff --git a/android-app/src/main/res/layout-large/main_calculator.xml b/android-app/src/main/res/layout-large/main_calculator.xml
index cc22efdc..b8595925 100644
--- a/android-app/src/main/res/layout-large/main_calculator.xml
+++ b/android-app/src/main/res/layout-large/main_calculator.xml
@@ -24,7 +24,7 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_layout"
 			  a:orientation="vertical"
-			  style="?cpp_main_multi_pane_layout_style">
+			  style="@style/CppMain.Multipane">
 
 	<LinearLayout
 			a:layout_height="0dp"
@@ -44,14 +44,14 @@
 					a:id="@+id/editorContainer"
 					a:layout_height="0dp"
 					a:layout_width="match_parent"
-					style="?cpp_pane_style"
+					style="@style/CppPaneStyle"
 					a:layout_weight="3"/>
 
 			<FrameLayout
 					a:id="@+id/displayContainer"
 					a:layout_height="0dp"
 					a:layout_width="match_parent"
-					style="?cpp_pane_style"
+					style="@style/CppPaneStyle"
 					a:layout_weight="1"/>
 
 		</LinearLayout>
@@ -62,7 +62,7 @@
 				a:layout_width="0dp"
 				a:layout_weight="1"
 				a:orientation="vertical"
-				style="?cpp_pane_style"/>
+				style="@style/CppPaneStyle"/>
 
 	</LinearLayout>
 
@@ -71,6 +71,6 @@
 			a:layout_height="0dp"
 			a:layout_width="match_parent"
 			a:layout_weight="2"
-			style="?cpp_pane_style_transparent"/>
+			style="@style/CppPaneStyle.Transparent"/>
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout-xlarge-land/main_calculator.xml b/android-app/src/main/res/layout-xlarge-land/main_calculator.xml
index 5ee4e95b..253afd97 100644
--- a/android-app/src/main/res/layout-xlarge-land/main_calculator.xml
+++ b/android-app/src/main/res/layout-xlarge-land/main_calculator.xml
@@ -24,7 +24,7 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_layout"
 			  a:orientation="vertical"
-			  style="?cpp_main_multi_pane_layout_style">
+			  style="@style/CppMain.Multipane">
 
 	<LinearLayout
 			a:layout_height="0dp"
@@ -44,14 +44,14 @@
 					a:id="@+id/editorContainer"
 					a:layout_height="0dp"
 					a:layout_width="match_parent"
-					style="?cpp_pane_style"
+					style="@style/CppPaneStyle"
 					a:layout_weight="3"/>
 
 			<FrameLayout
 					a:id="@+id/displayContainer"
 					a:layout_height="0dp"
 					a:layout_width="match_parent"
-					style="?cpp_pane_style"
+					style="@style/CppPaneStyle"
 					a:layout_weight="1"/>
 
 		</LinearLayout>
@@ -62,7 +62,7 @@
 				a:layout_width="0dp"
 				a:layout_weight="1"
 				a:orientation="vertical"
-				style="?cpp_pane_style"/>
+				style="@style/CppPaneStyle"/>
 
 	</LinearLayout>
 
@@ -71,6 +71,6 @@
 			a:layout_height="0dp"
 			a:layout_width="match_parent"
 			a:layout_weight="1"
-			style="?cpp_pane_style_transparent"/>
+			style="@style/CppPaneStyle.Transparent"/>
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout-xlarge/cpp_app_display.xml b/android-app/src/main/res/layout-xlarge/cpp_app_display.xml
index 58045b62..a092ad2d 100644
--- a/android-app/src/main/res/layout-xlarge/cpp_app_display.xml
+++ b/android-app/src/main/res/layout-xlarge/cpp_app_display.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent">
 
@@ -32,11 +32,11 @@
 			a:id="@+id/fragment_title"
 			a:layout_height="wrap_content"
 			a:layout_width="match_parent"
-			style="?cpp_fragment_title_style"/>
+			style="@style/CppFragmentTitle"/>
 
 	<org.solovyev.android.calculator.AndroidCalculatorDisplayView
 			a:id="@+id/calculator_display"
-			style="@style/cpp_display_style"
+			style="@style/CppText.Display"
 			a:inputType="textMultiLine"
 			a:maxLines="3"
 			a:scrollHorizontally="false"
diff --git a/android-app/src/main/res/layout-xlarge/cpp_app_editor.xml b/android-app/src/main/res/layout-xlarge/cpp_app_editor.xml
index 888e7b86..5d790225 100644
--- a/android-app/src/main/res/layout-xlarge/cpp_app_editor.xml
+++ b/android-app/src/main/res/layout-xlarge/cpp_app_editor.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent">
 
@@ -32,11 +32,11 @@
 			a:id="@+id/fragment_title"
 			a:layout_height="wrap_content"
 			a:layout_width="match_parent"
-			style="?cpp_fragment_title_style"/>
+			style="@style/CppFragmentTitle"/>
 
 	<org.solovyev.android.calculator.AndroidCalculatorEditorView
 			a:id="@+id/calculator_editor"
-			style="@style/cpp_editor_style"
+			style="@style/CppText.Editor"
 			a:textIsSelectable="true"
 			a:singleLine="false"
 			a:scrollbars="vertical"
diff --git a/android-app/src/main/res/layout-xlarge/main_calculator.xml b/android-app/src/main/res/layout-xlarge/main_calculator.xml
index 566b8b0d..d97f0f38 100644
--- a/android-app/src/main/res/layout-xlarge/main_calculator.xml
+++ b/android-app/src/main/res/layout-xlarge/main_calculator.xml
@@ -24,7 +24,7 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_layout"
 			  a:orientation="vertical"
-			  style="?cpp_main_multi_pane_layout_style">
+			  style="@style/CppMain.Multipane">
 
 	<LinearLayout
 			a:layout_height="0dp"
@@ -44,14 +44,14 @@
 					a:id="@+id/editorContainer"
 					a:layout_height="0dp"
 					a:layout_width="match_parent"
-					style="?cpp_pane_style"
+					style="@style/CppPaneStyle"
 					a:layout_weight="4"/>
 
 			<FrameLayout
 					a:id="@+id/displayContainer"
 					a:layout_height="0dp"
 					a:layout_width="match_parent"
-					style="?cpp_pane_style"
+					style="@style/CppPaneStyle"
 					a:layout_weight="1"/>
 
 		</LinearLayout>
@@ -62,7 +62,7 @@
 				a:layout_width="0dp"
 				a:layout_weight="1"
 				a:orientation="vertical"
-				style="?cpp_pane_style"/>
+				style="@style/CppPaneStyle"/>
 
 	</LinearLayout>
 
@@ -71,6 +71,6 @@
 			a:layout_height="0dp"
 			a:layout_width="match_parent"
 			a:layout_weight="1"
-			style="?cpp_pane_style_transparent"/>
+			style="@style/CppPaneStyle.Transparent"/>
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/about_fragment.xml b/android-app/src/main/res/layout/about_fragment.xml
index ce76decb..450e8d89 100644
--- a/android-app/src/main/res/layout/about_fragment.xml
+++ b/android-app/src/main/res/layout/about_fragment.xml
@@ -51,7 +51,7 @@
 				a:text="@string/c_about_content"
 				a:layout_height="match_parent"
 				a:layout_width="match_parent"
-				style="@style/cpp_about_style" />
+				style="@style/CppText.About" />
 
 
 			<TextView
@@ -60,7 +60,7 @@
 				a:layout_height="wrap_content"
 				a:layout_width="match_parent"
 				a:paddingBottom="0dp"
-				style="@style/cpp_about_style" />
+				style="@style/CppText.About" />
 
 			<TextView
 				a:id="@+id/cpp_about_translators"
@@ -68,7 +68,7 @@
 				a:layout_height="wrap_content"
 				a:layout_width="match_parent"
 				a:paddingTop="0dp"
-				style="@style/cpp_about_style" />
+				style="@style/CppText.About" />
 
 		</LinearLayout>
 	</ScrollView>
diff --git a/android-app/src/main/res/layout/cpp_app_button_0.xml b/android-app/src/main/res/layout/cpp_app_button_0.xml
index b127c190..78169b15 100644
--- a/android-app/src/main/res/layout/cpp_app_button_0.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_0.xml
@@ -29,4 +29,4 @@
 													a:text="0"
 													c:textDown="000"
 													c:directionTextScale="0.5"
-													style="?cpp_digit_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_1.xml b/android-app/src/main/res/layout/cpp_app_button_1.xml
index b26f801e..64731c97 100644
--- a/android-app/src/main/res/layout/cpp_app_button_1.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_1.xml
@@ -29,4 +29,4 @@
 													c:textUp="sin"
 													c:textLeft="A"
 													c:textDown="asin"
-													style="?cpp_digit_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_2.xml b/android-app/src/main/res/layout/cpp_app_button_2.xml
index 5aaf4526..9404148d 100644
--- a/android-app/src/main/res/layout/cpp_app_button_2.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_2.xml
@@ -29,4 +29,4 @@
 													c:textUp="cos"
 													c:textLeft="B"
 													c:textDown="acos"
-													style="?cpp_digit_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_3.xml b/android-app/src/main/res/layout/cpp_app_button_3.xml
index 5ce477a1..b56b7bf4 100644
--- a/android-app/src/main/res/layout/cpp_app_button_3.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_3.xml
@@ -29,4 +29,4 @@
 													c:textUp="tan"
 													c:textLeft="C"
 													c:textDown="atan"
-													style="?cpp_digit_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_4.xml b/android-app/src/main/res/layout/cpp_app_button_4.xml
index ff52122e..7e222325 100644
--- a/android-app/src/main/res/layout/cpp_app_button_4.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_4.xml
@@ -28,4 +28,4 @@
 													c:textUp="x"
 													c:textLeft="D"
 													c:textDown="y"
-													style="?cpp_digit_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_5.xml b/android-app/src/main/res/layout/cpp_app_button_5.xml
index cead4e30..6696b00e 100644
--- a/android-app/src/main/res/layout/cpp_app_button_5.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_5.xml
@@ -28,4 +28,4 @@
 													c:textUp="t"
 													c:textLeft="E"
 													c:textDown="j"
-													style="?cpp_digit_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_6.xml b/android-app/src/main/res/layout/cpp_app_button_6.xml
index 595d1013..8edf82f9 100644
--- a/android-app/src/main/res/layout/cpp_app_button_6.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_6.xml
@@ -30,4 +30,4 @@
 													   c:textLeft="F"
 													   c:textDown="rad"
 													   c:directionTextScale="0.33;0.30;0.33;0.33"
-													   style="?cpp_digit_button_style"/>
\ No newline at end of file
+													   style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_7.xml b/android-app/src/main/res/layout/cpp_app_button_7.xml
index f9476f18..4654e753 100644
--- a/android-app/src/main/res/layout/cpp_app_button_7.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_7.xml
@@ -30,4 +30,4 @@
 													c:textLeft="0b:"
 													c:textDown="!"
 													c:directionTextScale="0.5;0.5;0.5;0.33"
-													style="?cpp_digit_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_8.xml b/android-app/src/main/res/layout/cpp_app_button_8.xml
index ecf5e237..2dea06ed 100644
--- a/android-app/src/main/res/layout/cpp_app_button_8.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_8.xml
@@ -30,4 +30,4 @@
 													c:textLeft="0d:"
 													c:textDown="lg"
 													c:directionTextScale="0.5;0.5;0.5;0.33"
-													style="?cpp_digit_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_9.xml b/android-app/src/main/res/layout/cpp_app_button_9.xml
index e74543e8..00c1aec5 100644
--- a/android-app/src/main/res/layout/cpp_app_button_9.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_9.xml
@@ -30,4 +30,4 @@
 													c:textLeft="0x:"
 													c:textUp="π"
 													c:directionTextScale="0.5;0.5;0.5;0.33"
-													style="?cpp_digit_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_clear.xml b/android-app/src/main/res/layout/cpp_app_button_clear.xml
index 7f4814f7..406853fa 100644
--- a/android-app/src/main/res/layout/cpp_app_button_clear.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_clear.xml
@@ -30,4 +30,4 @@
 														 c:textDown="bin"
 														 c:textLeft="hex"
 														 a:textStyle="bold"
-														 style="?cpp_control_image_button_style"/>
\ No newline at end of file
+														 style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_copy.xml b/android-app/src/main/res/layout/cpp_app_button_copy.xml
index 4e6d97f3..4001d448 100644
--- a/android-app/src/main/res/layout/cpp_app_button_copy.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_copy.xml
@@ -25,4 +25,4 @@
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 a:id="@id/cpp_button_copy"
 			 a:src="@drawable/kb_copy"
-			 style="?cpp_control_image_button_style"/>
\ No newline at end of file
+			 style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_division.xml b/android-app/src/main/res/layout/cpp_app_button_division.xml
index 07fe6c25..81e7deba 100644
--- a/android-app/src/main/res/layout/cpp_app_button_division.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_division.xml
@@ -29,4 +29,4 @@
 													a:text="/"
 													c:textDown="√"
 													c:directionTextScale="0.5"
-													style="?cpp_operation_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_operation"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_donate.xml b/android-app/src/main/res/layout/cpp_app_button_donate.xml
index 4b3bf267..b2f8c90d 100644
--- a/android-app/src/main/res/layout/cpp_app_button_donate.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_donate.xml
@@ -25,4 +25,4 @@
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 a:id="@id/cpp_button_like"
 			 a:src="@drawable/kb_share"
-			 style="?cpp_control_image_button_style"/>
\ No newline at end of file
+			 style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_dot.xml b/android-app/src/main/res/layout/cpp_app_button_dot.xml
index da2b9201..1db91357 100644
--- a/android-app/src/main/res/layout/cpp_app_button_dot.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_dot.xml
@@ -28,4 +28,4 @@
 													a:text="."
 													c:textUp=","
 													c:directionTextScale="0.5"
-													style="?cpp_digit_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_empty.xml b/android-app/src/main/res/layout/cpp_app_button_empty.xml
index 0aab0311..d37328e8 100644
--- a/android-app/src/main/res/layout/cpp_app_button_empty.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_empty.xml
@@ -21,4 +21,4 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<org.solovyev.android.calculator.drag.DirectionDragButton style="?cpp_control_button_style"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton style="?attr/cpp_button_style_control"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_equals.xml b/android-app/src/main/res/layout/cpp_app_button_equals.xml
index 03de2907..615c3d9e 100644
--- a/android-app/src/main/res/layout/cpp_app_button_equals.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_equals.xml
@@ -28,4 +28,4 @@
 													a:text="="
 													c:textDown="@string/cpp_plot_button_text"
 													c:directionTextScale="0.5;0.5;0.33;0.5"
-													style="?cpp_control_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_control"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_erase.xml b/android-app/src/main/res/layout/cpp_app_button_erase.xml
index 66275c07..351938ec 100644
--- a/android-app/src/main/res/layout/cpp_app_button_erase.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_erase.xml
@@ -25,4 +25,4 @@
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 a:id="@id/cpp_button_erase"
 			 a:src="@drawable/kb_erase"
-			 style="?cpp_control_image_button_style"/>
\ No newline at end of file
+			 style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_functions.xml b/android-app/src/main/res/layout/cpp_app_button_functions.xml
index a91df2a0..c2cf5977 100644
--- a/android-app/src/main/res/layout/cpp_app_button_functions.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_functions.xml
@@ -29,4 +29,4 @@
 													c:textUp="+ƒ"
 													a:text="ƒ(x)"
 													a:textStyle="italic"
-													style="?cpp_control_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_control"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_history.xml b/android-app/src/main/res/layout/cpp_app_button_history.xml
index 8db1a982..795b853f 100644
--- a/android-app/src/main/res/layout/cpp_app_button_history.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_history.xml
@@ -28,5 +28,5 @@
 													c:textUp="@string/c_undo"
 													c:textDown="@string/c_redo"
 													c:directionTextScale="0.27"
-													style="?cpp_control_button_style"
+													style="?attr/cpp_button_style_control"
 													a:textStyle="bold"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_left.xml b/android-app/src/main/res/layout/cpp_app_button_left.xml
index 8b50fdf1..366ed24b 100644
--- a/android-app/src/main/res/layout/cpp_app_button_left.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_left.xml
@@ -28,4 +28,4 @@
 													c:textUp="◁◁"
 													a:text="◁"
 													c:directionTextScale="0.5"
-													style="?cpp_control_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_control"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_minus.xml b/android-app/src/main/res/layout/cpp_app_button_minus.xml
index 1a788f36..a002ace1 100644
--- a/android-app/src/main/res/layout/cpp_app_button_minus.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_minus.xml
@@ -27,4 +27,4 @@
 													c:textDown="∂,…"
 													a:text="-"
 													c:directionTextScale="0.4"
-													style="?cpp_operation_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_operation"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_multiplication.xml b/android-app/src/main/res/layout/cpp_app_button_multiplication.xml
index e1ad1f11..5b796e09 100644
--- a/android-app/src/main/res/layout/cpp_app_button_multiplication.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_multiplication.xml
@@ -29,5 +29,5 @@
 													c:textUp="^"
 													c:textDown="^2"
 													c:textLeft="Π"
-													style="?cpp_operation_button_style"
+													style="?attr/cpp_button_style_operation"
 													c:directionTextScale="0.5"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_operators.xml b/android-app/src/main/res/layout/cpp_app_button_operators.xml
index 73d260e3..ddfb85aa 100644
--- a/android-app/src/main/res/layout/cpp_app_button_operators.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_operators.xml
@@ -25,4 +25,4 @@
 <org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													a:id="@id/cpp_button_operators"
 													a:text="∂,…"
-													style="?cpp_control_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_control"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_paste.xml b/android-app/src/main/res/layout/cpp_app_button_paste.xml
index c184b789..46eada43 100644
--- a/android-app/src/main/res/layout/cpp_app_button_paste.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_paste.xml
@@ -25,4 +25,4 @@
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 a:id="@id/cpp_button_paste"
 			 a:src="@drawable/kb_paste"
-			 style="?cpp_control_image_button_style"/>
\ No newline at end of file
+			 style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_plus.xml b/android-app/src/main/res/layout/cpp_app_button_plus.xml
index 221e9c29..8e325228 100644
--- a/android-app/src/main/res/layout/cpp_app_button_plus.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_plus.xml
@@ -28,4 +28,4 @@
 													c:textUp="°"
 													c:textDown="E"
 													a:text="+"
-													style="?cpp_operation_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_operation"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_right.xml b/android-app/src/main/res/layout/cpp_app_button_right.xml
index 8d4524d4..e8a44f7e 100644
--- a/android-app/src/main/res/layout/cpp_app_button_right.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_right.xml
@@ -28,4 +28,4 @@
 													c:textUp="▷▷"
 													a:text="▷"
 													c:directionTextScale="0.5"
-													style="?cpp_control_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_control"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_round_brackets.xml b/android-app/src/main/res/layout/cpp_app_button_round_brackets.xml
index 919e47cc..eddb52dd 100644
--- a/android-app/src/main/res/layout/cpp_app_button_round_brackets.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_round_brackets.xml
@@ -30,4 +30,4 @@
 													c:textDown=")"
 													c:textLeft="(…)"
 													c:directionTextScale="0.5;0.5;0.5;0.33"
-													style="?cpp_digit_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_vars.xml b/android-app/src/main/res/layout/cpp_app_button_vars.xml
index e8ec4c3a..f57b82b9 100644
--- a/android-app/src/main/res/layout/cpp_app_button_vars.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_vars.xml
@@ -29,4 +29,4 @@
 													c:textUp="+π"
 													a:text="π,…"
 													a:textStyle="italic"
-													style="?cpp_control_button_style"/>
\ No newline at end of file
+													style="?attr/cpp_button_style_control"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_display.xml b/android-app/src/main/res/layout/cpp_app_display.xml
index 462bb091..ebbd962e 100644
--- a/android-app/src/main/res/layout/cpp_app_display.xml
+++ b/android-app/src/main/res/layout/cpp_app_display.xml
@@ -24,7 +24,7 @@
 
 <org.solovyev.android.calculator.AndroidCalculatorDisplayView xmlns:a="http://schemas.android.com/apk/res/android"
 															  a:id="@+id/calculator_display"
-															  style="@style/cpp_display_style"
+															  style="@style/CppText.Display"
 															  a:padding="@dimen/cpp_display_padding"
 															  a:inputType="textMultiLine"
 															  a:maxLines="3"
diff --git a/android-app/src/main/res/layout/cpp_app_display_mobile.xml b/android-app/src/main/res/layout/cpp_app_display_mobile.xml
index 462bb091..ebbd962e 100644
--- a/android-app/src/main/res/layout/cpp_app_display_mobile.xml
+++ b/android-app/src/main/res/layout/cpp_app_display_mobile.xml
@@ -24,7 +24,7 @@
 
 <org.solovyev.android.calculator.AndroidCalculatorDisplayView xmlns:a="http://schemas.android.com/apk/res/android"
 															  a:id="@+id/calculator_display"
-															  style="@style/cpp_display_style"
+															  style="@style/CppText.Display"
 															  a:padding="@dimen/cpp_display_padding"
 															  a:inputType="textMultiLine"
 															  a:maxLines="3"
diff --git a/android-app/src/main/res/layout/cpp_app_editor.xml b/android-app/src/main/res/layout/cpp_app_editor.xml
index 26415b84..23ac6fd9 100644
--- a/android-app/src/main/res/layout/cpp_app_editor.xml
+++ b/android-app/src/main/res/layout/cpp_app_editor.xml
@@ -24,14 +24,14 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent"
 			  a:padding="@dimen/cpp_editor_padding">
 
 	<org.solovyev.android.calculator.AndroidCalculatorEditorView
 			a:id="@+id/calculator_editor"
-			style="@style/cpp_editor_style"
+			style="@style/CppText.Editor"
 			a:textIsSelectable="true"
 			a:singleLine="false"
 			a:scrollbars="vertical"
diff --git a/android-app/src/main/res/layout/cpp_app_editor_mobile.xml b/android-app/src/main/res/layout/cpp_app_editor_mobile.xml
index cdaaa15c..b6d18512 100644
--- a/android-app/src/main/res/layout/cpp_app_editor_mobile.xml
+++ b/android-app/src/main/res/layout/cpp_app_editor_mobile.xml
@@ -24,14 +24,14 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent"
 			  a:padding="@dimen/cpp_editor_padding">
 
 	<org.solovyev.android.calculator.AndroidCalculatorEditorView
 			a:id="@+id/calculator_editor"
-			style="@style/cpp_editor_mobile_style"
+			style="@style/CppText.Editor.Mobile"
 			a:textIsSelectable="true"
 			a:singleLine="false"
 			a:scrollbars="vertical"
diff --git a/android-app/src/main/res/layout/cpp_dialog.xml b/android-app/src/main/res/layout/cpp_dialog.xml
index c77c2a56..1b1e65c9 100644
--- a/android-app/src/main/res/layout/cpp_dialog.xml
+++ b/android-app/src/main/res/layout/cpp_dialog.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/dialog_layout"
-			  style="@style/cpp_dialog"
+			  style="@style/CppDialog"
 			  a:orientation="vertical">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_dialog_fragment.xml b/android-app/src/main/res/layout/cpp_dialog_fragment.xml
index d1a9dd61..fbd5bfa6 100644
--- a/android-app/src/main/res/layout/cpp_dialog_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_dialog_fragment.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_gravity="center_horizontal"
 			  a:layout_height="match_parent"
diff --git a/android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml b/android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml
index 36365207..3b81a023 100644
--- a/android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml
+++ b/android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml
@@ -23,7 +23,7 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  style="@style/cpp_dialog">
+			  style="@style/CppDialog">
 
 	<LinearLayout
 			a:id="@+id/cpp_fixable_messages_container"
diff --git a/android-app/src/main/res/layout/cpp_plot_fragment.xml b/android-app/src/main/res/layout/cpp_plot_fragment.xml
index c91ab093..e18f368f 100644
--- a/android-app/src/main/res/layout/cpp_plot_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_fragment.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent">
 
@@ -32,7 +32,7 @@
 			a:id="@+id/fragment_title"
 			a:layout_height="wrap_content"
 			a:layout_width="match_parent"
-			style="?cpp_fragment_title_style"/>
+			style="@style/CppFragmentTitle"/>
 
 	<include layout="@layout/ad"/>
 
diff --git a/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml b/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
index 9063d3a1..82a3e35b 100644
--- a/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
+++ b/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
@@ -24,6 +24,6 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/dialog_layout"
-			  style="@style/cpp_dialog">
+			  style="@style/CppDialog">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml b/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml
index 998af24a..15371764 100644
--- a/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="wrap_content"
 			  a:layout_gravity="center_horizontal"
 			  a:layout_height="match_parent"
diff --git a/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml b/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml
index 470689ce..c95b4381 100644
--- a/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent">
 
@@ -60,6 +60,6 @@
 
 	</LinearLayout>
 
-	<ListView style="@style/ListView"/>
+	<ListView style="@style/CppListView"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_plot_range_fragment.xml b/android-app/src/main/res/layout/cpp_plot_range_fragment.xml
index dc0e5343..a9dabd0b 100644
--- a/android-app/src/main/res/layout/cpp_plot_range_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_range_fragment.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_gravity="center_horizontal"
 			  a:layout_height="match_parent"
diff --git a/android-app/src/main/res/layout/cpp_purchase_dialog_fragment.xml b/android-app/src/main/res/layout/cpp_purchase_dialog_fragment.xml
index e910cd7e..8a1ed044 100644
--- a/android-app/src/main/res/layout/cpp_purchase_dialog_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_purchase_dialog_fragment.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_gravity="center_horizontal"
 			  a:layout_height="match_parent"
diff --git a/android-app/src/main/res/layout/cpp_wizard.xml b/android-app/src/main/res/layout/cpp_wizard.xml
index 6bf89d8b..50f37d0f 100644
--- a/android-app/src/main/res/layout/cpp_wizard.xml
+++ b/android-app/src/main/res/layout/cpp_wizard.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@+id/wizard_layout"
-	style="@style/cpp_dialog"
+	style="@style/CppDialog"
 	a:orientation="vertical">
 
 	<FrameLayout
diff --git a/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml b/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
index 96d61428..4f3e806d 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
@@ -56,6 +56,6 @@
 		c:textDown="^2"
 		c:textUp="%"
 		c:directionTextScale="0.5;0.5;0.5;0.33"
-		style="?cpp_control_button_style" />
+		style="?attr/cpp_button_style_control" />
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/feedback.xml b/android-app/src/main/res/layout/feedback.xml
index 36dd965a..a41a3c61 100644
--- a/android-app/src/main/res/layout/feedback.xml
+++ b/android-app/src/main/res/layout/feedback.xml
@@ -28,7 +28,7 @@
 
 	<TextView
 			a:id="@+id/feedbackText"
-			style="@style/cpp_about_style"
+			style="@style/CppText.About"
 			a:layout_width="fill_parent"
 			a:text="@string/c_feedback_text"
 			a:layout_height="fill_parent"/>
diff --git a/android-app/src/main/res/layout/history_fragment.xml b/android-app/src/main/res/layout/history_fragment.xml
index 8bac8d7d..97608aa7 100644
--- a/android-app/src/main/res/layout/history_fragment.xml
+++ b/android-app/src/main/res/layout/history_fragment.xml
@@ -24,14 +24,14 @@
 
 <LinearLayout
 	a:id="@+id/main_fragment_layout"
-	style="?cpp_fragment_layout_style"
+	style="@style/CppFragment"
 	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent">
 
 	<TextView
 		a:id="@+id/fragment_title"
-		style="?cpp_fragment_title_style"
+		style="@style/CppFragmentTitle"
 		a:layout_width="match_parent"
 		a:layout_height="wrap_content" />
 
@@ -41,11 +41,11 @@
 		a:layout_width="match_parent"
 		a:layout_height="match_parent">
 
-		<ListView style="@style/ListView" />
+		<ListView style="@style/CppListView" />
 
 		<com.melnykov.fab.FloatingActionButton
 			a:id="@+id/fab"
-			style="@style/Fab"
+			style="@style/CppFab"
 			a:src="@drawable/ic_delete_white_36dp" />
 	</FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/history_item.xml b/android-app/src/main/res/layout/history_item.xml
index f7cd030f..f30d5cac 100644
--- a/android-app/src/main/res/layout/history_item.xml
+++ b/android-app/src/main/res/layout/history_item.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:orientation="horizontal"
-			  style="@style/ListViewItem">
+			  style="@style/CppListViewItem">
 
 
 	<LinearLayout
diff --git a/android-app/src/main/res/layout/main_calculator.xml b/android-app/src/main/res/layout/main_calculator.xml
index 0fa7940e..58c14652 100644
--- a/android-app/src/main/res/layout/main_calculator.xml
+++ b/android-app/src/main/res/layout/main_calculator.xml
@@ -23,7 +23,7 @@
   -->
 
 <LinearLayout a:id="@+id/main_layout"
-	style="?cpp_main_layout_style"
+	style="@style/CppMain"
 	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
diff --git a/android-app/src/main/res/layout/main_calculator_mobile.xml b/android-app/src/main/res/layout/main_calculator_mobile.xml
index 07848fa6..dc7fd21c 100644
--- a/android-app/src/main/res/layout/main_calculator_mobile.xml
+++ b/android-app/src/main/res/layout/main_calculator_mobile.xml
@@ -27,7 +27,7 @@
 			  a:layout_height="match_parent"
 			  a:id="@+id/main_layout"
 			  a:orientation="vertical"
-			  style="?cpp_main_layout_style">
+			  style="@style/CppMain">
 
 	<LinearLayout
 			a:id="@+id/editorContainer"
diff --git a/android-app/src/main/res/layout/main_empty.xml b/android-app/src/main/res/layout/main_empty.xml
index f7c124c0..a2e1bb21 100644
--- a/android-app/src/main/res/layout/main_empty.xml
+++ b/android-app/src/main/res/layout/main_empty.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_layout"
-			  style="?cpp_main_layout_style"
+			  style="@style/CppMain"
 			  a:orientation="vertical">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/main_empty_multi_pane.xml b/android-app/src/main/res/layout/main_empty_multi_pane.xml
index 20359ebc..0b22da69 100644
--- a/android-app/src/main/res/layout/main_empty_multi_pane.xml
+++ b/android-app/src/main/res/layout/main_empty_multi_pane.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_layout"
-			  style="?cpp_main_multi_pane_layout_style"
+			  style="@style/CppMain.Multipane"
 			  a:orientation="vertical">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/math_entities_fragment.xml b/android-app/src/main/res/layout/math_entities_fragment.xml
index e7a0c60e..175371a8 100644
--- a/android-app/src/main/res/layout/math_entities_fragment.xml
+++ b/android-app/src/main/res/layout/math_entities_fragment.xml
@@ -24,14 +24,14 @@
 
 <LinearLayout
 	a:id="@+id/main_fragment_layout"
-	style="?cpp_fragment_layout_style"
+	style="@style/CppFragment"
 	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent">
 
 	<TextView
 		a:id="@+id/fragment_title"
-		style="?cpp_fragment_title_style"
+		style="@style/CppFragmentTitle"
 		a:layout_width="match_parent"
 		a:layout_height="wrap_content" />
 
@@ -41,11 +41,11 @@
 		a:layout_width="match_parent"
 		a:layout_height="match_parent">
 
-		<ListView style="@style/ListView" />
+		<ListView style="@style/CppListView" />
 
 		<com.melnykov.fab.FloatingActionButton
 			a:id="@+id/fab"
-			style="@style/Fab"
+			style="@style/CppFab"
 			a:src="@drawable/ic_add_white_36dp"
 			a:visibility="gone" />
 	</FrameLayout>
diff --git a/android-app/src/main/res/layout/math_entity.xml b/android-app/src/main/res/layout/math_entity.xml
index f5398f84..b2510c9c 100644
--- a/android-app/src/main/res/layout/math_entity.xml
+++ b/android-app/src/main/res/layout/math_entity.xml
@@ -25,7 +25,7 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:layout_height="wrap_content"
 			  a:layout_width="match_parent"
-			  style="@style/ListViewItem"
+			  style="@style/CppListViewItem"
 			  a:orientation="horizontal">
 
 	<LinearLayout
diff --git a/android-app/src/main/res/layout/matrix_edit_fragment.xml b/android-app/src/main/res/layout/matrix_edit_fragment.xml
index c5ad2114..ed08cf5d 100644
--- a/android-app/src/main/res/layout/matrix_edit_fragment.xml
+++ b/android-app/src/main/res/layout/matrix_edit_fragment.xml
@@ -26,7 +26,7 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  xmlns:picker="http://schemas.android.com/apk/res-auto"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent">
 
@@ -34,7 +34,7 @@
 			a:id="@+id/fragmentTitle"
 			a:layout_height="wrap_content"
 			a:layout_width="match_parent"
-			style="?cpp_fragment_title_style"/>
+			style="@style/CppFragmentTitle"/>
 
 	<include layout="@layout/ad"/>
 
diff --git a/android-app/src/main/res/layout/notespp_announce.xml b/android-app/src/main/res/layout/notespp_announce.xml
index 0175318e..962005fc 100644
--- a/android-app/src/main/res/layout/notespp_announce.xml
+++ b/android-app/src/main/res/layout/notespp_announce.xml
@@ -28,7 +28,7 @@
 
 	<TextView
 			a:id="@+id/notespp_announce"
-			style="@style/cpp_about_style"
+			style="@style/CppText.About"
 			a:layout_width="fill_parent"
 			a:text="@string/c_notespp_announce_text"
 			a:layout_height="fill_parent"/>
diff --git a/android-app/src/main/res/layout/onscreen_display.xml b/android-app/src/main/res/layout/onscreen_display.xml
index 72d8c2ee..d4e21f08 100644
--- a/android-app/src/main/res/layout/onscreen_display.xml
+++ b/android-app/src/main/res/layout/onscreen_display.xml
@@ -8,7 +8,7 @@
 
 <org.solovyev.android.calculator.AndroidCalculatorDisplayView xmlns:a="http://schemas.android.com/apk/res/android"
 															  a:id="@+id/calculator_display"
-															  style="@style/cpp_onscreen_display_style"
+															  style="@style/CppText.Display.Onscreen"
 															  a:padding="@dimen/cpp_display_padding"
 															  a:inputType="textMultiLine"
 															  a:maxLines="3"
diff --git a/android-app/src/main/res/layout/onscreen_editor.xml b/android-app/src/main/res/layout/onscreen_editor.xml
index bfc2db19..742b8dd2 100644
--- a/android-app/src/main/res/layout/onscreen_editor.xml
+++ b/android-app/src/main/res/layout/onscreen_editor.xml
@@ -8,7 +8,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent"
 			  a:padding="@dimen/cpp_editor_padding">
diff --git a/android-app/src/main/res/layout/release_notes_fragment.xml b/android-app/src/main/res/layout/release_notes_fragment.xml
index 475cd290..0c66e137 100644
--- a/android-app/src/main/res/layout/release_notes_fragment.xml
+++ b/android-app/src/main/res/layout/release_notes_fragment.xml
@@ -35,7 +35,7 @@
 			a:layout_weight="1"
 			a:gravity="top|left"
 			a:scrollbars="vertical"
-			style="@style/cpp_about_style"/>
+			style="@style/CppText.About"/>
 
 	<!--
 			a:scrollbarFadeDuration="0" is not support in  android_1.6_compatibility
diff --git a/android-app/src/main/res/layout/saved_history_item.xml b/android-app/src/main/res/layout/saved_history_item.xml
index 237e5fa3..8bf3cacc 100644
--- a/android-app/src/main/res/layout/saved_history_item.xml
+++ b/android-app/src/main/res/layout/saved_history_item.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:orientation="vertical"
-	style="@style/ListViewItem">
+	style="@style/CppListViewItem">
 
 	<TextView
 		a:id="@+id/history_item"
diff --git a/android-app/src/main/res/layout/vars_fragment.xml b/android-app/src/main/res/layout/vars_fragment.xml
index 02e8145f..617d5652 100644
--- a/android-app/src/main/res/layout/vars_fragment.xml
+++ b/android-app/src/main/res/layout/vars_fragment.xml
@@ -24,14 +24,14 @@
 
 <LinearLayout
 	a:id="@+id/main_fragment_layout"
-	style="?cpp_fragment_layout_style"
+	style="@style/CppFragment"
 	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent">
 
 	<TextView
 		a:id="@+id/fragment_title"
-		style="?cpp_fragment_title_style"
+		style="@style/CppFragmentTitle"
 		a:layout_width="match_parent"
 		a:layout_height="wrap_content" />
 
@@ -41,11 +41,11 @@
 		a:layout_width="match_parent"
 		a:layout_height="match_parent">
 
-		<ListView style="@style/ListView" />
+		<ListView style="@style/CppListView" />
 
 		<com.melnykov.fab.FloatingActionButton
 			a:id="@+id/fab"
-			style="@style/Fab"
+			style="@style/CppFab"
 			a:src="@drawable/ic_add_white_36dp" />
 	</FrameLayout>
 
diff --git a/android-app/src/main/res/layout/widget_editor.xml b/android-app/src/main/res/layout/widget_editor.xml
index 13e24d33..70813b00 100644
--- a/android-app/src/main/res/layout/widget_editor.xml
+++ b/android-app/src/main/res/layout/widget_editor.xml
@@ -8,7 +8,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:id="@+id/main_fragment_layout"
-			  style="@style/cpp_default_fragment_layout_style"
+			  style="@style/CppFragment"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent"
 			  a:padding="@dimen/cpp_editor_padding">
diff --git a/android-app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml b/android-app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
index 49f64d9f..bb421d1d 100644
--- a/android-app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
+++ b/android-app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
@@ -8,7 +8,7 @@
 
 	<LinearLayout
 		a:id="@+id/main_fragment_layout"
-		style="@style/cpp_default_fragment_layout_style"
+		style="@style/CppFragment"
 		a:orientation="horizontal"
 		a:layout_width="match_parent"
 		a:layout_height="0dp"
diff --git a/android-app/src/main/res/values-v21/theme.xml b/android-app/src/main/res/values-v21/theme.xml
index add792a3..d24e933a 100644
--- a/android-app/src/main/res/values-v21/theme.xml
+++ b/android-app/src/main/res/values-v21/theme.xml
@@ -22,17 +22,17 @@
 
 <resources>
 
-	<style name="Theme" parent="Theme.Base">
+	<style name="Cpp.Theme" parent="Cpp.Theme.Base">
 		<item name="android:colorPrimary">@color/cpp_metro_button</item>
 		<item name="android:colorPrimaryDark">@color/cpp_metro_button_dark</item>
 	</style>
 
-	<style name="Theme.Dialog" parent="Theme.Base.Dialog">
+	<style name="Cpp.Theme.Dialog" parent="Cpp.Theme.Base.Dialog">
 		<item name="android:colorPrimary">@color/cpp_metro_button</item>
 		<item name="android:colorPrimaryDark">@color/cpp_metro_button_dark</item>
 	</style>
 
-	<style name="Theme.Wizard" parent="@style/cpp_metro_blue_theme">
+	<style name="Cpp.Theme.Wizard" parent="@style/cpp_metro_blue_theme">
 		<item name="android:windowBackground">@color/cpp_wizard_bg</item>
 		<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
 		<item name="colorAccent">@color/cpp_wizard_primary</item>
@@ -41,7 +41,7 @@
 		<item name="android:textColorPrimary">@color/cpp_wizard_primary</item>
 	</style>
 
-	<style name="Theme.Settings" parent="Theme.Settings.Base">
+	<style name="Cpp.Theme.Settings" parent="Cpp.Theme.Settings.Base">
 		<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
 		<item name="colorAccent">@color/cpp_wizard_primary</item>
 		<item name="android:colorAccent">@color/cpp_wizard_primary</item>
diff --git a/android-app/src/main/res/values-v21/theme_material.xml b/android-app/src/main/res/values-v21/theme_material.xml
index 3ad7f061..e26ebff4 100644
--- a/android-app/src/main/res/values-v21/theme_material.xml
+++ b/android-app/src/main/res/values-v21/theme_material.xml
@@ -22,38 +22,31 @@
 
 <resources>
 
-	<style name="material_digit_button_style" parent="cpp_keyboard_button_style">
+	<style name="CppKeyboardButton.Material.Digit" parent="CppKeyboardButton">
 		<item name="android:background">@drawable/material_button_dark</item>
 		<item name="android:stateListAnimator">@null</item>
 	</style>
 
-	<style name="material_control_button_style" parent="metro_digit_button_style">
-		<item name="android:background">@drawable/material_button_dark</item>
-		<item name="android:stateListAnimator">@null</item>
-	</style>
-
-	<style name="material_operation_button_style" parent="material_digit_button_style">
+	<style name="CppKeyboardButton.Material.Operation" parent="CppKeyboardButton.Material.Digit">
 		<item name="android:background">@drawable/material_blue_button</item>
-		<item name="android:stateListAnimator">@null</item>
 	</style>
 
-	<style name="material_control_image_button_style" parent="material_control_button_style">
+	<style name="CppKeyboardButton.Material.Control.Image" parent="CppKeyboardButton.Material.Digit">
 		<item name="android:padding">6dp</item>
-		<item name="android:stateListAnimator">@null</item>
 	</style>
 
-	<style name="cpp_material_theme" parent="cpp_metro_blue_theme">
-		<item name="cpp_digit_button_style">@style/material_digit_button_style</item>
-		<item name="cpp_control_button_style">@style/material_control_button_style</item>
-		<item name="cpp_control_image_button_style">@style/material_control_image_button_style</item>
-		<item name="cpp_operation_button_style">@style/material_operation_button_style</item>
+	<style name="Cpp.Theme.Material" parent="Cpp.Theme">
+		<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Digit</item>
+		<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Digit</item>
+		<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Control.Image</item>
+		<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Operation</item>
 	</style>
 
-	<style name="cpp_metro_blue_dialog_theme" parent="cpp_gray_dialog_theme">
-		<item name="cpp_digit_button_style">@style/material_digit_button_style</item>
-		<item name="cpp_control_button_style">@style/material_control_button_style</item>
-		<item name="cpp_control_image_button_style">@style/material_control_image_button_style</item>
-		<item name="cpp_operation_button_style">@style/material_operation_button_style</item>
+	<style name="Cpp.Theme.Dialog.Material" parent="Cpp.Theme.Dialog">
+		<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Digit</item>
+		<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Digit</item>
+		<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Control.Image</item>
+		<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Operation</item>
 	</style>
 
 </resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/attributes.xml b/android-app/src/main/res/values/attributes.xml
index bca5f069..542be23b 100644
--- a/android-app/src/main/res/values/attributes.xml
+++ b/android-app/src/main/res/values/attributes.xml
@@ -23,17 +23,10 @@
 
 <resources>
 
-	<attr name="cpp_digit_button_style" format="reference"/>
-	<attr name="cpp_control_button_style" format="reference"/>
-	<attr name="cpp_control_image_button_style" format="reference"/>
-	<attr name="cpp_operation_button_style" format="reference"/>
-	<attr name="cpp_fragment_layout_style" format="reference"/>
-	<attr name="cpp_fragment_title_style" format="reference"/>
-	<attr name="cpp_button_style" format="reference"/>
-	<attr name="cpp_pane_style" format="reference"/>
-	<attr name="cpp_pane_style_transparent" format="reference"/>
-	<attr name="cpp_main_layout_style" format="reference"/>
-	<attr name="cpp_main_multi_pane_layout_style" format="reference"/>
+	<attr name="cpp_button_style_digit" format="reference"/>
+	<attr name="cpp_button_style_control" format="reference"/>
+	<attr name="cpp_button_style_control_image" format="reference"/>
+	<attr name="cpp_button_style_operation" format="reference"/>
 	<attr name="cpp_main_bg" format="reference"/>
 
 </resources>
diff --git a/android-app/src/main/res/values/styles.xml b/android-app/src/main/res/values/styles.xml
index 9ac25fc7..43a06b9c 100644
--- a/android-app/src/main/res/values/styles.xml
+++ b/android-app/src/main/res/values/styles.xml
@@ -40,16 +40,7 @@
 		<item name="android:textSize">@dimen/cpp_text_size</item>
 	</style>
 
-	<style name="cpp_button_style">
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:focusable">true</item>
-		<item name="android:background">@drawable/metro_blue_button</item>
-		<item name="android:textSize">@dimen/cpp_button_text_size</item>
-		<item name="android:textColor">@color/cpp_button_text</item>
-	</style>
-
-	<style name="cpp_keyboard_button_style">
+	<style name="CppKeyboardButton">
 		<item name="android:layout_width">0dp</item>
 		<item name="android:layout_height">match_parent</item>
 		<item name="android:layout_weight">1</item>
@@ -62,7 +53,7 @@
 		<item name="android:scaleType">centerInside</item>
 	</style>
 
-	<style name="cpp_onscreen_editor_style" parent="cpp_editor_style">
+	<style name="cpp_onscreen_editor_style" parent="CppText.Editor">
 		<item name="android:ellipsize">none</item>
 		<item name="android:singleLine">true</item>
 		<item name="android:maxLines">1</item>
@@ -71,7 +62,7 @@
 		<item name="android:scrollbars">horizontal</item>
 	</style>
 
-	<style name="cpp_editor_style" parent="cpp_default_text">
+	<style name="CppText.Editor" parent="CppText">
 		<item name="android:text">""</item>
 		<item name="android:gravity">left|top</item>
 		<item name="android:layout_width">fill_parent</item>
@@ -79,22 +70,22 @@
 		<item name="android:textSize">@dimen/cpp_editor_text_size</item>
 	</style>
 
-	<style name="cpp_editor_mobile_style" parent="cpp_editor_style">
+	<style name="CppText.Editor.Mobile" parent="CppText.Editor">
 		<item name="android:textSize">@dimen/cpp_editor_text_size_mobile</item>
 	</style>
 
-	<style name="cpp_display_style" parent="cpp_default_text">
+	<style name="CppText.Display" parent="CppText">
 		<item name="android:gravity">top|right</item>
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">match_parent</item>
 		<item name="android:textSize">@dimen/cpp_display_text_size</item>
 	</style>
 
-	<style name="cpp_onscreen_display_style" parent="cpp_display_style">
+	<style name="CppText.Display.Onscreen" parent="CppText.Display">
 		<item name="android:textSize">@dimen/cpp_onscreen_display_text_size</item>
 	</style>
 
-	<style name="cpp_about_style" parent="cpp_default_text">
+	<style name="CppText.About" parent="CppText">
 		<item name="android:gravity">center</item>
 		<item name="android:layout_width">fill_parent</item>
 		<item name="android:layout_height">fill_parent</item>
@@ -102,12 +93,11 @@
 		<item name="android:padding">5dp</item>
 	</style>
 
-	<style name="cpp_default_text">
+	<style name="CppText">
 		<item name="android:background">@android:color/transparent</item>
 		<item name="android:textColor">@color/cpp_text</item>
 	</style>
 
-
 	<style name="cpp_simple_metro_digit_button_style" parent="metro_digit_button_style">
 		<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
 		<item name="android:background">@drawable/metro_widget_button_dark</item>
@@ -127,21 +117,21 @@
 		<item name="android:background">@drawable/metro_widget_button_light</item>
 	</style>
 
-	<style name="cpp_widget_main_layout_style" parent="cpp_default_main_layout_style">
+	<style name="cpp_widget_main_layout_style" parent="CppMain">
 		<item name="android:background">@color/cpp_main_bg</item>
 		<item name="android:padding">1dp</item>
 		<item name="android:layout_margin">@dimen/cpp_widget_margin</item>
 	</style>
 
-	<style name="cpp_widget_editor_style" parent="cpp_editor_style">
+	<style name="cpp_widget_editor_style" parent="CppText.Editor">
 		<item name="android:textSize">@dimen/cpp_widget_editor_text_size</item>
 	</style>
 
-	<style name="cpp_widget_display_style" parent="cpp_display_style">
+	<style name="cpp_widget_display_style" parent="CppText.Display">
 		<item name="android:textSize">@dimen/cpp_widget_display_text_size</item>
 	</style>
 
-	<style name="cpp_onscreen_main_layout_style" parent="cpp_default_main_layout_style">
+	<style name="cpp_onscreen_main_layout_style" parent="CppMain">
 		<item name="android:background">@color/cpp_main_bg</item>
 		<item name="android:padding">1dp</item>
 	</style>
@@ -201,4 +191,83 @@
 		<item name="materialColor">@color/cpp_wizard_button_selector</item>
 		<item name="android:textAppearance">@android:style/TextAppearance.Medium</item>
 	</style>
+
+	<style name="CppFragmentTitle">
+		<item name="android:textColor">@android:color/white</item>
+		<item name="android:textSize">@dimen/cpp_fragment_title_text_size</item>
+		<item name="android:paddingLeft">@dimen/cpp_pane_margin</item>
+	</style>
+
+	<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:padding">@dimen/cpp_pane_padding</item>
+		<item name="android:background">@drawable/pane_background</item>
+	</style>
+
+	<style name="CppPaneStyle.Transparent" parent="CppPaneStyle">
+		<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">@dimen/cpp_pane_padding</item>
+		<item name="android:paddingBottom">@dimen/cpp_pane_padding</item>
+	</style>
+
+	<style name="CppFragment">
+		<item name="android:layout_margin">0dp</item>
+		<item name="android:padding">0dp</item>
+		<item name="android:orientation">vertical</item>
+	</style>
+
+	<style name="CppDialog">
+		<item name="android:padding">6dp</item>
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:orientation">vertical</item>
+		<item name="android:layout_gravity">center_horizontal</item>
+	</style>
+
+	<style name="CppListViewItem">
+		<item name="android:paddingLeft">16dp</item>
+		<item name="android:paddingRight">16dp</item>
+		<item name="android:paddingBottom">20dp</item>
+		<item name="android:paddingTop">20dp</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:minHeight">72dp</item>
+		<item name="android:gravity">center_vertical|left</item>
+	</style>
+
+	<style name="CppFab">
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_gravity">bottom|end</item>
+		<item name="android:layout_margin">16dp</item>
+		<item name="fab_colorNormal">@color/cpp_metro_button</item>
+		<item name="fab_colorPressed">@color/cpp_metro_button</item>
+		<item name="fab_colorRipple">?attr/colorControlHighlight</item>
+	</style>
+
+	<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>
+		<item name="android:layout_weight">1</item>
+		<item name="android:fadingEdge">none</item>
+		<item name="android:paddingLeft">@dimen/cpp_pane_padding</item>
+		<item name="android:paddingRight">@dimen/cpp_pane_padding</item>
+		<item name="android:layout_marginBottom">@dimen/cpp_pane_padding</item>
+	</style>
+
 </resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme.xml b/android-app/src/main/res/values/theme.xml
index 6df57acd..132f2d81 100644
--- a/android-app/src/main/res/values/theme.xml
+++ b/android-app/src/main/res/values/theme.xml
@@ -22,26 +22,35 @@
 
 <resources>
 
-	<style name="Theme" parent="Theme.Base"></style>
-	<style name="Theme.Dialog" parent="Theme.Base.Dialog"></style>
+	<style name="Cpp.Theme" parent="Cpp.Theme.Base"/>
 
-	<style name="Theme.Base" parent="@style/Theme.AppCompat"></style>
-	<style name="Theme.Base.Dialog" parent="@style/Theme.AppCompat.Dialog">
+	<style name="Cpp.Theme.Dialog" parent="Cpp.Theme.Base.Dialog"/>
+
+	<style name="Cpp.Theme.Base" parent="@style/Theme.AppCompat">
+		<item name="android:windowBackground">@color/cpp_main_bg</item>
+
+		<item name="cpp_main_bg">@color/cpp_main_bg</item>
+	</style>
+
+	<style name="Cpp.Theme.Base.Dialog" parent="@style/Theme.AppCompat.Dialog">
 		<item name="android:windowNoTitle">false</item>
 		<item name="android:windowTitleBackgroundStyle">@android:color/transparent</item>
 		<item name="windowActionBar">false</item>
+		<item name="android:windowCloseOnTouchOutside">false</item>
+
+		<item name="cpp_main_bg">@color/cpp_main_bg</item>
 	</style>
 
-	<style name="Theme.Wizard.Purchase" parent="cpp_metro_blue_theme">
+	<style name="Cpp.Theme.Wizard.Purchase" parent="cpp_metro_blue_theme">
 		<item name="android:windowNoTitle">true</item>
 		<item name="android:background">@color/cpp_metro_button_light</item>
 	</style>
 
-	<style name="Theme.Wizard" parent="@style/cpp_metro_blue_theme">
+	<style name="Cpp.Theme.Wizard" parent="@style/cpp_metro_blue_theme">
 		<item name="android:windowBackground">@color/cpp_wizard_bg</item>
 	</style>
 
-	<style name="Theme.Settings.Base" parent="@style/cpp_metro_blue_theme">
+	<style name="Cpp.Theme.Settings.Base" parent="@style/cpp_metro_blue_theme">
 		<item name="android:windowNoTitle">true</item>
 		<item name="android:windowActionBar">false</item>
 		<item name="toolbarStyle">@style/Widget.Toolbar</item>
@@ -49,8 +58,8 @@
 		<item name="android:textColorSecondary">@color/cpp_wizard_secondary</item>
 		<item name="android:textColorPrimary">@color/cpp_wizard_primary</item>
 	</style>
-	<style name="Theme.Settings" parent="Theme.Settings.Base">
-	</style>
+
+	<style name="Cpp.Theme.Settings" parent="Cpp.Theme.Settings.Base"/>
 
 	<style name="Widget.Toolbar" parent="@style/Widget.AppCompat.Toolbar">
 		<item name="android:background">?attr/colorPrimary</item>
diff --git a/android-app/src/main/res/values/theme_gray.xml b/android-app/src/main/res/values/theme_gray.xml
deleted file mode 100644
index 88cc8a7d..00000000
--- a/android-app/src/main/res/values/theme_gray.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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
-  -->
-
-<resources>
-
-	<style name="cpp_default_digit_button_style" parent="cpp_keyboard_button_style">
-		<item name="android:background">@drawable/gray_button</item>
-	</style>
-
-	<style name="cpp_dialog">
-		<item name="android:padding">6dp</item>
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:orientation">vertical</item>
-		<item name="android:layout_gravity">center_horizontal</item>
-	</style>
-
-	<style name="cpp_default_control_button_style" parent="cpp_keyboard_button_style">
-		<item name="android:background">@drawable/gray_button_dark</item>
-	</style>
-
-	<style name="cpp_default_operation_button_style" parent="cpp_default_digit_button_style">
-		<item name="android:textColor">@color/cpp_button_text_operator</item>
-	</style>
-
-	<style name="cpp_default_control_image_button_style" parent="cpp_default_control_button_style">
-		<item name="android:padding">6dp</item>
-	</style>
-
-	<style name="ListViewItem">
-		<item name="android:paddingLeft">16dp</item>
-		<item name="android:paddingRight">16dp</item>
-		<item name="android:paddingBottom">20dp</item>
-		<item name="android:paddingTop">20dp</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_width">match_parent</item>
-		<item name="android:minHeight">72dp</item>
-		<item name="android:gravity">center_vertical|left</item>
-	</style>
-
-	<style name="Fab">
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_gravity">bottom|end</item>
-		<item name="android:layout_margin">16dp</item>
-		<item name="fab_colorNormal">@color/cpp_metro_button</item>
-		<item name="fab_colorPressed">@color/cpp_metro_button</item>
-		<item name="fab_colorRipple">?attr/colorControlHighlight</item>
-	</style>
-
-	<style name="ListView">
-		<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>
-		<item name="android:layout_weight">1</item>
-		<item name="android:fadingEdge">none</item>
-		<item name="android:paddingLeft">@dimen/cpp_pane_padding</item>
-		<item name="android:paddingRight">@dimen/cpp_pane_padding</item>
-		<item name="android:layout_marginBottom">@dimen/cpp_pane_padding</item>
-	</style>
-
-	<style name="cpp_default_fragment_title_style">
-		<item name="android:textColor">@android:color/white</item>
-		<item name="android:textSize">@dimen/cpp_fragment_title_text_size</item>
-		<item name="android:paddingLeft">@dimen/cpp_pane_margin</item>
-	</style>
-
-	<style name="cpp_default_button_style" parent="cpp_button_style">
-		<item name="android:paddingTop">5dp</item>
-		<item name="android:paddingBottom">5dp</item>
-		<item name="android:paddingLeft">10dp</item>
-		<item name="android:paddingRight">10dp</item>
-	</style>
-
-	<style name="cpp_default_pane_style_transparent" parent="cpp_default_pane_style">
-		<item name="android:background">@android:color/transparent</item>
-		<item name="android:padding">0dp</item>
-	</style>
-
-	<style name="cpp_default_pane_style">
-		<item name="android:layout_marginLeft">@dimen/cpp_pane_margin</item>
-		<item name="android:layout_marginTop">@dimen/cpp_pane_margin</item>
-		<item name="android:padding">@dimen/cpp_pane_padding</item>
-		<item name="android:background">@drawable/pane_background</item>
-	</style>
-
-	<style name="cpp_default_main_multi_pane_layout_style" parent="cpp_default_main_layout_style">
-		<item name="android:paddingRight">@dimen/cpp_pane_padding</item>
-		<item name="android:paddingBottom">@dimen/cpp_pane_padding</item>
-	</style>
-
-	<style name="cpp_default_fragment_multi_pane_layout_style" parent="cpp_default_fragment_layout_style"></style>
-
-	<style name="cpp_default_fragment_layout_style">
-		<item name="android:layout_margin">0dp</item>
-		<item name="android:padding">0dp</item>
-		<item name="android:orientation">vertical</item>
-	</style>
-
-	<style name="cpp_default_main_layout_style">
-		<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="cpp_gray_theme" parent="Theme">
-		<item name="android:windowBackground">@color/cpp_main_bg</item>
-
-		<!-- buttons -->
-		<item name="cpp_digit_button_style">@style/cpp_default_digit_button_style</item>
-		<item name="cpp_control_button_style">@style/cpp_default_control_button_style</item>
-		<item name="cpp_control_image_button_style">@style/cpp_default_control_image_button_style</item>
-		<item name="cpp_operation_button_style">@style/cpp_default_operation_button_style</item>
-
-		<!-- other -->
-		<item name="cpp_fragment_title_style">@style/cpp_default_fragment_title_style</item>
-		<item name="cpp_button_style">@style/cpp_default_button_style</item>
-
-		<item name="cpp_main_layout_style">@style/cpp_default_main_layout_style</item>
-		<item name="cpp_main_multi_pane_layout_style">@style/cpp_default_main_multi_pane_layout_style</item>
-
-		<item name="cpp_fragment_layout_style">@style/cpp_default_fragment_layout_style</item>
-
-		<item name="cpp_pane_style">@style/cpp_default_pane_style</item>
-		<item name="cpp_pane_style_transparent">@style/cpp_default_pane_style_transparent</item>
-		<item name="cpp_main_bg">@color/cpp_main_bg</item>
-	</style>
-
-	<style name="cpp_gray_dialog_theme" parent="Theme.Dialog">
-		<item name="android:windowCloseOnTouchOutside">false</item>
-		<!-- buttons -->
-		<item name="cpp_digit_button_style">@style/cpp_default_digit_button_style</item>
-		<item name="cpp_control_button_style">@style/cpp_default_control_button_style</item>
-		<item name="cpp_control_image_button_style">@style/cpp_default_control_image_button_style</item>
-		<item name="cpp_operation_button_style">@style/cpp_default_operation_button_style</item>
-
-		<!-- other -->
-		<item name="cpp_fragment_title_style">@style/cpp_default_fragment_title_style</item>
-		<item name="cpp_button_style">@style/cpp_default_button_style</item>
-
-		<item name="cpp_main_layout_style">@style/cpp_default_main_layout_style</item>
-		<item name="cpp_main_multi_pane_layout_style">@style/cpp_default_main_multi_pane_layout_style</item>
-
-		<item name="cpp_fragment_layout_style">@style/cpp_default_fragment_layout_style</item>
-
-		<item name="cpp_pane_style">@style/cpp_default_pane_style</item>
-		<item name="cpp_pane_style_transparent">@style/cpp_default_pane_style_transparent</item>
-		<item name="cpp_main_bg">@color/cpp_main_bg</item>
-	</style>
-
-</resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_metro_blue.xml b/android-app/src/main/res/values/theme_metro_blue.xml
index 0f5d301b..913b620a 100644
--- a/android-app/src/main/res/values/theme_metro_blue.xml
+++ b/android-app/src/main/res/values/theme_metro_blue.xml
@@ -22,7 +22,7 @@
 
 <resources>
 
-	<style name="metro_digit_button_style" parent="cpp_keyboard_button_style">
+	<style name="metro_digit_button_style" parent="CppKeyboardButton">
 		<item name="android:background">@drawable/metro_button_dark</item>
 	</style>
 
@@ -48,18 +48,18 @@
 		<item name="android:padding">6dp</item>
 	</style>
 
-	<style name="cpp_metro_blue_theme" parent="cpp_gray_theme">
-		<item name="cpp_digit_button_style">@style/metro_digit_button_style</item>
-		<item name="cpp_control_button_style">@style/metro_control_button_style</item>
-		<item name="cpp_control_image_button_style">@style/metro_control_image_button_style</item>
-		<item name="cpp_operation_button_style">@style/metro_blue_operation_button_style</item>
+	<style name="cpp_metro_blue_theme" parent="Cpp.Theme">
+		<item name="cpp_button_style_digit">@style/metro_digit_button_style</item>
+		<item name="cpp_button_style_control">@style/metro_control_button_style</item>
+		<item name="cpp_button_style_control_image">@style/metro_control_image_button_style</item>
+		<item name="cpp_button_style_operation">@style/metro_blue_operation_button_style</item>
 	</style>
 
-	<style name="cpp_metro_blue_dialog_theme" parent="cpp_gray_dialog_theme">
-		<item name="cpp_digit_button_style">@style/metro_digit_button_style</item>
-		<item name="cpp_control_button_style">@style/metro_control_button_style</item>
-		<item name="cpp_control_image_button_style">@style/metro_control_image_button_style</item>
-		<item name="cpp_operation_button_style">@style/metro_blue_operation_button_style</item>
+	<style name="Cpp.Theme.Dialog.Material" parent="Cpp.Theme.Dialog">
+		<item name="cpp_button_style_digit">@style/metro_digit_button_style</item>
+		<item name="cpp_button_style_control">@style/metro_control_button_style</item>
+		<item name="cpp_button_style_control_image">@style/metro_control_image_button_style</item>
+		<item name="cpp_button_style_operation">@style/metro_blue_operation_button_style</item>
 	</style>
 
 </resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_metro_green.xml b/android-app/src/main/res/values/theme_metro_green.xml
index 154451fb..4e783016 100644
--- a/android-app/src/main/res/values/theme_metro_green.xml
+++ b/android-app/src/main/res/values/theme_metro_green.xml
@@ -27,7 +27,7 @@
 	</style>
 
 	<style name="cpp_metro_green_theme" parent="cpp_metro_blue_theme">
-		<item name="cpp_operation_button_style">@style/metro_green_operation_button_style</item>
+		<item name="cpp_button_style_operation">@style/metro_green_operation_button_style</item>
 	</style>
 
 </resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_metro_purple.xml b/android-app/src/main/res/values/theme_metro_purple.xml
index 9fbab8bc..94e44289 100644
--- a/android-app/src/main/res/values/theme_metro_purple.xml
+++ b/android-app/src/main/res/values/theme_metro_purple.xml
@@ -27,7 +27,7 @@
 	</style>
 
 	<style name="cpp_metro_purple_theme" parent="cpp_metro_blue_theme">
-		<item name="cpp_operation_button_style">@style/metro_purple_operation_button_style</item>
+		<item name="cpp_button_style_operation">@style/metro_purple_operation_button_style</item>
 	</style>
 
 </resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_light_blue.xml b/android-app/src/main/res/values/theme_old_blue.xml
similarity index 60%
rename from android-app/src/main/res/values/theme_light_blue.xml
rename to android-app/src/main/res/values/theme_old_blue.xml
index 860b2a0b..43a9dcc4 100644
--- a/android-app/src/main/res/values/theme_light_blue.xml
+++ b/android-app/src/main/res/values/theme_old_blue.xml
@@ -22,27 +22,27 @@
 
 <resources>
 
-	<style name="light_blue_digit_button_style" parent="cpp_keyboard_button_style">
+	<style name="CppKeyboardButton.Blue.Digit" parent="CppKeyboardButton">
 		<item name="android:background">@drawable/blue_button</item>
 	</style>
 
-	<style name="light_blue_control_button_style" parent="cpp_keyboard_button_style">
+	<style name="CppKeyboardButton.Blue.Control" parent="CppKeyboardButton">
 		<item name="android:background">@drawable/blue_button_dark</item>
 	</style>
 
-	<style name="light_blue_operation_button_style" parent="light_blue_digit_button_style">
+	<style name="CppKeyboardButton.Blue.Operation" parent="CppKeyboardButton.Blue.Digit">
 		<item name="android:textColor">@color/cpp_button_text_operator</item>
 	</style>
 
-	<style name="light_blue_control_image_button_style" parent="light_blue_control_button_style">
+	<style name="CppKeyboardButton.Blue.Control.Image" parent="CppKeyboardButton.Blue.Control">
 		<item name="android:padding">6dp</item>
 	</style>
 
-	<style name="cpp_light_blue_theme" parent="cpp_gray_theme">
-		<item name="cpp_digit_button_style">@style/light_blue_digit_button_style</item>
-		<item name="cpp_control_button_style">@style/light_blue_control_button_style</item>
-		<item name="cpp_control_image_button_style">@style/light_blue_control_image_button_style</item>
-		<item name="cpp_operation_button_style">@style/light_blue_operation_button_style</item>
+	<style name="Cpp.Theme.Blue" parent="Cpp.Theme">
+		<item name="cpp_button_style_digit">@style/CppKeyboardButton.Blue.Digit</item>
+		<item name="cpp_button_style_control">@style/CppKeyboardButton.Blue.Control</item>
+		<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Blue.Control.Image</item>
+		<item name="cpp_button_style_operation">@style/CppKeyboardButton.Blue.Operation</item>
 	</style>
 
 </resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_old_gray.xml b/android-app/src/main/res/values/theme_old_gray.xml
new file mode 100644
index 00000000..3cbd54f7
--- /dev/null
+++ b/android-app/src/main/res/values/theme_old_gray.xml
@@ -0,0 +1,55 @@
+<?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
+  -->
+
+<resources>
+
+	<style name="CppKeyboardButton.Gray.Digit" parent="CppKeyboardButton">
+		<item name="android:background">@drawable/gray_button</item>
+	</style>
+
+	<style name="CppKeyboardButton.Gray.Control" parent="CppKeyboardButton">
+		<item name="android:background">@drawable/gray_button_dark</item>
+	</style>
+
+	<style name="CppKeyboardButton.Gray.Operation" parent="CppKeyboardButton.Gray.Digit">
+		<item name="android:textColor">@color/cpp_button_text_operator</item>
+	</style>
+
+	<style name="CppKeyboardButton.Gray.Control.Image" parent="CppKeyboardButton.Gray.Control">
+		<item name="android:padding">6dp</item>
+	</style>
+
+	<style name="Cpp.Theme.Gray" parent="Cpp.Theme">
+		<item name="cpp_button_style_digit">@style/CppKeyboardButton.Gray.Digit</item>
+		<item name="cpp_button_style_control">@style/CppKeyboardButton.Gray.Control</item>
+		<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Gray.Control.Image</item>
+		<item name="cpp_button_style_operation">@style/CppKeyboardButton.Gray.Operation</item>
+	</style>
+
+	<style name="Cpp.Theme.Dialog.Gray" parent="Cpp.Theme.Dialog">
+		<item name="cpp_button_style_digit">@style/CppKeyboardButton.Gray.Digit</item>
+		<item name="cpp_button_style_control">@style/CppKeyboardButton.Gray.Control</item>
+		<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Gray.Control.Image</item>
+		<item name="cpp_button_style_operation">@style/CppKeyboardButton.Gray.Operation</item>
+	</style>
+
+</resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_violet.xml b/android-app/src/main/res/values/theme_old_violet.xml
similarity index 60%
rename from android-app/src/main/res/values/theme_violet.xml
rename to android-app/src/main/res/values/theme_old_violet.xml
index a414abbe..202dd32b 100644
--- a/android-app/src/main/res/values/theme_violet.xml
+++ b/android-app/src/main/res/values/theme_old_violet.xml
@@ -22,26 +22,26 @@
 
 <resources>
 
-	<style name="violet_digit_button_style" parent="cpp_keyboard_button_style">
+	<style name="CppKeyboardButton.Violet.Digit" parent="CppKeyboardButton">
 		<item name="android:background">@drawable/violet_button</item>
 	</style>
 
-	<style name="violet_operation_button_style" parent="violet_digit_button_style">
+	<style name="CppKeyboardButton.Violet.Operation" parent="CppKeyboardButton.Violet.Digit">
 		<item name="android:textColor">@color/cpp_button_text_operator</item>
 	</style>
 
-	<style name="violet_control_button_style" parent="cpp_keyboard_button_style">
+	<style name="CppKeyboardButton.Violet.Control" parent="CppKeyboardButton">
 		<item name="android:background">@drawable/violet_button_dark</item>
 	</style>
 
-	<style name="violet_control_image_button_style" parent="violet_control_button_style">
+	<style name="CppKeyboardButton.Violet.Control.Image" parent="CppKeyboardButton.Violet.Control">
 		<item name="android:padding">6dp</item>
 	</style>
 
-	<style name="cpp_violet_theme" parent="cpp_gray_theme">
-		<item name="cpp_digit_button_style">@style/violet_digit_button_style</item>
-		<item name="cpp_control_button_style">@style/violet_control_button_style</item>
-		<item name="cpp_control_image_button_style">@style/violet_control_image_button_style</item>
-		<item name="cpp_operation_button_style">@style/violet_operation_button_style</item>
+	<style name="Cpp.Theme.Violet" parent="Cpp.Theme">
+		<item name="cpp_button_style_digit">@style/CppKeyboardButton.Violet.Digit</item>
+		<item name="cpp_button_style_control">@style/CppKeyboardButton.Violet.Control</item>
+		<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Violet.Control.Image</item>
+		<item name="cpp_button_style_operation">@style/CppKeyboardButton.Violet.Operation</item>
 	</style>
 </resources>
\ No newline at end of file