diff --git a/calculatorpp/res/layout-land/main_calculator.xml b/calculatorpp/res/layout-land/main_calculator.xml
index 14b24087..576a4df7 100644
--- a/calculatorpp/res/layout-land/main_calculator.xml
+++ b/calculatorpp/res/layout-land/main_calculator.xml
@@ -9,7 +9,7 @@
         xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/main_layout"
         a:orientation="vertical"
-        style="?mainLayoutStyle">
+        style="?cpp_main_layout_style">
 
     <include layout="@layout/main_first_pane"/>
 
diff --git a/calculatorpp/res/layout-land/main_calculator_mobile.xml b/calculatorpp/res/layout-land/main_calculator_mobile.xml
index 8bb7bfa4..b82b9f61 100644
--- a/calculatorpp/res/layout-land/main_calculator_mobile.xml
+++ b/calculatorpp/res/layout-land/main_calculator_mobile.xml
@@ -9,7 +9,7 @@
         xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/main_layout"
         a:orientation="vertical"
-        style="?mainLayoutStyle">
+        style="?cpp_main_layout_style">
 
     <include layout="@layout/main_first_pane_mobile"/>
 
diff --git a/calculatorpp/res/layout-large-land/main_calculator.xml b/calculatorpp/res/layout-large-land/main_calculator.xml
index cf894fea..72466751 100644
--- a/calculatorpp/res/layout-large-land/main_calculator.xml
+++ b/calculatorpp/res/layout-large-land/main_calculator.xml
@@ -9,7 +9,7 @@
         xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/main_layout"
         a:orientation="vertical"
-        style="?mainMultiPaneLayoutStyle">
+        style="?cpp_main_multi_pane_layout_style">
 
     <LinearLayout
             a:layout_height="0dp"
@@ -28,13 +28,13 @@
             <LinearLayout a:id="@+id/editorContainer"
                           a:layout_height="0dp"
                           a:layout_width="match_parent"
-                          style="?paneStyle"
+                          style="?cpp_pane_style"
                           a:layout_weight="1"/>
 
             <LinearLayout a:id="@+id/displayContainer"
                           a:layout_height="0dp"
                           a:layout_width="match_parent"
-                          style="?paneStyle"
+                          style="?cpp_pane_style"
                           a:layout_weight="1"/>
 
         </LinearLayout>
@@ -44,7 +44,7 @@
                       a:layout_width="0dp"
                       a:layout_weight="1"
                       a:orientation="vertical"
-                      style="?paneStyle"/>
+                      style="?cpp_pane_style"/>
 
     </LinearLayout>
 
@@ -52,6 +52,6 @@
                   a:layout_height="0dp"
                   a:layout_width="match_parent"
                   a:layout_weight="2"
-                  style="?paneStyleTransparent"/>
+                  style="?cpp_pane_style_transparent"/>
 
 </LinearLayout>
diff --git a/calculatorpp/res/layout-large/calc_display.xml b/calculatorpp/res/layout-large/calc_display.xml
index 5e0d8bb4..48c937a9 100644
--- a/calculatorpp/res/layout-large/calc_display.xml
+++ b/calculatorpp/res/layout-large/calc_display.xml
@@ -8,17 +8,17 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
               a:layout_width="match_parent"
               a:layout_height="match_parent">
 
-    <TextView a:id="@+id/fragmentTitle"
+    <TextView a:id="@+id/fragment_title"
               a:layout_height="wrap_content"
               a:layout_width="match_parent"
-              style="?fragmentTitleStyle"/>
+              style="?cpp_fragment_title_style"/>
 
     <org.solovyev.android.calculator.AndroidCalculatorDisplayView
-            a:id="@+id/calculatorDisplay"
+            a:id="@+id/calculator_display"
             style="@style/cpp_display_style"
             a:inputType="textMultiLine"
             a:maxLines="3"
diff --git a/calculatorpp/res/layout-large/calc_editor.xml b/calculatorpp/res/layout-large/calc_editor.xml
index a31ac17d..a5c40786 100644
--- a/calculatorpp/res/layout-large/calc_editor.xml
+++ b/calculatorpp/res/layout-large/calc_editor.xml
@@ -8,17 +8,17 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent">
 
-    <TextView a:id="@+id/fragmentTitle"
+    <TextView a:id="@+id/fragment_title"
               a:layout_height="wrap_content"
               a:layout_width="match_parent"
-              style="?fragmentTitleStyle"/>
+              style="?cpp_fragment_title_style"/>
 
 	<org.solovyev.android.calculator.AndroidCalculatorEditorView
-			a:id="@+id/calculatorEditor"
+			a:id="@+id/calculator_editor"
 			style="@style/cpp_editor_style"
             a:textIsSelectable="true"
 			a:singleLine="false"
diff --git a/calculatorpp/res/layout-large/main_calculator.xml b/calculatorpp/res/layout-large/main_calculator.xml
index 76b1a702..156a0edd 100644
--- a/calculatorpp/res/layout-large/main_calculator.xml
+++ b/calculatorpp/res/layout-large/main_calculator.xml
@@ -9,7 +9,7 @@
         xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/main_layout"
         a:orientation="vertical"
-        style="?mainMultiPaneLayoutStyle">
+        style="?cpp_main_multi_pane_layout_style">
 
     <LinearLayout
             a:layout_height="0dp"
@@ -28,13 +28,13 @@
             <LinearLayout a:id="@+id/editorContainer"
                           a:layout_height="0dp"
                           a:layout_width="match_parent"
-                          style="?paneStyle"
+                          style="?cpp_pane_style"
                           a:layout_weight="4"/>
 
             <LinearLayout a:id="@+id/displayContainer"
                           a:layout_height="0dp"
                           a:layout_width="match_parent"
-                          style="?paneStyle"
+                          style="?cpp_pane_style"
                           a:layout_weight="1"/>
 
         </LinearLayout>
@@ -44,7 +44,7 @@
                       a:layout_width="0dp"
                       a:layout_weight="1"
                       a:orientation="vertical"
-                      style="?paneStyle"/>
+                      style="?cpp_pane_style"/>
 
     </LinearLayout>
 
@@ -52,6 +52,6 @@
                   a:layout_height="0dp"
                   a:layout_width="match_parent"
                   a:layout_weight="2"
-                  style="?paneStyleTransparent"/>
+                  style="?cpp_pane_style_transparent"/>
 
 </LinearLayout>
