diff --git a/src/keepass2android/Resources/drawable-hdpi/btn_new_group.png b/src/keepass2android/Resources/drawable-hdpi/btn_new_group.png
new file mode 100644
index 00000000..a2f4d955
Binary files /dev/null and b/src/keepass2android/Resources/drawable-hdpi/btn_new_group.png differ
diff --git a/src/keepass2android/Resources/drawable-hdpi/btn_new_group_holodark.png b/src/keepass2android/Resources/drawable-hdpi/btn_new_group_holodark.png
new file mode 100644
index 00000000..93a541cc
Binary files /dev/null and b/src/keepass2android/Resources/drawable-hdpi/btn_new_group_holodark.png differ
diff --git a/src/keepass2android/Resources/drawable-hdpi/collections_collection_holodark.png b/src/keepass2android/Resources/drawable-hdpi/collections_collection_holodark.png
new file mode 100644
index 00000000..78500a93
Binary files /dev/null and b/src/keepass2android/Resources/drawable-hdpi/collections_collection_holodark.png differ
diff --git a/src/keepass2android/Resources/drawable-hdpi/collections_new_label_holodark.png b/src/keepass2android/Resources/drawable-hdpi/collections_new_label_holodark.png
new file mode 100644
index 00000000..2c996f2d
Binary files /dev/null and b/src/keepass2android/Resources/drawable-hdpi/collections_new_label_holodark.png differ
diff --git a/src/keepass2android/Resources/drawable-hdpi/device_access_new_account_holodark.png b/src/keepass2android/Resources/drawable-hdpi/device_access_new_account_holodark.png
new file mode 100644
index 00000000..e61a09f5
Binary files /dev/null and b/src/keepass2android/Resources/drawable-hdpi/device_access_new_account_holodark.png differ
diff --git a/src/keepass2android/Resources/drawable-hdpi/ic_menu_remove_field_holodark.png b/src/keepass2android/Resources/drawable-hdpi/ic_menu_remove_field_holodark.png
new file mode 100644
index 00000000..094eea58
Binary files /dev/null and b/src/keepass2android/Resources/drawable-hdpi/ic_menu_remove_field_holodark.png differ
diff --git a/src/keepass2android/Resources/drawable-hdpi/location_web_site_holodark.png b/src/keepass2android/Resources/drawable-hdpi/location_web_site_holodark.png
new file mode 100644
index 00000000..9b77be96
Binary files /dev/null and b/src/keepass2android/Resources/drawable-hdpi/location_web_site_holodark.png differ
diff --git a/src/keepass2android/Resources/drawable/btn_new_group_holodark.png b/src/keepass2android/Resources/drawable/btn_new_group_holodark.png
new file mode 100644
index 00000000..0a5bd458
Binary files /dev/null and b/src/keepass2android/Resources/drawable/btn_new_group_holodark.png differ
diff --git a/src/keepass2android/Resources/drawable/ic_menu_add_field_holodark.png b/src/keepass2android/Resources/drawable/ic_menu_add_field_holodark.png
new file mode 100644
index 00000000..099c1508
Binary files /dev/null and b/src/keepass2android/Resources/drawable/ic_menu_add_field_holodark.png differ
diff --git a/src/keepass2android/Resources/drawable/ic_menu_remove_field_holodark.png b/src/keepass2android/Resources/drawable/ic_menu_remove_field_holodark.png
new file mode 100644
index 00000000..094eea58
Binary files /dev/null and b/src/keepass2android/Resources/drawable/ic_menu_remove_field_holodark.png differ
diff --git a/src/keepass2android/Resources/values-v14/styles.xml b/src/keepass2android/Resources/values-v14/styles.xml
index 8b335574..0c3af43d 100644
--- a/src/keepass2android/Resources/values-v14/styles.xml
+++ b/src/keepass2android/Resources/values-v14/styles.xml
@@ -16,19 +16,17 @@
   along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-	<style name="Base" parent="android:Theme.Holo.Light"></style>
