diff --git a/android-app/src/main/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png b/android-app/src/main/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png
deleted file mode 100644
index 4f4cf423..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png b/android-app/src/main/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png
deleted file mode 100644
index b0dc31fb..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png b/android-app/src/main/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png
deleted file mode 100644
index 8220f7e7..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png b/android-app/src/main/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png
deleted file mode 100644
index e6d8a300..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/default_abs__list_focused_holo.9.png b/android-app/src/main/res/drawable-nodpi/default_abs__list_focused_holo.9.png
deleted file mode 100644
index 6d2ce5d1..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/default_abs__list_focused_holo.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png b/android-app/src/main/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png
deleted file mode 100644
index 78648132..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png b/android-app/src/main/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png
deleted file mode 100644
index 0b7b3ef4..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png b/android-app/src/main/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png
deleted file mode 100644
index 74ab84a1..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png b/android-app/src/main/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png
deleted file mode 100644
index cb0f01c3..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png b/android-app/src/main/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png
deleted file mode 100644
index bd047fce..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/default_abs__tab_selected_holo.9.png b/android-app/src/main/res/drawable-nodpi/default_abs__tab_selected_holo.9.png
deleted file mode 100644
index 1f358332..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/default_abs__tab_selected_holo.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png b/android-app/src/main/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png
deleted file mode 100644
index e758a805..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png b/android-app/src/main/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png
deleted file mode 100644
index a3af9c15..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png b/android-app/src/main/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png
deleted file mode 100644
index 8a29e758..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png b/android-app/src/main/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png
deleted file mode 100644
index a3d3aa00..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png b/android-app/src/main/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png
deleted file mode 100644
index d461fd64..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png b/android-app/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png
deleted file mode 100644
index ce86040d..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png b/android-app/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png
deleted file mode 100644
index dce4c69b..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png b/android-app/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png
deleted file mode 100644
index 8e7bfd6f..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png b/android-app/src/main/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png
deleted file mode 100644
index efb79dcd..00000000
Binary files a/android-app/src/main/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable/default_abs__btn_cab_done_holo_dark.xml b/android-app/src/main/res/drawable/default_abs__btn_cab_done_holo_dark.xml
deleted file mode 100644
index c4410967..00000000
--- a/android-app/src/main/res/drawable/default_abs__btn_cab_done_holo_dark.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true" android:drawable="@drawable/default_abs__btn_cab_done_pressed_holo_dark"/>
-	<item android:state_focused="true" android:state_enabled="true"
-		  android:drawable="@drawable/default_abs__btn_cab_done_focused_holo_dark"/>
-	<item android:state_enabled="true" android:drawable="@drawable/default_abs__btn_cab_done_default_holo_dark"/>
-</selector>
diff --git a/android-app/src/main/res/drawable/default_abs__item_background_holo_dark.xml b/android-app/src/main/res/drawable/default_abs__item_background_holo_dark.xml
deleted file mode 100644
index 5fa51ea9..00000000
--- a/android-app/src/main/res/drawable/default_abs__item_background_holo_dark.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-  <!-- todo serso: fix me-->
-<!--	<item android:state_focused="true" android:state_enabled="false" android:state_pressed="true"
-		  android:drawable="@drawable/abs__list_selector_disabled_holo_dark"/>
-	<item android:state_focused="true" android:state_enabled="false"
-		  android:drawable="@drawable/abs__list_selector_disabled_holo_dark"/>-->
-	<item android:state_focused="true" android:state_pressed="true"
-		  android:drawable="@drawable/default_abs__list_selector_background_transition_holo_dark"/>
-	<item android:state_focused="false" android:state_pressed="true"
-		  android:drawable="@drawable/default_abs__list_selector_background_transition_holo_dark"/>
-	<item android:state_focused="true" android:drawable="@drawable/default_abs__list_focused_holo"/>
-	<item android:drawable="@android:color/transparent"/>
-</selector>
diff --git a/android-app/src/main/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml b/android-app/src/main/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
deleted file mode 100644
index 44f03a67..00000000
--- a/android-app/src/main/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<transition xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@drawable/default_abs__list_pressed_holo_dark"/>
-	<item android:drawable="@drawable/default_abs__list_longpressed_holo"/>
-</transition>
diff --git a/android-app/src/main/res/drawable/default_abs__list_selector_holo_dark.xml b/android-app/src/main/res/drawable/default_abs__list_selector_holo_dark.xml
deleted file mode 100644
index 4dd7d536..00000000
--- a/android-app/src/main/res/drawable/default_abs__list_selector_holo_dark.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<item android:state_window_focused="false" android:drawable="@android:color/transparent"/>
-
-	<!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-  <!-- todo serso: fix me-->
-<!--	<item android:state_focused="true" android:state_enabled="false" android:state_pressed="true"
-		  android:drawable="@drawable/abs__list_selector_disabled_holo_dark"/>
-	<item android:state_focused="true" android:state_enabled="false"
-		  android:drawable="@drawable/abs__list_selector_disabled_holo_dark"/>-->
-	<item android:state_focused="true" android:state_pressed="true"
-		  android:drawable="@drawable/default_abs__list_selector_background_transition_holo_dark"/>
-	<item android:state_focused="false" android:state_pressed="true"
-		  android:drawable="@drawable/default_abs__list_selector_background_transition_holo_dark"/>
-	<item android:state_focused="true" android:drawable="@drawable/default_abs__list_focused_holo"/>
-</selector>
diff --git a/android-app/src/main/res/drawable/default_abs__tab_indicator_ab_holo.xml b/android-app/src/main/res/drawable/default_abs__tab_indicator_ab_holo.xml
deleted file mode 100644
index f9a720b6..00000000
--- a/android-app/src/main/res/drawable/default_abs__tab_indicator_ab_holo.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<selector xmlns:a="http://schemas.android.com/apk/res/android">
-	<!-- Non focused states -->
-	<item a:state_focused="false" a:state_selected="false" a:state_pressed="false"
-		  a:drawable="@android:color/transparent"/>
-	<item a:state_focused="false" a:state_selected="true" a:state_pressed="false"
-		  a:drawable="@drawable/default_abs__tab_selected_holo"/>
-
-	<!-- Focused states -->
-	<item a:state_focused="true" a:state_selected="false" a:state_pressed="false"
-		  a:drawable="@drawable/default_abs__list_focused_holo"/>
-	<item a:state_focused="true" a:state_selected="true" a:state_pressed="false"
-		  a:drawable="@drawable/default_abs__tab_selected_focused_holo"/>
-
-	<!-- Pressed -->
-	<!--    Non focused states -->
-	<item a:state_focused="false" a:state_selected="false" a:state_pressed="true"
-		  a:drawable="@drawable/default_abs__list_pressed_holo_dark"/>
-	<item a:state_focused="false" a:state_selected="true" a:state_pressed="true"
-		  a:drawable="@drawable/default_abs__tab_selected_pressed_holo"/>
-
-	<!--    Focused states -->
-	<item a:state_focused="true" a:state_selected="false" a:state_pressed="true"
-		  a:drawable="@drawable/default_abs__tab_unselected_pressed_holo"/>
-	<item a:state_focused="true" a:state_selected="true" a:state_pressed="true"
-		  a:drawable="@drawable/default_abs__tab_selected_pressed_holo"/>
-</selector>
diff --git a/android-app/src/main/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml b/android-app/src/main/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
deleted file mode 100644
index 71ae4541..00000000
--- a/android-app/src/main/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<selector xmlns:a="http://schemas.android.com/apk/res/android">
-	<!-- Non focused states -->
-	<item a:state_focused="false" a:state_selected="false" a:state_pressed="false"
-		  a:drawable="@android:color/transparent"/>
-	<item a:state_focused="false" a:state_selected="true" a:state_pressed="false"
-		  a:drawable="@drawable/metro_blue_abs__tab_selected_holo"/>
-
-	<!-- Focused states -->
-	<item a:state_focused="true" a:state_selected="false" a:state_pressed="false"
-		  a:drawable="@drawable/metro_blue_abs__list_focused_holo"/>
-	<item a:state_focused="true" a:state_selected="true" a:state_pressed="false"
-		  a:drawable="@drawable/metro_blue_abs__tab_selected_focused_holo"/>
-
-	<!-- Pressed -->
-	<!--    Non focused states -->
-	<item a:state_focused="false" a:state_selected="false" a:state_pressed="true"
-		  a:drawable="@drawable/metro_blue_abs__list_pressed_holo_dark"/>
-	<item a:state_focused="false" a:state_selected="true" a:state_pressed="true"
-		  a:drawable="@drawable/metro_blue_abs__tab_selected_pressed_holo"/>
-
-	<!--    Focused states -->
-	<item a:state_focused="true" a:state_selected="false" a:state_pressed="true"
-		  a:drawable="@drawable/metro_blue_abs__tab_unselected_pressed_holo"/>
-	<item a:state_focused="true" a:state_selected="true" a:state_pressed="true"
-		  a:drawable="@drawable/metro_blue_abs__tab_selected_pressed_holo"/>
-</selector>
diff --git a/android-app/src/main/res/drawable/metro_blue_list_item.xml b/android-app/src/main/res/drawable/metro_blue_list_item.xml
deleted file mode 100644
index cbc7a037..00000000
--- a/android-app/src/main/res/drawable/metro_blue_list_item.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<selector xmlns:a="http://schemas.android.com/apk/res/android">
-	<!-- Non focused states -->
-	<item a:state_focused="false" a:state_selected="false" a:state_pressed="false"
-		  a:drawable="@android:color/transparent"/>
-	<item a:state_focused="false" a:state_selected="true" a:state_pressed="false"
-		  a:drawable="@color/cpp_metro_blue_color"/>
-
-	<!-- Focused states -->
-	<item a:state_focused="true" a:state_selected="false" a:state_pressed="false"
-		  a:drawable="@color/cpp_metro_blue_color"/>
-	<item a:state_focused="true" a:state_selected="true" a:state_pressed="false"
-		  a:drawable="@color/cpp_metro_blue_color"/>
-
-	<!-- Pressed -->
-	<!--    Non focused states -->
-	<item a:state_focused="false" a:state_selected="false" a:state_pressed="true"
-		  a:drawable="@color/cpp_metro_blue_color"/>
-	<item a:state_focused="false" a:state_selected="true" a:state_pressed="true"
-		  a:drawable="@color/cpp_metro_blue_color"/>
-
-	<!--    Focused states -->
-	<item a:state_focused="true" a:state_selected="false" a:state_pressed="true"
-		  a:drawable="@color/cpp_metro_blue_color"/>
-	<item a:state_focused="true" a:state_selected="true" a:state_pressed="true"
-		  a:drawable="@color/cpp_metro_blue_color"/>
-</selector>
diff --git a/android-app/src/main/res/values/colors.xml b/android-app/src/main/res/values/colors.xml
index 59a04e2c..61f1e3e4 100644
--- a/android-app/src/main/res/values/colors.xml
+++ b/android-app/src/main/res/values/colors.xml
@@ -29,7 +29,7 @@
 	<color name="cpp_button_operator_text_color">#ffffff99</color>
 	<color name="cpp_button_ce_text_color">#ffffffff</color>
 	<color name="cpp_selected_angle_unit_text_color">#ffffff99</color>