diff --git a/calculatorpp/res/layout-xlarge-land/main_calculator.xml b/calculatorpp/res/layout-xlarge-land/main_calculator.xml
index 94d04dcb..debd4163 100644
--- a/calculatorpp/res/layout-xlarge-land/main_calculator.xml
+++ b/calculatorpp/res/layout-xlarge-land/main_calculator.xml
@@ -9,7 +9,7 @@
         xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/main_layout"
         a:orientation="vertical"
-        style="?mainMultiPaneLayoutStyle">
+        style="?cpp_main_multi_pane_layout_style">
 
     <LinearLayout
             a:layout_height="0dp"
@@ -28,13 +28,13 @@
             <LinearLayout a:id="@+id/editorContainer"
                           a:layout_height="0dp"
                           a:layout_width="match_parent"
-                          style="?paneStyle"
+                          style="?cpp_pane_style"
                           a:layout_weight="3"/>
 
             <LinearLayout a:id="@+id/displayContainer"
                           a:layout_height="0dp"
                           a:layout_width="match_parent"
-                          style="?paneStyle"
+                          style="?cpp_pane_style"
                           a:layout_weight="1"/>
 
         </LinearLayout>
@@ -44,7 +44,7 @@
                       a:layout_width="0dp"
                       a:layout_weight="1"
                       a:orientation="vertical"
-                      style="?paneStyle"/>
+                      style="?cpp_pane_style"/>
 
     </LinearLayout>
 
@@ -52,6 +52,6 @@
                   a:layout_height="0dp"
                   a:layout_width="match_parent"
                   a:layout_weight="1"
-                  style="?paneStyleTransparent"/>
+                  style="?cpp_pane_style_transparent"/>
 
 </LinearLayout>
diff --git a/calculatorpp/res/layout-xlarge/calc_display.xml b/calculatorpp/res/layout-xlarge/calc_display.xml
index 5e0d8bb4..48c937a9 100644
--- a/calculatorpp/res/layout-xlarge/calc_display.xml
+++ b/calculatorpp/res/layout-xlarge/calc_display.xml
@@ -8,17 +8,17 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
               a:layout_width="match_parent"
               a:layout_height="match_parent">
 
-    <TextView a:id="@+id/fragmentTitle"
+    <TextView a:id="@+id/fragment_title"
               a:layout_height="wrap_content"
               a:layout_width="match_parent"
-              style="?fragmentTitleStyle"/>
+              style="?cpp_fragment_title_style"/>
 
     <org.solovyev.android.calculator.AndroidCalculatorDisplayView
-            a:id="@+id/calculatorDisplay"
+            a:id="@+id/calculator_display"
             style="@style/cpp_display_style"
             a:inputType="textMultiLine"
             a:maxLines="3"
diff --git a/calculatorpp/res/layout-xlarge/calc_editor.xml b/calculatorpp/res/layout-xlarge/calc_editor.xml
index a31ac17d..a5c40786 100644
--- a/calculatorpp/res/layout-xlarge/calc_editor.xml
+++ b/calculatorpp/res/layout-xlarge/calc_editor.xml
@@ -8,17 +8,17 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
 			  a:layout_width="match_parent"
 			  a:layout_height="match_parent">
 
-    <TextView a:id="@+id/fragmentTitle"
+    <TextView a:id="@+id/fragment_title"
               a:layout_height="wrap_content"
               a:layout_width="match_parent"
-              style="?fragmentTitleStyle"/>
+              style="?cpp_fragment_title_style"/>
 
 	<org.solovyev.android.calculator.AndroidCalculatorEditorView
-			a:id="@+id/calculatorEditor"
+			a:id="@+id/calculator_editor"
 			style="@style/cpp_editor_style"
             a:textIsSelectable="true"
 			a:singleLine="false"
diff --git a/calculatorpp/res/layout-xlarge/main_calculator.xml b/calculatorpp/res/layout-xlarge/main_calculator.xml
index f9b4bd27..47e03f4f 100644
--- a/calculatorpp/res/layout-xlarge/main_calculator.xml
+++ b/calculatorpp/res/layout-xlarge/main_calculator.xml
@@ -9,7 +9,7 @@
         xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/main_layout"
         a:orientation="vertical"
-        style="?mainMultiPaneLayoutStyle">
+        style="?cpp_main_multi_pane_layout_style">
 
     <LinearLayout
             a:layout_height="0dp"
@@ -28,13 +28,13 @@
             <LinearLayout a:id="@+id/editorContainer"
                           a:layout_height="0dp"
                           a:layout_width="match_parent"
-                          style="?paneStyle"
+                          style="?cpp_pane_style"
                           a:layout_weight="4"/>
 
             <LinearLayout a:id="@+id/displayContainer"
                           a:layout_height="0dp"
                           a:layout_width="match_parent"
-                          style="?paneStyle"
+                          style="?cpp_pane_style"
                           a:layout_weight="1"/>
 
         </LinearLayout>
@@ -44,7 +44,7 @@
                       a:layout_width="0dp"
                       a:layout_weight="1"
                       a:orientation="vertical"
-                      style="?paneStyle"/>
+                      style="?cpp_pane_style"/>
 
     </LinearLayout>
 
@@ -52,6 +52,6 @@
                   a:layout_height="0dp"
                   a:layout_width="match_parent"
                   a:layout_weight="1"
-                  style="?paneStyleTransparent"/>
+                  style="?cpp_pane_style_transparent"/>
 
 </LinearLayout>
diff --git a/calculatorpp/res/layout/calc_clear_button.xml b/calculatorpp/res/layout/calc_clear_button.xml
index 91033335..6b84b546 100644
--- a/calculatorpp/res/layout/calc_clear_button.xml
+++ b/calculatorpp/res/layout/calc_clear_button.xml
@@ -14,5 +14,5 @@
 			 c:textDown="bin"
 			 c:textLeft="hex"
 			 a:textStyle="bold"
-			 style="?controlImageButtonStyle"
+			 style="?cpp_control_image_button_style"
 			 a:onClick="clearButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_copy_button.xml b/calculatorpp/res/layout/calc_copy_button.xml
index 10208bda..d0fe8181 100644
--- a/calculatorpp/res/layout/calc_copy_button.xml
+++ b/calculatorpp/res/layout/calc_copy_button.xml
@@ -9,5 +9,5 @@
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 a:id="@+id/copyButton"
 			 a:src="@drawable/kb_copy"
-			 style="?controlImageButtonStyle"
+			 style="?cpp_control_image_button_style"
 			 a:onClick="copyButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_display.xml b/calculatorpp/res/layout/calc_display.xml
index 81b1a5dd..95879ff0 100644
--- a/calculatorpp/res/layout/calc_display.xml
+++ b/calculatorpp/res/layout/calc_display.xml
@@ -8,7 +8,7 @@
 
 <org.solovyev.android.calculator.AndroidCalculatorDisplayView
 		xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@+id/calculatorDisplay"
