diff --git a/android-app-core/res/layout/widget_app_button.xml b/android-app-core/res/layout/cpp_simple_app_button.xml
similarity index 85%
rename from android-app-core/res/layout/widget_app_button.xml
rename to android-app-core/res/layout/cpp_simple_app_button.xml
index 1149f1e2..754fccce 100644
--- a/android-app-core/res/layout/widget_app_button.xml
+++ b/android-app-core/res/layout/cpp_simple_app_button.xml
@@ -9,5 +9,5 @@
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/appButton"
         a:src="@drawable/kb_logo"
-        style="@style/widget_metro_control_image_button_style"
+        style="@style/cpp_simple_metro_control_image_button_style"
         a:contentDescription="App"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_clear_button.xml b/android-app-core/res/layout/cpp_simple_clear_button.xml
similarity index 85%
rename from android-app-core/res/layout/widget_clear_button.xml
rename to android-app-core/res/layout/cpp_simple_clear_button.xml
index 8715b738..9e5a9e7b 100644
--- a/android-app-core/res/layout/widget_clear_button.xml
+++ b/android-app-core/res/layout/cpp_simple_clear_button.xml
@@ -10,4 +10,4 @@
         a:id="@+id/clearButton"
         a:text="@string/c_clear"
         a:textStyle="bold"
-        style="@style/widget_metro_control_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_copy_button.xml b/android-app-core/res/layout/cpp_simple_copy_button.xml
similarity index 85%
rename from android-app-core/res/layout/widget_copy_button.xml
rename to android-app-core/res/layout/cpp_simple_copy_button.xml
index eac06ff0..4c383d47 100644
--- a/android-app-core/res/layout/widget_copy_button.xml
+++ b/android-app-core/res/layout/cpp_simple_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="@style/widget_metro_control_image_button_style"
+        style="@style/cpp_simple_metro_control_image_button_style"
         a:contentDescription="Copy"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_division_button.xml b/android-app-core/res/layout/cpp_simple_division_button.xml
similarity index 82%
rename from android-app-core/res/layout/widget_division_button.xml
rename to android-app-core/res/layout/cpp_simple_division_button.xml
index 1a99c28b..24e67794 100644
--- a/android-app-core/res/layout/widget_division_button.xml
+++ b/android-app-core/res/layout/cpp_simple_division_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/divisionButton"
         a:text="/"
-        style="@style/widget_metro_blue_operation_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_dot_button.xml b/android-app-core/res/layout/cpp_simple_dot_button.xml
similarity index 100%
rename from android-app-core/res/layout/widget_dot_button.xml
rename to android-app-core/res/layout/cpp_simple_dot_button.xml
diff --git a/android-app-core/res/layout/widget_eight_digit_button.xml b/android-app-core/res/layout/cpp_simple_eight_digit_button.xml
similarity index 84%
rename from android-app-core/res/layout/widget_eight_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_eight_digit_button.xml
index c592c842..345eae85 100644
--- a/android-app-core/res/layout/widget_eight_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_eight_digit_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/eightDigitButton"
         a:text="8"
-        style="@style/widget_metro_digit_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_equals_button.xml b/android-app-core/res/layout/cpp_simple_equals_button.xml
similarity index 84%
rename from android-app-core/res/layout/widget_equals_button.xml
rename to android-app-core/res/layout/cpp_simple_equals_button.xml
index c07b0070..204ffbf6 100644
--- a/android-app-core/res/layout/widget_equals_button.xml
+++ b/android-app-core/res/layout/cpp_simple_equals_button.xml
@@ -9,4 +9,4 @@
         xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/equalsButton"
         a:text="="
-        style="@style/widget_metro_control_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_erase_button.xml b/android-app-core/res/layout/cpp_simple_erase_button.xml
similarity index 85%
rename from android-app-core/res/layout/widget_erase_button.xml
rename to android-app-core/res/layout/cpp_simple_erase_button.xml
index edd42f61..bc22552b 100644
--- a/android-app-core/res/layout/widget_erase_button.xml
+++ b/android-app-core/res/layout/cpp_simple_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="@style/widget_metro_control_image_button_style"
+        style="@style/cpp_simple_metro_control_image_button_style"
         a:contentDescription="Erase"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_five_digit_button.xml b/android-app-core/res/layout/cpp_simple_five_digit_button.xml