-    <style name="NoTitleBar" parent="android:Theme.Holo.Light"></style>
-    <style name="Dialog" parent="android:Theme.Holo.Light.Dialog"></style>
-		<style name="GroupTextSmall" parent="android:Theme.Holo.Light">
-		<item name="@android:textColor">@color/group</item>
-		<item name="@android:textSize">15sp</item>
+
+    <style name="GroupTextSmall" parent="attr/TextViewParentStyle">
+        <item name="@android:textColor">?TextColorGroup</item>
+		
 	</style>
-	<style name="GroupText" parent="android:Theme.Holo.Light">
-		<item name="@android:textColor">@color/group</item>
+	<style name="GroupText" parent="@attr/TextViewParentStyle">
+		<item name="@android:textColor">?TextColorGroup</item>
 		<item name="@android:textSize">20sp</item>
 	</style>
-	<style name="GroupTextLarge" parent="android:Theme.Holo.Light">
-		<item name="@android:textColor">@color/group</item>
+	<style name="GroupTextLarge" parent="@attr/TextViewParentStyle">
+		<item name="@android:textColor">?TextColorGroup</item>
 		<item name="@android:textSize">28sp</item>
 	</style>
 	<style name="ElementTextSmall">
@@ -55,11 +53,11 @@
         <item name="android:layout_marginLeft">12dip</item>
         <item name="android:layout_marginRight">12dip</item>
         <item name="android:paddingLeft">4dp</item>
-        <item name="android:textColor">@color/dark_gray</item>
-        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">?TextColorItem</item>
+        <item name="android:textSize">18sp</item>
     
 	</style>
-	<style name="EntryFieldHeader" parent="android:Widget.Holo.Light.TextView">
+	<style name="EntryFieldHeader">
         <item name="android:drawableBottom">@drawable/section_header</item>
         <item name="android:drawablePadding">2dp</item>
         <item name="android:layout_marginLeft">12dip</item>
@@ -68,11 +66,12 @@
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:paddingLeft">4dp</item>
         <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">@color/light_gray</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">?TextColorHeader</item>
+        <item name="android:textSize">18sp</item>
         <item name="android:textStyle">bold</item>
     </style>
-	<style name="InfoHeader" parent="android:Widget.Holo.Light.TextView">
+   
+	<style name="InfoHeader">
 		<item name="android:drawableBottom">@drawable/section_header</item>
 		<item name="android:drawablePadding">2dp</item>
 		<item name="android:layout_marginLeft">0dip</item>
@@ -81,19 +80,19 @@
 		<item name="android:layout_marginTop">8dp</item>
 		<item name="android:paddingLeft">4dp</item>
 		<item name="android:textAllCaps">true</item>
-		<item name="android:textColor">@color/light_gray</item>
+		<item name="android:textColor">?TextColorHeader</item>
 		<item name="android:textSize">14sp</item>
 		<item name="android:textStyle">bold</item>
 	</style>
     
-	<style name="BottomBarActionButton" parent="android:style/Widget.Holo.Light.ActionButton">
+	<style name="BottomBarActionButton">
 	    <item name="android:background">?android:attr/selectableItemBackground</item>
 	</style>
     
 	<style name="TextAppearance_EditEntry_Small">
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">#FF888888</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
         <item name="android:textAllCaps">true</item>
     </style>
 	
@@ -112,7 +111,7 @@
     <style name="TextAppearance_EditEntry">
         <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
         <item name="android:textSize">18sp</item>
-        <item name="android:textColor">#FF333333</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="TextAppearance_EditEntry_Value" parent="TextAppearance_EditEntry">
@@ -134,7 +133,7 @@
 	<style name="TextAppearance_SubElement">
 		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
 		<item name="android:textSize">18sp</item>
-		<item name="android:textColor">#FF333333</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
 		<item name="android:gravity">center_vertical</item>
 		<item name="android:layout_gravity">center_vertical</item>
 		<item name="android:layout_marginRight">12dip</item>
@@ -160,8 +159,8 @@
         <item name="android:paddingLeft">8dip</item>
         <item name="android:paddingRight">8dip</item>
         <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">#FF737373</item>