+		a:id="@+id/calculator_display"
 		style="@style/cpp_display_style"
         a:padding="@dimen/cpp_display_padding"
 		a:inputType="textMultiLine"
diff --git a/calculatorpp/res/layout/calc_display_mobile.xml b/calculatorpp/res/layout/calc_display_mobile.xml
index f01cfde8..cce9c30c 100644
--- a/calculatorpp/res/layout/calc_display_mobile.xml
+++ b/calculatorpp/res/layout/calc_display_mobile.xml
@@ -8,7 +8,7 @@
 
 <org.solovyev.android.calculator.AndroidCalculatorDisplayView
 		xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@+id/calculatorDisplay"
+		a:id="@+id/calculator_display"
 		style="@style/cpp_display_style"
         a:padding="@dimen/cpp_display_padding"
 		a:inputType="textMultiLine"
diff --git a/calculatorpp/res/layout/calc_division_button.xml b/calculatorpp/res/layout/calc_division_button.xml
index 148a7431..05755043 100644
--- a/calculatorpp/res/layout/calc_division_button.xml
+++ b/calculatorpp/res/layout/calc_division_button.xml
@@ -13,5 +13,5 @@
 													   a:text="/"
 													   c:textDown="√"
 													   c:directionTextScale="0.5"
-													   style="?operationButtonStyle"
+													   style="?cpp_operation_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_donate_button.xml b/calculatorpp/res/layout/calc_donate_button.xml
index b4d4e5fa..ad4c928b 100644
--- a/calculatorpp/res/layout/calc_donate_button.xml
+++ b/calculatorpp/res/layout/calc_donate_button.xml
@@ -9,5 +9,5 @@
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 a:id="@+id/likeButton"
 			 a:src="@drawable/kb_facebook"
-			 style="?controlImageButtonStyle"
+			 style="?cpp_control_image_button_style"
 			 a:onClick="likeButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_dot_button.xml b/calculatorpp/res/layout/calc_dot_button.xml
index 848dcfc6..a006ef05 100644
--- a/calculatorpp/res/layout/calc_dot_button.xml
+++ b/calculatorpp/res/layout/calc_dot_button.xml
@@ -12,5 +12,5 @@
 													   a:text="."
 													   c:textUp=","
 													   c:directionTextScale="0.5"
-													   style="?digitButtonStyle"
+													   style="?cpp_digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_editor.xml b/calculatorpp/res/layout/calc_editor.xml
index f22fbd24..220b01fa 100644
--- a/calculatorpp/res/layout/calc_editor.xml
+++ b/calculatorpp/res/layout/calc_editor.xml
@@ -8,13 +8,13 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
               a:layout_width="match_parent"
               a:layout_height="match_parent"
               a:padding="@dimen/cpp_editor_padding">
 
     <org.solovyev.android.calculator.AndroidCalculatorEditorView
-            a:id="@+id/calculatorEditor"
+            a:id="@+id/calculator_editor"
             style="@style/cpp_editor_style"
             a:textIsSelectable="true"
             a:singleLine="false"
diff --git a/calculatorpp/res/layout/calc_editor_mobile.xml b/calculatorpp/res/layout/calc_editor_mobile.xml
index f22fbd24..220b01fa 100644
--- a/calculatorpp/res/layout/calc_editor_mobile.xml
+++ b/calculatorpp/res/layout/calc_editor_mobile.xml
@@ -8,13 +8,13 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
               a:layout_width="match_parent"
               a:layout_height="match_parent"
               a:padding="@dimen/cpp_editor_padding">
 
     <org.solovyev.android.calculator.AndroidCalculatorEditorView
-            a:id="@+id/calculatorEditor"
+            a:id="@+id/calculator_editor"
             style="@style/cpp_editor_style"
             a:textIsSelectable="true"
             a:singleLine="false"
diff --git a/calculatorpp/res/layout/calc_eight_digit_button.xml b/calculatorpp/res/layout/calc_eight_digit_button.xml
index 8e32e322..bec911cf 100644
--- a/calculatorpp/res/layout/calc_eight_digit_button.xml
+++ b/calculatorpp/res/layout/calc_eight_digit_button.xml
@@ -13,5 +13,5 @@
 													   c:textLeft="0d:"
 													   c:textDown="lg"
 													   c:directionTextScale="0.5;0.5;0.5;0.33"
-													   style="?digitButtonStyle"
+													   style="?cpp_digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_empty_button.xml b/calculatorpp/res/layout/calc_empty_button.xml
index 0a4d6128..38d77b13 100644
--- a/calculatorpp/res/layout/calc_empty_button.xml
+++ b/calculatorpp/res/layout/calc_empty_button.xml
@@ -7,4 +7,4 @@
   -->
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-													   style="?controlButtonStyle"/>
\ No newline at end of file
+													   style="?cpp_control_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_equals_button.xml b/calculatorpp/res/layout/calc_equals_button.xml
index e2e04b76..ca375116 100644
--- a/calculatorpp/res/layout/calc_equals_button.xml
+++ b/calculatorpp/res/layout/calc_equals_button.xml
@@ -14,5 +14,5 @@
 		c:directionTextScale="0.5"
 		a:layout_width="fill_parent"
 		a:layout_height="fill_parent"
-		style="?controlButtonStyle"
+		style="?cpp_control_button_style"
 		a:onClick="equalsButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_erase_button.xml b/calculatorpp/res/layout/calc_erase_button.xml
index f6851bcc..46ad2dfd 100644
--- a/calculatorpp/res/layout/calc_erase_button.xml
+++ b/calculatorpp/res/layout/calc_erase_button.xml
@@ -9,5 +9,5 @@
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 a:id="@+id/eraseButton"
 			 a:src="@drawable/kb_delete"
-			 style="?controlImageButtonStyle"
+			 style="?cpp_control_image_button_style"
 			 a:onClick="eraseButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_five_digit_button.xml b/calculatorpp/res/layout/calc_five_digit_button.xml
index 1b5c10cb..4c59b34e 100644
--- a/calculatorpp/res/layout/calc_five_digit_button.xml
+++ b/calculatorpp/res/layout/calc_five_digit_button.xml
@@ -12,5 +12,5 @@
 													   c:textUp="t"
 													   c:textLeft="E"
 													   c:textDown="j"