similarity index 84%
rename from android-app-core/res/layout/widget_five_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_five_digit_button.xml
index 51a7691d..48fa94f1 100644
--- a/android-app-core/res/layout/widget_five_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_five_digit_button.xml
@@ -8,4 +8,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/fiveDigitButton"
         a:text="5"
-        style="@style/widget_metro_digit_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_four_digit_button.xml b/android-app-core/res/layout/cpp_simple_four_digit_button.xml
similarity index 84%
rename from android-app-core/res/layout/widget_four_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_four_digit_button.xml
index 560acbd4..beeef1ec 100644
--- a/android-app-core/res/layout/widget_four_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_four_digit_button.xml
@@ -8,4 +8,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/fourDigitButton"
         a:text="4"
-        style="@style/widget_metro_digit_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_functions_button.xml b/android-app-core/res/layout/cpp_simple_functions_button.xml
similarity index 85%
rename from android-app-core/res/layout/widget_functions_button.xml
rename to android-app-core/res/layout/cpp_simple_functions_button.xml
index 1a240018..f10d5054 100644
--- a/android-app-core/res/layout/widget_functions_button.xml
+++ b/android-app-core/res/layout/cpp_simple_functions_button.xml
@@ -10,4 +10,4 @@
         a:id="@+id/functions_button"
         a:text="ƒ(x)"
         a:textStyle="italic"
-        style="@style/widget_metro_control_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_history_button.xml b/android-app-core/res/layout/cpp_simple_history_button.xml
similarity index 86%
rename from android-app-core/res/layout/widget_history_button.xml
rename to android-app-core/res/layout/cpp_simple_history_button.xml
index 51338209..edeb6dfa 100644
--- a/android-app-core/res/layout/widget_history_button.xml
+++ b/android-app-core/res/layout/cpp_simple_history_button.xml
@@ -8,5 +8,5 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/historyButton"
         a:text="@string/c_history_button"
-        style="@style/widget_metro_control_button_style"
+        style="@style/cpp_simple_metro_control_button_style"
         a:textStyle="bold"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_keyboard.xml b/android-app-core/res/layout/cpp_simple_keyboard.xml
new file mode 100644
index 00000000..ff327116
--- /dev/null
+++ b/android-app-core/res/layout/cpp_simple_keyboard.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+              a:layout_width="match_parent"
+              a:layout_height="match_parent"
+              a:orientation="vertical">
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_simple_seven_digit_button"/>
+        <include layout="@layout/cpp_simple_eight_digit_button"/>
+        <include layout="@layout/cpp_simple_nine_digit_button"/>
+        <include layout="@layout/cpp_simple_multiplication_button"/>
+        <include layout="@layout/cpp_simple_percent_button"/>
+        <include layout="@layout/cpp_simple_clear_button"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_simple_four_digit_button"/>
+        <include layout="@layout/cpp_simple_five_digit_button"/>
+        <include layout="@layout/cpp_simple_six_digit_button"/>
+        <include layout="@layout/cpp_simple_division_button"/>
+        <include layout="@layout/cpp_simple_power_button"/>
+        <include layout="@layout/cpp_simple_erase_button"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_simple_one_digit_button"/>
+        <include layout="@layout/cpp_simple_two_digit_button"/>
+        <include layout="@layout/cpp_simple_three_digit_button"/>
+        <include layout="@layout/cpp_simple_plus_button"/>
+        <include layout="@layout/cpp_simple_like_button"/>
+        <include layout="@layout/cpp_simple_copy_button"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_simple_round_brackets_button"/>
+        <include layout="@layout/cpp_simple_zero_digit_button"/>
+        <include layout="@layout/cpp_simple_dot_button"/>
+        <include layout="@layout/cpp_simple_subtraction_button"/>
+        <include layout="@layout/cpp_simple_settings_button"/>
+        <include layout="@layout/cpp_simple_paste_button"/>
+
+    </LinearLayout>
+
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/cpp_simple_left_button"/>
+        <include layout="@layout/cpp_simple_right_button"/>
+        <include layout="@layout/cpp_simple_vars_button"/>
+        <include layout="@layout/cpp_simple_functions_button"/>
+        <include layout="@layout/cpp_simple_app_button"/>
+        <include layout="@layout/cpp_simple_history_button"/>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_left_button.xml b/android-app-core/res/layout/cpp_simple_left_button.xml
similarity index 84%
rename from android-app-core/res/layout/widget_left_button.xml
rename to android-app-core/res/layout/cpp_simple_left_button.xml
index f5dd952f..79d76cac 100644
--- a/android-app-core/res/layout/widget_left_button.xml
+++ b/android-app-core/res/layout/cpp_simple_left_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/leftButton"
         a:text="◀"