-	<color name="cpp_default_background">#ff000000</color>
+	<color name="cpp_main_bg">#ff000000</color>
 	<color name="cpp_pane_background">#ff1f1f1f</color>
 	<color name="cpp_metro_button_background">#ff1f1f1f</color>
 	<color name="cpp_metro_blue_color">#10648c</color>
diff --git a/android-app/src/main/res/values/styles.xml b/android-app/src/main/res/values/styles.xml
index 5822e305..4a46c993 100644
--- a/android-app/src/main/res/values/styles.xml
+++ b/android-app/src/main/res/values/styles.xml
@@ -123,7 +123,7 @@
 	</style>
 
 	<style name="cpp_widget_main_layout_style" parent="cpp_default_main_layout_style">
-		<item name="android:background">@color/cpp_default_background</item>
+		<item name="android:background">@color/cpp_main_bg</item>
 		<item name="android:padding">1dp</item>
 		<item name="android:layout_margin">@dimen/cpp_widget_margin</item>
 	</style>
@@ -137,7 +137,7 @@
 	</style>
 
 	<style name="cpp_onscreen_main_layout_style" parent="cpp_default_main_layout_style">
-		<item name="android:background">@color/cpp_default_background</item>
+		<item name="android:background">@color/cpp_main_bg</item>
 		<item name="android:padding">1dp</item>
 	</style>
 