-													   style="?digitButtonStyle"
+													   style="?cpp_digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_four_digit_button.xml b/calculatorpp/res/layout/calc_four_digit_button.xml
index 17acfe6e..06eabd24 100644
--- a/calculatorpp/res/layout/calc_four_digit_button.xml
+++ b/calculatorpp/res/layout/calc_four_digit_button.xml
@@ -12,5 +12,5 @@
 													   c:textUp="x"
 													   c:textLeft="D"
 													   c:textDown="y"
-													   style="?digitButtonStyle"
+													   style="?cpp_digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_functions_button.xml b/calculatorpp/res/layout/calc_functions_button.xml
index 10d72a2f..53baae99 100644
--- a/calculatorpp/res/layout/calc_functions_button.xml
+++ b/calculatorpp/res/layout/calc_functions_button.xml
@@ -14,4 +14,4 @@
     a:text="ƒ(x)"
     a:textStyle="italic"
     a:onClick="functionsButtonClickHandler"
-    style="?controlButtonStyle" />
\ No newline at end of file
+    style="?cpp_control_button_style" />
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_history_button.xml b/calculatorpp/res/layout/calc_history_button.xml
index dfb3b4ef..517c216a 100644
--- a/calculatorpp/res/layout/calc_history_button.xml
+++ b/calculatorpp/res/layout/calc_history_button.xml
@@ -12,6 +12,6 @@
 													   c:textUp="@string/c_undo"
 													   c:textDown="@string/c_redo"
 													   c:directionTextScale="0.27"
-													   style="?controlButtonStyle"
+													   style="?cpp_control_button_style"
 													   a:textStyle="bold"
 													   a:onClick="historyButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_left_button.xml b/calculatorpp/res/layout/calc_left_button.xml
index 9ca3cfeb..8116a5ac 100644
--- a/calculatorpp/res/layout/calc_left_button.xml
+++ b/calculatorpp/res/layout/calc_left_button.xml
@@ -12,5 +12,5 @@
 													   c:textUp="◀◀"
 													   a:text="◀"
 													   c:directionTextScale="0.5"
-													   style="?controlButtonStyle"
+													   style="?cpp_control_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_multiplication_button.xml b/calculatorpp/res/layout/calc_multiplication_button.xml
index ea5831ae..0ed0c46c 100644
--- a/calculatorpp/res/layout/calc_multiplication_button.xml
+++ b/calculatorpp/res/layout/calc_multiplication_button.xml
@@ -13,6 +13,6 @@
 													   c:textUp="^"
 													   c:textDown="^2"
 													   c:textLeft="Π"
-													   style="?operationButtonStyle"
+													   style="?cpp_operation_button_style"
 													   c:directionTextScale="0.5"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_nine_digit_button.xml b/calculatorpp/res/layout/calc_nine_digit_button.xml
index 74d1bfa2..b920ea78 100644
--- a/calculatorpp/res/layout/calc_nine_digit_button.xml
+++ b/calculatorpp/res/layout/calc_nine_digit_button.xml
@@ -13,5 +13,5 @@
 													   c:textLeft="0x:"
 													   c:textUp="π"
 													   c:directionTextScale="0.5;0.5;0.5;0.33"
-													   style="?digitButtonStyle"
+													   style="?cpp_digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_one_digit_button.xml b/calculatorpp/res/layout/calc_one_digit_button.xml
index a5311385..63c5fc05 100644
--- a/calculatorpp/res/layout/calc_one_digit_button.xml
+++ b/calculatorpp/res/layout/calc_one_digit_button.xml
@@ -13,5 +13,5 @@
 													   c:textUp="sin"
 													   c:textLeft="A"
 													   c:textDown="asin"
-													   style="?digitButtonStyle"
+													   style="?cpp_digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_operators_button.xml b/calculatorpp/res/layout/calc_operators_button.xml
index 3c5b8bd0..425dcdb0 100644
--- a/calculatorpp/res/layout/calc_operators_button.xml
+++ b/calculatorpp/res/layout/calc_operators_button.xml
@@ -10,4 +10,4 @@
 													   a:id="@+id/functions_button"
 													   a:text="∂,…"
 													   a:onClick="operatorsButtonClickHandler"
-													   style="?controlButtonStyle"/>
\ No newline at end of file
+													   style="?cpp_control_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_paste_button.xml b/calculatorpp/res/layout/calc_paste_button.xml
index 98ac3ff5..a6cd5e42 100644
--- a/calculatorpp/res/layout/calc_paste_button.xml
+++ b/calculatorpp/res/layout/calc_paste_button.xml
@@ -9,5 +9,5 @@
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 a:id="@+id/pasteButton"
 			 a:src="@drawable/kb_paste"
-			 style="?controlImageButtonStyle"
+			 style="?cpp_control_image_button_style"
 			 a:onClick="pasteButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_plus_button.xml b/calculatorpp/res/layout/calc_plus_button.xml
index b01f8822..83e5531d 100644
--- a/calculatorpp/res/layout/calc_plus_button.xml
+++ b/calculatorpp/res/layout/calc_plus_button.xml
@@ -12,5 +12,5 @@
 													   c:textUp="°"
 													   c:textDown="E"
 													   a:text="+"
-													   style="?operationButtonStyle"
+													   style="?cpp_operation_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_right_button.xml b/calculatorpp/res/layout/calc_right_button.xml
index 943ab992..35659042 100644
--- a/calculatorpp/res/layout/calc_right_button.xml
+++ b/calculatorpp/res/layout/calc_right_button.xml
@@ -12,5 +12,5 @@
 													   c:textUp="▶▶"
 													   a:text="▶"
 													   c:directionTextScale="0.5"
-													   style="?controlButtonStyle"
+													   style="?cpp_control_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_round_brackets_button.xml b/calculatorpp/res/layout/calc_round_brackets_button.xml
index 73e1c89b..719ceb09 100644
--- a/calculatorpp/res/layout/calc_round_brackets_button.xml
+++ b/calculatorpp/res/layout/calc_round_brackets_button.xml
@@ -14,5 +14,5 @@
 													   c:textDown=")"
 													   c:textLeft="(…)"
 													   c:directionTextScale="0.5;0.5;0.5;0.33"
-													   style="?digitButtonStyle"
+													   style="?cpp_digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_seven_digit_button.xml b/calculatorpp/res/layout/calc_seven_digit_button.xml
index 59417e4c..3518e3e6 100644
--- a/calculatorpp/res/layout/calc_seven_digit_button.xml
+++ b/calculatorpp/res/layout/calc_seven_digit_button.xml
@@ -13,5 +13,5 @@
 													   c:textLeft="0b:"
 													   c:textDown="!"
 													   c:directionTextScale="0.5;0.5;0.5;0.33"