-        style="@style/widget_metro_control_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_like_button.xml b/android-app-core/res/layout/cpp_simple_like_button.xml
similarity index 85%
rename from android-app-core/res/layout/widget_like_button.xml
rename to android-app-core/res/layout/cpp_simple_like_button.xml
index f7432a99..1db2b59e 100644
--- a/android-app-core/res/layout/widget_like_button.xml
+++ b/android-app-core/res/layout/cpp_simple_like_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="@style/widget_metro_control_image_button_style"
+        style="@style/cpp_simple_metro_control_image_button_style"
         a:contentDescription="Like"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_multiplication_button.xml b/android-app-core/res/layout/cpp_simple_multiplication_button.xml
similarity index 83%
rename from android-app-core/res/layout/widget_multiplication_button.xml
rename to android-app-core/res/layout/cpp_simple_multiplication_button.xml
index 736c3961..fcda5dcb 100644
--- a/android-app-core/res/layout/widget_multiplication_button.xml
+++ b/android-app-core/res/layout/cpp_simple_multiplication_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/multiplicationButton"
         a:text="×"
-        style="@style/widget_metro_blue_operation_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_nine_digit_button.xml b/android-app-core/res/layout/cpp_simple_nine_digit_button.xml
similarity index 84%
rename from android-app-core/res/layout/widget_nine_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_nine_digit_button.xml
index a66e30de..6d5fa140 100644
--- a/android-app-core/res/layout/widget_nine_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_nine_digit_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/nineDigitButton"
         a:text="9"
-        style="@style/widget_metro_digit_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_one_digit_button.xml b/android-app-core/res/layout/cpp_simple_one_digit_button.xml
similarity index 84%
rename from android-app-core/res/layout/widget_one_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_one_digit_button.xml
index 93e2c106..ccfd092f 100644
--- a/android-app-core/res/layout/widget_one_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_one_digit_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/oneDigitButton"
         a:text="1"
-        style="@style/widget_metro_digit_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_paste_button.xml b/android-app-core/res/layout/cpp_simple_paste_button.xml
similarity index 85%
rename from android-app-core/res/layout/widget_paste_button.xml
rename to android-app-core/res/layout/cpp_simple_paste_button.xml
index 1512e5f9..42eca36f 100644
--- a/android-app-core/res/layout/widget_paste_button.xml
+++ b/android-app-core/res/layout/cpp_simple_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="@style/widget_metro_control_image_button_style"
+        style="@style/cpp_simple_metro_control_image_button_style"
         a:contentDescription="Paste"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_percent_button.xml b/android-app-core/res/layout/cpp_simple_percent_button.xml
similarity index 82%
rename from android-app-core/res/layout/widget_percent_button.xml
rename to android-app-core/res/layout/cpp_simple_percent_button.xml
index 8d6c30ad..d91ed8b3 100644
--- a/android-app-core/res/layout/widget_percent_button.xml
+++ b/android-app-core/res/layout/cpp_simple_percent_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/percentButton"
         a:text="%"
-        style="@style/widget_metro_blue_operation_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_plus_button.xml b/android-app-core/res/layout/cpp_simple_plus_button.xml
similarity index 82%
rename from android-app-core/res/layout/widget_plus_button.xml
rename to android-app-core/res/layout/cpp_simple_plus_button.xml
index e3b32fc1..c41001bf 100644
--- a/android-app-core/res/layout/widget_plus_button.xml
+++ b/android-app-core/res/layout/cpp_simple_plus_button.xml
@@ -8,4 +8,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/plusButton"
         a:text="+"
-        style="@style/widget_metro_blue_operation_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_power_button.xml b/android-app-core/res/layout/cpp_simple_power_button.xml
similarity index 82%
rename from android-app-core/res/layout/widget_power_button.xml
rename to android-app-core/res/layout/cpp_simple_power_button.xml
index 8c481de9..5f77f94c 100644
--- a/android-app-core/res/layout/widget_power_button.xml
+++ b/android-app-core/res/layout/cpp_simple_power_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/powerButton"
         a:text="^"
