diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a2a6de4f..e3e96c1c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,12 +15,12 @@
 			  a:targetSdkVersion="8"/>
 
 	<application a:icon="@drawable/icon"
+				 a:hardwareAccelerated="false"
 				 a:label="@string/c_app_name"
 				 a:name=".CalculatorApplication">
 
 		<activity a:name=".CalculatorActivity"
 				  a:windowSoftInputMode="adjustPan"
-				  a:hardwareAccelerated="false"
 				  a:label="@string/c_app_name">
 
 			<intent-filter>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 81a6f6cd..dae0ab1c 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -9,11 +9,13 @@
 		<item>@string/p_default_theme</item>
 		<item>@string/p_violet_theme</item>
 		<item>@string/p_light_blue_theme</item>
+		<item>@string/p_windows_theme</item>
 	</string-array>
 	<string-array name="p_theme_values">
 		<item>default_theme</item>
 		<item>violet_theme</item>
 		<item>light_blue_theme</item>
+		<item>windows_theme</item>
 	</string-array>
 
 	<string-array name="p_grouping_separator_names">
diff --git a/res/values/styles-windows-theme.xml b/res/values/styles-windows-theme.xml
new file mode 100644
index 00000000..c27614e6
--- /dev/null
+++ b/res/values/styles-windows-theme.xml
@@ -0,0 +1,23 @@
+<resources>
+
+	<style name="windows_digit_button_style" parent="button_style">
+		<item name="android:background">@drawable/windows_button_dark</item>
+		<item name="android:layout_marginLeft">2dp</item>
+		<item name="android:layout_marginBottom">2dp</item>
+	</style>
+
+	<style name="windows_control_button_style" parent="windows_digit_button_style">
+		<item name="android:background">@drawable/windows_button_light</item>
+	</style>
+
+	<style name="windows_control_image_button_style" parent="windows_control_button_style">
+		<item name="android:padding">6dp</item>
+	</style>
+
+	<style name="windows_theme">
+		<item name="digitButtonStyle">@style/windows_digit_button_style</item>
+		<item name="controlButtonStyle">@style/windows_control_button_style</item>
+		<item name="controlImageButtonStyle">@style/windows_control_image_button_style</item>
+	</style>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/text_strings.xml b/res/values/text_strings.xml
index 47b2894f..b019a73d 100644
--- a/res/values/text_strings.xml
+++ b/res/values/text_strings.xml
@@ -90,6 +90,7 @@
 	<string name="p_default_theme">Default</string>
 	<string name="p_violet_theme">Violet</string>
 	<string name="p_light_blue_theme">Light Blue</string>
+	<string name="p_windows_theme">Windows Metro</string>
 	<string name="c_calc_result_precision_summary">Precision of result value (all calculations are done with maximum precision regardless of the value of this option)</string>
 	<string name="c_calc_color_display_summary">Toggles colouring and styling in calculator editor</string>
 	<string name="c_calc_theme_summary">Sets the theme for calculator</string>