-													   style="?digitButtonStyle"
+													   style="?cpp_digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_six_digit_button.xml b/calculatorpp/res/layout/calc_six_digit_button.xml
index fc6b73ea..47f619e1 100644
--- a/calculatorpp/res/layout/calc_six_digit_button.xml
+++ b/calculatorpp/res/layout/calc_six_digit_button.xml
@@ -14,5 +14,5 @@
 													   c:textLeft="F"
 													   c:textDown="rad"
 													   c:directionTextScale="0.33;0.30;0.33;0.33"
-													   style="?digitButtonStyle"
+													   style="?cpp_digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_subtraction_button.xml b/calculatorpp/res/layout/calc_subtraction_button.xml
index b10a691d..2ac9ea09 100644
--- a/calculatorpp/res/layout/calc_subtraction_button.xml
+++ b/calculatorpp/res/layout/calc_subtraction_button.xml
@@ -11,5 +11,5 @@
 													   c:textDown="∂,…"
 													   a:text="-"
 													   c:directionTextScale="0.5"
-													   style="?operationButtonStyle"
+													   style="?cpp_operation_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_three_digit_button.xml b/calculatorpp/res/layout/calc_three_digit_button.xml
index 65bcc852..63e7e588 100644
--- a/calculatorpp/res/layout/calc_three_digit_button.xml
+++ b/calculatorpp/res/layout/calc_three_digit_button.xml
@@ -13,5 +13,5 @@
 													   c:textUp="tan"
 													   c:textLeft="C"
 													   c:textDown="atan"
-													   style="?digitButtonStyle"
+													   style="?cpp_digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_two_digit_button.xml b/calculatorpp/res/layout/calc_two_digit_button.xml
index 62dfdb34..d4456b65 100644
--- a/calculatorpp/res/layout/calc_two_digit_button.xml
+++ b/calculatorpp/res/layout/calc_two_digit_button.xml
@@ -13,5 +13,5 @@
 													   c:textUp="cos"
 													   c:textLeft="B"
 													   c:textDown="acos"
-													   style="?digitButtonStyle"
+													   style="?cpp_digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_vars_button.xml b/calculatorpp/res/layout/calc_vars_button.xml
index a8f5fb9d..85db3d2a 100644
--- a/calculatorpp/res/layout/calc_vars_button.xml
+++ b/calculatorpp/res/layout/calc_vars_button.xml
@@ -14,4 +14,4 @@
 													   a:text="π,…"
 													   a:textStyle="italic"
 													   a:onClick="varsButtonClickHandler"
-													   style="?controlButtonStyle"/>
\ No newline at end of file
+													   style="?cpp_control_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_zero_digit_button.xml b/calculatorpp/res/layout/calc_zero_digit_button.xml
index fd5cbc4e..dfa471e3 100644
--- a/calculatorpp/res/layout/calc_zero_digit_button.xml
+++ b/calculatorpp/res/layout/calc_zero_digit_button.xml
@@ -13,5 +13,5 @@
 													   a:text="0"
 													   c:textDown="000"
 													   c:directionTextScale="0.5"
-													   style="?digitButtonStyle"
+													   style="?cpp_digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calculator_messages_dialog.xml b/calculatorpp/res/layout/calculator_messages_dialog.xml
index 620f1e81..d8743a39 100644
--- a/calculatorpp/res/layout/calculator_messages_dialog.xml
+++ b/calculatorpp/res/layout/calculator_messages_dialog.xml
@@ -3,7 +3,7 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
     a:layout_width="wrap_content"
     a:layout_height="wrap_content"
-    style="?dialogStyle"
+    style="?cpp_dialog_style"
     a:orientation="vertical">
 
     <LinearLayout
diff --git a/calculatorpp/res/layout/drag_button_calibration.xml b/calculatorpp/res/layout/drag_button_calibration.xml
index cf8e9b99..120f6ea9 100644
--- a/calculatorpp/res/layout/drag_button_calibration.xml
+++ b/calculatorpp/res/layout/drag_button_calibration.xml
@@ -27,7 +27,7 @@
 														   c:textDown="@string/c_down"
 														   a:layout_width="80dp"
 														   a:layout_height="80dp"
-														   style="?digitButtonStyle"/>
+														   style="?cpp_digit_button_style"/>
 
 			<org.solovyev.android.view.drag.DirectionDragButton a:id="@+id/calibrationButtonRight"
 														   a:text=""
@@ -35,7 +35,7 @@
 														   c:textDown="@string/c_down"
 														   a:layout_width="80dp"
 														   a:layout_height="80dp"
-														   style="?digitButtonStyle"/>
+														   style="?cpp_digit_button_style"/>
 
 			<ImageView a:id="@+id/calibrationArrowRight"
 					   a:layout_gravity="right"
diff --git a/calculatorpp/res/layout/help_faq_fragment.xml b/calculatorpp/res/layout/help_faq_fragment.xml
index 64275e0b..e6eaa1c0 100644
--- a/calculatorpp/res/layout/help_faq_fragment.xml
+++ b/calculatorpp/res/layout/help_faq_fragment.xml
@@ -8,14 +8,14 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
               a:layout_width="match_parent"
               a:layout_height="match_parent">
 
-    <TextView a:id="@+id/fragmentTitle"
+    <TextView a:id="@+id/fragment_title"
               a:layout_height="wrap_content"
               a:layout_width="match_parent"
-              style="?fragmentTitleStyle"/>
+              style="?cpp_fragment_title_style"/>
 
     <include layout="@layout/ad"/>
 
diff --git a/calculatorpp/res/layout/help_hints_fragment.xml b/calculatorpp/res/layout/help_hints_fragment.xml
index 6cfcf112..9ec48381 100644
--- a/calculatorpp/res/layout/help_hints_fragment.xml
+++ b/calculatorpp/res/layout/help_hints_fragment.xml
@@ -7,14 +7,14 @@
   -->
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
               a:layout_width="match_parent"
               a:layout_height="match_parent">
 
-    <TextView a:id="@+id/fragmentTitle"
+    <TextView a:id="@+id/fragment_title"
               a:layout_height="wrap_content"
               a:layout_width="match_parent"
-              style="?fragmentTitleStyle"/>
+              style="?cpp_fragment_title_style"/>
 
     <include layout="@layout/ad"/>
 
diff --git a/calculatorpp/res/layout/help_screens_fragment.xml b/calculatorpp/res/layout/help_screens_fragment.xml
index 8f4d5e0e..84bb7557 100644
--- a/calculatorpp/res/layout/help_screens_fragment.xml
+++ b/calculatorpp/res/layout/help_screens_fragment.xml
@@ -7,14 +7,14 @@
   -->
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
               a:layout_width="match_parent"
               a:layout_height="match_parent">
 