-        style="@style/widget_metro_blue_operation_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_right_button.xml b/android-app-core/res/layout/cpp_simple_right_button.xml
similarity index 84%
rename from android-app-core/res/layout/widget_right_button.xml
rename to android-app-core/res/layout/cpp_simple_right_button.xml
index e7a5df07..4656d89d 100644
--- a/android-app-core/res/layout/widget_right_button.xml
+++ b/android-app-core/res/layout/cpp_simple_right_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/rightButton"
         a:text="▶"
-        style="@style/widget_metro_control_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_round_brackets_button.xml b/android-app-core/res/layout/cpp_simple_round_brackets_button.xml
similarity index 84%
rename from android-app-core/res/layout/widget_round_brackets_button.xml
rename to android-app-core/res/layout/cpp_simple_round_brackets_button.xml
index 02a67454..1ae049d9 100644
--- a/android-app-core/res/layout/widget_round_brackets_button.xml
+++ b/android-app-core/res/layout/cpp_simple_round_brackets_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/roundBracketsButton"
         a:text="()"
-        style="@style/widget_metro_digit_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_settings_button.xml b/android-app-core/res/layout/cpp_simple_settings_button.xml
similarity index 85%
rename from android-app-core/res/layout/widget_settings_button.xml
rename to android-app-core/res/layout/cpp_simple_settings_button.xml
index 86f316cf..df6e4293 100644
--- a/android-app-core/res/layout/widget_settings_button.xml
+++ b/android-app-core/res/layout/cpp_simple_settings_button.xml
@@ -9,5 +9,5 @@
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/settingsButton"
         a:src="@drawable/kb_settings"
-        style="@style/widget_metro_control_image_button_style"
+        style="@style/cpp_simple_metro_control_image_button_style"
         a:contentDescription="Settings"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_seven_digit_button.xml b/android-app-core/res/layout/cpp_simple_seven_digit_button.xml
similarity index 72%
rename from android-app-core/res/layout/widget_seven_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_seven_digit_button.xml
index 3cb5ffaa..a45fae6a 100644
--- a/android-app-core/res/layout/widget_seven_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_seven_digit_button.xml
@@ -3,4 +3,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/sevenDigitButton"
         a:text="7"
-        style="@style/widget_metro_digit_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_six_digit_button.xml b/android-app-core/res/layout/cpp_simple_six_digit_button.xml
similarity index 84%
rename from android-app-core/res/layout/widget_six_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_six_digit_button.xml
index e018f4c6..aef39320 100644
--- a/android-app-core/res/layout/widget_six_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_six_digit_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/sixDigitButton"
         a:text="6"
-        style="@style/widget_metro_digit_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_subtraction_button.xml b/android-app-core/res/layout/cpp_simple_subtraction_button.xml
similarity index 82%
rename from android-app-core/res/layout/widget_subtraction_button.xml
rename to android-app-core/res/layout/cpp_simple_subtraction_button.xml
index 21fee994..b5888abc 100644
--- a/android-app-core/res/layout/widget_subtraction_button.xml
+++ b/android-app-core/res/layout/cpp_simple_subtraction_button.xml
@@ -8,4 +8,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/subtractionButton"
         a:text="-"
-        style="@style/widget_metro_blue_operation_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_three_digit_button.xml b/android-app-core/res/layout/cpp_simple_three_digit_button.xml
similarity index 84%
rename from android-app-core/res/layout/widget_three_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_three_digit_button.xml
index 8138087c..9cc9c46f 100644
--- a/android-app-core/res/layout/widget_three_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_three_digit_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/threeDigitButton"
         a:text="3"
-        style="@style/widget_metro_digit_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_two_digit_button.xml b/android-app-core/res/layout/cpp_simple_two_digit_button.xml
similarity index 84%
rename from android-app-core/res/layout/widget_two_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_two_digit_button.xml
index bca333fd..5745a27d 100644
--- a/android-app-core/res/layout/widget_two_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_two_digit_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/twoDigitButton"
         a:text="2"