diff --git a/android-app/src/main/res/values/theme_gray.xml b/android-app/src/main/res/values/theme_gray.xml
index 3df5c3c2..7734b1f9 100644
--- a/android-app/src/main/res/values/theme_gray.xml
+++ b/android-app/src/main/res/values/theme_gray.xml
@@ -115,33 +115,8 @@
 		<item name="android:layout_width">match_parent</item>
 	</style>
 
-	<style name="cpp_default_actionbar_style" parent="@style/Widget.AppCompat.ActionBar">
-		<item name="background">@drawable/default_abs__ab_transparent_dark_holo</item>
-		<item name="android:background">@drawable/default_abs__ab_transparent_dark_holo</item>
-	</style>
-
-	<style name="cpp_default_actionbar_tab_style" parent="@style/Widget.AppCompat.ActionBar.TabView">
-		<item name="background">@drawable/default_abs__tab_indicator_ab_holo</item>
-		<item name="android:background">@drawable/default_abs__tab_indicator_ab_holo</item>
-	</style>
-
-	<style name="cpp_default_actionbar_close_button_style" parent="@style/Widget.AppCompat.ActionButton.CloseMode">
-		<item name="android:background">@drawable/default_abs__btn_cab_done_holo_dark</item>
-		<item name="background">@drawable/default_abs__btn_cab_done_holo_dark</item>
-	</style>
-
-	<style name="cpp_default_actionbar_dropdown_style" parent="@style/Widget.AppCompat.Spinner.DropDown.ActionBar">
-		<!--<item name="android:background">@drawable/default_abs__spinner_ab_holo_dark</item>
-		<item name="background">@drawable/default_abs__spinner_ab_holo_dark</item>-->
-	</style>
-
-	<style name="cpp_default_actionbar_dropdown_listview_style" parent="@style/Widget.AppCompat.ListView.DropDown">
-		<item name="android:listSelector">@drawable/default_abs__list_selector_holo_dark</item>
-		<!--<item name="listSelector">@drawable/default_abs__list_selector_holo_dark</item>-->
-	</style>
-
 	<style name="cpp_gray_theme" parent="@style/Theme.AppCompat">