-    <TextView a:id="@+id/fragmentTitle"
+    <TextView a:id="@+id/fragment_title"
               a:layout_height="wrap_content"
               a:layout_width="match_parent"
-              style="?fragmentTitleStyle"/>
+              style="?cpp_fragment_title_style"/>
 
     <include layout="@layout/ad"/>
 
diff --git a/calculatorpp/res/layout/history_fragment.xml b/calculatorpp/res/layout/history_fragment.xml
index e3cdd7c6..85db40d4 100644
--- a/calculatorpp/res/layout/history_fragment.xml
+++ b/calculatorpp/res/layout/history_fragment.xml
@@ -2,17 +2,17 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
               a:layout_width="match_parent"
               a:layout_height="match_parent">
 
-    <TextView a:id="@+id/fragmentTitle"
+    <TextView a:id="@+id/fragment_title"
               a:layout_height="wrap_content"
               a:layout_width="match_parent"
-              style="?fragmentTitleStyle"/>
+              style="?cpp_fragment_title_style"/>
 
     <include layout="@layout/ad"/>
 
-    <ListView style="?fragmentListViewStyle"/>
+    <ListView style="?cpp_fragment_list_view_style"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/history_item.xml b/calculatorpp/res/layout/history_item.xml
index d3be7e51..d1bf122c 100644
--- a/calculatorpp/res/layout/history_item.xml
+++ b/calculatorpp/res/layout/history_item.xml
@@ -8,7 +8,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:orientation="vertical"
-              style="?fragmentListViewItemStyle"
+              style="?cpp_fragment_list_view_item_style"
 			  a:layout_width="fill_parent"
 			  a:layout_height="fill_parent">
 
diff --git a/calculatorpp/res/layout/main_calculator.xml b/calculatorpp/res/layout/main_calculator.xml
index 0c0d3569..3dda0891 100644
--- a/calculatorpp/res/layout/main_calculator.xml
+++ b/calculatorpp/res/layout/main_calculator.xml
@@ -12,7 +12,7 @@
         a:layout_height="match_parent"
         a:id="@+id/main_layout"
         a:orientation="vertical"
-        style="?mainLayoutStyle">
+        style="?cpp_main_layout_style">
 
     <LinearLayout a:id="@+id/editorContainer"
                   a:layout_weight="2"
diff --git a/calculatorpp/res/layout/main_calculator_mobile.xml b/calculatorpp/res/layout/main_calculator_mobile.xml
index 8a800417..8f2bd5c2 100644
--- a/calculatorpp/res/layout/main_calculator_mobile.xml
+++ b/calculatorpp/res/layout/main_calculator_mobile.xml
@@ -12,7 +12,7 @@
         a:layout_height="match_parent"
         a:id="@+id/main_layout"
         a:orientation="vertical"
-        style="?mainLayoutStyle">
+        style="?cpp_main_layout_style">
 
     <LinearLayout a:id="@+id/editorContainer"
                   a:layout_weight="2"
diff --git a/calculatorpp/res/layout/main_empty.xml b/calculatorpp/res/layout/main_empty.xml
index 906a10f6..0f196828 100644
--- a/calculatorpp/res/layout/main_empty.xml
+++ b/calculatorpp/res/layout/main_empty.xml
@@ -8,7 +8,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@+id/main_layout"
-    style="?mainLayoutStyle"
+    style="?cpp_main_layout_style"
     a:orientation="vertical">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/main_empty_multi_pane.xml b/calculatorpp/res/layout/main_empty_multi_pane.xml
index 35bf6f40..af4764cc 100644
--- a/calculatorpp/res/layout/main_empty_multi_pane.xml
+++ b/calculatorpp/res/layout/main_empty_multi_pane.xml
@@ -8,7 +8,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@+id/main_layout"
-    style="?mainMultiPaneLayoutStyle"
+    style="?cpp_main_multi_pane_layout_style"
     a:orientation="vertical">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/math_entities_fragment.xml b/calculatorpp/res/layout/math_entities_fragment.xml
index e3cdd7c6..85db40d4 100644
--- a/calculatorpp/res/layout/math_entities_fragment.xml
+++ b/calculatorpp/res/layout/math_entities_fragment.xml
@@ -2,17 +2,17 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
               a:layout_width="match_parent"
               a:layout_height="match_parent">
 
-    <TextView a:id="@+id/fragmentTitle"
+    <TextView a:id="@+id/fragment_title"
               a:layout_height="wrap_content"
               a:layout_width="match_parent"
-              style="?fragmentTitleStyle"/>
+              style="?cpp_fragment_title_style"/>
 
     <include layout="@layout/ad"/>
 
-    <ListView style="?fragmentListViewStyle"/>
+    <ListView style="?cpp_fragment_list_view_style"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/math_entity.xml b/calculatorpp/res/layout/math_entity.xml
index 3f41f32f..6c1ece7e 100644
--- a/calculatorpp/res/layout/math_entity.xml
+++ b/calculatorpp/res/layout/math_entity.xml
@@ -9,7 +9,7 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:layout_height="wrap_content"
               a:layout_width="match_parent"
-              style="?fragmentListViewItemStyle"
+              style="?cpp_fragment_list_view_item_style"
               a:paddingBottom="@dimen/cpp_pane_padding"
               a:orientation="vertical">
 
diff --git a/calculatorpp/res/layout/plot_fragment.xml b/calculatorpp/res/layout/plot_fragment.xml
index 1e2d53c5..fc690e01 100644
--- a/calculatorpp/res/layout/plot_fragment.xml
+++ b/calculatorpp/res/layout/plot_fragment.xml
@@ -2,14 +2,14 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
               a:layout_width="match_parent"
               a:layout_height="match_parent">
 
-    <TextView a:id="@+id/fragmentTitle"
+    <TextView a:id="@+id/fragment_title"
               a:layout_height="wrap_content"
               a:layout_width="match_parent"
-              style="?fragmentTitleStyle"/>
+              style="?cpp_fragment_title_style"/>
 
     <include layout="@layout/ad"/>
 
diff --git a/calculatorpp/res/layout/saved_history_item.xml b/calculatorpp/res/layout/saved_history_item.xml
index 88c3afd9..7e4fc460 100644
--- a/calculatorpp/res/layout/saved_history_item.xml
+++ b/calculatorpp/res/layout/saved_history_item.xml
@@ -8,7 +8,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:orientation="vertical"
-              style="?fragmentListViewItemStyle"
+              style="?cpp_fragment_list_view_item_style"
               a:layout_width="fill_parent"
 			  a:layout_height="fill_parent">
 