-        style="@style/widget_metro_digit_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_vars_button.xml b/android-app-core/res/layout/cpp_simple_vars_button.xml
similarity index 85%
rename from android-app-core/res/layout/widget_vars_button.xml
rename to android-app-core/res/layout/cpp_simple_vars_button.xml
index 2ba91c0c..6be475f1 100644
--- a/android-app-core/res/layout/widget_vars_button.xml
+++ b/android-app-core/res/layout/cpp_simple_vars_button.xml
@@ -10,4 +10,4 @@
         a:id="@+id/vars_button"
         a:text="π,…"
         a:textStyle="italic"
-        style="@style/widget_metro_control_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_zero_digit_button.xml b/android-app-core/res/layout/cpp_simple_zero_digit_button.xml
similarity index 84%
rename from android-app-core/res/layout/widget_zero_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_zero_digit_button.xml
index 0c9aca96..4da0706c 100644
--- a/android-app-core/res/layout/widget_zero_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_zero_digit_button.xml
@@ -9,4 +9,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
         a:id="@+id/zeroDigitButton"
         a:text="0"
-        style="@style/widget_metro_digit_button_style"/>
\ No newline at end of file
+        style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/widget_keyboard.xml b/android-app-core/res/layout/widget_keyboard.xml
deleted file mode 100644
index 699538ae..00000000
--- a/android-app-core/res/layout/widget_keyboard.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-              a:layout_width="match_parent"
-              a:layout_height="match_parent"
-              a:orientation="vertical">
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/widget_seven_digit_button"/>
-        <include layout="@layout/widget_eight_digit_button"/>
-        <include layout="@layout/widget_nine_digit_button"/>
-        <include layout="@layout/widget_multiplication_button"/>
-        <include layout="@layout/widget_percent_button"/>
-        <include layout="@layout/widget_clear_button"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/widget_four_digit_button"/>
-        <include layout="@layout/widget_five_digit_button"/>
-        <include layout="@layout/widget_six_digit_button"/>
-        <include layout="@layout/widget_division_button"/>
-        <include layout="@layout/widget_power_button"/>
-        <include layout="@layout/widget_erase_button"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/widget_one_digit_button"/>
-        <include layout="@layout/widget_two_digit_button"/>
-        <include layout="@layout/widget_three_digit_button"/>
-        <include layout="@layout/widget_plus_button"/>
-        <include layout="@layout/widget_like_button"/>
-        <include layout="@layout/widget_copy_button"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/widget_round_brackets_button"/>
-        <include layout="@layout/widget_zero_digit_button"/>
-        <include layout="@layout/widget_dot_button"/>
-        <include layout="@layout/widget_subtraction_button"/>
-        <include layout="@layout/widget_settings_button"/>
-        <include layout="@layout/widget_paste_button"/>
-
-    </LinearLayout>
-
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/widget_left_button"/>
-        <include layout="@layout/widget_right_button"/>
-        <include layout="@layout/widget_vars_button"/>
-        <include layout="@layout/widget_functions_button"/>
-        <include layout="@layout/widget_app_button"/>
-        <include layout="@layout/widget_history_button"/>
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android-app-core/res/values/styles.xml b/android-app-core/res/values/styles.xml
index 3dd2ecce..4d9b3f46 100644
--- a/android-app-core/res/values/styles.xml
+++ b/android-app-core/res/values/styles.xml
@@ -89,19 +89,19 @@
 
 
 
-    <style name="widget_metro_digit_button_style" parent="metro_digit_button_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>
     </style>
 
-    <style name="widget_metro_control_button_style" parent="metro_control_button_style">
+    <style name="cpp_simple_metro_control_button_style" parent="metro_control_button_style">
         <item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
     </style>
 
-    <style name="widget_metro_blue_operation_button_style" parent="metro_blue_operation_button_style">
+    <style name="cpp_simple_metro_blue_operation_button_style" parent="metro_blue_operation_button_style">
         <item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
     </style>
 
-    <style name="widget_metro_control_image_button_style" parent="metro_control_image_button_style">
+    <style name="cpp_simple_metro_control_image_button_style" parent="metro_control_image_button_style">
         <item name="android:scaleType">center</item>
     </style>
 