-		<item name="android:windowBackground">@color/cpp_default_background</item>
+		<item name="android:windowBackground">@color/cpp_main_bg</item>
 
 		<!-- buttons -->
 		<item name="cpp_digit_button_style">@style/cpp_default_digit_button_style</item>
@@ -164,25 +139,6 @@
 
 		<item name="cpp_pane_style">@style/cpp_default_pane_style</item>
 		<item name="cpp_pane_style_transparent">@style/cpp_default_pane_style_transparent</item>
-
-		<!-- action bar-->
-		<!--<item name="actionBarTabStyle">@style/cpp_default_actionbar_tab_style</item>
-		<item name="android:actionBarTabStyle">@style/cpp_default_actionbar_tab_style</item>
-
-		<item name="actionBarStyle">@style/cpp_default_actionbar_style</item>
-		<item name="android:actionBarStyle">@style/cpp_default_actionbar_style</item>
-
-		<item name="actionModeCloseButtonStyle">@style/cpp_default_actionbar_close_button_style</item>
-		<item name="android:actionModeCloseButtonStyle">@style/cpp_default_actionbar_close_button_style</item>
-
-		<item name="actionBarItemBackground">@drawable/default_abs__item_background_holo_dark</item>
-		<item name="android:actionBarItemBackground">@drawable/default_abs__item_background_holo_dark</item>
-
-		<item name="actionDropDownStyle">@style/cpp_default_actionbar_dropdown_style</item>
-		<item name="android:actionDropDownStyle">@style/cpp_default_actionbar_dropdown_style</item>
-
-		<item name="dropDownListViewStyle">@style/cpp_default_actionbar_dropdown_listview_style</item>
-		<item name="android:dropDownListViewStyle">@style/cpp_default_actionbar_dropdown_listview_style</item>-->
 	</style>
 
 	<style name="cpp_gray_dialog_theme" parent="@style/Theme.AppCompat.Dialog">