diff --git a/calculatorpp/res/layout/vars_fragment.xml b/calculatorpp/res/layout/vars_fragment.xml
index a131f1a7..77521d86 100644
--- a/calculatorpp/res/layout/vars_fragment.xml
+++ b/calculatorpp/res/layout/vars_fragment.xml
@@ -8,17 +8,17 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
               a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
               a:layout_width="match_parent"
               a:layout_height="match_parent">
 
-    <TextView a:id="@+id/fragmentTitle"
+    <TextView a:id="@+id/fragment_title"
               a:layout_height="wrap_content"
               a:layout_width="match_parent"
-              style="?fragmentTitleStyle"/>
+              style="?cpp_fragment_title_style"/>
 
     <include layout="@layout/ad"/>
 
-    <ListView style="?fragmentListViewStyle"/>
+    <ListView style="?cpp_fragment_list_view_style"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_display.xml b/calculatorpp/res/layout/widget_display.xml
index 436ffb77..2824442d 100644
--- a/calculatorpp/res/layout/widget_display.xml
+++ b/calculatorpp/res/layout/widget_display.xml
@@ -8,7 +8,7 @@
 
 <TextView
         xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/calculatorDisplay"
+        a:id="@+id/calculator_display"
         style="@style/cpp_widget_display_style"
         a:textIsSelectable="true"
         a:padding="@dimen/cpp_display_padding"
diff --git a/calculatorpp/res/layout/widget_editor.xml b/calculatorpp/res/layout/widget_editor.xml
index b857c577..6eaadc81 100644
--- a/calculatorpp/res/layout/widget_editor.xml
+++ b/calculatorpp/res/layout/widget_editor.xml
@@ -14,7 +14,7 @@
               a:padding="@dimen/cpp_editor_padding">
 
     <TextView
-            a:id="@+id/calculatorEditor"
+            a:id="@+id/calculator_editor"
             style="@style/cpp_widget_editor_style"
             a:textIsSelectable="true"
             a:singleLine="false"
diff --git a/calculatorpp/res/values/attributes.xml b/calculatorpp/res/values/attributes.xml
index 6a51976d..016a410f 100644
--- a/calculatorpp/res/values/attributes.xml
+++ b/calculatorpp/res/values/attributes.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-	<attr name="dialogStyle" format="reference" />
-	<attr name="digitButtonStyle" format="reference" />
-	<attr name="controlButtonStyle" format="reference" />
-	<attr name="controlImageButtonStyle" format="reference" />
-	<attr name="operationButtonStyle" format="reference" />
-	<attr name="fragmentLayoutStyle" format="reference" />
-	<attr name="fragmentTitleStyle" format="reference" />
-	<attr name="fragmentListViewStyle" format="reference" />
-	<attr name="fragmentListViewItemStyle" format="reference" />
-	<attr name="buttonStyle" format="reference" />
-	<attr name="paneStyle" format="reference" />
-	<attr name="paneStyleTransparent" format="reference" />
-	<attr name="mainLayoutStyle" format="reference" />
-	<attr name="mainMultiPaneLayoutStyle" format="reference" />
+	<attr name="cpp_dialog_style" format="reference" />
+	<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_fragment_list_view_style" format="reference" />
+	<attr name="cpp_fragment_list_view_item_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" />
 
 </resources>
diff --git a/calculatorpp/res/values/theme_default.xml b/calculatorpp/res/values/theme_default.xml
index a8417451..2c5e198e 100644
--- a/calculatorpp/res/values/theme_default.xml
+++ b/calculatorpp/res/values/theme_default.xml
@@ -115,24 +115,24 @@
     </style>
 
     <style name="default_theme" parent="Theme.Sherlock">
-        <item name="digitButtonStyle">@style/default_digit_button_style</item>
-        <item name="controlButtonStyle">@style/default_control_button_style</item>
-        <item name="controlImageButtonStyle">@style/default_control_image_button_style</item>
-        <item name="operationButtonStyle">@style/default_operation_button_style</item>
-        <item name="fragmentTitleStyle">@style/default_fragment_title_style</item>
-        <item name="fragmentListViewStyle">@style/default_fragment_list_view_style</item>
-        <item name="fragmentListViewItemStyle">@style/default_fragment_list_view_item_style</item>
-        <item name="buttonStyle">@style/default_button_style</item>
+        <item name="cpp_digit_button_style">@style/default_digit_button_style</item>
+        <item name="cpp_control_button_style">@style/default_control_button_style</item>
+        <item name="cpp_control_image_button_style">@style/default_control_image_button_style</item>
+        <item name="cpp_operation_button_style">@style/default_operation_button_style</item>
+        <item name="cpp_fragment_title_style">@style/default_fragment_title_style</item>
+        <item name="cpp_fragment_list_view_style">@style/default_fragment_list_view_style</item>
+        <item name="cpp_fragment_list_view_item_style">@style/default_fragment_list_view_item_style</item>
+        <item name="cpp_button_style">@style/default_button_style</item>
 
-        <item name="mainLayoutStyle">@style/default_main_layout_style</item>
-        <item name="mainMultiPaneLayoutStyle">@style/default_main_multi_pane_layout_style</item>
+        <item name="cpp_main_layout_style">@style/default_main_layout_style</item>
+        <item name="cpp_main_multi_pane_layout_style">@style/default_main_multi_pane_layout_style</item>
 
-        <item name="fragmentLayoutStyle">@style/default_fragment_layout_style</item>
+        <item name="cpp_fragment_layout_style">@style/default_fragment_layout_style</item>
 
-        <item name="dialogStyle">@style/default_dialog_style</item>
+        <item name="cpp_dialog_style">@style/default_dialog_style</item>
 
-        <item name="paneStyle">@style/default_pane_style</item>
-        <item name="paneStyleTransparent">@style/default_pane_style_transparent</item>
+        <item name="cpp_pane_style">@style/default_pane_style</item>
+        <item name="cpp_pane_style_transparent">@style/default_pane_style_transparent</item>
 
         <!-- action bar-->
         <item name="actionBarTabStyle">@style/default_actionbar_tab_style</item>
diff --git a/calculatorpp/res/values/theme_light_blue.xml b/calculatorpp/res/values/theme_light_blue.xml
index 7c204cc7..274dc075 100644
--- a/calculatorpp/res/values/theme_light_blue.xml
+++ b/calculatorpp/res/values/theme_light_blue.xml
@@ -24,10 +24,10 @@
 	</style>
 
 	<style name="light_blue_theme" parent="default_theme">