diff --git a/android-app-onscreen/res/layout/onscreen_keyboard.xml b/android-app-onscreen/res/layout/onscreen_keyboard.xml
index 901dca2f..8f882cc4 100644
--- a/android-app-onscreen/res/layout/onscreen_keyboard.xml
+++ b/android-app-onscreen/res/layout/onscreen_keyboard.xml
@@ -9,11 +9,11 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/widget_seven_digit_button"/>
-        <include layout="@layout/widget_eight_digit_button"/>
-        <include layout="@layout/widget_nine_digit_button"/>
-        <include layout="@layout/widget_multiplication_button"/>
-		<include layout="@layout/widget_erase_button"/>
+        <include layout="@layout/cpp_simple_seven_digit_button"/>
+        <include layout="@layout/cpp_simple_eight_digit_button"/>
+        <include layout="@layout/cpp_simple_nine_digit_button"/>
+        <include layout="@layout/cpp_simple_multiplication_button"/>
+		<include layout="@layout/cpp_simple_erase_button"/>
 
     </LinearLayout>
 
@@ -21,11 +21,11 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/widget_four_digit_button"/>
-        <include layout="@layout/widget_five_digit_button"/>
-        <include layout="@layout/widget_six_digit_button"/>
-        <include layout="@layout/widget_division_button"/>
-		<include layout="@layout/widget_percent_button"/>
+        <include layout="@layout/cpp_simple_four_digit_button"/>
+        <include layout="@layout/cpp_simple_five_digit_button"/>
+        <include layout="@layout/cpp_simple_six_digit_button"/>
+        <include layout="@layout/cpp_simple_division_button"/>
+		<include layout="@layout/cpp_simple_percent_button"/>
 
 	</LinearLayout>
 
@@ -33,22 +33,22 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/widget_one_digit_button"/>
-        <include layout="@layout/widget_two_digit_button"/>
-        <include layout="@layout/widget_three_digit_button"/>
-        <include layout="@layout/widget_plus_button"/>
-		<include layout="@layout/widget_power_button"/>
+        <include layout="@layout/cpp_simple_one_digit_button"/>
+        <include layout="@layout/cpp_simple_two_digit_button"/>
+        <include layout="@layout/cpp_simple_three_digit_button"/>
+        <include layout="@layout/cpp_simple_plus_button"/>
+		<include layout="@layout/cpp_simple_power_button"/>
     </LinearLayout>
 
     <LinearLayout a:layout_weight="1"
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/widget_round_brackets_button"/>
-        <include layout="@layout/widget_zero_digit_button"/>
-        <include layout="@layout/widget_dot_button"/>
-        <include layout="@layout/widget_subtraction_button"/>
-		<include layout="@layout/widget_app_button"/>
+        <include layout="@layout/cpp_simple_round_brackets_button"/>
+        <include layout="@layout/cpp_simple_zero_digit_button"/>
+        <include layout="@layout/cpp_simple_dot_button"/>
+        <include layout="@layout/cpp_simple_subtraction_button"/>
+		<include layout="@layout/cpp_simple_app_button"/>
 
 	</LinearLayout>
 
diff --git a/android-app-onscreen/res/layout/onscreen_layout.xml b/android-app-onscreen/res/layout/onscreen_layout.xml
index 1593b4ec..aa1893cb 100644
--- a/android-app-onscreen/res/layout/onscreen_layout.xml
+++ b/android-app-onscreen/res/layout/onscreen_layout.xml
@@ -19,7 +19,7 @@
 					  a:layout_width="match_parent"
 					  a:layout_height="0dp">
 
-			<include layout="@layout/widget_equals_button"
+			<include layout="@layout/cpp_simple_equals_button"
 					 a:layout_margin="@dimen/cpp_button_margin"
 					 a:layout_weight="1"
 					 a:layout_width="0dp"
diff --git a/android-app-widget/res/layout/widget_layout.xml b/android-app-widget/res/layout/widget_layout.xml
index 878e298b..3ffa9846 100644
--- a/android-app-widget/res/layout/widget_layout.xml
+++ b/android-app-widget/res/layout/widget_layout.xml
@@ -15,7 +15,7 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/widget_equals_button"
+        <include layout="@layout/cpp_simple_equals_button"
                  a:layout_margin="@dimen/cpp_button_margin"
                  a:layout_weight="1"
                  a:layout_width="0dp"
@@ -28,7 +28,7 @@
 
     </LinearLayout>
 
-    <include layout="@layout/widget_keyboard"
+    <include layout="@layout/cpp_simple_keyboard"
              a:layout_weight="5"
              a:layout_width="match_parent"
              a:layout_height="0dp"/>