diff --git a/res/values/attrs.xml b/res/values/attributes.xml
similarity index 100%
rename from res/values/attrs.xml
rename to res/values/attributes.xml
diff --git a/res/values/default_values.xml b/res/values/preferences.xml
similarity index 100%
rename from res/values/default_values.xml
rename to res/values/preferences.xml
diff --git a/res/values/styles-common.xml b/res/values/styles-common.xml
index afe3576a..5d74735c 100644
--- a/res/values/styles-common.xml
+++ b/res/values/styles-common.xml
@@ -17,40 +17,6 @@
 		<item name="android:layout_marginBottom">1dp</item>
 	</style>
 
-	<style name="default_digit_button_style" parent="button_style">
-		<item name="android:background">@drawable/default_button</item>
-	</style>
-
-	<style name="violet_digit_button_style" parent="button_style">
-		<item name="android:background">@drawable/violet_button</item>
-	</style>
-
-	<style name="light_blue_digit_button_style" parent="button_style">
-		<item name="android:background">@drawable/blue_button</item>
-	</style>
-
-	<style name="default_control_button_style" parent="button_style"/>
-
-	<style name="violet_control_button_style" parent="button_style">
-		<item name="android:background">@drawable/violet_button_dark</item>
-	</style>
-
-	<style name="light_blue_control_button_style" parent="button_style">
-		<item name="android:background">@drawable/blue_button_dark</item>
-	</style>
-
-	<style name="default_control_image_button_style" parent="default_control_button_style">
-		<item name="android:padding">6dp</item>
-	</style>
-
-	<style name="violet_control_image_button_style" parent="violet_control_button_style">
-		<item name="android:padding">6dp</item>
-	</style>
-
-	<style name="light_blue_control_image_button_style" parent="light_blue_control_button_style">
-		<item name="android:padding">6dp</item>
-	</style>
-
 	<style name="editor_style" parent="editor_style_parent">
 		<item name="android:gravity">left|top</item>
 		<item name="android:layout_width">fill_parent</item>
@@ -69,24 +35,6 @@
 		<item name="android:layout_height">fill_parent</item>
 	</style>
 
-	<style name="default_theme">
-		<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>
-	</style>
-
-	<style name="violet_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>
-	</style>
-
-	<style name="light_blue_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>
-	</style>
-
 	<style name="default_text">
 		<item name="android:background">@color/default_background</item>
 		<item name="android:textColor">@color/default_text_color</item>
diff --git a/res/values/styles-default-theme.xml b/res/values/styles-default-theme.xml
new file mode 100644
index 00000000..f06b6f46
--- /dev/null
+++ b/res/values/styles-default-theme.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+  ~ For more information, please, contact se.solovyev@gmail.com
+  ~ or visit http://se.solovyev.org
+  -->
+
+<resources>
+	<style name="default_digit_button_style" parent="button_style">
+		<item name="android:background">@drawable/default_button</item>
+	</style>
+
+	<style name="default_control_button_style" parent="button_style"/>
+
+	<style name="default_control_image_button_style" parent="default_control_button_style">
+		<item name="android:padding">6dp</item>
+	</style>
+
+	<style name="default_theme">
+		<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>
+	</style>
+</resources>
\ No newline at end of file
diff --git a/res/values/styles-light-blue-theme.xml b/res/values/styles-light-blue-theme.xml
new file mode 100644
index 00000000..ebff5daf
--- /dev/null
+++ b/res/values/styles-light-blue-theme.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+  ~ For more information, please, contact se.solovyev@gmail.com
+  ~ or visit http://se.solovyev.org
+  -->
+
+<resources>
+
+	<style name="light_blue_digit_button_style" parent="button_style">
+		<item name="android:background">@drawable/blue_button</item>
+	</style>
+
+	<style name="light_blue_control_button_style" parent="button_style">
+		<item name="android:background">@drawable/blue_button_dark</item>
+	</style>
+
+	<style name="light_blue_control_image_button_style" parent="light_blue_control_button_style">
+		<item name="android:padding">6dp</item>
+	</style>
+
+	<style name="light_blue_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>
+	</style>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/styles-violet-theme.xml b/res/values/styles-violet-theme.xml
new file mode 100644
index 00000000..551a367f
--- /dev/null
+++ b/res/values/styles-violet-theme.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+  ~ For more information, please, contact se.solovyev@gmail.com
+  ~ or visit http://se.solovyev.org
+  -->
+
+<resources>
+	<style name="violet_digit_button_style" parent="button_style">
+		<item name="android:background">@drawable/violet_button</item>
+	</style>
+
+	<style name="violet_control_button_style" parent="button_style">
+		<item name="android:background">@drawable/violet_button_dark</item>
+	</style>
+
+	<style name="violet_control_image_button_style" parent="violet_control_button_style">
+		<item name="android:padding">6dp</item>
+	</style>
+
+	<style name="violet_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>
+	</style>
+</resources>
\ No newline at end of file
diff --git a/res/xml/main_preferences.xml b/res/xml/preferences.xml
similarity index 95%
rename from res/xml/main_preferences.xml
rename to res/xml/preferences.xml
index 91f2e057..78da14f5 100644
--- a/res/xml/main_preferences.xml
+++ b/res/xml/preferences.xml
@@ -12,7 +12,7 @@
 
 	<PreferenceCategory a:title="@string/c_prefs_calculations_category">
 
-		<org.solovyev.android.view.prefs.AdViewPreference
+		<org.solovyev.android.ads.AdViewPreference
 			 a:key="admob_01"
 			 a:layout="@layout/admob_pref"/>
 
@@ -22,7 +22,7 @@
 				a:title="@string/c_calc_round_result_title"
 				a:defaultValue="true"/>
 
-		<org.solovyev.android.view.prefs.NumberPickerDialogPreference
+		<org.solovyev.android.prefs.NumberPickerDialogPreference
 				a:key="@string/p_calc_result_precision_key"
 				a:title="@string/p_calc_result_precision_title"
 				a:summary="@string/c_calc_result_precision_summary"
@@ -58,7 +58,7 @@
 
 	<PreferenceCategory a:title="@string/c_prefs_appearance_category">
 
-		<org.solovyev.android.view.prefs.AdViewPreference
+		<org.solovyev.android.ads.AdViewPreference
 			 a:key="admob_02"
 			 a:layout="@layout/admob_pref"/>
 
@@ -93,7 +93,7 @@
 						a:entryValues="@array/p_layout_values"/>
 
 
-		<org.solovyev.android.view.prefs.FloatRangeSeekBarPreference
+		<org.solovyev.android.prefs.FloatRangeSeekBarPreference
 				a:key="@string/p_drag_distance_key"
 				a:title="@string/c_swipe_distance"
 				a:summary="@string/c_swipe_distance_summary"
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java b/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
index eb4e5c22..48ef24ac 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
@@ -33,7 +33,7 @@ public class CalculatorPreferencesActivity extends PreferenceActivity implements
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-		addPreferencesFromResource(R.xml.main_preferences);
+		addPreferencesFromResource(R.xml.preferences);
 
 		final Preference adFreePreference = findPreference(CalculatorApplication.AD_FREE_P_KEY);
 		adFreePreference.setEnabled(false);