-		<item name="digitButtonStyle">@style/light_blue_digit_button_style</item>
-		<item name="controlButtonStyle">@style/light_blue_control_button_style</item>
-		<item name="controlImageButtonStyle">@style/light_blue_control_image_button_style</item>
-		<item name="operationButtonStyle">@style/light_blue_operation_button_style</item>
+		<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>
 
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/res/values/theme_metro_blue.xml b/calculatorpp/res/values/theme_metro_blue.xml
index b1d58c0e..54161c67 100644
--- a/calculatorpp/res/values/theme_metro_blue.xml
+++ b/calculatorpp/res/values/theme_metro_blue.xml
@@ -48,12 +48,12 @@
     </style>
 
 	<style name="metro_blue_theme" parent="default_theme">
-		<item name="digitButtonStyle">@style/metro_digit_button_style</item>
-		<item name="controlButtonStyle">@style/metro_control_button_style</item>
-		<item name="controlImageButtonStyle">@style/metro_control_image_button_style</item>
-		<item name="operationButtonStyle">@style/metro_blue_operation_button_style</item>
+		<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>
 
-        <item name="fragmentListViewItemStyle">@style/metro_blue_fragment_list_view_item_style</item>
+        <item name="cpp_fragment_list_view_item_style">@style/metro_blue_fragment_list_view_item_style</item>
 
         <!--action bar-->
 <!--        <item name="actionBarTabStyle">@style/metro_blue_actionbar_tab_style</item>
diff --git a/calculatorpp/res/values/theme_metro_green.xml b/calculatorpp/res/values/theme_metro_green.xml
index 002253cc..9de2cf9a 100644
--- a/calculatorpp/res/values/theme_metro_green.xml
+++ b/calculatorpp/res/values/theme_metro_green.xml
@@ -10,8 +10,8 @@
     </style>
 
     <style name="metro_green_theme" parent="metro_blue_theme">
-		<item name="operationButtonStyle">@style/metro_green_operation_button_style</item>
-        <item name="fragmentListViewItemStyle">@style/metro_green_fragment_list_view_item_style</item>
+		<item name="cpp_operation_button_style">@style/metro_green_operation_button_style</item>
+        <item name="cpp_fragment_list_view_item_style">@style/metro_green_fragment_list_view_item_style</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/res/values/theme_metro_purple.xml b/calculatorpp/res/values/theme_metro_purple.xml
index f0f362ca..582afd5b 100644
--- a/calculatorpp/res/values/theme_metro_purple.xml
+++ b/calculatorpp/res/values/theme_metro_purple.xml
@@ -11,8 +11,8 @@
     </style>
 
 	<style name="metro_purple_theme" parent="metro_blue_theme">
-		<item name="operationButtonStyle">@style/metro_purple_operation_button_style</item>
-        <item name="fragmentListViewItemStyle">@style/metro_purple_fragment_list_view_item_style</item>
+		<item name="cpp_operation_button_style">@style/metro_purple_operation_button_style</item>
+        <item name="cpp_fragment_list_view_item_style">@style/metro_purple_fragment_list_view_item_style</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/res/values/theme_violet.xml b/calculatorpp/res/values/theme_violet.xml
index 156fd603..b0a79c03 100644
--- a/calculatorpp/res/values/theme_violet.xml
+++ b/calculatorpp/res/values/theme_violet.xml
@@ -23,9 +23,9 @@
 	</style>
 
 	<style name="violet_theme" parent="default_theme">
-		<item name="digitButtonStyle">@style/violet_digit_button_style</item>
-		<item name="controlButtonStyle">@style/violet_control_button_style</item>
-		<item name="controlImageButtonStyle">@style/violet_control_image_button_style</item>
-		<item name="operationButtonStyle">@style/violet_operation_button_style</item>
+		<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>
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java
index 8bf92c67..a367ab9d 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java
@@ -59,7 +59,7 @@ public class AndroidCalculator implements Calculator, CalculatorEventListener, S
     }
 
     public void setDisplay(@NotNull Activity activity) {
-        final AndroidCalculatorDisplayView displayView = (AndroidCalculatorDisplayView) activity.findViewById(R.id.calculatorDisplay);
+        final AndroidCalculatorDisplayView displayView = (AndroidCalculatorDisplayView) activity.findViewById(R.id.calculator_display);
         setDisplay(activity, displayView);
     }
 
@@ -69,7 +69,7 @@ public class AndroidCalculator implements Calculator, CalculatorEventListener, S
     }
 
     public void setEditor(@NotNull Activity activity) {
-        final AndroidCalculatorEditorView editorView = (AndroidCalculatorEditorView) activity.findViewById(R.id.calculatorEditor);
+        final AndroidCalculatorEditorView editorView = (AndroidCalculatorEditorView) activity.findViewById(R.id.calculator_editor);
         setEditor(activity, editorView);
     }
 
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
index da696eea..9c2e19c3 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
@@ -47,7 +47,7 @@ public class CalculatorFragmentHelperImpl extends AbstractCalculatorHelper imple
     }
 
     public void setPaneTitle(@NotNull Fragment fragment, int titleResId) {
-        final TextView fragmentTitle = (TextView) fragment.getView().findViewById(R.id.fragmentTitle);
+        final TextView fragmentTitle = (TextView) fragment.getView().findViewById(R.id.fragment_title);
         if (fragmentTitle != null) {
             if (!isPane(fragment)) {
                 fragmentTitle.setVisibility(View.GONE);
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
index 03f01d4a..316b65ef 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
@@ -204,10 +204,10 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
 
     private void updateDisplayState(@NotNull Context context, @NotNull RemoteViews views, @NotNull CalculatorDisplayViewState displayState) {
         if (displayState.isValid()) {
-            views.setTextViewText(R.id.calculatorDisplay, displayState.getText());
-            views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.cpp_default_text_color));
+            views.setTextViewText(R.id.calculator_display, displayState.getText());
+            views.setTextColor(R.id.calculator_display, context.getResources().getColor(R.color.cpp_default_text_color));
         } else {
-            views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.cpp_display_error_text_color));
+            views.setTextColor(R.id.calculator_display, context.getResources().getColor(R.color.cpp_display_error_text_color));
         }
     }
 
@@ -221,7 +221,7 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
             newText = Html.fromHtml(text.substring(0, selection) + "<font color=\"#" + getCursorColor(context) + "\">|</font>" + text.substring(selection));
         }
         CalculatorLocatorImpl.getInstance().getNotifier().showDebugMessage(TAG, "New editor state: " + text);
-        views.setTextViewText(R.id.calculatorEditor, newText);
+        views.setTextViewText(R.id.calculator_editor, newText);
     }
 
     /*