diff --git a/android-app/src/main/res/values/theme_metro_blue.xml b/android-app/src/main/res/values/theme_metro_blue.xml
index ad55dd01..ca0536ac 100644
--- a/android-app/src/main/res/values/theme_metro_blue.xml
+++ b/android-app/src/main/res/values/theme_metro_blue.xml
@@ -47,43 +47,22 @@
 		<item name="android:padding">6dp</item>
 	</style>
 
-	<style name="metro_blue_fragment_list_view_item_style" parent="cpp_default_fragment_list_view_item_style">
-		<item name="background">@drawable/metro_blue_list_item</item>
-		<item name="android:background">@drawable/metro_blue_list_item</item>
-	</style>
-
-	<style name="metro_blue_actionbar_style" parent="@style/Widget.AppCompat.ActionBar">
-		<item name="background">@drawable/metro_blue_abs__ab_transparent_dark_holo</item>
-		<item name="android:background">@drawable/metro_blue_abs__ab_transparent_dark_holo</item>
-	</style>
-
-	<style name="metro_blue_actionbar_tab_style" parent="cpp_default_actionbar_tab_style">
-		<item name="background">@drawable/metro_blue_abs__tab_indicator_ab_holo</item>
-		<item name="android:background">@drawable/metro_blue_abs__tab_indicator_ab_holo</item>
-	</style>
-
 	<style name="cpp_metro_blue_theme" parent="cpp_gray_theme">
+		<item name="android:colorAccent">@color/cpp_metro_blue_color</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="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>
-				<item name="android:actionBarTabStyle">@style/metro_blue_actionbar_tab_style</item>
-				<item name="actionBarStyle">@style/metro_blue_actionbar_style</item>
-				<item name="android:actionBarStyle">@style/metro_blue_actionbar_style</item>-->
 	</style>
 
 	<style name="cpp_metro_blue_dialog_theme" parent="cpp_gray_dialog_theme">
+		<item name="android:colorAccent">@color/cpp_metro_blue_color</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="cpp_fragment_list_view_item_style">@style/metro_blue_fragment_list_view_item_style</item>
 	</style>
 
 </resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_metro_green.xml b/android-app/src/main/res/values/theme_metro_green.xml
index 86479cbb..b718842f 100644
--- a/android-app/src/main/res/values/theme_metro_green.xml
+++ b/android-app/src/main/res/values/theme_metro_green.xml
@@ -32,6 +32,8 @@
 	</style>
 
 	<style name="cpp_metro_green_theme" parent="cpp_metro_blue_theme">
+      <item name="android:colorAccent">@color/cpp_metro_green_color</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>
diff --git a/android-app/src/main/res/values/theme_metro_purple.xml b/android-app/src/main/res/values/theme_metro_purple.xml
index a84d13b1..735c9cc1 100644
--- a/android-app/src/main/res/values/theme_metro_purple.xml
+++ b/android-app/src/main/res/values/theme_metro_purple.xml
@@ -33,6 +33,8 @@
 	</style>
 
 	<style name="cpp_metro_purple_theme" parent="cpp_metro_blue_theme">
+		<item name="android:colorAccent">@color/cpp_metro_purple_color</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>