-        <item name="android:background">#e8e8e8</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
     </style>
     
     <style name="AdditionalStringLayout">
@@ -182,7 +181,7 @@
         <item name="android:layout_marginTop">4dp</item>
         <item name="android:paddingLeft">4dp</item>
         <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">@color/light_gray</item>
+        <item name="android:textColor">?TextColorHeader</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textStyle">bold</item>    
     </style>
diff --git a/src/keepass2android/Resources/values-v14/styles_dark.xml b/src/keepass2android/Resources/values-v14/styles_dark.xml
new file mode 100644
index 00000000..8dc74cc4
--- /dev/null
+++ b/src/keepass2android/Resources/values-v14/styles_dark.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
+
+  Keepass2Android is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  Keepass2Android is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+	<style name="BaseDark" parent="android:Theme.Holo">
+	    <item name="TextViewParentStyle">@style/small</item>
+	    <item name="ActionBarButtonParentStyle">@android:style/Widget.Holo.Light.ActionButton</item>
+	    <item name="TextColorGroup">?android:attr/textColorPrimary</item>
+	    <item name="TextColorHeader">?android:attr/textColorPrimary</item>
+	    <item name="TextColorItem">?android:attr/textColorSecondary</item>
+	    <item name="CancelDrawable">@android:drawable/ic_menu_close_clear_cancel</item>
+	    <item name="AddFieldDrawable">@drawable/ic_menu_add_field_holodark</item>
+	    <item name="NewGroupDrawable">@drawable/btn_new_group_holodark</item>
+	    <item name="NewEntryDrawable">@drawable/device_access_new_account_holodark</item>
+	    <item name="OpenFileDrawable">@drawable/collections_collection_holodark</item>
+		<item name="CreateDbDrawable">@drawable/collections_new_label_holodark</item>
+		<item name="OpenUrlDrawable">@drawable/location_web_site_holodark</item>
+	    
+	</style>
+	<style name="TextViewParent" parent="@style/small"></style>
+    <style name="NoTitleBarDark" parent="BaseDark"></style>
+    <style name="DialogDark" parent="BaseDark"></style>
+	
+	
+</resources>
diff --git a/src/keepass2android/Resources/values-v14/styles_light.xml b/src/keepass2android/Resources/values-v14/styles_light.xml
new file mode 100644
index 00000000..311056e4
--- /dev/null
+++ b/src/keepass2android/Resources/values-v14/styles_light.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
+
+  Keepass2Android is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  Keepass2Android is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+	<style name="BaseLight" parent="android:Theme.Holo.Light">
+	    <!--  <item name="TextViewParentStyle">@android:style/Widget.Holo.Light.TextView</item> -->
+	    <item name="TextViewParentStyle">@style/BIG</item>
+	    <item name="ActionBarButtonParentStyle">@android:style/Widget.Holo.Light.ActionButton</item>
+	    <item name="TextColorGroup">@color/blue_highlight</item>
+	    <item name="TextColorHeader">@color/light_gray</item>
+	    <item name="TextColorItem">@color/dark_gray</item>
+	    <item name="CancelDrawable">@android:drawable/ic_menu_close_clear_cancel</item>
+	    <item name="AddFieldDrawable">@drawable/ic_menu_add_field_holo_light</item>
+	    <item name="NewGroupDrawable">@drawable/btn_new_group</item>
+	    <item name="NewEntryDrawable">@drawable/device_access_new_account</item>
+		<item name="OpenFileDrawable">@drawable/collections_collection</item>
+		<item name="CreateDbDrawable">@drawable/collections_new_label</item>
+		<item name="OpenUrlDrawable">@drawable/location_web_site</item>
+	</style>
+	<style name="TextViewParent" parent="@style/BIG"></style>
+    <style name="NoTitleBarLight" parent="BaseLight">
+    </style>
+    <style name="DialogLight" parent="BaseLight"></style>
+    <style name="BIG">
+        <item name="android:textSize">50sp</item>
+    </style>
+    <style name="small">
+        <item name="android:textSize">7sp</item>
+    </style>
+</resources>