diff --git a/src/ArtTestApp.zip b/src/ArtTestApp.zip
new file mode 100644
index 00000000..292094c3
Binary files /dev/null and b/src/ArtTestApp.zip differ
diff --git a/src/ArtTestApp/Activity1.cs b/src/ArtTestApp/Activity1.cs
new file mode 100644
index 00000000..e6e66c74
--- /dev/null
+++ b/src/ArtTestApp/Activity1.cs
@@ -0,0 +1,45 @@
+using System;
+
+using Android.App;
+using Android.Content;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+using Android.OS;
+
+namespace ArtTestApp
+{
+	[Activity(Label = "ArtTestApp", MainLauncher = true, Icon = "@drawable/icon")]
+	public class Activity1 : Activity
+	{
+		
+		protected override void OnCreate(Bundle bundle)
+		{
+			base.OnCreate(bundle);
+
+			// Set our view from the "main" layout resource
+			SetContentView(Resource.Layout.Main);
+
+			// Get our button from the layout resource,
+			// and attach an event to it
+			FindViewById<Button>(Resource.Id.MyButton1).Click += (sender, args) =>
+				{
+					try
+					{
+						StartActivity(typeof (Activity2));
+					}
+					catch (Exception ex)
+					{
+						Toast.MakeText(this, ex.ToString(), ToastLength.Long).Show();
+					}
+					
+				};
+			FindViewById<Button>(Resource.Id.MyButton2).Click += (sender, args) => StartActivityForResult(typeof(Activity2),1);
+
+			FindViewById<Button>(Resource.Id.MyButton3).Click += (sender, args) => StartActivityForResult(typeof(PrefActivity), 1);
+
+
+		}
+	}
+}
+
diff --git a/src/ArtTestApp/Activity2.cs b/src/ArtTestApp/Activity2.cs
new file mode 100644
index 00000000..7497fe92
--- /dev/null
+++ b/src/ArtTestApp/Activity2.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+
+namespace ArtTestApp
+{
+	[Activity(Label = "My Activity")]
+	public class Activity2 : Activity
+	{
+		protected override void OnCreate(Bundle bundle)
+		{
+			base.OnCreate(bundle);
+
+			// Create your application here
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/ArtTestApp/ArtTestApp.csproj b/src/ArtTestApp/ArtTestApp.csproj
new file mode 100644
index 00000000..b207682c
--- /dev/null
+++ b/src/ArtTestApp/ArtTestApp.csproj
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ArtTestApp</RootNamespace>
+    <AssemblyName>ArtTestApp</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <AndroidApplication>true</AndroidApplication>
+    <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
+    <AndroidLinkMode>None</AndroidLinkMode>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Mono.Android" />
+    <Reference Include="mscorlib" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Activity1.cs" />
+    <Compile Include="Activity2.cs" />
+    <Compile Include="PrefActivity.cs" />
+    <Compile Include="Resources\Resource.Designer.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\AboutResources.txt" />
+    <None Include="Assets\AboutAssets.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\Main.axml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\Strings.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\Icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Properties\AndroidManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Xml\pref.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+     Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/ArtTestApp/Assets/AboutAssets.txt b/src/ArtTestApp/Assets/AboutAssets.txt
new file mode 100644
index 00000000..ee398862
--- /dev/null
+++ b/src/ArtTestApp/Assets/AboutAssets.txt
@@ -0,0 +1,19 @@
+Any raw assets you want to be deployed with your application can be placed in
+this directory (and child directories) and given a Build Action of "AndroidAsset".
+
+These files will be deployed with you package and will be accessible using Android's
+AssetManager, like this:
+
+public class ReadAsset : Activity
+{
+	protected override void OnCreate (Bundle bundle)
+	{
+		base.OnCreate (bundle);
+
+		InputStream input = Assets.Open ("my_asset.txt");
+	}
+}
+
+Additionally, some Android functions will automatically load asset files:
+
+Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
\ No newline at end of file
diff --git a/src/ArtTestApp/PrefActivity.cs b/src/ArtTestApp/PrefActivity.cs
new file mode 100644
index 00000000..205a021e
--- /dev/null
+++ b/src/ArtTestApp/PrefActivity.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Preferences;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+
+namespace ArtTestApp
+{
+	[Activity(Label = "My PrefActivity")]
+	public class PrefActivity : PreferenceActivity
+	{
+		protected override void OnCreate(Bundle bundle)
+		{
+			base.OnCreate(bundle);
+
+			FragmentManager.BeginTransaction().Replace(Android.Resource.Id.Content, new AppPreferenceFragment()).Commit();
+		}
+
+		public class AppPreferenceFragment : PreferenceFragment
+		{
+			public override void OnCreate(Bundle savedInstanceState)
+			{
+				base.OnCreate(savedInstanceState);
+
+				AddPreferencesFromResource(Resource.Xml.pref);
+			}
+		}	
+	}
+}
\ No newline at end of file
diff --git a/src/ArtTestApp/Properties/AndroidManifest.xml b/src/ArtTestApp/Properties/AndroidManifest.xml
new file mode 100644
index 00000000..c074f195
--- /dev/null
+++ b/src/ArtTestApp/Properties/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+	<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="15" />
+	<application></application>
+</manifest>
\ No newline at end of file
diff --git a/src/ArtTestApp/Properties/AssemblyInfo.cs b/src/ArtTestApp/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..a85cd44a
--- /dev/null
+++ b/src/ArtTestApp/Properties/AssemblyInfo.cs
@@ -0,0 +1,34 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Android.App;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ArtTestApp")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ArtTestApp")]
+[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+// Add some common permissions, these can be removed if not needed
+[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
+[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
diff --git a/src/ArtTestApp/Resources/AboutResources.txt b/src/ArtTestApp/Resources/AboutResources.txt
new file mode 100644
index 00000000..194ae28a
--- /dev/null
+++ b/src/ArtTestApp/Resources/AboutResources.txt
@@ -0,0 +1,50 @@
+Images, layout descriptions, binary blobs and string dictionaries can be included 
+in your application as resource files.  Various Android APIs are designed to 
+operate on the resource IDs instead of dealing with images, strings or binary blobs 
+directly.
+
+For example, a sample Android app that contains a user interface layout (main.xml),
+an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
+would keep its resources in the "Resources" directory of the application:
+
+Resources/
+    drawable-hdpi/
+        icon.png
+
+    drawable-ldpi/
+        icon.png
+
+    drawable-mdpi/
+        icon.png
+
+    layout/
+        main.xml
+
+    values/
+        strings.xml
+
+In order to get the build system to recognize Android resources, set the build action to
+"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
+instead operate on resource IDs.  When you compile an Android application that uses resources, 
+the build system will package the resources for distribution and generate a class called
+"Resource" that contains the tokens for each one of the resources included. For example, 
+for the above Resources layout, this is what the Resource class would expose:
+
+public class Resource {
+    public class drawable {
+        public const int icon = 0x123;
+    }
+
+    public class layout {
+        public const int main = 0x456;
+    }
+
+    public class strings {
+        public const int first_string = 0xabc;
+        public const int second_string = 0xbcd;
+    }
+}
+
+You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main 
+to reference the layout/main.xml file, or Resource.strings.first_string to reference the first 
+string in the dictionary file values/strings.xml.
\ No newline at end of file
diff --git a/src/ArtTestApp/Resources/Drawable/Icon.png b/src/ArtTestApp/Resources/Drawable/Icon.png
new file mode 100644
index 00000000..8074c4c5
Binary files /dev/null and b/src/ArtTestApp/Resources/Drawable/Icon.png differ
diff --git a/src/ArtTestApp/Resources/Layout/Main.axml b/src/ArtTestApp/Resources/Layout/Main.axml
new file mode 100644
index 00000000..00dd120c
--- /dev/null
+++ b/src/ArtTestApp/Resources/Layout/Main.axml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+    <Button
+        android:id="@+id/MyButton1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="StartActivity" />
+    <Button
+        android:id="@+id/MyButton2"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="StartActivityForResult" />
+    <Button
+        android:id="@+id/MyButton3"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="Start Preference Activity" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/ArtTestApp/Resources/Values/Strings.xml b/src/ArtTestApp/Resources/Values/Strings.xml
new file mode 100644
index 00000000..2004c650
--- /dev/null
+++ b/src/ArtTestApp/Resources/Values/Strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="Hello">Hello World, Click Me!</string>
+    <string name="ApplicationName">ArtTestApp</string>
+</resources>
diff --git a/src/ArtTestApp/Resources/Xml/pref.xml b/src/ArtTestApp/Resources/Xml/pref.xml
new file mode 100644
index 00000000..90f79446
--- /dev/null
+++ b/src/ArtTestApp/Resources/Xml/pref.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<PreferenceScreen
+	xmlns:android="http://schemas.android.com/apk/res/android">
+	<PreferenceScreen
+	  android:key="db_key"
+	  android:title="database"
+	  android:summary="menu_db_settings">
+		<EditTextPreference
+                android:title="database_name"
+                android:persistent="false"
+                android:key="database_name_key"/>
+
+	</PreferenceScreen>
+	/
+</PreferenceScreen>
+	
\ No newline at end of file
diff --git a/src/KeePass.sln b/src/KeePass.sln
index def2e389..43597bf5 100644
--- a/src/KeePass.sln
+++ b/src/KeePass.sln
@@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidFileChooserBinding",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KP2AKdbLibraryBinding", "KP2AKdbLibraryBinding\KP2AKdbLibraryBinding.csproj", "{70D3844A-D9FA-4A64-B205-A84C6A822196}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArtTestApp", "ArtTestApp\ArtTestApp.csproj", "{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -258,6 +260,30 @@ Global
 		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
 		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
 		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Win32.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|x64.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/keepass2android/KeePass.cs b/src/keepass2android/KeePass.cs
index 28b39d4b..75980432 100644
--- a/src/keepass2android/KeePass.cs
+++ b/src/keepass2android/KeePass.cs
@@ -79,7 +79,7 @@ namespace keepass2android
 					.SetTitle("Warning")
 					.SetMessage(
 						//"It looks like you are running ART (Android Runtime). Please note: At the time of this app's release, Google says ART is experimental. And indeed, the early releases of ART (e.g. in Android 4.4, 4.4.1 and 4.4.2) contain a bug which causes crashes in Mono for Android apps including Keepass2Android. This bug was fixed after the 4.4.2 release so if you have a later Android release, you might be able to use this app. If not, please switch to Dalvik. Please do not downrate Keepass2Android for this problem, it's not our bug :-). Thanks! See our website (keepass2android.codeplex.com) for more information on this issue.")
-						"It looks like you are running ART (Android Runtime). Please note: At the time of this app's release, Google says ART is experimental. And indeed, the early releases of ART (e.g. in Android 4.4, 4.4.1 and 4.4.2) contain a bug which causes crashes in Mono for Android apps including Keepass2Android. We have incorporated a workaround which might work or not. If you experience crashes, please switch to Dalvik. Please do not downrate Keepass2Android for this problem, it's not our bug :-). Thanks! See our website (keepass2android.codeplex.com) for more information on this issue.")
+						"It looks like you are running ART (Android Runtime). Please note: At the time of this app's release, Google says ART is experimental. And indeed, the early releases of ART (e.g. in Android 4.4, 4.4.1 and 4.4.2) contain a bug which causes crashes in Mono for Android apps including Keepass2Android. We have incorporated a workaround which allows to use the basic features, but you will probably experience crashes at some time. Switch to Dalvik for a stable version. Please do not downrate Keepass2Android for this problem, it's not our bug :-). Thanks! See our website (keepass2android.codeplex.com) for more information on this issue.")
 					.SetPositiveButton("OK", (sender, args) => LaunchNextActivity())
 					.Create()
 					.Show();
diff --git a/src/keepass2android/Resources/values-v14/styles.xml b/src/keepass2android/Resources/values-v14/styles.xml
index 8cb3f66c..632a0294 100644
--- a/src/keepass2android/Resources/values-v14/styles.xml
+++ b/src/keepass2android/Resources/values-v14/styles.xml
@@ -18,15 +18,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="GroupTextSmall">
-        <item name="@android:textColor">?TextColorGroup</item>
+        <item name="@android:textColor">?android:attr/textColorPrimary</item>
 		
 	</style>
 	<style name="GroupText">
-		<item name="@android:textColor">?TextColorGroup</item>
+		<item name="@android:textColor">?android:attr/textColorPrimary</item>
 		<item name="@android:textSize">20sp</item>
 	</style>
 	<style name="GroupTextLarge">
-		<item name="@android:textColor">?TextColorGroup</item>
+		<item name="@android:textColor">?android:attr/textColorPrimary</item>
 		<item name="@android:textSize">28sp</item>
 	</style>
 	<style name="ElementTextSmall">
@@ -53,7 +53,7 @@
         <item name="android:layout_marginLeft">12dip</item>
         <item name="android:layout_marginRight">12dip</item>
         <item name="android:paddingLeft">4dp</item>
-        <item name="android:textColor">?TextColorItem</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
         <item name="android:textSize">18sp</item>
     
 	</style>
@@ -66,7 +66,7 @@
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:paddingLeft">4dp</item>
         <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">?TextColorHeader</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">18sp</item>
         <item name="android:textStyle">bold</item>
     </style>
@@ -80,7 +80,7 @@
 		<item name="android:layout_marginTop">8dp</item>
 		<item name="android:paddingLeft">4dp</item>
 		<item name="android:textAllCaps">true</item>
-		<item name="android:textColor">?TextColorHeader</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
 		<item name="android:textSize">14sp</item>
 		<item name="android:textStyle">bold</item>
 	</style>
@@ -181,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">?TextColorHeader</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textStyle">bold</item>    
     </style>
diff --git a/src/keepass2android/Resources/values-v14/styles_light.xml b/src/keepass2android/Resources/values-v14/styles_light.xml
index a7b420a1..c2fadbd0 100644
--- a/src/keepass2android/Resources/values-v14/styles_light.xml
+++ b/src/keepass2android/Resources/values-v14/styles_light.xml
@@ -17,9 +17,9 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 	<style name="BaseLight" parent="android:Theme.Holo.Light">
-	    <item name="TextColorGroup">@color/dark_gray</item>
-	    <item name="TextColorHeader">@color/light_gray</item>
-	    <item name="TextColorItem">@color/dark_gray</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_holo_light</item>
 	    <item name="NewGroupDrawable">@drawable/btn_new_group</item>
diff --git a/src/keepass2android/settings/DatabaseSettingsActivity.cs b/src/keepass2android/settings/DatabaseSettingsActivity.cs
index 1ac88b87..b1f32450 100644
--- a/src/keepass2android/settings/DatabaseSettingsActivity.cs
+++ b/src/keepass2android/settings/DatabaseSettingsActivity.cs
@@ -39,7 +39,7 @@ namespace keepass2android
 			_design = new ActivityDesign(this);
 		}
 
-		public static void Launch(Context ctx)
+		public static void Launch(Activity ctx)
 		{
 			ctx.StartActivity(new Intent(ctx, typeof(DatabaseSettingsActivity)));
 		}