diff --git a/src/KeePassLib2Android/Resources/Resource.designer.cs b/src/KeePassLib2Android/Resources/Resource.designer.cs
index f338879f..e83a1334 100644
--- a/src/KeePassLib2Android/Resources/Resource.designer.cs
+++ b/src/KeePassLib2Android/Resources/Resource.designer.cs
@@ -1,27 +1,37 @@
 #pragma warning disable 1591
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.2012
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.18051
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: Android.Runtime.ResourceDesignerAttribute("KeePassLib2Android.Resource", IsApplication=false)]
+[assembly: global::Android.Runtime.ResourceDesignerAttribute("KeePassLib2Android.Resource", IsApplication=false)]
 
 namespace KeePassLib2Android
 {
 	
 	
-	[System.CodeDom.Compiler.GeneratedCodeAttribute("Novell.MonoDroid.Build.Tasks", "1.0.0.0")]
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	{
 		
+		static Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+		}
+		
 		public partial class Attribute
 		{
 			
+			static Attribute()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private Attribute()
 			{
 			}
@@ -33,6 +43,11 @@ namespace KeePassLib2Android
 			// aapt resource value: 0x7f020000
 			public static int library_name = 2130837504;
 			
+			static String()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private String()
 			{
 			}
diff --git a/src/KeePassLib2Android/Serialization/IOConnection.cs b/src/KeePassLib2Android/Serialization/IOConnection.cs
index db59ffeb..e63ce303 100644
--- a/src/KeePassLib2Android/Serialization/IOConnection.cs
+++ b/src/KeePassLib2Android/Serialization/IOConnection.cs
@@ -105,7 +105,7 @@ namespace KeePassLib.Serialization
 			// Not implemented and ignored in Mono < 2.10
 			try
 			{
-				request.CachePolicy = new RequestCachePolicy(RequestCacheLevel.NoCacheNoStore);
+				//request.CachePolicy = new RequestCachePolicy(RequestCacheLevel.NoCacheNoStore);
 			}
 			catch(NotImplementedException) { }
 			catch(Exception) { Debug.Assert(false); }
diff --git a/src/Kp2aKeyboardBinding/Transforms/Metadata.xml b/src/Kp2aKeyboardBinding/Transforms/Metadata.xml
index 87ac70dc..f90ccd90 100644
--- a/src/Kp2aKeyboardBinding/Transforms/Metadata.xml
+++ b/src/Kp2aKeyboardBinding/Transforms/Metadata.xml
@@ -1,4 +1,5 @@
 <metadata>
+	<remove-node path="/api/package[@name='keepass2android.softkeyboard']/class[@name='KP2AKeyboard']" />
 	<!--
   This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
   <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
diff --git a/src/keepass2android/Resources/Resource.designer.cs b/src/keepass2android/Resources/Resource.designer.cs
index b85b70c9..f021c9f5 100644
--- a/src/keepass2android/Resources/Resource.designer.cs
+++ b/src/keepass2android/Resources/Resource.designer.cs
@@ -1,24 +1,29 @@
 #pragma warning disable 1591
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.2012
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.18051
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: Android.Runtime.ResourceDesignerAttribute("keepass2android.Resource", IsApplication=true)]
+[assembly: global::Android.Runtime.ResourceDesignerAttribute("keepass2android.Resource", IsApplication=true)]
 
 namespace keepass2android
 {
 	
 	
-	[System.CodeDom.Compiler.GeneratedCodeAttribute("Novell.MonoDroid.Build.Tasks", "1.0.0.0")]
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	{
 		
+		static Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+		}
+		
 		public static void UpdateIdValues()
 		{
 			KeePassLib2Android.Resource.String.library_name = keepass2android.Resource.String.library_name;
@@ -39,6 +44,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f040003
 			public const int anim_leave_back = 2130968579;
 			
+			static Animation()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private Animation()
 			{
 			}
@@ -62,6 +72,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f0a0001
 			public const int list_size_values = 2131361793;
 			
+			static Array()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private Array()
 			{
 			}
@@ -70,6 +85,11 @@ namespace keepass2android
 		public partial class Attribute
 		{
 			
+			static Attribute()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private Attribute()
 			{
 			}
@@ -108,6 +128,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f090002
 			public const int sort_default = 2131296258;
 			
+			static Boolean()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private Boolean()
 			{
 			}
@@ -158,6 +183,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f06000c
 			public const int light_gray = 2131099660;
 			
+			static Color()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private Color()
 			{
 			}
@@ -175,6 +205,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f070000
 			public const int key_height = 2131165184;
 			
+			static Dimension()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private Dimension()
 			{
 			}
@@ -519,6 +554,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f02006f
 			public const int YellowButton = 2130837615;
 			
+			static Drawable()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private Drawable()
 			{
 			}
@@ -1043,6 +1083,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f0d0002
 			public const int version_title = 2131558402;
 			
+			static Id()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private Id()
 			{
 			}
@@ -1165,6 +1210,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f030025
 			public const int url_credentials = 2130903077;
 			
+			static Layout()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private Layout()
 			{
 			}
@@ -1188,6 +1238,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f0c0004
 			public const int password = 2131492868;
 			
+			static Menu()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private Menu()
 			{
 			}
@@ -2150,6 +2205,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f0800b6
 			public const int yes = 2131230902;
 			
+			static String()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private String()
 			{
 			}
@@ -2239,6 +2299,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f0b000d
 			public const int WhiteOnDarkSmall = 2131427341;
 			
+			static Style()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private Style()
 			{
 			}
@@ -2268,6 +2333,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f050006
 			public const int symbols_shift = 2131034118;
 			
+			static Xml()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
 			private Xml()
 			{
 			}
diff --git a/src/keepass2android/SupportLib/android-support-v4.jar b/src/keepass2android/SupportLib/android-support-v4.jar
deleted file mode 100644
index 6080877d..00000000
Binary files a/src/keepass2android/SupportLib/android-support-v4.jar and /dev/null differ