diff --git a/src/PluginHostTest/Activity1.cs b/src/PluginHostTest/Activity1.cs
new file mode 100644
index 00000000..b22ea02a
--- /dev/null
+++ b/src/PluginHostTest/Activity1.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Android.App;
+using Android.Content;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+using Android.OS;
+using Keepass2android.Pluginsdk;
+using keepass2android;
+
+namespace PluginHostTest
+{
+	[Activity(Label = "PluginHostTest", MainLauncher = true, Icon = "@drawable/icon")]
+	public class Activity1 : Activity
+	{
+		int count = 1;
+
+		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
+			Button button = FindViewById<Button>(Resource.Id.MyButton);
+
+			button.Click += delegate { PluginHost.TriggerRequests(this);  };
+
+			FindViewById<Button>(Resource.Id.managePluginsButton).Click += delegate(object sender, EventArgs args)
+				{
+					StartActivity(new Intent(this, typeof(PluginListActivity)));
+				};
+			FindViewById<Button>(Resource.Id.entryviewButton).Click += delegate
+			{
+					StartActivity(new Intent(this, typeof(EntryActivity)));
+			};
+
+			FindViewById<Button>(Resource.Id.testDbButton).Click += delegate
+				{
+					string message = "ok. ";
+					try
+					{
+						Stopwatch sw = new Stopwatch();
+						sw.Start();
+						PluginDatabase db = new PluginDatabase(this);
+						db.Clear();
+						
+
+						if (db.GetAllPluginPackages().Count() != 0)
+							throw new Exception("db not empty!");
+
+						const string testPackageA = "test.package.a";
+						const string testPackageB = "test.package.b";
+						db.ClearPlugin(testPackageA);
+						db.ClearPlugin(testPackageB);
+						EnsurePackageDataIsEmpty(db, testPackageA);
+						EnsurePackageDataIsEmpty(db, testPackageB);
+
+						string[] requestedScopes = {
+							Strings.ScopeDatabaseActions
+						};
+						db.StorePlugin(testPackageA, null, requestedScopes);
+						EnsurePackageDataIsEmpty(db, testPackageB);
+						EnsurePackageDataIsEmpty(new PluginDatabase(this), testPackageB);
+						db.StorePlugin(testPackageB, null, requestedScopes);
+						EnsurePackageHasUnacceptedScope(db, testPackageA, Strings.ScopeDatabaseActions);
+						EnsurePackageHasUnacceptedScope(db, testPackageB, Strings.ScopeDatabaseActions);
+						EnsurePackageHasUnacceptedScope(new PluginDatabase(this), testPackageA, Strings.ScopeDatabaseActions);
+						
+						if (db.GetAllPluginPackages().Count() != 2)
+							throw new Exception("wrong count of plugins");
+						if (db.GetPluginsWithAcceptedScope(Strings.ScopeDatabaseActions).Any())
+						{
+							throw new Exception("wrong count of accepted plugins");
+						}
+						if (new PluginDatabase(this).GetPluginsWithAcceptedScope(Strings.ScopeDatabaseActions).Any())
+						{
+							throw new Exception("wrong count of accepted plugins");
+						}
+
+						db.SetEnabled(testPackageA, true);
+						if (db.GetPluginsWithAcceptedScope(Strings.ScopeDatabaseActions).Single() != testPackageA)
+						{
+							throw new Exception("wrong plugin");
+						}
+						if (new PluginDatabase(this).GetPluginsWithAcceptedScope(Strings.ScopeDatabaseActions).Single() != testPackageA)
+						{
+							throw new Exception("wrong plugin");
+						}
+						if (db.GetPluginsWithAcceptedScope("somescope").Any())
+						{
+							throw new Exception("wrong count of accepted plugins");
+						}
+						var accessTokenA = db.GetAccessToken(testPackageA);
+						if (String.IsNullOrEmpty(accessTokenA))
+							throw new Exception("expected access token!");
+						if (!db.IsEnabled(testPackageA))
+							throw new Exception("plugin not enabled!");
+						if (db.IsEnabled(testPackageB))
+							throw new Exception("plugin enabled!");
+						if (!db.IsValidAccessToken(testPackageA, accessTokenA, Strings.ScopeDatabaseActions))
+							throw new Exception("invalid token!");
+						db.SetEnabled(testPackageA, false);
+						if (db.IsValidAccessToken(testPackageA, accessTokenA, Strings.ScopeDatabaseActions))
+							throw new Exception("valid token?!");
+						if (db.GetPluginsWithAcceptedScope(Strings.ScopeDatabaseActions).Any())
+							throw new Exception("unexpected!");
+
+
+						new PluginDatabase(this).SetEnabled(testPackageB, true);
+						if (!db.IsEnabled(testPackageB))
+							throw new Exception("plugin not enabled!");
+
+						db.SetEnabled(testPackageA, true);
+						accessTokenA = db.GetAccessToken(testPackageA);
+						
+						message += sw.ElapsedMilliseconds + "ms";
+
+						Stopwatch swQuery = new Stopwatch();
+						swQuery.Start();
+						int n = 3;
+						for (int i = 0; i < n; i++)
+						{
+							if (db.GetPluginsWithAcceptedScope(Strings.ScopeDatabaseActions).Count() != 2)
+							{
+								throw new Exception("wrong plugin");
+							}
+							if (!db.IsValidAccessToken(testPackageA, accessTokenA, Strings.ScopeDatabaseActions))
+								throw new Exception("invalid token");
+						}
+						message += "/ " + swQuery.ElapsedMilliseconds/(double)n/2.0 + "ms for query";
+
+
+					}
+					catch (Exception exception)
+					{
+						message = exception.ToString();
+					}
+					Toast.MakeText(this, message, ToastLength.Long).Show();
+
+				};
+
+			
+		}
+
+		private void EnsurePackageHasUnacceptedScope(PluginDatabase db, string plugin, string scope)
+		{
+			if (String.IsNullOrEmpty(db.GetRequestToken(plugin)))
+				throw new Exception("invalid request token");
+			if (db.GetAccessToken(plugin) != null)
+				throw new Exception("invalid access token!");
+			if (db.GetPluginScopes(plugin).Count != 1)
+				throw new Exception("Unexpected scopes!");
+			if (db.GetPluginScopes(plugin).First() != scope)
+				throw new Exception("Unexpected scope in db!");
+		}
+
+		private static void EnsurePackageDataIsEmpty(PluginDatabase db, string testPackageA)
+		{
+			if (String.IsNullOrEmpty(db.GetRequestToken(testPackageA)))
+				throw new Exception("invalid request token");
+			if (db.GetAccessToken(testPackageA) != null)
+				throw new Exception("invalid access token!");
+			if (db.GetPluginScopes(testPackageA).Count > 0)
+				throw new Exception("Unexpected scopes!");
+		}
+	}
+}
+
diff --git a/src/PluginHostTest/Assets/AboutAssets.txt b/src/PluginHostTest/Assets/AboutAssets.txt
new file mode 100644
index 00000000..ee398862
--- /dev/null
+++ b/src/PluginHostTest/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/PluginHostTest/Assets/DejaVuSansMono.ttf b/src/PluginHostTest/Assets/DejaVuSansMono.ttf
new file mode 100644
index 00000000..8b7bb2a4
Binary files /dev/null and b/src/PluginHostTest/Assets/DejaVuSansMono.ttf differ
diff --git a/src/PluginHostTest/Assets/fontawesome-webfont.ttf b/src/PluginHostTest/Assets/fontawesome-webfont.ttf
new file mode 100644
index 00000000..d3659246
Binary files /dev/null and b/src/PluginHostTest/Assets/fontawesome-webfont.ttf differ
diff --git a/src/PluginHostTest/ClickView.cs b/src/PluginHostTest/ClickView.cs
new file mode 100644
index 00000000..99b09399
--- /dev/null
+++ b/src/PluginHostTest/ClickView.cs
@@ -0,0 +1,44 @@
+/*
+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 3 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/>.
+  */
+
+using System;
+using Android.Content;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+
+namespace keepass2android.view
+{
+	public abstract class ClickView : LinearLayout {
+		protected ClickView (IntPtr javaReference, JniHandleOwnership transfer)
+			: base(javaReference, transfer)
+		{
+			
+		}
+
+		protected ClickView(Context context) :base(context)
+		{
+		}
+		
+		abstract public void OnClick();
+		
+		abstract public void OnCreateMenu(IContextMenu menu, IContextMenuContextMenuInfo menuInfo);
+		
+		abstract public bool OnContextItemSelected(IMenuItem item);
+	}
+}
+
diff --git a/src/PluginHostTest/EntryActivity.cs b/src/PluginHostTest/EntryActivity.cs
new file mode 100644
index 00000000..0eb25ddb
--- /dev/null
+++ b/src/PluginHostTest/EntryActivity.cs
@@ -0,0 +1,367 @@
+/*
+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 3 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/>.
+  */
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Views;
+using Android.Widget;
+using Android.Preferences;
+using Android.Text.Method;
+using System.Globalization;
+using Android.Content.PM;
+using Android.Webkit;
+using Android.Graphics;
+using Java.IO;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	[Activity (Label = "@string/app_name", ConfigurationChanges=ConfigChanges.Orientation|ConfigChanges.KeyboardHidden, Theme="@style/NoTitleBar")]			
+	public class EntryActivity : Activity {
+		public const String KeyEntry = "entry";
+		public const String KeyRefreshPos = "refresh_pos";
+		public const String KeyCloseAfterCreate = "close_after_create";
+
+		private static Typeface _passwordFont;
+
+		private bool _showPassword;
+		private int _pos;
+
+		private List<TextView> _protectedTextViews;
+
+
+		protected void SetEntryView() {
+			SetContentView(Resource.Layout.entry_view);
+		}
+		
+		protected void SetupEditButtons() {
+			View edit =  FindViewById(Resource.Id.entry_edit);
+			if (true)
+			{
+				edit.Visibility = ViewStates.Visible;
+				edit.Click += (sender, e) =>
+				{
+					
+				};	
+			}
+			else
+			{
+				edit.Visibility = ViewStates.Gone;
+			}
+			
+		}
+		
+		protected override void OnCreate(Bundle savedInstanceState)
+		{
+			
+			ISharedPreferences prefs = PreferenceManager.GetDefaultSharedPreferences(this);
+
+			long usageCount = prefs.GetLong(GetString(Resource.String.UsageCount_key), 0);
+
+			ISharedPreferencesEditor edit = prefs.Edit();
+			edit.PutLong(GetString(Resource.String.UsageCount_key), usageCount+1);
+			edit.Commit();
+
+			_showPassword = ! prefs.GetBoolean(GetString(Resource.String.maskpass_key), Resources.GetBoolean(Resource.Boolean.maskpass_default));
+			
+			base.OnCreate(savedInstanceState);
+			SetEntryView();
+
+			FillData(false);
+			
+			SetupEditButtons();
+
+			
+		}
+
+		public void CompleteOnCreate()
+		{
+			
+		}
+
+
+		private String getDateTime(DateTime dt) {
+			return dt.ToString ("g", CultureInfo.CurrentUICulture);
+		}
+
+		String concatTags(List<string> tags)
+		{
+			StringBuilder sb = new StringBuilder();
+			foreach (string tag in tags)
+			{
+				sb.Append(tag);
+				sb.Append(", ");
+			}
+			if (tags.Count > 0)
+				sb.Remove(sb.Length-2,2);
+			return sb.ToString();
+		}
+
+		void PopulateExtraStrings(bool trimList)
+		{
+			ViewGroup extraGroup = (ViewGroup)FindViewById(Resource.Id.extra_strings);
+			if (trimList)
+			{
+				extraGroup.RemoveAllViews();
+			}
+			bool hasExtraFields = false;
+			foreach (var view in from pair in new Dictionary<string, string>() { { "Field header", "field value" }, { "another header", "_aiaeiae" } }
+								 orderby pair.Key 
+								 select CreateEditSection(pair.Key, pair.Value, true))
+			{
+				extraGroup.AddView(view);
+				hasExtraFields = true;
+			}
+			FindViewById(Resource.Id.entry_extra_strings_label).Visibility = hasExtraFields ? ViewStates.Visible : ViewStates.Gone;
+		}
+
+		View CreateEditSection(string key, string value, bool isProtected)
+		{
+			LinearLayout layout = new LinearLayout(this, null) {Orientation = Orientation.Vertical};
+			LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FillParent, ViewGroup.LayoutParams.WrapContent);
+			layoutParams.SetMargins(10,0,0,0);
+			layout.LayoutParameters = layoutParams;
+			View viewInflated = LayoutInflater.Inflate(Resource.Layout.entry_extrastring_title,null);
+			TextView keyView = (TextView)viewInflated;
+			if (key != null)
+				keyView.Text = key;
+			
+			layout.AddView(keyView);
+			TextView valueView = (TextView)LayoutInflater.Inflate(Resource.Layout.entry_extrastring_value, null);
+			if (value != null)
+				valueView.Text = value;
+			SetPasswordTypeface(valueView);
+			if (isProtected)
+				RegisterProtectedTextView(valueView);
+
+
+			if ((int)Build.VERSION.SdkInt >= 11)
+				valueView.SetTextIsSelectable(true);
+			layout.AddView(valueView);
+			return layout;
+		}
+
+		private void RegisterProtectedTextView(TextView protectedTextView)
+		{
+			_protectedTextViews.Add(protectedTextView);
+		}
+
+
+		void PopulateBinaries(bool trimList)
+		{
+			ViewGroup binariesGroup = (ViewGroup)FindViewById(Resource.Id.binaries);
+			if (trimList)
+			{
+				binariesGroup.RemoveAllViews();
+			}
+			foreach (KeyValuePair<string, string> pair in new Dictionary<string, string>() { {"abc",""}, {"test.png","uia"} })
+			{
+				String key = pair.Key;
+				Button binaryButton = new Button(this);
+				RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.FillParent, ViewGroup.LayoutParams.WrapContent);
+				binaryButton.Text = key;
+				binaryButton.SetCompoundDrawablesWithIntrinsicBounds( Resources.GetDrawable(Android.Resource.Drawable.IcMenuSave),null, null, null);
+				binaryButton.Click += (sender, e) => 
+				{
+					Button btnSender = (Button)(sender);
+
+					AlertDialog.Builder builder = new AlertDialog.Builder(this);
+					builder.SetTitle(GetString(Resource.String.SaveAttachmentDialog_title));
+					
+					builder.SetMessage(GetString(Resource.String.SaveAttachmentDialog_text));
+					
+					builder.SetPositiveButton(GetString(Resource.String.SaveAttachmentDialog_save), (dlgSender, dlgEvt) => 
+					                                                                                                                    {
+							
+						});
+					
+					builder.SetNegativeButton(GetString(Resource.String.SaveAttachmentDialog_open), (dlgSender, dlgEvt) => 
+					                                                                                                                   {
+							
+						});
+
+					Dialog dialog = builder.Create();
+					dialog.Show();
+
+
+				};
+				binariesGroup.AddView(binaryButton,layoutParams);
+
+				
+			}
+			FindViewById(Resource.Id.entry_binaries_label).Visibility = true ? ViewStates.Visible : ViewStates.Gone;
+		}
+
+		// url = file path or whatever suitable URL you want.
+		public static String GetMimeType(String url)
+		{
+			String type = null;
+			String extension = MimeTypeMap.GetFileExtensionFromUrl(url);
+			if (extension != null) {
+				MimeTypeMap mime = MimeTypeMap.Singleton;
+				type = mime.GetMimeTypeFromExtension(extension);
+			}
+			return type;
+		}
+
+		public override void OnBackPressed()
+		{
+			base.OnBackPressed();
+		}
+
+		protected void FillData(bool trimList)
+		{
+			_protectedTextViews = new List<TextView>();
+			ImageView iv = (ImageView)FindViewById(Resource.Id.entry_icon);
+			if (iv != null)
+			{
+				iv.SetImageDrawable(Resources.GetDrawable(Resource.Drawable.ic00));
+			}
+			
+			
+
+			ActionBar.Title = "Entry title";
+			ActionBar.SetDisplayHomeAsUpEnabled(true);
+			
+			PopulateText(Resource.Id.entry_user_name, Resource.Id.entry_user_name_label, "user name");
+			
+			PopulateText(Resource.Id.entry_url, Resource.Id.entry_url_label, "www.google.com");
+			PopulateText(Resource.Id.entry_password, Resource.Id.entry_password_label, "my password");
+			RegisterProtectedTextView(FindViewById<TextView>(Resource.Id.entry_password));
+			SetPasswordTypeface(FindViewById<TextView>(Resource.Id.entry_password));
+			
+			
+			PopulateText(Resource.Id.entry_created, Resource.Id.entry_created_label, getDateTime(DateTime.Now));
+			PopulateText(Resource.Id.entry_modified, Resource.Id.entry_modified_label, getDateTime(DateTime.Now));
+			
+			if (true)
+			{
+				FindViewById(Resource.Id.entry_expires).Visibility = ViewStates.Visible;
+				FindViewById(Resource.Id.entry_expires_label).Visibility = ViewStates.Visible;
+				
+				PopulateText(Resource.Id.entry_expires, Resource.Id.entry_expires_label, getDateTime(DateTime.Now));
+
+			} 
+			else
+			{
+				FindViewById(Resource.Id.entry_expires).Visibility = ViewStates.Gone;
+				FindViewById(Resource.Id.entry_expires_label).Visibility = ViewStates.Gone;
+			}
+			PopulateText(Resource.Id.entry_comment, Resource.Id.entry_comment_label, "some text about this entry");
+
+			PopulateText(Resource.Id.entry_tags, Resource.Id.entry_tags_label, "bla; blubb; blablubb");
+
+			PopulateExtraStrings(trimList);
+
+			PopulateBinaries(trimList);
+
+			SetPasswordStyle();
+		}
+
+		private void SetPasswordTypeface(TextView textView)
+		{
+			
+		}
+
+		private void PopulateText(int viewId, int headerViewId,int resId) {
+			View header = FindViewById(headerViewId);
+			TextView tv = (TextView)FindViewById(viewId);
+
+			header.Visibility = tv.Visibility = ViewStates.Visible;
+			tv.SetText (resId);
+		}
+		
+		private void PopulateText(int viewId, int headerViewId, String text)
+		{
+			View header = FindViewById(headerViewId);
+			TextView tv = (TextView)FindViewById(viewId);
+			if (String.IsNullOrEmpty(text))
+			{
+				header.Visibility = tv.Visibility = ViewStates.Gone;
+			}
+			else
+			{
+				header.Visibility = tv.Visibility = ViewStates.Visible;
+				tv.Text = text;
+
+			}
+		}
+
+		void RequiresRefresh ()
+		{
+			Intent ret = new Intent ();
+			ret.PutExtra (KeyRefreshPos, _pos);
+			
+		}
+		
+		
+		
+		private void SetPasswordStyle() {
+			foreach (TextView password in _protectedTextViews)
+			{
+
+				if (_showPassword)
+				{
+					password.TransformationMethod = null;
+				}
+				else
+				{
+					password.TransformationMethod = PasswordTransformationMethod.Instance;
+				}
+			}
+		}
+		protected override void OnResume()
+		{
+			
+			base.OnResume();
+		}
+		
+		/// <summary>
+		/// brings up a dialog asking the user whether he wants to add the given URL to the entry for automatic finding
+		/// </summary>
+		public void AskAddUrlThenCompleteCreate(string url)
+		{
+			AlertDialog.Builder builder = new AlertDialog.Builder(this);
+			builder.SetTitle(GetString(Resource.String.AddUrlToEntryDialog_title));
+
+			builder.SetMessage(GetString(Resource.String.AddUrlToEntryDialog_text, new Java.Lang.Object[] { url } ));
+
+			builder.SetPositiveButton(GetString(Resource.String.yes), (dlgSender, dlgEvt) =>
+				{
+					
+				});
+
+			builder.SetNegativeButton(GetString(Resource.String.no), (dlgSender, dlgEvt) =>
+			{
+				CompleteOnCreate();
+			});
+
+			Dialog dialog = builder.Create();
+			dialog.Show();
+
+		}
+
+	}
+
+}
+
diff --git a/src/PluginHostTest/EntryContentsView.cs b/src/PluginHostTest/EntryContentsView.cs
new file mode 100644
index 00000000..2c2730f9
--- /dev/null
+++ b/src/PluginHostTest/EntryContentsView.cs
@@ -0,0 +1,64 @@
+/*
+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 3 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/>.
+  */
+
+using Android.Content;
+using Android.Util;
+using Android.Views;
+using Android.Widget;
+
+using System;
+using Android.Runtime;
+using PluginHostTest;
+
+
+namespace keepass2android.view
+{
+	
+	public class EntryContentsView : LinearLayout {
+
+		public EntryContentsView (IntPtr javaReference, JniHandleOwnership transfer)
+			: base(javaReference, transfer)
+		{
+
+		}
+		
+		public EntryContentsView(Context context):base(context, null) {
+			InflateView();
+		}
+		
+		public EntryContentsView(Context context, IAttributeSet attrs): base(context, attrs) {
+			
+			InflateView();
+		}
+		
+		private void InflateView() {
+			LayoutInflater inflater = (LayoutInflater) Context.GetSystemService(Context.LayoutInflaterService);
+			inflater.Inflate(Resource.Layout.entry_view_contents, this);
+
+		}
+
+		/*
+		 * doesn't compile with mono for android
+		 * 
+		protected override LayoutParams GenerateDefaultLayoutParams() {
+			return new LayoutParams(LayoutParams.FillParent, LayoutParams.WrapContent);
+		}
+		*/
+	}
+
+}
+
diff --git a/src/PluginHostTest/EntrySection.cs b/src/PluginHostTest/EntrySection.cs
new file mode 100644
index 00000000..988a475b
--- /dev/null
+++ b/src/PluginHostTest/EntrySection.cs
@@ -0,0 +1,75 @@
+/*
+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 3 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/>.
+  */
+
+using System;
+using Android.Content;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+using Android.Util;
+using PluginHostTest;
+
+namespace keepass2android.view
+{
+	
+	public class EntrySection : LinearLayout {
+		
+		public EntrySection(Context context): base(context, null) {
+			InflateView (null, null);
+		}
+		
+		public EntrySection(Context context, IAttributeSet attrs): base(context, attrs) {
+			InflateView (null, null);
+		}
+		
+		public EntrySection(Context context, IAttributeSet attrs, String title, String value): base(context, attrs) {
+			
+			InflateView(title, value);
+		}
+
+		public EntrySection (IntPtr javaReference, JniHandleOwnership transfer)
+			: base(javaReference, transfer)
+		{
+			
+		}
+		
+		
+		private void InflateView(String title, String value) {
+			LayoutInflater inflater = (LayoutInflater) Context.GetSystemService(Context.LayoutInflaterService);
+			inflater.Inflate(Resource.Layout.entry_section, this);
+			
+			SetText(Resource.Id.title, title);
+
+			FindViewById<TextView>(Resource.Id.value).Invalidate();
+			SetText(Resource.Id.value, value);
+			//TODO: this seems to cause a bug when rotating the device (and the activity gets destroyed)
+			//After recreating the activity, the value fields all have the same content.
+			if ((int)Android.OS.Build.VERSION.SdkInt >= 11)
+				FindViewById<TextView>(Resource.Id.value).SetTextIsSelectable(true);
+		}
+		
+		private void SetText(int resId, String str) {
+			if (str != null) {
+				TextView tvTitle = (TextView) FindViewById(resId);
+				tvTitle.Text = str;
+			}
+			
+		}
+	}
+
+}
+
diff --git a/src/PluginHostTest/Kp2aShortHelpView.cs b/src/PluginHostTest/Kp2aShortHelpView.cs
new file mode 100644
index 00000000..e6323319
--- /dev/null
+++ b/src/PluginHostTest/Kp2aShortHelpView.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.Content.Res;
+using Android.Graphics;
+using Android.OS;
+using Android.Runtime;
+using Android.Text;
+using Android.Text.Method;
+using Android.Text.Style;
+using Android.Text.Util;
+using Android.Util;
+using Android.Views;
+using Android.Widget;
+using PluginHostTest;
+
+namespace keepass2android.views
+{
+	public class Kp2aShortHelpView: TextView
+	{
+		private string _helpText;
+		private static Typeface _iconFont;
+
+		protected Kp2aShortHelpView(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
+		{
+		}
+
+		public Kp2aShortHelpView(Context context) : base(context)
+		{
+		}
+
+		public Kp2aShortHelpView(Context context, IAttributeSet attrs) : base(context, attrs)
+		{
+			Initialize(attrs);
+		}
+
+		public Kp2aShortHelpView(Context context, IAttributeSet attrs, int defStyle) : base(context, attrs, defStyle)
+		{
+			Initialize(attrs);
+		}
+
+		public string HelpText
+		{
+			get { return _helpText; }
+			set { _helpText = value;
+				UpdateView();
+			}
+		}
+
+		private void UpdateView()
+		{
+			if (!String.IsNullOrEmpty(_helpText))
+			{
+				Text = "i";
+				Clickable = true;
+
+
+				MovementMethod = LinkMovementMethod.Instance;
+				Click += (sender, args) =>
+				{
+					new AlertDialog.Builder(Context)
+						.SetTitle("PluginHostTest")
+						.SetMessage(_helpText)
+						.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => { })
+					.Show();
+				};
+				Visibility = ViewStates.Visible;
+			}
+			else
+			{
+				Visibility = ViewStates.Gone;
+			}
+		}
+
+		void Initialize(IAttributeSet attrs)
+		{
+			TypedArray a = Context.ObtainStyledAttributes(
+		 attrs,
+		 Resource.Styleable.Kp2aShortHelpView);
+			HelpText = a.GetString(Resource.Styleable.Kp2aShortHelpView_help_text);
+		
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/PluginArrayAdapter.cs b/src/PluginHostTest/PluginArrayAdapter.cs
new file mode 100644
index 00000000..c27ec331
--- /dev/null
+++ b/src/PluginHostTest/PluginArrayAdapter.cs
@@ -0,0 +1,113 @@
+using Android.Widget;
+using Android.Content;
+using Android.Views;
+using System.Collections.Generic;
+using Android.App;
+using PluginHostTest;
+
+namespace keepass2android
+{
+
+	public class PluginItem
+	{
+		private readonly string _package;
+
+		public PluginItem(string package, string _label, int _icon, string _version, string _enabledStatus)
+		{
+			_package = package;
+			Label = _label;
+			Icon = _icon;
+			Version = _version;
+			EnabledStatus = _enabledStatus;
+		}
+
+		public string Label
+		{
+			get;
+			set;
+		}
+
+		public string Version
+		{
+			get;
+			set;
+		}
+
+		public string EnabledStatus
+		{
+			get;
+			set;
+		}
+
+		public int Icon
+		{
+			get;
+			set;
+		}
+
+		public string Package
+		{
+			get { return _package; }
+		}
+	}
+
+
+	public class PluginArrayAdapter : ArrayAdapter<PluginItem>
+	{
+
+		class PluginViewHolder : Java.Lang.Object
+		{
+			public ImageView imgIcon;
+			public TextView txtTitle;
+			public TextView txtVersion;
+
+			public TextView txtEnabledStatus;
+		}
+
+		Context context;
+		int layoutResourceId;
+		IList<PluginItem> data = null;
+
+		public PluginArrayAdapter(Context context, int layoutResourceId, IList<PluginItem> data) :
+			base(context, layoutResourceId, data)
+		{
+
+			this.layoutResourceId = layoutResourceId;
+			this.context = context;
+			this.data = data;
+		}
+
+		public override View GetView(int position, View convertView, ViewGroup parent)
+		{
+			View row = convertView;
+			PluginViewHolder holder = null;
+
+			if (row == null)
+			{
+				LayoutInflater inflater = ((Activity)context).LayoutInflater;
+				row = inflater.Inflate(layoutResourceId, parent, false);
+
+				holder = new PluginViewHolder();
+				holder.imgIcon = (ImageView)row.FindViewById(Resource.Id.imgIcon);
+				holder.txtTitle = (TextView)row.FindViewById(Resource.Id.txtLabel);
+				holder.txtVersion = (TextView)row.FindViewById(Resource.Id.txtVersion);
+				holder.txtEnabledStatus = (TextView)row.FindViewById(Resource.Id.txtStatus);
+
+				row.Tag = holder;
+			}
+			else
+			{
+				holder = (PluginViewHolder)row.Tag;
+			}
+
+			var item = data[position];
+			holder.txtTitle.Text = item.Label;
+			holder.txtVersion.Text = item.Version;
+			holder.txtEnabledStatus.Text = item.EnabledStatus;
+			holder.imgIcon.SetImageResource(item.Icon);
+
+			return row;
+		}
+	}
+
+}
diff --git a/src/PluginHostTest/PluginDatabase.cs b/src/PluginHostTest/PluginDatabase.cs
new file mode 100644
index 00000000..a38cdb0a
--- /dev/null
+++ b/src/PluginHostTest/PluginDatabase.cs
@@ -0,0 +1,174 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Android.Content;
+using Android.Util;
+using Keepass2android.Pluginsdk;
+
+namespace keepass2android
+{
+	public class PluginDatabase
+	{
+		private const string _tag = "KP2A_PluginDatabase";
+		private readonly Context _ctx;
+		private const string _accessToken = "accessToken";
+		private const string _scopes = "scopes";
+		private const string _requesttoken = "requestToken";
+		private const string _pluginlist = "pluginList";
+
+
+
+		public PluginDatabase(Context ctx)
+		{
+			_ctx = ctx;
+		}
+
+		private ISharedPreferences GetPreferencesForPlugin(string packageName)
+		{
+			var prefs = _ctx.GetSharedPreferences("KP2A.Plugin." + packageName, FileCreationMode.Private);
+			if (prefs.GetString(_requesttoken, null) == null)
+			{
+				var editor = prefs.Edit();
+				editor.PutString(_requesttoken, Guid.NewGuid().ToString());
+				editor.Commit();
+
+				var hostPrefs = GetHostPrefs();
+				var plugins = hostPrefs.GetStringSet(_pluginlist, new List<string>());
+				if (!plugins.Contains(packageName))
+				{
+					plugins.Add(packageName);
+					hostPrefs.Edit().PutStringSet(_pluginlist, plugins).Commit();
+				}
+
+			}
+			return prefs;
+		}
+
+		/// <summary>
+		/// Returns the request token for the plugin. Request token is created of not yet available.
+		/// </summary>
+		/// <returns>Request token. Never null or empty.</returns>
+		public string GetRequestToken(string pkgName)
+		{
+			return GetPreferencesForPlugin(pkgName).GetString(_requesttoken, null);
+		}
+
+		public IList<string> GetPluginScopes(string pluginPackage)
+		{
+			var prefs = GetPreferencesForPlugin(pluginPackage);
+			return AccessManager.StringToStringArray(prefs.GetString(_scopes, ""));
+		}
+
+		public IEnumerable<String> GetAllPluginPackages()
+		{
+			var hostPrefs = GetHostPrefs();
+			return hostPrefs.GetStringSet(_pluginlist, new List<string>());
+		}
+
+		public bool IsEnabled(string pluginPackage)
+		{
+			return GetPreferencesForPlugin(pluginPackage).GetString(_accessToken, null) != null;
+		}
+
+
+		public void StorePlugin(string pluginPackage, string accessToken, IList<string> requestedScopes)
+		{
+			ISharedPreferences hostPrefs = GetHostPrefs();
+			ISharedPreferences pluginPrefs = GetPreferencesForPlugin(pluginPackage);
+			var stringSet = hostPrefs.GetStringSet(_pluginlist, new Collection<string>());
+			if (!stringSet.Contains(pluginPackage))
+			{
+				stringSet.Add(pluginPackage);
+				hostPrefs.Edit()
+				         .PutStringSet(_pluginlist, stringSet)
+				         .Commit();
+			}
+
+			pluginPrefs.Edit()
+			           .PutString(_scopes, AccessManager.StringArrayToString(requestedScopes))
+			           .PutString(_accessToken, accessToken)
+			           .Commit();
+		}
+
+		private ISharedPreferences GetHostPrefs()
+		{
+			return _ctx.GetSharedPreferences("plugins", FileCreationMode.Private);
+		}
+
+		public void SetEnabled(string pluginPackage, bool enabled)
+		{
+			if (enabled)
+			{
+				string accessToken = Guid.NewGuid().ToString();
+
+				Intent i = new Intent(Strings.ActionReceiveAccess);
+				i.SetPackage(pluginPackage);
+
+				i.PutExtra(Strings.ExtraSender, _ctx.PackageName);
+				i.PutExtra(Strings.ExtraRequestToken, GetPreferencesForPlugin(pluginPackage).GetString(_requesttoken, null));
+				i.PutExtra(Strings.ExtraAccessToken, accessToken);
+				_ctx.SendBroadcast(i);
+
+				StorePlugin(pluginPackage, accessToken, GetPluginScopes( pluginPackage));
+			}
+			else
+			{
+				Intent i = new Intent(Strings.ActionRevokeAccess);
+				i.SetPackage(pluginPackage);
+				i.PutExtra(Strings.ExtraSender, _ctx.PackageName);
+				i.PutExtra(Strings.ExtraRequestToken, GetPreferencesForPlugin(pluginPackage).GetString(_requesttoken, null));
+				_ctx.SendBroadcast(i);
+				StorePlugin(pluginPackage, null, GetPluginScopes(pluginPackage));
+			}
+		}
+
+		public bool IsValidAccessToken(string pluginPackage, string accessToken, string scope)
+		{
+			var prefs = GetPreferencesForPlugin(pluginPackage);
+			if (prefs.GetString(_accessToken, null) != accessToken)
+			{
+				Log.Warn(_tag, "Invalid access token for " + pluginPackage);
+				return false;
+			}
+			if (!AccessManager.StringToStringArray(prefs.GetString(_scopes, "")).Contains(scope))
+			{
+				Log.Warn(_tag, "Scope " + scope + " not granted for " + pluginPackage);
+				return false;
+			}
+			return true;
+		}
+
+		public string GetAccessToken(string pluginPackage)
+		{
+			return GetPreferencesForPlugin(pluginPackage).GetString(_accessToken, null);
+		}
+
+		public void Clear()
+		{
+			foreach (string plugin in GetAllPluginPackages())
+			{
+				GetPreferencesForPlugin(plugin).Edit().Clear().Commit();
+			}
+			GetHostPrefs().Edit().Clear().Commit();
+		}
+
+		
+		public IEnumerable<string> GetPluginsWithAcceptedScope(string scope)
+		{
+			return GetAllPluginPackages().Where(plugin =>
+				{
+					var prefs = GetPreferencesForPlugin(plugin);
+					return (prefs.GetString(_accessToken, null) != null)
+						 && AccessManager.StringToStringArray(prefs.GetString(_scopes, "")).Contains(scope);
+
+				});
+		}
+
+		public void ClearPlugin(string plugin)
+		{
+			var prefs = _ctx.GetSharedPreferences("KP2A.Plugin." + plugin, FileCreationMode.Private);
+			prefs.Edit().Clear().Commit();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/PluginDetailsActivity.cs b/src/PluginHostTest/PluginDetailsActivity.cs
new file mode 100644
index 00000000..2fb4fd58
--- /dev/null
+++ b/src/PluginHostTest/PluginDetailsActivity.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.Content.PM;
+using Android.Content.Res;
+using Android.Graphics.Drawables;
+using Android.OS;
+using Android.Runtime;
+using Android.Util;
+using Android.Views;
+using Android.Widget;
+using Java.Util;
+using Keepass2android.Pluginsdk;
+using keepass2android;
+using keepass2android.views;
+
+namespace PluginHostTest
+{
+	[Activity(Label = "TODO Details")]
+	public class PluginDetailsActivity : Activity
+	{
+		protected override void OnCreate(Bundle bundle)
+		{
+			base.OnCreate(bundle);
+
+			string pluginPackage = Intent.GetStringExtra("PluginPackage");
+
+			Intent mainIntent = new Intent(Intent.ActionMain, null);
+			mainIntent.AddCategory(Intent.CategoryLauncher);
+
+			IList<ResolveInfo> appList = PackageManager.QueryIntentActivities(mainIntent, 0);
+			//Collections.Sort(appList, new ResolveInfo.DisplayNameComparator(PackageManager));
+
+			foreach (ResolveInfo temp in appList) 
+			{
+
+				Log.Verbose("my logs", "package and activity name = "
+						+ temp.ActivityInfo.PackageName + "    "
+						+ temp.ActivityInfo.Name + " " + temp.ActivityInfo.IconResource);
+
+			 }
+			var pluginRes = PackageManager.GetResourcesForApplication(pluginPackage);
+			var title = GetStringFromPlugin(pluginRes, pluginPackage, "kp2aplugin_title");
+			var author = GetStringFromPlugin(pluginRes, pluginPackage, "kp2aplugin_author");
+			var shortDesc = GetStringFromPlugin(pluginRes, pluginPackage, "kp2aplugin_shortdesc");
+
+			var version = PackageManager.GetPackageInfo(pluginPackage, 0).VersionName;
+			
+			SetContentView(Resource.Layout.plugin_details);
+			if (title != null)
+				FindViewById<TextView>(Resource.Id.txtLabel).Text = title;
+			FindViewById<TextView>(Resource.Id.txtVersion).Text = version;
+			SetTextOrHide(Resource.Id.txtAuthor, author);
+			SetTextOrHide(Resource.Id.txtShortDesc, shortDesc);
+
+			var checkbox = FindViewById<CheckBox>(Resource.Id.cb_enabled);
+			PluginDatabase pluginDb = new PluginDatabase(this);
+			checkbox.Checked = pluginDb.IsEnabled(pluginPackage);
+			checkbox.CheckedChange += delegate(object sender, CompoundButton.CheckedChangeEventArgs args)
+				{
+					pluginDb.SetEnabled(pluginPackage, checkbox.Checked);
+				};
+			
+			Drawable d = PackageManager.GetApplicationIcon(pluginPackage);
+			FindViewById<ImageView>(Resource.Id.imgIcon).SetImageDrawable(d);
+			
+			FindViewById<TextView>(Resource.Id.txtVersion).Text = version;
+
+			var scopesContainer = FindViewById<LinearLayout>(Resource.Id.scopes_list);
+
+			foreach (string scope in pluginDb.GetPluginScopes(pluginPackage))
+			{
+				string scopeId = scope.Substring("keepass2android.".Length);
+
+				TextWithHelp help = new TextWithHelp(this, GetString(Resources.GetIdentifier(scopeId + "_title", "string", PackageName)), GetString(Resources.GetIdentifier(scopeId + "_explanation", "string", PackageName)));
+				LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FillParent, ViewGroup.LayoutParams.WrapContent);
+				help.LayoutParameters = layoutParams;
+				scopesContainer.AddView(help);	
+			}
+			
+			
+		}
+
+		private void SetTextOrHide(int resourceId, string text)
+		{
+			if (text != null)
+			{
+				FindViewById<TextView>(resourceId).Text = text;
+				FindViewById<TextView>(resourceId).Visibility = ViewStates.Visible;
+			}
+			else
+				FindViewById<TextView>(resourceId).Visibility = ViewStates.Gone;
+		}
+
+		private static string GetStringFromPlugin(Resources pluginRes, string pluginPackage, string stringId)
+		{
+			int titleId = pluginRes.GetIdentifier(pluginPackage + ":string/"+stringId, null, null);
+			string title = null;
+			if (titleId != 0)
+				title = pluginRes.GetString(titleId);
+			return title;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/PluginHost.cs b/src/PluginHostTest/PluginHost.cs
new file mode 100644
index 00000000..ca33b2b3
--- /dev/null
+++ b/src/PluginHostTest/PluginHost.cs
@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.Content.PM;
+using Android.OS;
+using Android.Runtime;
+using Android.Util;
+using Android.Views;
+using Android.Widget;
+
+using Keepass2android;
+using Keepass2android.Pluginsdk;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	[BroadcastReceiver()]
+	[IntentFilter(new[] { Strings.ActionRequestAccess})]
+	public class PluginHost: BroadcastReceiver
+	{
+		
+		private const string _tag = "KP2A_PluginHost";
+		
+
+		private static readonly string[] _validScopes = { Strings.ScopeDatabaseActions };
+
+		public static void TriggerRequests(Context ctx)
+		{
+			Intent accessIntent = new Intent(Strings.ActionTriggerRequestAccess);
+			PackageManager packageManager = ctx.PackageManager;
+			IList<ResolveInfo> dictPacks = packageManager.QueryBroadcastReceivers(
+				accessIntent, PackageInfoFlags.Receivers);
+			PluginDatabase pluginDatabase = new PluginDatabase(ctx);
+			foreach (ResolveInfo ri in dictPacks)
+			{
+				ApplicationInfo appInfo = ri.ActivityInfo.ApplicationInfo;
+				String pkgName = appInfo.PackageName;
+				
+				try
+				{
+					
+					Intent triggerIntent = new Intent(Strings.ActionTriggerRequestAccess);
+					triggerIntent.SetPackage(pkgName);
+					triggerIntent.PutExtra(Strings.ExtraSender, ctx.PackageName);
+					
+					triggerIntent.PutExtra(Strings.ExtraRequestToken, pluginDatabase.GetRequestToken(pkgName));
+					ctx.SendBroadcast(triggerIntent);
+				}
+				catch (Exception e)
+				{
+					
+					
+				}
+			}
+
+		}
+
+		
+
+
+
+		public override void OnReceive(Context context, Intent intent)
+		{
+			PluginDatabase pluginDb = new PluginDatabase(context);
+			if (intent.Action == Strings.ActionRequestAccess)
+			{
+				var senderPackage = intent.GetStringExtra(Strings.ExtraSender);
+				var requestToken = intent.GetStringExtra(Strings.ExtraRequestToken);
+
+			 	var requestedScopes = intent.GetStringArrayListExtra(Strings.ExtraScopes);
+
+				if (!AreScopesValid(requestedScopes))
+				{
+					return;
+				}
+
+				if (pluginDb.GetRequestToken(senderPackage) != requestToken)
+				{
+					Log.Warn(_tag, "Invalid requestToken!");
+					return;
+				}
+				string currentAccessToken = pluginDb.GetAccessToken(senderPackage);
+				if ((currentAccessToken != null) 
+					&& (AccessManager.IsSubset(requestedScopes,
+				                           pluginDb.GetPluginScopes(senderPackage))))
+				{
+					//permission already there.
+					var i = new Intent(Strings.ActionReceiveAccess);
+					i.PutExtra(Strings.ExtraSender, context.PackageName);
+					i.PutExtra(Strings.ExtraAccessToken, currentAccessToken);
+					//TODO: Plugin should verify requestToken to make sure it doesn't receive accessTokens from malicious apps
+					i.PutExtra(Strings.ExtraRequestToken, requestToken);
+					i.SetPackage(senderPackage);
+					context.SendBroadcast(i);
+
+					Log.Debug(_tag, "Plugin " + senderPackage + " enabled.");
+				}
+				else
+				{
+					//store that scope was requested but not yet approved (=> accessToken = null)
+					pluginDb.StorePlugin(senderPackage, null, requestedScopes);
+
+					Log.Debug(_tag, "Plugin " + senderPackage + " not enabled.");
+
+					//see if the plugin has an access token
+					string accessToken = intent.GetStringExtra(Strings.ExtraAccessToken);
+					if (accessToken != null)
+					{
+						//notify plugin that access token is no longer valid or sufficient
+						Intent i = new Intent(Strings.ActionRevokeAccess);
+						i.PutExtra(Strings.ExtraSender, context.PackageName);
+						i.PutExtra(Strings.ExtraAccessToken, accessToken);
+						i.SetPackage(senderPackage);
+						context.SendBroadcast(i);
+						Log.Warn(_tag, "Access token of plugin " + senderPackage + " not (or no more) valid.");
+					}
+					
+				}
+
+
+			}
+		}
+
+		private bool AreScopesValid(IList<string> requestedScopes)
+		{
+			foreach (string scope in requestedScopes)
+			{
+				if (!_validScopes.Contains(scope))
+				{
+					Log.Warn(_tag, "invalid scope: " + scope);
+					return false;
+				}
+			}
+			return true;
+		}
+
+		
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/PluginHostTest.csproj b/src/PluginHostTest/PluginHostTest.csproj
new file mode 100644
index 00000000..bc6de219
--- /dev/null
+++ b/src/PluginHostTest/PluginHostTest.csproj
@@ -0,0 +1,578 @@
+<?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>{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PluginHostTest</RootNamespace>
+    <AssemblyName>PluginHostTest</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <AndroidApplication>true</AndroidApplication>
+    <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+    <AndroidUseLatestPlatformSdk />
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <AndroidSupportedAbis>armeabi-v7a</AndroidSupportedAbis>
+    <AndroidStoreUncompressedFileExtensions />
+    <MandroidI18n />
+    <JavaMaximumHeapSize />
+    <JavaOptions />
+  </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="Mono.Android.Support.v4" />
+    <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="ClickView.cs" />
+    <Compile Include="EntryActivity.cs" />
+    <Compile Include="EntryContentsView.cs" />
+    <Compile Include="EntrySection.cs" />
+    <Compile Include="Kp2aShortHelpView.cs" />
+    <Compile Include="PluginDatabase.cs" />
+    <Compile Include="PluginDetailsActivity.cs" />
+    <Compile Include="PluginArrayAdapter.cs" />
+    <Compile Include="PluginListActivity.cs" />
+    <Compile Include="PluginHost.cs" />
+    <Compile Include="Resources\Resource.Designer.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TextViewSelect.cs" />
+    <Compile Include="TextWithHelp.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Assets\DejaVuSansMono.ttf" />
+    <TransformFile Include="Assets\fontawesome-webfont.ttf" />
+    <None Include="Resources\AboutResources.txt" />
+    <None Include="Assets\AboutAssets.txt" />
+    <AndroidResource Include="Resources\Layout\plugin_list.xml">
+      <SubType>AndroidResource</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\Main.axml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\Strings2.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\Icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Properties\AndroidManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PluginSdkBinding\PluginSdkBinding.csproj">
+      <Project>{3da3911e-36de-465e-8f15-f1991b6437e5}</Project>
+      <Name>PluginSdkBinding</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\ListViewPluginRow.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\plugin_details.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\text_with_help.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\config2.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\attrs.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\colors.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\config.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\dimens.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\styles.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\strings.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\BlueButton.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values-v14\styles_light.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values-v14\colors.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values-v14\styles.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values-v14\styles_dark.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\btn_new_group.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\btn_new_group_dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\btn_new_group_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\collections_collection.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\collections_new_label.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\device_access_new_account.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\device_access_new_account_dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\device_access_not_secure.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\donate_cake.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\EntryFieldHeaderBackground.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\extra_string_header.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\GreenButton.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\HeaderButtonBackground.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_action_eye_open.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_action_search.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_action_search_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_keepass2android.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_keepass2android_nonet.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_launcher.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_launcher_folder_small.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_launcher_gray.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_launcher_gray_bday.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_launcher_offline.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_launcher_red.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_menu_add_field_holo_light.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_menu_add_field_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_menu_remove_field_holo_light.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_menu_remove_field_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_menu_view.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_androidget.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_androidsend.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_dropbox.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_dropboxKP2A.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_file.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_ftp.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_gdrive.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_http.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_https.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_sftp.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_skydrive.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_unlocked_gray.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic00.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic01.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic02.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic03.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic04.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic05.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic06.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic07.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic08.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic09.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic10.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic12.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic13.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic14.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic15.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic17.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic18.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic19.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic20.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic21.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic22.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic23.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic24.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic25.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic26.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic27.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic28.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic29.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic30.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic31.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic33.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic34.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic35.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic36.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic37.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic38.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic39.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic40.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic41.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic42.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic43.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic44.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic45.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic46.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic47.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic48.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic49.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic50.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic51.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic52.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic53.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic54.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic55.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic56.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic57.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic58.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic59.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic60.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic61.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic62.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic63.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic64.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic65.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic66.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic67.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic68.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic99_blank.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\location_web_site.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\navigation_accept.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\navigation_accept_dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\navigation_cancel.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\navigation_cancel_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\navigation_previous_item.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\navigation_previous_item_dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\notify.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\notify_keyboard.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\oktoberfest.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\RedButton.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\section_header.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\transparent.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\YellowButton.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\collections_collection_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\collections_new_label_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\device_access_new_account_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\location_web_site_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Resources\Layout\entry_edit.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_edit_section.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_extrastring_title.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_extrastring_value.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_list_entry.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_section.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_view_test.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_view_contents.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_view.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/PluginHostTest/PluginListActivity.cs b/src/PluginHostTest/PluginListActivity.cs
new file mode 100644
index 00000000..3b9b8bd2
--- /dev/null
+++ b/src/PluginHostTest/PluginListActivity.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using System.Linq;
+using Android.App;
+using Android.Content;
+using Android.Content.PM;
+using Android.OS;
+using Android.Widget;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	//TODO theme?
+	[Activity (Label = "Plugins (TODO)", ConfigurationChanges=ConfigChanges.Orientation|ConfigChanges.KeyboardHidden )]		
+	public class PluginListActivity : ListActivity
+	{
+		private PluginArrayAdapter _pluginArrayAdapter;
+
+		protected override void OnCreate(Bundle bundle)
+		{
+			base.OnCreate(bundle);
+			
+			//TODO _design.ApplyTheme();
+
+			SetContentView(Resource.Layout.plugin_list);
+			PluginDatabase pluginDb = new PluginDatabase(this);
+
+			List<PluginItem> items = (from pluginPackage in pluginDb.GetAllPluginPackages()
+			                          let version = PackageManager.GetPackageInfo(pluginPackage, 0).VersionName
+									  let enabledStatus = pluginDb.IsEnabled(pluginPackage) ? GetString(Resource.String.plugin_enabled) : GetString(Resource.String.plugin_disabled)
+			                          select new PluginItem(pluginPackage, "the plugin", Resource.Drawable.Icon, version, enabledStatus)).ToList();
+			/*
+				{
+					new PluginItem("PluginA", Resource.Drawable.Icon, "keepass2android.plugina", "connected"),
+					new PluginItem("KeepassNFC", Resource.Drawable.Icon, "com.bla.blubb.plugina", "disconnected")
+				};
+			 * */
+			_pluginArrayAdapter = new PluginArrayAdapter(this, Resource.Layout.ListViewPluginRow, items);
+			ListAdapter = _pluginArrayAdapter;
+
+			ListView listView = FindViewById<ListView>(Android.Resource.Id.List);
+			listView.ItemClick +=
+				(sender, args) =>
+					{
+						Intent i = new Intent(this, typeof(PluginDetailsActivity));
+						i.PutExtra("PluginPackage", items[args.Position].Package);
+						StartActivity(i);
+					};
+			
+			// Create your application here
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/Properties/AndroidManifest.xml b/src/PluginHostTest/Properties/AndroidManifest.xml
new file mode 100644
index 00000000..9bcbd632
--- /dev/null
+++ b/src/PluginHostTest/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="12" android:targetSdkVersion="19" />
+	<application></application>
+</manifest>
\ No newline at end of file
diff --git a/src/PluginHostTest/Properties/AssemblyInfo.cs b/src/PluginHostTest/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..6f316b87
--- /dev/null
+++ b/src/PluginHostTest/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("PluginHostTest")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PluginHostTest")]
+[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/PluginHostTest/Resources/AboutResources.txt b/src/PluginHostTest/Resources/AboutResources.txt
new file mode 100644
index 00000000..194ae28a
--- /dev/null
+++ b/src/PluginHostTest/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/PluginHostTest/Resources/Drawable/2_action_about.png b/src/PluginHostTest/Resources/Drawable/2_action_about.png
new file mode 100644
index 00000000..8f39c428
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/2_action_about.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/BlueButton.xml b/src/PluginHostTest/Resources/Drawable/BlueButton.xml
new file mode 100644
index 00000000..de790c7f
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/BlueButton.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="#449def" />
+            <stroke
+                android:width="1dp"
+                android:color="#2f6699" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#449def"
+                android:endColor="#2f6699"
+                android:angle="270" />
+            <stroke
+                android:width="1dp"
+                android:color="#2f6699" />
+            <corners
+                android:radius="4dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>
+
diff --git a/src/PluginHostTest/Resources/Drawable/EntryFieldHeaderBackground.xml b/src/PluginHostTest/Resources/Drawable/EntryFieldHeaderBackground.xml
new file mode 100644
index 00000000..058b5119
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/EntryFieldHeaderBackground.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item>
+    <shape>
+        <gradient
+            android:angle="45"
+            android:startColor="#FF000030"
+            android:endColor="#FF000000"
+            android:type="linear" />
+    </shape>
+</item>
+</selector>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Drawable/GreenButton.xml b/src/PluginHostTest/Resources/Drawable/GreenButton.xml
new file mode 100644
index 00000000..26143578
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/GreenButton.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="#70c656" />
+            <stroke
+                android:width="1dp"
+                android:color="#53933f" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#70c656"
+                android:endColor="#53933f"
+                android:angle="270" />
+            <stroke
+                android:width="1dp"
+                android:color="#53933f" />
+            <corners
+                android:radius="4dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>
+
diff --git a/src/PluginHostTest/Resources/Drawable/HeaderButtonBackground.xml b/src/PluginHostTest/Resources/Drawable/HeaderButtonBackground.xml
new file mode 100644
index 00000000..231b6355
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/HeaderButtonBackground.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@color/group_header_button_pressed"/> <!-- pressed -->
+    <item android:state_focused="true" android:drawable="@color/group_header_button_pressed"/> <!-- focused -->
+    <item android:drawable="@android:color/transparent"/> <!-- default -->
+</selector>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Drawable/Icon.png b/src/PluginHostTest/Resources/Drawable/Icon.png
new file mode 100644
index 00000000..a07c69fa
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/Icon.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/RedButton.xml b/src/PluginHostTest/Resources/Drawable/RedButton.xml
new file mode 100644
index 00000000..216d100a
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/RedButton.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="#ef4444" />
+            <stroke
+                android:width="1dp"
+                android:color="#992f2f" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#ef4444"
+                android:endColor="#992f2f"
+                android:angle="270" />
+            <stroke
+                android:width="1dp"
+                android:color="#992f2f" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>
diff --git a/src/PluginHostTest/Resources/Drawable/YellowButton.xml b/src/PluginHostTest/Resources/Drawable/YellowButton.xml
new file mode 100644
index 00000000..bad953c5
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/YellowButton.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_pressed="true">
+        <shape>
+            <solid
+                android:color="#f3ae1b" />
+            <stroke
+                android:width="1dp"
+                android:color="#bb6008" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#f3ae1b"
+                android:endColor="#bb6008"
+                android:angle="270" />
+            <stroke
+                android:width="1dp"
+                android:color="#bb6008" />
+            <corners
+                android:radius="4dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Drawable/btn_new_group.png b/src/PluginHostTest/Resources/Drawable/btn_new_group.png
new file mode 100644
index 00000000..468d1fc9
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/btn_new_group.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/btn_new_group_dark.png b/src/PluginHostTest/Resources/Drawable/btn_new_group_dark.png
new file mode 100644
index 00000000..32ae9ebb
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/btn_new_group_dark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/btn_new_group_holodark.png b/src/PluginHostTest/Resources/Drawable/btn_new_group_holodark.png
new file mode 100644
index 00000000..0a5bd458
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/btn_new_group_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/collections_collection.png b/src/PluginHostTest/Resources/Drawable/collections_collection.png
new file mode 100644
index 00000000..d1324014
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/collections_collection.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/collections_collection_holodark.png b/src/PluginHostTest/Resources/Drawable/collections_collection_holodark.png
new file mode 100644
index 00000000..78500a93
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/collections_collection_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/collections_new_label.png b/src/PluginHostTest/Resources/Drawable/collections_new_label.png
new file mode 100644
index 00000000..70ad36c1
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/collections_new_label.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/collections_new_label_holodark.png b/src/PluginHostTest/Resources/Drawable/collections_new_label_holodark.png
new file mode 100644
index 00000000..2c996f2d
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/collections_new_label_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/device_access_new_account.png b/src/PluginHostTest/Resources/Drawable/device_access_new_account.png
new file mode 100644
index 00000000..fe7f4665
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/device_access_new_account.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/device_access_new_account_dark.png b/src/PluginHostTest/Resources/Drawable/device_access_new_account_dark.png
new file mode 100644
index 00000000..27889219
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/device_access_new_account_dark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/device_access_new_account_holodark.png b/src/PluginHostTest/Resources/Drawable/device_access_new_account_holodark.png
new file mode 100644
index 00000000..e61a09f5
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/device_access_new_account_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/device_access_not_secure.png b/src/PluginHostTest/Resources/Drawable/device_access_not_secure.png
new file mode 100644
index 00000000..4a6463c3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/device_access_not_secure.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/donate_cake.png b/src/PluginHostTest/Resources/Drawable/donate_cake.png
new file mode 100644
index 00000000..6d3fc612
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/donate_cake.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/extra_string_header.xml b/src/PluginHostTest/Resources/Drawable/extra_string_header.xml
new file mode 100644
index 00000000..5b7ab453
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/extra_string_header.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <size android:height="2px" />
+    <solid 
+        android:color="@color/emphasis2"/>
+</shape>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Drawable/ic00.png b/src/PluginHostTest/Resources/Drawable/ic00.png
new file mode 100644
index 00000000..b74e831f
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic00.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic01.png b/src/PluginHostTest/Resources/Drawable/ic01.png
new file mode 100644
index 00000000..e164a9f3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic01.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic02.png b/src/PluginHostTest/Resources/Drawable/ic02.png
new file mode 100644
index 00000000..d5f6551d
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic02.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic03.png b/src/PluginHostTest/Resources/Drawable/ic03.png
new file mode 100644
index 00000000..b3781e45
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic03.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic04.png b/src/PluginHostTest/Resources/Drawable/ic04.png
new file mode 100644
index 00000000..def2ea10
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic04.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic05.png b/src/PluginHostTest/Resources/Drawable/ic05.png
new file mode 100644
index 00000000..67118111
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic05.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic06.png b/src/PluginHostTest/Resources/Drawable/ic06.png
new file mode 100644
index 00000000..57c1a1da
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic06.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic07.png b/src/PluginHostTest/Resources/Drawable/ic07.png
new file mode 100644
index 00000000..89ef01ba
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic07.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic08.png b/src/PluginHostTest/Resources/Drawable/ic08.png
new file mode 100644
index 00000000..cb5f8f0a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic08.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic09.png b/src/PluginHostTest/Resources/Drawable/ic09.png
new file mode 100644
index 00000000..b38168a2
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic09.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic10.png b/src/PluginHostTest/Resources/Drawable/ic10.png
new file mode 100644
index 00000000..966610d9
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic10.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic11.png b/src/PluginHostTest/Resources/Drawable/ic11.png
new file mode 100644
index 00000000..b41b44c3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic11.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic12.png b/src/PluginHostTest/Resources/Drawable/ic12.png
new file mode 100644
index 00000000..92ca07dc
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic12.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic13.png b/src/PluginHostTest/Resources/Drawable/ic13.png
new file mode 100644
index 00000000..42b6ec07
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic13.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic14.png b/src/PluginHostTest/Resources/Drawable/ic14.png
new file mode 100644
index 00000000..b7552c07
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic14.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic15.png b/src/PluginHostTest/Resources/Drawable/ic15.png
new file mode 100644
index 00000000..974635d9
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic15.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic16.png b/src/PluginHostTest/Resources/Drawable/ic16.png
new file mode 100644
index 00000000..47d4b36f
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic16.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic17.png b/src/PluginHostTest/Resources/Drawable/ic17.png
new file mode 100644
index 00000000..209af79d
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic17.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic18.png b/src/PluginHostTest/Resources/Drawable/ic18.png
new file mode 100644
index 00000000..30f1dfa0
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic18.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic19.png b/src/PluginHostTest/Resources/Drawable/ic19.png
new file mode 100644
index 00000000..356a2e7b
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic19.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic20.png b/src/PluginHostTest/Resources/Drawable/ic20.png
new file mode 100644
index 00000000..135fd11b
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic20.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic21.png b/src/PluginHostTest/Resources/Drawable/ic21.png
new file mode 100644
index 00000000..d80fc95a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic21.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic22.png b/src/PluginHostTest/Resources/Drawable/ic22.png
new file mode 100644
index 00000000..788d0e7c
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic22.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic23.png b/src/PluginHostTest/Resources/Drawable/ic23.png
new file mode 100644
index 00000000..6345beab
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic23.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic24.png b/src/PluginHostTest/Resources/Drawable/ic24.png
new file mode 100644
index 00000000..6b77a056
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic24.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic25.png b/src/PluginHostTest/Resources/Drawable/ic25.png
new file mode 100644
index 00000000..280423f3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic25.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic26.png b/src/PluginHostTest/Resources/Drawable/ic26.png
new file mode 100644
index 00000000..9e278996
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic26.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic27.png b/src/PluginHostTest/Resources/Drawable/ic27.png
new file mode 100644
index 00000000..c71d9b7e
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic27.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic28.png b/src/PluginHostTest/Resources/Drawable/ic28.png
new file mode 100644
index 00000000..3bea4d71
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic28.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic29.png b/src/PluginHostTest/Resources/Drawable/ic29.png
new file mode 100644
index 00000000..a4ce18b9
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic29.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic30.png b/src/PluginHostTest/Resources/Drawable/ic30.png
new file mode 100644
index 00000000..49dcd2ca
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic30.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic31.png b/src/PluginHostTest/Resources/Drawable/ic31.png
new file mode 100644
index 00000000..a510ec65
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic31.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic32.png b/src/PluginHostTest/Resources/Drawable/ic32.png
new file mode 100644
index 00000000..96b46fd2
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic32.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic33.png b/src/PluginHostTest/Resources/Drawable/ic33.png
new file mode 100644
index 00000000..db5111a9
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic33.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic34.png b/src/PluginHostTest/Resources/Drawable/ic34.png
new file mode 100644
index 00000000..feebf2bd
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic34.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic35.png b/src/PluginHostTest/Resources/Drawable/ic35.png
new file mode 100644
index 00000000..629ad9aa
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic35.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic36.png b/src/PluginHostTest/Resources/Drawable/ic36.png
new file mode 100644
index 00000000..8dc08855
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic36.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic37.png b/src/PluginHostTest/Resources/Drawable/ic37.png
new file mode 100644
index 00000000..fef91068
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic37.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic38.png b/src/PluginHostTest/Resources/Drawable/ic38.png
new file mode 100644
index 00000000..9b141689
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic38.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic39.png b/src/PluginHostTest/Resources/Drawable/ic39.png
new file mode 100644
index 00000000..1f36acaa
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic39.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic40.png b/src/PluginHostTest/Resources/Drawable/ic40.png
new file mode 100644
index 00000000..81d60885
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic40.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic41.png b/src/PluginHostTest/Resources/Drawable/ic41.png
new file mode 100644
index 00000000..a02c56a4
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic41.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic42.png b/src/PluginHostTest/Resources/Drawable/ic42.png
new file mode 100644
index 00000000..e0a295d0
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic42.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic43.png b/src/PluginHostTest/Resources/Drawable/ic43.png
new file mode 100644
index 00000000..6170d86c
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic43.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic44.png b/src/PluginHostTest/Resources/Drawable/ic44.png
new file mode 100644
index 00000000..0a9d2090
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic44.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic45.png b/src/PluginHostTest/Resources/Drawable/ic45.png
new file mode 100644
index 00000000..2d5e260a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic45.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic46.png b/src/PluginHostTest/Resources/Drawable/ic46.png
new file mode 100644
index 00000000..d8197d61
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic46.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic47.png b/src/PluginHostTest/Resources/Drawable/ic47.png
new file mode 100644
index 00000000..2aabd0a2
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic47.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic48.png b/src/PluginHostTest/Resources/Drawable/ic48.png
new file mode 100644
index 00000000..bd433f4b
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic48.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic49.png b/src/PluginHostTest/Resources/Drawable/ic49.png
new file mode 100644
index 00000000..376aa6ec
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic49.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic50.png b/src/PluginHostTest/Resources/Drawable/ic50.png
new file mode 100644
index 00000000..174b86c3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic50.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic51.png b/src/PluginHostTest/Resources/Drawable/ic51.png
new file mode 100644
index 00000000..2b49969a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic51.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic52.png b/src/PluginHostTest/Resources/Drawable/ic52.png
new file mode 100644
index 00000000..36adbc8e
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic52.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic53.png b/src/PluginHostTest/Resources/Drawable/ic53.png
new file mode 100644
index 00000000..592ce6f4
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic53.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic54.png b/src/PluginHostTest/Resources/Drawable/ic54.png
new file mode 100644
index 00000000..2dfe90be
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic54.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic55.png b/src/PluginHostTest/Resources/Drawable/ic55.png
new file mode 100644
index 00000000..69e55a1d
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic55.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic56.png b/src/PluginHostTest/Resources/Drawable/ic56.png
new file mode 100644
index 00000000..fbedb011
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic56.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic57.png b/src/PluginHostTest/Resources/Drawable/ic57.png
new file mode 100644
index 00000000..ed6d2e05
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic57.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic58.png b/src/PluginHostTest/Resources/Drawable/ic58.png
new file mode 100644
index 00000000..91d7c5f6
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic58.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic59.png b/src/PluginHostTest/Resources/Drawable/ic59.png
new file mode 100644
index 00000000..5cc4f6b5
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic59.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic60.png b/src/PluginHostTest/Resources/Drawable/ic60.png
new file mode 100644
index 00000000..0094f836
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic60.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic61.png b/src/PluginHostTest/Resources/Drawable/ic61.png
new file mode 100644
index 00000000..fcee6c9c
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic61.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic62.png b/src/PluginHostTest/Resources/Drawable/ic62.png
new file mode 100644
index 00000000..8640421a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic62.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic63.png b/src/PluginHostTest/Resources/Drawable/ic63.png
new file mode 100644
index 00000000..e340fbea
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic63.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic64.png b/src/PluginHostTest/Resources/Drawable/ic64.png
new file mode 100644
index 00000000..5dd1edf2
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic64.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic65.png b/src/PluginHostTest/Resources/Drawable/ic65.png
new file mode 100644
index 00000000..4721b68f
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic65.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic66.png b/src/PluginHostTest/Resources/Drawable/ic66.png
new file mode 100644
index 00000000..e2a83b94
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic66.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic67.png b/src/PluginHostTest/Resources/Drawable/ic67.png
new file mode 100644
index 00000000..42691a0e
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic67.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic68.png b/src/PluginHostTest/Resources/Drawable/ic68.png
new file mode 100644
index 00000000..69060470
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic68.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic99_blank.png b/src/PluginHostTest/Resources/Drawable/ic99_blank.png
new file mode 100644
index 00000000..5dd1edf2
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic99_blank.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_action_eye_open.png b/src/PluginHostTest/Resources/Drawable/ic_action_eye_open.png
new file mode 100644
index 00000000..aa461c84
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_action_eye_open.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_action_search.png b/src/PluginHostTest/Resources/Drawable/ic_action_search.png
new file mode 100644
index 00000000..3aa64404
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_action_search.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_action_search_holodark.png b/src/PluginHostTest/Resources/Drawable/ic_action_search_holodark.png
new file mode 100644
index 00000000..d37d6d25
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_action_search_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_keepass2android.png b/src/PluginHostTest/Resources/Drawable/ic_keepass2android.png
new file mode 100644
index 00000000..f0109f9c
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_keepass2android.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_keepass2android_nonet.png b/src/PluginHostTest/Resources/Drawable/ic_keepass2android_nonet.png
new file mode 100644
index 00000000..0dd22310
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_keepass2android_nonet.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_launcher.png b/src/PluginHostTest/Resources/Drawable/ic_launcher.png
new file mode 100644
index 00000000..189558d2
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_launcher.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_launcher_folder_small.png b/src/PluginHostTest/Resources/Drawable/ic_launcher_folder_small.png
new file mode 100644
index 00000000..5df8d60f
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_launcher_folder_small.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_launcher_gray.png b/src/PluginHostTest/Resources/Drawable/ic_launcher_gray.png
new file mode 100644
index 00000000..710baa01
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_launcher_gray.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_launcher_gray_bday.png b/src/PluginHostTest/Resources/Drawable/ic_launcher_gray_bday.png
new file mode 100644
index 00000000..a6ac3338
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_launcher_gray_bday.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_launcher_offline.png b/src/PluginHostTest/Resources/Drawable/ic_launcher_offline.png
new file mode 100644
index 00000000..cac41265
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_launcher_offline.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_launcher_red.png b/src/PluginHostTest/Resources/Drawable/ic_launcher_red.png
new file mode 100644
index 00000000..d01a118a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_launcher_red.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_menu_add_field_holo_light.png b/src/PluginHostTest/Resources/Drawable/ic_menu_add_field_holo_light.png
new file mode 100644
index 00000000..4a4990c0
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_menu_add_field_holo_light.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_menu_add_field_holodark.png b/src/PluginHostTest/Resources/Drawable/ic_menu_add_field_holodark.png
new file mode 100644
index 00000000..099c1508
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_menu_add_field_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_menu_remove_field_holo_light.png b/src/PluginHostTest/Resources/Drawable/ic_menu_remove_field_holo_light.png
new file mode 100644
index 00000000..b31359f7
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_menu_remove_field_holo_light.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_menu_remove_field_holodark.png b/src/PluginHostTest/Resources/Drawable/ic_menu_remove_field_holodark.png
new file mode 100644
index 00000000..094eea58
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_menu_remove_field_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_menu_view.png b/src/PluginHostTest/Resources/Drawable/ic_menu_view.png
new file mode 100644
index 00000000..f13e199e
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_menu_view.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_androidget.png b/src/PluginHostTest/Resources/Drawable/ic_storage_androidget.png
new file mode 100644
index 00000000..3c0b985c
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_androidget.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_androidsend.png b/src/PluginHostTest/Resources/Drawable/ic_storage_androidsend.png
new file mode 100644
index 00000000..3c0b985c
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_androidsend.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_dropbox.png b/src/PluginHostTest/Resources/Drawable/ic_storage_dropbox.png
new file mode 100644
index 00000000..27b8fc40
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_dropbox.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_dropboxKP2A.png b/src/PluginHostTest/Resources/Drawable/ic_storage_dropboxKP2A.png
new file mode 100644
index 00000000..27b8fc40
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_dropboxKP2A.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_file.png b/src/PluginHostTest/Resources/Drawable/ic_storage_file.png
new file mode 100644
index 00000000..6462ac98
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_file.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_ftp.png b/src/PluginHostTest/Resources/Drawable/ic_storage_ftp.png
new file mode 100644
index 00000000..e164a9f3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_ftp.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_gdrive.png b/src/PluginHostTest/Resources/Drawable/ic_storage_gdrive.png
new file mode 100644
index 00000000..1761d023
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_gdrive.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_http.png b/src/PluginHostTest/Resources/Drawable/ic_storage_http.png
new file mode 100644
index 00000000..e164a9f3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_http.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_https.png b/src/PluginHostTest/Resources/Drawable/ic_storage_https.png
new file mode 100644
index 00000000..e164a9f3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_https.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_sftp.png b/src/PluginHostTest/Resources/Drawable/ic_storage_sftp.png
new file mode 100644
index 00000000..2155f6cd
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_sftp.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_skydrive.png b/src/PluginHostTest/Resources/Drawable/ic_storage_skydrive.png
new file mode 100644
index 00000000..fbe96d5f
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_skydrive.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_unlocked_gray.png b/src/PluginHostTest/Resources/Drawable/ic_unlocked_gray.png
new file mode 100644
index 00000000..3a0ca74b
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_unlocked_gray.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/launcher.png b/src/PluginHostTest/Resources/Drawable/launcher.png
new file mode 100644
index 00000000..e52d5f33
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/launcher.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/location_web_site.png b/src/PluginHostTest/Resources/Drawable/location_web_site.png
new file mode 100644
index 00000000..bd6b8682
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/location_web_site.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/location_web_site_holodark.png b/src/PluginHostTest/Resources/Drawable/location_web_site_holodark.png
new file mode 100644
index 00000000..9b77be96
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/location_web_site_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/navigation_accept.png b/src/PluginHostTest/Resources/Drawable/navigation_accept.png
new file mode 100644
index 00000000..58bf9721
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/navigation_accept.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/navigation_accept_dark.png b/src/PluginHostTest/Resources/Drawable/navigation_accept_dark.png
new file mode 100644
index 00000000..53cf6877
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/navigation_accept_dark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/navigation_cancel.png b/src/PluginHostTest/Resources/Drawable/navigation_cancel.png
new file mode 100644
index 00000000..9f4c3d6a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/navigation_cancel.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/navigation_cancel_holodark.png b/src/PluginHostTest/Resources/Drawable/navigation_cancel_holodark.png
new file mode 100644
index 00000000..3336760d
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/navigation_cancel_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/navigation_previous_item.png b/src/PluginHostTest/Resources/Drawable/navigation_previous_item.png
new file mode 100644
index 00000000..8d19e391
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/navigation_previous_item.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/navigation_previous_item_dark.png b/src/PluginHostTest/Resources/Drawable/navigation_previous_item_dark.png
new file mode 100644
index 00000000..64538ce8
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/navigation_previous_item_dark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/notify.png b/src/PluginHostTest/Resources/Drawable/notify.png
new file mode 100644
index 00000000..57439167
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/notify.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/notify_keyboard.png b/src/PluginHostTest/Resources/Drawable/notify_keyboard.png
new file mode 100644
index 00000000..0e9c1beb
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/notify_keyboard.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/oktoberfest.png b/src/PluginHostTest/Resources/Drawable/oktoberfest.png
new file mode 100644
index 00000000..8baf7af0
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/oktoberfest.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/section_header.xml b/src/PluginHostTest/Resources/Drawable/section_header.xml
new file mode 100644
index 00000000..fbe5fae4
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/section_header.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <size android:width="1000dp" android:height="2px" />
+    <solid 
+        android:color="@color/light_gray"/>
+</shape>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Drawable/transparent.png b/src/PluginHostTest/Resources/Drawable/transparent.png
new file mode 100644
index 00000000..d401564d
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/transparent.png differ
diff --git a/src/PluginHostTest/Resources/Layout/ListViewPluginRow.xml b/src/PluginHostTest/Resources/Layout/ListViewPluginRow.xml
new file mode 100644
index 00000000..159c425c
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/ListViewPluginRow.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="10dp">
+    <ImageView
+        android:id="@+id/imgIcon"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="15dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp" />
+    <TextView
+        android:id="@+id/txtLabel"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/imgIcon"
+        android:textSize="22dp"
+         />
+    <TextView
+        android:id="@+id/txtVersion"
+        android:text="0.9.3"
+        android:textSize="14dp"
+        android:textColor="#888888"
+        android:layout_toRightOf="@id/imgIcon"
+        android:layout_below="@id/txtLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+    <TextView
+        android:id="@+id/txtStatus"
+        android:textSize="14dp"
+        android:textColor="#888888"
+        android:layout_toRightOf="@id/imgIcon"
+        android:gravity="right"
+        android:layout_below="@id/txtVersion"
+        android:layout_alignRight="@id/txtLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/Main.axml b/src/PluginHostTest/Resources/Layout/Main.axml
new file mode 100644
index 00000000..e359342b
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/Main.axml
@@ -0,0 +1,26 @@
+<?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/MyButton"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/Hello" />
+    <Button
+        android:id="@+id/managePluginsButton"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="manage plugins" />
+    <Button
+        android:id="@+id/entryviewButton"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="entry" />
+    <Button
+        android:id="@+id/testDbButton"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="test db" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_edit.xml b/src/PluginHostTest/Resources/Layout/entry_edit.xml
new file mode 100644
index 00000000..a20dca89
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_edit.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+    <ScrollView
+        android:id="@+id/entry_scroll"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@id/entry_save_header">
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+        <!-- Title -->
+            <ImageButton
+                android:id="@+id/icon_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:src="@drawable/ic00" />
+            <EditText
+                android:id="@+id/entry_title"
+                style="@style/TextAppearance_EditEntry_Value"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dip"
+                android:capitalize="sentences"
+                android:layout_toLeftOf="@+id/icon_button"
+                android:hint="@string/hint_title"
+                android:singleLine="true" />
+        <!-- Username -->
+            <EditText
+                android:id="@+id/entry_user_name"
+                style="@style/TextAppearance_EditEntry_Value"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dip"
+                android:layout_below="@id/icon_button"
+                android:hint="@string/hint_username"
+                android:inputType="textEmailAddress"
+                android:singleLine="true" />
+        <!-- URL -->
+            <EditText
+                android:id="@+id/entry_url"
+                style="@style/TextAppearance_EditEntry_Value"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dip"
+                android:layout_below="@id/entry_user_name"
+                android:hint="@string/hint_url"
+                android:inputType="textUri"
+                android:singleLine="true" />
+        <!-- Password -->
+            <TextView
+                android:id="@+id/entry_password_label"
+                style="@style/TextAppearance_EditEntry_LabelSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/entry_url"
+                android:text="@string/entry_password" />
+             <RelativeLayout
+			android:id="@+id/password_section"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/entry_password_label">
+			
+		<Button
+			android:id="@+id/generate_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:text="@string/ellipsis" />
+			<ImageButton
+        android:id="@+id/toggle_password"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_menu_view"
+		android:layout_alignTop="@id/generate_button"
+        android:layout_toLeftOf="@id/generate_button"
+         />
+		<EditText
+			android:id="@+id/entry_password"
+			style="@style/TextAppearance_EditEntry_Value"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_alignTop="@id/generate_button"
+			android:layout_toLeftOf="@id/toggle_password"
+			android:hint="@string/hint_pass"
+			android:inputType="textPassword"
+			android:singleLine="true"
+			android:typeface="monospace" />
+		<!-- Confirm Password -->
+		<EditText
+			android:id="@+id/entry_confpassword"
+			style="@style/TextAppearance_EditEntry_Value"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/entry_password"
+			android:hint="@string/hint_conf_pass"
+			android:inputType="textPassword"
+			android:singleLine="true"
+			android:typeface="monospace" />
+
+		</RelativeLayout>
+        <!-- Comment -->
+            <TextView
+                android:id="@+id/entry_comment_label"
+                style="@style/TextAppearance_EditEntry_LabelSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/password_section"
+                android:text="@string/entry_comment" />
+            <EditText
+                android:id="@+id/entry_comment"
+                style="@style/TextAppearance_EditEntry_Value"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/entry_comment_label"
+                android:hint="@string/hint_comment"
+                android:inputType="textMultiLine" />
+        <!-- Extra strings -->
+            <LinearLayout
+                android:id="@+id/advanced_container"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/entry_comment"
+                android:orientation="vertical" />
+            <Button
+                android:id="@+id/add_advanced"
+                style="@style/EditEntryButton"
+                android:layout_marginTop="-4dp"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/advanced_container"
+                android:drawableLeft="?attr/ic_menu_add_field"
+                android:text="@string/add_extra_string" />
+        <!-- file attachments -->
+            <TextView
+                android:id="@+id/entry_binaries_label"
+                style="@style/TextAppearance_EditEntry_LabelSmall"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/add_advanced"
+                android:text="@string/entry_binaries" />
+            <LinearLayout
+                android:id="@+id/binaries"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/entry_binaries_label"
+                android:orientation="vertical" />
+        <!-- Tags -->
+            <TextView
+                android:id="@+id/entry_tags_label"
+                style="@style/TextAppearance_EditEntry_LabelSmall"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/binaries"
+                android:text="@string/entry_tags" />
+            <EditText
+                android:id="@+id/entry_tags"
+                style="@style/TextAppearance_EditEntry_Value"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/entry_tags_label"
+                android:hint="@string/hint_tags"
+                android:inputType="text"
+                android:singleLine="true" />
+        <!-- Override URL -->
+            <TextView
+                android:id="@+id/entry_override_url_label"
+                style="@style/TextAppearance_EditEntry_LabelSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/entry_tags"
+                android:text="@string/entry_override_url" />
+            <EditText
+                android:id="@+id/entry_override_url"
+                style="@style/TextAppearance_EditEntry_Value"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/entry_override_url_label"
+                android:hint="@string/hint_override_url"
+                android:inputType="textUri"
+                android:singleLine="true" />
+        <!-- Expires -->
+            <TextView
+                android:id="@+id/entry_expires_label"
+                style="@style/TextAppearance_EditEntry_LabelSmall"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/entry_override_url"
+                android:text="@string/entry_expires" />
+            <CheckBox
+                android:id="@+id/entry_expires_checkbox"
+                android:layout_marginLeft="16dip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/entry_expires_label" />
+            <EditText
+                android:id="@+id/entry_expires"
+                android:layout_marginLeft="-12dip"
+                android:layout_marginRight="12dip"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/entry_expires_label"
+                android:layout_toRightOf="@id/entry_expires_checkbox" />
+        </RelativeLayout>
+    </ScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_edit_section.xml b/src/PluginHostTest/Resources/Layout/entry_edit_section.xml
new file mode 100644
index 00000000..77deb9db
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_edit_section.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:paddingTop="1dip"
+    android:gravity="center_vertical"
+    android:layout_height="wrap_content">
+    <EditText
+        android:id="@+id/title"
+        android:singleLine="true"
+        android:inputType="text"
+        android:hint="@string/field_name"
+        style="@style/TextAppearance_EditEntry_Value"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="2"
+        android:gravity="top|left"
+        android:layout_marginRight="0dip" />
+    <EditText
+        android:id="@+id/value"
+        android:hint="@string/field_value"
+        android:inputType="textMultiLine"
+        style="@style/TextAppearance_EditEntry_Value"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="3"
+        android:gravity="top|left"
+        android:layout_marginRight="0dip" />
+	<CheckBox
+        android:id="@+id/protection"
+        android:layout_width="0dip"
+        android:layout_height="0dip"
+		 android:visibility="gone"
+        android:text="@string/protection"/>
+    <Button
+        android:id="@+id/edit_extra"
+        android:text="…" 
+		android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+		android:layout_marginRight="8dip" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_extrastring_title.xml b/src/PluginHostTest/Resources/Layout/entry_extrastring_title.xml
new file mode 100644
index 00000000..4f0b2bb7
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_extrastring_title.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="Title"
+    android:layout_marginLeft="10dp"
+    style="@style/ExtraFieldHeader" />
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_extrastring_value.xml b/src/PluginHostTest/Resources/Layout/entry_extrastring_value.xml
new file mode 100644
index 00000000..12d7a0ef
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_extrastring_value.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:typeface="monospace"
+    android:text="Value"
+    android:layout_marginLeft="30dp"
+    style="@style/EntryItem" />
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_list_entry.xml b/src/PluginHostTest/Resources/Layout/entry_list_entry.xml
new file mode 100644
index 00000000..263958f8
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_list_entry.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:stretchColumns="1">
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical">
+        <ImageView
+            android:id="@+id/entry_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic99_blank" />
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/entry_text"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="abc"
+                style="@style/ElementTextLarge" />
+            <TextView
+                android:id="@+id/entry_text_detail"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="abcde"
+                style="@style/ElementTextSmall" />
+        </LinearLayout>
+        <View />
+    </TableRow>
+</TableLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_section.xml b/src/PluginHostTest/Resources/Layout/entry_section.xml
new file mode 100644
index 00000000..e8ca7241
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_section.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Title"
+        android:layout_marginLeft="10dp"
+        style="@style/ExtraFieldHeader" />
+    <TextView
+        android:id="@+id/value"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:typeface="monospace"
+        android:text="Value"
+        android:layout_marginLeft="30dp"
+        style="@style/EntryItem" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_view.xml b/src/PluginHostTest/Resources/Layout/entry_view.xml
new file mode 100644
index 00000000..06518d82
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_view.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+	<LinearLayout
+        android:id="@+id/top"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:orientation="horizontal" />
+	<LinearLayout
+        android:id="@+id/bottom_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:divider="?android:attr/dividerVertical"
+        android:layout_alignParentBottom="true"
+        android:dividerPadding="12dp">
+
+		<FrameLayout
+            style="?android:attr/actionButtonStyle"
+            android:id="@+id/entry_edit"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+			<TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawableLeft="@android:drawable/ic_menu_edit"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@string/menu_edit" />
+		</FrameLayout>
+
+	</LinearLayout>
+
+	<ImageView
+        android:id="@+id/entry_divider2"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/bottom_bar"
+        android:scaleType="fitXY"
+        android:tint="@color/blue_highlight"
+        android:src="@android:drawable/divider_horizontal_bright" />
+	<ScrollView
+        android:id="@+id/entry_scroll"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@id/entry_divider2"
+        android:fillViewport="true"
+        android:scrollbarStyle="insideOverlay">
+		<keepass2android.view.EntryContentsView
+            android:id="@+id/entry_contents"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent" />
+	</ScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_view_contents.xml b/src/PluginHostTest/Resources/Layout/entry_view_contents.xml
new file mode 100644
index 00000000..45eaf270
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_view_contents.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/entry_table"
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="vertical">
+
+	<!-- Username -->
+	<TextView
+        android:id="@+id/entry_user_name_label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/entry_user_name"
+        style="@style/EntryFieldHeader"
+         />
+	<TextView
+        android:id="@+id/entry_user_name"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textIsSelectable="true"
+        style="@style/EntryItem" />
+	<!--  URL -->
+	<TextView
+        android:id="@+id/entry_url_label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/entry_url"
+        style="@style/EntryFieldHeader"
+         />
+	<TextView
+        android:id="@+id/entry_url"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:autoLink="all"
+        android:textIsSelectable="true"
+        style="@style/EntryItem" />
+	<!-- Password -->
+	<TextView
+        android:id="@+id/entry_password_label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/entry_password"
+        style="@style/EntryFieldHeader"
+         />
+	<TextView
+        android:id="@+id/entry_password"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:password="true"
+        android:textIsSelectable="true"
+        android:typeface="monospace"
+        style="@style/EntryItem" />
+	<!-- Comment -->
+	<TextView
+        android:id="@+id/entry_comment_label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/entry_comment"
+        style="@style/EntryFieldHeader"
+         />
+	<TextView
+        android:id="@+id/entry_comment"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textIsSelectable="true"
+        style="@style/EntryItem" />
+
+
+	<TextView
+        android:id="@+id/entry_extra_strings_label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/entry_extra_strings"
+        style="@style/EntryFieldHeader"
+         />
+	<LinearLayout
+        android:id="@+id/extra_strings"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:orientation="vertical" />
+	<!-- file attachments -->
+	<TextView
+        android:id="@+id/entry_binaries_label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/entry_binaries"
+        style="@style/EntryFieldHeader"
+         />
+	<LinearLayout
+        android:id="@+id/binaries"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+	<!--Tags -->
+	<TextView
+        android:id="@+id/entry_tags_label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/entry_tags"
+        style="@style/EntryFieldHeader"
+         />
+	<TextView
+        android:id="@+id/entry_tags"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textIsSelectable="true"
+        style="@style/EntryItem" />
+	<!--Override URL-->
+	<TextView
+        android:id="@+id/entry_override_url_label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/entry_override_url"
+        style="@style/EntryFieldHeader"
+         />
+	<TextView
+        android:id="@+id/entry_override_url"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:autoLink="all"
+        android:textIsSelectable="true"
+        style="@style/EntryItem" />
+
+	<!-- Created -->
+	<TextView
+        android:id="@+id/entry_created_label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/entry_created"
+        style="@style/EntryFieldHeader"
+         />
+	<TextView
+        android:id="@+id/entry_created"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@style/EntryItem" />
+	<!-- Modified -->
+	<TextView
+        android:id="@+id/entry_modified_label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/entry_modified"
+        style="@style/EntryFieldHeader"
+         />
+	<TextView
+        android:id="@+id/entry_modified"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@style/EntryItem" />
+	<!-- Expires -->
+	<TextView
+        android:id="@+id/entry_expires_label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/entry_expires"
+        style="@style/EntryFieldHeader"
+         />
+	<TextView
+        android:id="@+id/entry_expires"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@style/EntryItem" />
+	<!-- Property Change Conflict | id:@+id/entry_url_label -->
+</LinearLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_view_test.xml b/src/PluginHostTest/Resources/Layout/entry_view_test.xml
new file mode 100644
index 00000000..5ab5565c
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_view_test.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="vertical">
+<!-- Extra strings -->
+    <LinearLayout
+        android:id="@+id/extra_strings"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/plugin_details.xml b/src/PluginHostTest/Resources/Layout/plugin_details.xml
new file mode 100644
index 00000000..cdc00bd5
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/plugin_details.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/plugin_scroll"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:fillViewport="true"
+        android:scrollbarStyle="insideOverlay">
+	<LinearLayout android:id="@+id/scopes_list"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+		<RelativeLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:padding="4dp">
+			<ImageView
+				android:id="@+id/imgIcon"
+				android:layout_width="64dp"
+				android:layout_height="64dp"
+				android:layout_alignParentTop="true"
+				android:layout_marginRight="15dp"
+				android:layout_marginTop="5dp"
+				android:layout_marginBottom="5dp" />
+			<TextView
+				android:id="@+id/txtLabel"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_toRightOf="@id/imgIcon"
+				android:textSize="22dp"
+         />
+			<TextView
+				android:id="@+id/txtVersion"
+				android:text="0.9.3"
+				android:textSize="14dp"
+				android:textColor="#888888"
+				android:layout_toRightOf="@id/imgIcon"
+				android:layout_below="@id/txtLabel"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
+			<TextView
+				android:id="@+id/txtAuthor"
+				android:text=""
+				android:textSize="14dp"
+				android:textColor="#888888"
+				android:layout_below="@id/txtVersion"
+				android:layout_toRightOf="@id/imgIcon"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
+		</RelativeLayout>
+		
+		<TextView
+				android:id="@+id/txtShortDesc"
+				android:text=""
+				android:textSize="14dp"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
+
+		<CheckBox
+                android:id="@+id/cb_enabled"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/plugin_enabled_checkbox"
+                android:checked="true"
+                 />
+		
+		<TextView
+			android:id="@+id/scopes_title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Scopes"
+			android:layout_marginLeft="10dp"
+			android:layout_marginTop="18dp"
+			style="@style/ExtraFieldHeader" />
+		<LinearLayout android:id="@+id/scopes_list"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+		</LinearLayout>
+	</LinearLayout>	
+</ScrollView>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/plugin_list.xml b/src/PluginHostTest/Resources/Layout/plugin_list.xml
new file mode 100644
index 00000000..1bc0c799
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/plugin_list.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="plugin text"
+            style="@style/PaddedElement"
+            android:id="@+id/textView"
+            android:layout_gravity="left|center_vertical" />
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:padding="8dp" />
+    </LinearLayout>
+</merge>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/text_with_help.xml b/src/PluginHostTest/Resources/Layout/text_with_help.xml
new file mode 100644
index 00000000..708776f0
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/text_with_help.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+			xmlns:app="http://schemas.android.com/apk/res-auto"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content">
+
+
+	<keepass2android.views.Kp2aShortHelpView
+		android:id="@+id/help"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="right"
+		style="@style/TextAppearance_Help"
+		
+		android:layout_alignParentRight="true"
+		android:background="?android:attr/selectableItemBackground"
+				 />
+
+
+	<TextView
+		android:id="@+id/text"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_toLeftOf="@id/help"
+		style="@style/TextAppearance_SubElement"
+		
+			 />
+
+</RelativeLayout>
diff --git a/src/PluginHostTest/Resources/Values-v14/colors.xml b/src/PluginHostTest/Resources/Values-v14/colors.xml
new file mode 100644
index 00000000..d244d4ea
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values-v14/colors.xml
@@ -0,0 +1,33 @@
+<?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>
+	<color name="blue_highlight">#0000dd</color>
+	<color name="group">#333333</color>
+	<color name="icon_background">#00555555</color>
+	<color name="icon_text">#000000</color>
+	<color name="light_gray">#a8a8a8</color>
+	<color name="dark_gray">#303030</color>
+
+	<color name="element_being_moved">#a8a8a8</color>
+
+	<color name="emphasis">#31b6e7</color>
+	<color name="emphasis2">#4f7a8a</color>
+	
+</resources>    
diff --git a/src/PluginHostTest/Resources/Values-v14/styles.xml b/src/PluginHostTest/Resources/Values-v14/styles.xml
new file mode 100644
index 00000000..c8315ddc
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values-v14/styles.xml
@@ -0,0 +1,188 @@
+<?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="GroupTextSmall">
+        <item name="@android:textColor">?android:attr/textColorPrimary</item>
+		
+	</style>
+	<style name="GroupText">
+		<item name="@android:textColor">?android:attr/textColorPrimary</item>
+		<item name="@android:textSize">20sp</item>
+	</style>
+	<style name="GroupTextLarge">
+		<item name="@android:textColor">?android:attr/textColorPrimary</item>
+		<item name="@android:textSize">28sp</item>
+	</style>
+	<style name="ElementTextSmall">
+		<item name="@android:textSize">15sp</item>
+	</style>
+	<style name="ElementText">
+		<item name="@android:textSize">20sp</item>
+	</style>
+	<style name="ElementTextLarge">
+		<item name="@android:textSize">28sp</item>
+	</style>
+
+	<style name="GroupLabel">
+	</style>
+	<style name="WhiteOnBlack">
+	</style>
+	<style name="WhiteOnBlackSmall" parent="WhiteOnBlack">
+	</style>
+	<style name="WhiteOnDarkSmall" parent="WhiteOnBlack">
+	</style>
+	<style name="ElementTextTitle" parent="WhiteOnBlack">
+	</style>
+	<style name="EntryItem">
+        <item name="android:layout_marginLeft">12dip</item>
+        <item name="android:layout_marginRight">12dip</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:textSize">18sp</item>
+    
+	</style>
+	<style name="EntryFieldHeader">
+        <item name="android:drawableBottom">@drawable/section_header</item>
+        <item name="android:drawablePadding">2dp</item>
+        <item name="android:layout_marginLeft">12dip</item>
+        <item name="android:layout_marginRight">12dip</item>
+        <item name="android:layout_marginBottom">3dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+   
+	<style name="InfoHeader">
+		<item name="android:drawableBottom">@drawable/section_header</item>
+		<item name="android:drawablePadding">2dp</item>
+		<item name="android:layout_marginLeft">0dip</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:layout_marginBottom">3dp</item>
+		<item name="android:layout_marginTop">8dp</item>
+		<item name="android:paddingLeft">4dp</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
+		<item name="android:textSize">14sp</item>
+		<item name="android:textStyle">bold</item>
+	</style>
+    
+	<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">?android:attr/textColorSecondary</item>
+        <item name="android:textAllCaps">true</item>
+    </style>
+	
+	
+    <style name="TextAppearance_EditEntry_LabelSmall" parent="TextAppearance_EditEntry_Small">
+        <item name="android:minHeight">24dip</item>
+        <item name="android:layout_width">144dip</item>
+        <item name="android:layout_marginTop">12dip</item>
+        <item name="android:layout_marginLeft">16dip</item>
+        <item name="android:layout_marginRight">16dip</item>
+        <item name="android:paddingLeft">8dip</item>
+        <item name="android:paddingRight">8dip</item>
+        <item name="android:layout_marginBottom">-12dip</item>
+    </style>
+
+    <style name="TextAppearance_EditEntry">
+        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
+    <style name="TextAppearance_EditEntry_Value" parent="TextAppearance_EditEntry">
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_marginRight">12dip</item>
+        <item name="android:layout_marginLeft">12dip</item>
+    </style>
+    
+    <style name="TextAppearance_SmallHeading" parent="TextAppearance_EditEntry_Small">
+        <item name="android:minHeight">24dip</item>
+        <item name="android:layout_width">144dip</item>
+        <item name="android:layout_marginTop">12dip</item>
+        <item name="android:layout_marginRight">16dip</item>
+        <item name="android:paddingRight">8dip</item>
+        <item name="android:layout_marginBottom">-12dip</item>
+    </style>
+
+	<style name="TextAppearance_SubElement">
+		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+		<item name="android:textSize">18sp</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>
+		<item name="android:layout_marginLeft">12dip</item>
+	</style>
+
+	<style name="TextAppearance_Help">
+		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+		<item name="android:textSize">24sp</item>
+		<item name="android:padding">12sp</item>
+		<item name="android:gravity">center_vertical</item>
+		<item name="android:layout_gravity">center_vertical</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:layout_marginLeft">12dip</item>
+	</style>
+    
+    
+    <style name="EditEntryButton">
+        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+        <item name="android:layout_marginTop">12dip</item>
+        <item name="android:layout_marginLeft">24dip</item>
+        <item name="android:layout_marginRight">24dip</item>
+        <item name="android:paddingLeft">8dip</item>
+        <item name="android:paddingRight">8dip</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
+    </style>
+    
+    <style name="AdditionalStringLayout">
+        <item name="android:layout_marginLeft">24dip</item>
+        <item name="android:layout_marginRight">24dip</item>
+      </style>
+    
+
+    <style name="MinusButton">
+        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:src">@drawable/ic_menu_remove_field_holo_light</item>
+    </style>
+    
+	<style name="ExtraFieldHeader" parent="android:Widget.Holo.Light.TextView">
+		<item name="android:layout_marginLeft">16dip</item>
+        <item name="android:layout_marginRight">12dip</item>
+        <item name="android:layout_marginBottom">3dp</item>
+        <item name="android:layout_marginTop">4dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textStyle">bold</item>    
+    </style>
+</resources>
diff --git a/src/PluginHostTest/Resources/Values-v14/styles_dark.xml b/src/PluginHostTest/Resources/Values-v14/styles_dark.xml
new file mode 100644
index 00000000..09b506dc
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values-v14/styles_dark.xml
@@ -0,0 +1,45 @@
+<?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="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>
+
+		<item name="ic_menu_add_field">@drawable/ic_menu_add_field_holodark</item>
+		<item name="ic_launcher_folder_small">@drawable/ic_launcher_folder_small</item>
+		<item name="ic_action_search_drawable">@drawable/ic_action_search_holodark</item>
+		<item name="NavigationAcceptDrawable">@drawable/navigation_accept_dark</item>
+		
+
+
+	</style>
+    <style name="NoTitleBarDark" parent="BaseDark"></style>
+	<style name="BaseDark_Dialog" parent="android:Theme.Holo.Dialog" />
+    <style name="DialogDark" parent="BaseDark_Dialog"></style>
+	<style name="ThemeDark" parent="BaseDark"></style>
+	
+	
+</resources>
diff --git a/src/PluginHostTest/Resources/Values-v14/styles_light.xml b/src/PluginHostTest/Resources/Values-v14/styles_light.xml
new file mode 100644
index 00000000..a3428c00
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values-v14/styles_light.xml
@@ -0,0 +1,47 @@
+<?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="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>
+	    <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>
+		<item name="ic_menu_add_field">@drawable/ic_menu_add_field_holo_light</item>
+		<item name="ic_launcher_folder_small">@drawable/ic_launcher_folder_small</item>
+		<item name="ic_action_search_drawable">@drawable/ic_action_search</item>
+		<item name="NavigationAcceptDrawable">@drawable/navigation_accept</item> <!--Holo Dark: ..dark.png -->
+		
+	</style>
+    <style name="NoTitleBarLight" parent="BaseLight">
+    </style>
+    
+
+	<style name="BaseLight_Dialog" parent="android:Theme.Holo.Light.Dialog" />
+	<style name="DialogLight" parent="BaseLight_Dialog"></style>
+	
+	<style name="ThemeLight" parent="BaseLight"></style>
+	
+	<!-- "default" for Preference activity etc.:-->
+	<style name="NoTitleBar" parent="BaseLight"></style>
+</resources>
diff --git a/src/PluginHostTest/Resources/Values/Strings2.xml b/src/PluginHostTest/Resources/Values/Strings2.xml
new file mode 100644
index 00000000..5b8cf766
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/Strings2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="Hello">Hello World, Click Me!</string>
+    <string name="ApplicationName">PluginHostTest</string>
+	<string name="plugin_enabled_checkbox">Enabled</string>
+
+	<string name="SCOPE_DATABASE_ACTIONS_title">Database action notifications</string>
+	<string name="SCOPE_DATABASE_ACTIONS_explanation">Plugin will be notified when a database is opened, closed or saved.</string>
+
+	<string name="SCOPE_CURRENT_ENTRY_title">Current entry data</string>
+	<string name="SCOPE_CURRENT_ENTRY_explanation">Plugin will receive all data about the current database entry and will be allowed to offer actions on it.</string>
+
+</resources>
diff --git a/src/PluginHostTest/Resources/Values/attrs.xml b/src/PluginHostTest/Resources/Values/attrs.xml
new file mode 100644
index 00000000..fa131c5a
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/attrs.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="TextViewParentStyle" format="reference"/>
+    <attr name="ActionBarButtonParentStyle" format="reference" />
+    <attr name="TextColorGroup" format="reference"></attr>
+    <attr name="TextColorHeader" format="reference"></attr>
+    <attr name="TextColorItem" format="reference"></attr>
+    <attr name="CancelDrawable" format="reference"></attr>
+    <attr name="NewGroupDrawable" format="reference"></attr>
+    <attr name="AddFieldDrawable" format="reference"></attr>
+    <attr name="NewEntryDrawable" format="reference"></attr>
+    <attr name="OpenFileDrawable" format="reference"></attr>
+    <attr name="OpenUrlDrawable" format="reference"></attr>
+    <attr name="CreateDbDrawable" format="reference"></attr>
+	<attr name="ic_menu_add_field" format="reference"></attr>
+
+	<attr name="ic_launcher_folder_small" format="reference"></attr>
+	<attr name="ic_action_search_drawable" format="reference"></attr>
+	<attr name="NavigationAcceptDrawable" format="reference"></attr>
+    
+    
+</resources>
diff --git a/src/PluginHostTest/Resources/Values/colors.xml b/src/PluginHostTest/Resources/Values/colors.xml
new file mode 100644
index 00000000..12c7c1d9
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/colors.xml
@@ -0,0 +1,34 @@
+<?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>
+	<color name="blue_highlight">#0000dd</color>
+	<color name="group">#ffffff</color>
+	<color name="icon_background">#555555</color>
+	<color name="icon_text">#000000</color>
+	<color name="group_header_button_pressed">#101080</color>
+	
+	<color name="emphasis">#31b6e7</color>
+    <color name="emphasis2">#4f7a8a</color>
+    <color name="bg_gray">#cecbce</color>
+    <color name="light_gray">#a8a8a8</color>
+
+	<color name="element_being_moved">#a8a8a8</color>
+    
+</resources>    
diff --git a/src/PluginHostTest/Resources/Values/config.xml b/src/PluginHostTest/Resources/Values/config.xml
new file mode 100644
index 00000000..24402e9d
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/config.xml
@@ -0,0 +1,148 @@
+<?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>
+
+	<attr name="help_text" format="string" />
+	<declare-styleable name="Kp2aShortHelpView">
+		<attr name="android:text"/>
+		<attr name="help_text" />
+	</declare-styleable>
+	<declare-styleable name="TextWithHelp">
+		<attr name="android:text"/>
+		<attr name="help_text" />
+	</declare-styleable>
+
+	<string name="icon_info">&#xf05a;</string>
+
+  <string name="library_name"></string>
+    <string name="default_file_path">/keepass/keepass.kdbx</string>
+    <string name="donate_url"><![CDATA[http://philipp.crocoll.net/donate.php?lang=%1$s&app=%2$s]]></string>
+    <string name="homepage">http://keepass2android.codeplex.com</string>
+    <string name="homepage_short">keepass2android.codeplex.com</string>
+	<string name="further_author_names">Alex Vallat</string>
+    <string name="issues">http://keepass2android.codeplex.com</string>
+    <string name="oi_filemanager_market">market://details?id=org.openintents.filemanager</string>
+    <string name="oi_filemanager_web">https://openintents.googlecode.com/files/FileManager-2.0.2.apk</string>
+	<string name="permission_desc">KP2A Internal File Browsing Permission</string>
+   
+    <!--  Preference settings -->
+    <string name="algorithm_key">algorithm</string>
+    <string name="app_key">app</string>
+    <string name="app_timeout_key">app_timeout_key</string>
+	<string name="show_kill_app_key">show_kill_app_key</string>
+    <string name="clipboard_timeout_key">clip_timeout_key</string>
+    <string name="db_key">db</string>
+    <string name="rounds_key">rounds</string>
+    <string name="keyfile_key">keyfile</string>
+    <string name="maskpass_key">maskpass</string>
+    <string name="omitbackup_key">omitbackup</string>    
+    <string name="list_size_key">list_size</string>
+	<string name="design_key">design_key</string>
+	<string name="sort_key">sort_key</string>
+	<string name="TanExpiresOnUse_key">TanExpiresOnUse_key</string>
+	<string name="ShowUsernameInList_key">ShowUsernameInList_key</string>
+	<string name="RememberRecentFiles_key">RememberRecentFiles_key</string>
+    <string name="default_username_key">defaultUsername</string>
+    <string name="database_name_key">databaseName</string>
+    <string name="BinaryDirectory_key">binaryDirectory</string>
+    <string name="BinaryDirectory_default">/mnt/sdcard/keepass2android/binaries/</string>
+    <bool name="maskpass_default">true</bool>
+    <bool name="keyfile_default">true</bool>
+    <bool name="sort_default">true</bool>
+    <bool name="omitbackup_default">true</bool>
+    <bool name="TanExpiresOnUse_default">true</bool>
+    <bool name="ShowUsernameInList_default">true</bool>
+
+	<bool name="RememberRecentFiles_default">true</bool>
+	
+	
+	<string name="password_access_prefs_key">password_access_prefs_key</string>
+	<string name="security_prefs_key">security_prefs_key</string>
+	<string name="display_prefs_key">display_prefs_key</string>
+	<string name="QuickUnlock_prefs_key">QuickUnlock_prefs_key</string>
+	<string name="FileHandling_prefs_key">FileHandling_prefs_key</string>
+
+	<string name="QuickUnlockDefaultEnabled_key">Enable_QuickUnlock_by_default</string>
+	<string name="QuickUnlockLength_key">QuickUnlockLength</string>
+	<string name="QuickUnlockLength_default">3</string>
+	<string name="QuickUnlockIconHidden_key">QuickUnlockIconHidden_key</string>
+	<string name="QuickUnlockIconHidden16_key">QuickUnlockIconHidden16_key</string>
+	
+	<string name="UsageCount_key">UsageCount</string>
+	<string name="LastInfoVersionCode_key">LastInfoVersion</string>
+	
+	<string name="UseFileTransactions_key">UseFileTransactions</string>
+	<string name="LockWhenScreenOff_key">LockWhenScreenOff</string>
+	<string name="UseOfflineCache_key">UseOfflineCache</string>
+	<string name="AcceptAllServerCertificates_key">AcceptAllServerCertificates</string>
+	<string name="CheckForFileChangesOnSave_key">CheckForFileChangesOnSave</string>
+
+	<string name="MarketURL">market://details?id=</string>
+	<string name="SuggestionsURL">https://keepass2android.codeplex.com/workitem/list/basic</string>
+	<string name="TranslationURL">http://crowdin.net/project/keepass2android</string>
+	
+	<string name="CopyToClipboardNotification_key">ShowCopyToClipboardNotification</string>
+	<bool name="CopyToClipboardNotification_default">true</bool>
+	
+	<string name="UseKp2aKeyboard_key">ShowKp2aKeyboardNotification</string>
+	<bool name="UseKp2aKeyboard_default">true</bool>
+	
+	<string name="OpenKp2aKeyboardAutomatically_key">OpenKp2aKeyboardAutomatically</string>
+	<bool name="OpenKp2aKeyboardAutomatically_default">true</bool>
+	
+    <string name="clipboard_timeout_default">300000</string>
+    <string-array name="clipboard_timeout_values">
+    	<item>30000</item>
+    	<item>60000</item>
+    	<item>300000</item>
+		<item>600000</item>
+		<item>900000</item>
+		<item>1800000</item>
+		<item>3600000</item>
+    	<item>-1</item>
+    </string-array>
+
+	<string name="list_size_default">20</string>
+    <string-array name="list_size_values">
+    	<item>15</item>
+    	<item>20</item>
+    	<item>28</item>
+    </string-array>
+
+	<string name="design_default">Light</string>
+	<string-array name="design_values">
+		<item>Light</item>
+		<item>Dark</item>
+	</string-array>
+	
+	<string name="AcceptAllServerCertificates_default">WARN</string>
+	<string-array name="AcceptAllServerCertificates_values">
+		<item>IGNORE</item>
+		<item>WARN</item>
+		<item>ERROR</item>
+	</string-array>
+
+	<string name="ShowUnlockedNotification_key">ShowUnlockedNotification</string>
+	<bool name="ShowUnlockedNotification_default">true</bool>
+
+	<string name="PreloadDatabaseEnabled_key">PreloadDatabaseEnabled</string>
+	<bool name="PreloadDatabaseEnabled_default">true</bool>
+
+</resources>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Values/config2.xml b/src/PluginHostTest/Resources/Values/config2.xml
new file mode 100644
index 00000000..22a5e94c
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/config2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+	<declare-styleable name="Kp2aShortHelpView">
+		<attr name="android:text"/>
+		<attr name="help_text" />
+	</declare-styleable>
+	<declare-styleable name="TextWithHelp">
+		<attr name="android:text"/>
+		<attr name="help_text" />
+	</declare-styleable>
+	
+</resources>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Values/dimens.xml b/src/PluginHostTest/Resources/Values/dimens.xml
new file mode 100644
index 00000000..55c1e590
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/dimens.xml
@@ -0,0 +1,7 @@
+<resources>
+
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+</resources>
diff --git a/src/PluginHostTest/Resources/Values/strings.xml b/src/PluginHostTest/Resources/Values/strings.xml
new file mode 100644
index 00000000..572cb0b0
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/strings.xml
@@ -0,0 +1,586 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<resources>
+  <string name="about_feedback">Feedback</string>
+  <string name="about_homepage">Homepage</string>
+  <string name="AboutText">Keepass2Android is a password manager providing read/write access to KeePass 2.x databases on Android.</string>
+  <string name="CreditsText">The User Interface is based on a port of KeepassDroid developed by Brian Pellin. Code for database operations is based on KeePass by Dominik Reichl. The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the Creative Commons 3.0 Attribution License.</string>
+  <string name="CreditsTextSFTP">SFTP support is implemented using the JSch library under BSD licence, created by JCraft, Inc.</string>
+  <string name="accept">Accept</string>
+  <string name="add_entry">Add entry</string>
+  <string name="add_url_entry">Create entry for URL</string>
+  <string name="add_group">Add group</string>
+  <string name="add_group_title">Add Group</string>
+  <string name="edit_group_title">Edit Group</string>
+  <string name="algorithm">Algorithm</string>
+  <string name="algorithm_colon">Algorithm</string>
+  <string name="app_name">Keepass2Android</string>
+  <string name="short_app_name">KP2A</string>
+  <string name="app_name_nonet">Keepass2Android Offline</string>
+  <string name="short_app_name_nonet">KP2A Offline</string>
+  <string name="app_timeout">Application timeout</string>
+  <string name="app_timeout_summary">Time before locking database when the application is inactive.</string>
+  <string name="kill_app_label">Kill application process</string>
+  <string name="show_kill_app">Close-Button</string>
+  <string name="show_kill_app_summary">Show a button in password screen to kill the application process (for paranoid users)</string>
+  <string name="application">Application</string>
+  <string name="application_settings">Application settings</string>
+	
+	<string name="security_prefs">Security</string>
+	<string name="display_prefs">Display</string>
+	<string name="password_access_prefs">Password entry access</string>
+	<string name="QuickUnlock_prefs">QuickUnlock</string>
+	<string name="FileHandling_prefs">File handling</string>
+	<string name="keyboard_prefs">Keyboard</string>
+	<string name="export_prefs">Export database...</string>
+	<string name="brackets">Brackets</string>
+  <string name="cancel">Cancel</string>
+  <string name="ClearClipboard">Clipboard cleared.</string>
+  <string name="clipboard_timeout">Clipboard timeout</string>
+  <string name="clipboard_timeout_summary">Time before clearing clipboard after copying username or password</string>
+  <string name="copy_username">Select to copy username to clipboard</string>
+  <string name="copy_password">Select to copy password to clipboard</string>
+  <string name="available_through_keyboard">Entry is available through KP2A Keyboard</string>
+  <string name="not_possible_im_picker">Could not open dialog to select input method. Please activate keyboard manually.</string>
+  <string name="please_activate_keyboard">Please enable the Keepass2Android keyboard in your system settings.</string>
+  <string name="creating_db_key">Creating database key…</string>
+  <string name="current_group">Current Group</string>
+  <string name="current_group_root">Current Group: Root</string>
+  <string name="database">Database</string>
+  <string name="digits">Digits</string>
+  <string name="disclaimer_formal">Keepass2Android comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it under the conditions of the GPL version 2 or later.</string>
+  <string name="ellipsis">\u2026</string>
+  <string name="enter_filename">Enter database filename</string>
+  <string name="entry_accessed">Accessed</string>
+  <string name="entry_cancel">Cancel</string>
+  <string name="entry_comment">Comments</string>
+  <string name="entry_tags">Tags</string>
+  <string name="entry_override_url">Override URL</string>
+  <string name="entry_confpassword">Confirm password</string>
+  <string name="entry_created">Created</string>
+  <string name="entry_expires">Expires</string>
+  <string name="entry_keyfile">Key file (optional)</string>
+  <string name="entry_modified">Modified</string>
+  <string name="entry_password">Password</string>
+  <string name="entry_save">Save</string>
+  <string name="entry_title">Name</string>
+  <string name="entry_url">URL</string>
+  <string name="entry_user_name">User Name</string>
+  <string name="entry_extra_strings">Extra string fields</string>
+  <string name="entry_binaries">File attachments</string>
+  <string name="error_can_not_handle_uri">Keepass2Android cannot handle this uri.</string>
+  <string name="error_could_not_create_group">Error creating group.</string>
+  <string name="error_could_not_create_parent">Could not create parent directory.</string>
+  <string name="error_database_exists">This file already exists.</string>
+  <string name="error_database_settings">Failed to determine database settings.</string>
+  <string name="error_failed_to_launch_link">Failed to launch link.</string>
+  <string name="error_filename_required">A filename is required.</string>
+  <string name="error_file_not_create">Could not create file</string>
+  <string name="error_invalid_db">Invalid database.</string>
+  <string name="error_invalid_path">Invalid path.</string>
+  <string name="error_no_name">A name is required.</string>
+  <string name="error_nopass">A password or a keyfile is required.</string>
+  <string name="error_pass_gen_type">At least one password generation type must be selected</string>
+  <string name="error_pass_match">Passwords do not match.</string>
+  <string name="error_rounds_not_number">Rounds must be a number.</string>
+  <string name="error_title_required">A title is required.</string>
+  <string name="error_wrong_length">Enter a positive integer on length field</string>
+  <string name="FileNotFound">File not found.</string>
+  <string name="file_browser">File Browser</string>
+  <string name="generate_password">Generate Password</string>
+  <string name="group">Group</string>
+  <string name="hint_comment">comment</string>
+  <string name="hint_conf_pass">confirm password</string>
+  <string name="hint_generated_password">generated password</string>
+  <string name="hint_group_name">Group name</string>
+  <string name="hint_keyfile">key file</string>
+  <string name="hint_length">length</string>
+  <string name="hint_pass">password</string>
+  <string name="hint_login_pass">Password</string>
+  <string name="hint_title">name</string>
+  <string name="hint_url">url</string>
+  <string name="hint_override_url">override url</string>
+  <string name="hint_tags">tag1, tag2</string>
+  <string name="hint_username">username</string>
+  <string name="InvalidPassword">Invalid password or key file.</string>
+  <string name="invalid_algorithm">Invalid algorithm.</string>
+  <string name="invalid_db_sig">Database format not recognized.</string>
+  <string name="keyfile_does_not_exist">Key file does not exist.</string>
+  <string name="keyfile_is_empty">Key file is empty.</string>
+  <string name="length">Length</string>
+  <string name="list_size_title">Group list size</string>
+  <string name="list_size_summary">Text size in the group list</string>
+  <string name="loading_database">Loading database…</string>
+  <string name="lowercase">Lower-case</string>
+  <string name="MaskedPassword">*****</string>
+  <string name="maskpass_title">Mask password</string>
+  <string name="maskpass_summary">Hide passwords by default</string>
+  <string name="menu_about">About</string>
+  <string name="menu_change_key">Change Master Key</string>
+  <string name="menu_copy_pass">Copy Password</string>
+  <string name="menu_copy_user">Copy User</string>
+  <string name="menu_create">Create</string>
+  <string name="menu_app_settings">Settings</string>
+  <string name="menu_db_settings">Database settings</string>
+  <string name="menu_delete">Delete</string>
+  <string name="menu_move">Move to another group</string>
+  <string name="menu_donate">Donate a beer...</string>
+  <string name="menu_edit">Edit</string>
+  <string name="menu_hide_password">Hide Password</string>
+  <string name="menu_lock">Lock Database</string>
+  <string name="menu_open">Open</string>
+  <string name="menu_rename">Rename</string>
+  <string name="menu_search">Search</string>
+  <string name="menu_search_advanced">Advanced Search</string>
+  <string name="menu_url">Go to URL</string>
+	<string name="menu_change_db">Change database…</string>
+  <string name="minus">Minus</string>
+  <string name="never">Never</string>
+  <string name="yes">Yes</string>
+  <string name="no">No</string>
+  <string name="no_keys">No entries in the database or group.</string>
+  <string name="no_results">No search results</string>
+  <string name="no_url_handler">No handler for this url.</string>
+  <string name="open_recent">Open recent database (click to open)</string>
+  <string name="omitbackup_title">Don\'t search backup and recycle bin entries</string>
+  <string name="omitbackup_summary">Omit \'Backup\' and Recycle Bin group from search results</string>
+  <string name="pass_filename">KeePass database filename</string>
+  <string name="password_title">Enter database password</string>
+  <string name="master_key_type">Select master key type:</string>
+  <string name="progress_create">Creating new database…</string>
+  <string name="create_database">Create database</string>
+  <string name="progress_title">Working…</string>
+  <string name="remember_keyfile_summary">Remembers the location of keyfiles</string>
+  <string name="remember_keyfile_title">Save keyfile</string>
+  <string name="remove_from_filelist">Remove</string>
+  <string name="rijndael">Rijndael (AES)</string>
+  <string name="root">Root</string>
+  <string name="rounds">Encryption Rounds</string>
+  <string name="rounds_explaination">Higher encryption rounds provide additional protection against brute force attacks, but can really slow down loading and saving.</string>
+  <string name="rounds_hint">rounds</string>
+  <string name="database_name">Database name</string>
+  <string name="default_username">Default user name for new entries</string>
+  <string name="saving_database">Saving database…</string>
+	<string name="exporting_database">Exporting database…</string>
+	<string name="export_database_successful">Database exported successfully!</string>
+	
+	<string name="space">Space</string>
+  <string name="search_label">Search</string>
+  <string name="show_password">Show password</string>
+  <string name="sort_name">Sort by name</string>
+  <string name="sort_db">Sort by creation date</string>
+  <string name="special">Special</string>
+  <string name="search_hint">Find what</string>
+  <string name="search_results">Search results</string>
+  <string name="search_in">Search in</string>
+  <string name="select_other_entry">Select another entry</string>
+  <string name="select_group_then_add">Open the desired group, then press "%1$s"!</string>
+	<string name="insert_element_here">Insert here</string>
+  <string name="twofish">Twofish</string>
+  <string name="underline">Underline</string>
+  <string name="unsupported_db_version">Unsupported database version.</string>
+  <string name="uppercase">Upper-case</string>
+  <string name="warning_read_only">Your sd card is currently read-only. You may not be able to save changes to your database.</string>
+  <string name="warning_unmounted">Your sd card is not currently mounted on your device. You will not be able to load or create your database.</string>
+  <string name="version_label">Version</string>
+	<string name="version_history">Version history</string>
+	<string name="author">Keepass2Android is developed by Philipp Crocoll.</string>
+	<string name="further_authors">Thanks to code contributions by %1$s.</string>
+	<string name="credit_plugin1">The Twofish Cipher Plugin for Keepass was developed by Scott Greenberg and is included in KP2A.</string>
+	<string name="credit_android_filechooser">android-filechooser was developed by Hai Bison</string>
+	<string name="credit_keyboard">The KP2A keyboard is based on the Gingerbread keyboard by the Android Open Source Project and uses the Plugin Manager code from Hacker\'s Keyboard by Klaus Weidner.</string>
+	<string name="please_note">Please note</string>
+	<string name="contributors">Contributors</string>
+  <string name="regular_expression">Regular expression</string>
+  <string name="TanExpiresOnUse_title">Tan expires on use</string>
+  <string name="TanExpiresOnUse_summary">Mark TAN entries expired when using them</string>
+  <string name="ShowUsernameInList_title">Display username in list</string>
+  <string name="ShowUsernameInList_summary">Display usernames below entry titles. Useful for multiple accounts or TANs.</string>
+	<string name="RememberRecentFiles_title">Remember databases</string>
+	<string name="RememberRecentFiles_summary">Remember recently opened databases and show them in the Open database screen.</string>
+	
+	<string name="kp2a_findUrl">Keepass2Android: Find password</string>
+  <string name="excludeExpiredEntries">Exclude expired entries</string>
+  <string name="search_options">Options</string>
+  <string name="caseSensitive">Case sensitive</string>
+  <string name="start_open_file">Open file...</string>
+  <string name="start_create">Create new database...</string>
+  <string name="start_open_url">Open URL...</string>
+  <string name="start_create_import">Import file to new database...</string>
+  <string name="enter_filename_details_url">The complete URL must be specified including protocol like http://.</string>
+  <string name="enter_filename_details_create_import">File to import will be selected in the next step.</string>
+  <string name="enable_quickunlock">Enable QuickUnlock</string>
+  <string name="QuickUnlock_label">Enter last %1$d characters of your password:</string>
+  <string name="QuickUnlock_button">QuickUnlock!</string>
+  <string name="QuickUnlock_lockButton">Close database</string>
+  <string name="QuickUnlockDefaultEnabled_title">Enable QuickUnlock by default</string>
+  <string name="QuickUnlockDefaultEnabled_summary">Defines whether QuickUnlock is enabled by default or not.</string>
+  <string name="QuickUnlockIconHidden_title">Hide QuickUnlock icon</string>
+  <string name="QuickUnlockIconHidden_summary">QuickUnlock unfortunately does not work without displaying a notification icon. Select this option to use a transparent icon.</string>
+  <string name="QuickUnlockIconHidden16_title">Hide QuickUnlock icon</string>
+  <string name="QuickUnlockIconHidden16_summary">QuickUnlock requires a notification to work properly. Select this option to display a notification without an icon.</string>
+  <string name="QuickUnlockLength_title">Length of QuickUnlock key</string>
+  <string name="QuickUnlockLength_summary">Maximum number of characters used as QuickUnlock password.</string>
+  <string name="QuickUnlock_fail">QuickUnlock failed: incorrect password!</string>
+  <string name="BinaryDirectory_title">File attachments directory</string>
+  <string name="BinaryDirectory_summary">Directory where file attachments are saved to.</string>
+  <string name="SaveAttachmentDialog_title">Save attachment</string>
+  <string name="SaveAttachmentDialog_text">Please select where to save the attachment.</string>
+  <string name="SaveAttachmentDialog_save">Save to SD card</string>
+  <string name="SaveAttachmentDialog_open">Save to cache and open</string>
+  
+  <string name="SaveAttachment_doneMessage">Saved file to %1$s.</string>
+  <string name="SaveAttachment_Failed">Could not save attachment to %1$s.</string>
+
+	<string name="AddUrlToEntryDialog_title">Remember search text?</string>
+	<string name="AddUrlToEntryDialog_text">Would you like to store the search text "%1$s" in the selected entry in order to find it automatically next time?</string>
+
+	<string name="error_invalid_expiry_date">Invalid date/time format for expiry date!</string>
+  <string name="error_string_key">A field name is required for each string.</string>
+  <string name="field_name">Field Name</string>
+  <string name="field_value">Field value</string>
+  <string name="protection">Protected field</string>
+  <string name="add_binary">Add file attachment...</string>
+  <string name="add_extra_string">Add additional string</string>
+	<string name="delete_extra_string">Delete additional string</string>
+	<string name="database_loaded_quickunlock_enabled">%1$s: Locked. QuickUnlock enabled.</string>
+	<string name="database_loaded_unlocked">%1$s: Unlocked.</string>
+  <string name="credentials_dialog_title">Enter server credentials</string>
+  <string name="UseFileTransactions_title">File transactions</string>
+  <string name="UseFileTransactions_summary">Use file transactions for writing databases</string>
+	<string name="LockWhenScreenOff_title">Lock when screen off</string>
+  <string name="LockWhenScreenOff_summary">Lock the database when screen is switched off.</string>
+	<string name="UseOfflineCache_title">Database caching</string>
+	<string name="UseOfflineCache_summary">Keep a copy of remote database files in the application cache directory. This allows to use remote databases even when offline.</string>
+
+	<string name="AcceptAllServerCertificates_title">SSL certificates</string>
+	<string name="AcceptAllServerCertificates_summary">Define the behavior when certificate validation fails. Note: you can install certificates on your device if validation fails!</string>
+	
+	
+	<string name="ClearOfflineCache_title">Clear cache?</string>
+	<string name="ClearOfflineCache_question">This will delete all cached database files. Any changes you made while being offline which have not yet been synchronized will be lost! Continue?</string>
+  <string name="CheckForFileChangesOnSave_title">Check for modifications</string>
+  <string name="CheckForFileChangesOnSave_summary">Check whether the file was modified externally before saving changes.</string>
+	
+  <string name="ShowCopyToClipboardNotification_title">Clipboard notifications</string>
+  <string name="ShowCopyToClipboardNotification_summary">Make username and password accessible through the notification bar and clipboard. Beware of password sniffers!</string>
+  <string name="ShowKp2aKeyboardNotification_title">KP2A keyboard notification</string>
+  <string name="ShowKp2aKeyboardNotification_summary">Make full entry accessible through the KP2A keyboard (recommended).</string>
+  <string name="OpenKp2aKeyboardAutomatically_title">Switch keyboard</string>
+  <string name="OpenKp2aKeyboardAutomatically_summary">Open keyboard selection dialog when entry is available through KP2A keyboard after search from the browser.</string>
+	
+	<string name="kp2a_switch_rooted">Auto-switch on rooted devices</string>
+    <string name="kp2a_switch_rooted_summary">On rooted devices, it is possible to automatically switch to the Keepass2Android keyboard (after search for an entry or by clicking the KP2A keyboard notification) and to switch back to the previous keyboard without showing the Input method picker. This also requires to install the Secure Settings app. See the KP2A documentation for more information!</string>
+
+	<string name="ShowUnlockedNotification_title">Notification icon while unlocked</string>
+	<string name="ShowUnlockedNotification_summary">Show a notification icon while the database is unlocked.</string>
+
+	<string name="PreloadDatabaseEnabled_title">Pre-load database file</string>
+	<string name="PreloadDatabaseEnabled_summary">Start background loading or downloading of the database file during password entry.</string>
+
+	<string name="AskOverwriteBinary">Do you want to overwrite the existing binary with the same name?</string>
+  <string name="AskOverwriteBinary_title">Overwrite existing binary?</string>
+  <string name="AskOverwriteBinary_yes">Overwrite</string>
+  <string name="AskOverwriteBinary_no">Rename</string>
+  <string name="AttachFailed">Failed to add file attachment.</string>
+  <string name="RecycleBin">Recycle Bin</string>
+  <string name="AskDeletePermanentlyEntry">Do you want to delete this entry permanently? Press No to recycle.</string>
+  <string name="AskDeletePermanentlyGroup">Do you want to delete this group permanently? Press No to recycle.</string>
+  <string name="AskDeletePermanently_title">Delete permanently?</string>
+  <string name="AskReloadFile_title">Reload file?</string>
+  <string name="AskReloadFile">The file which is currently open was changed by another program. Do you want to reload it?</string>
+  <string name="AskDiscardChanges">Do you really want to discard the changes made? (The Save button is at the top of the form.)</string>
+  <string name="AskDiscardChanges_title">Discard changes?</string>
+  <string name="suggest_improvements">Suggest or vote for improvements</string>
+  <string name="rate_app">Rate this app</string>
+  <string name="translate_app">Translate KP2A</string>
+	<string name="AddingEntry">Adding entry…</string>
+	<string name="AddingGroup">Adding group…</string>
+	<string name="DeletingEntry">Deleting entry…</string>
+	<string name="DeletingGroup">Deleting group…</string>
+	<string name="SettingPassword">Setting password…</string>
+	<string name="UndoingChanges">Undoing changes…</string>
+	<string name="TransformingKey">Transforming master key…</string>
+	<string name="DecodingDatabase">Decoding database…</string>
+	<string name="ParsingDatabase">Parsing database…</string>
+	<string name="CheckingTargetFileForChanges">Checking target file for changes…</string>
+	<string name="TitleSyncQuestion">Merge changes?</string>
+	<string name="MessageSyncQuestion">The database file was modified externally. Do you want to load and merge the changes before saving? Select No if you want to overwrite the external changes.</string>
+	<string name="SynchronizingDatabase">Merging changes…</string>
+	<string name="YesSynchronize">Yes, merge</string>
+	<string name="NoOverwrite">No, overwrite</string>
+
+	<string name="SynchronizingCachedDatabase">Synchronizing cached database…</string>
+	<string name="DownloadingRemoteFile">Downloading remote file…</string>
+	<string name="UploadingFile">Uploading file…</string>
+	<string name="RestoringRemoteFile">Restoring remote file…</string>
+	<string name="FilesInSync">Files are in sync.</string>
+	<string name="SynchronizedDatabaseSuccessfully">Database synchronized successfully!</string>
+	<string name="CheckingDatabaseForChanges">Checking database for changes…</string>
+
+	<string name="CouldNotSaveToRemote">Could not save to remote: %1$s. Save again or use the Synchronize menu when remote connection is available again.</string>
+	<string name="CouldNotLoadFromRemote">Could not open from remote: %1$s. Loaded file from local cache. You can still make changes in the database and synchronize them later.</string>
+	<string name="UpdatedRemoteFileOnLoad">Updated remote file.</string>
+	<string name="NotifyOpenFromLocalDueToConflict">Opened local file due to conflict with changes in remote file. Use Synchronize menu to merge.</string>
+	<string name="LoadedFromRemoteInSync">Remote file and cache are synchronized.</string>
+	<string name="UpdatedCachedFileOnLoad">Updated local cache copy of %1$s.</string>
+	<string name="RemoteDatabaseUnchanged">No changes detected.</string>
+
+	<string name="ResolvedCacheConflictByUsingRemoteOtpAux">Updated cached OTP auxiliary file: Remote counter was higher.</string>
+	<string name="ResolvedCacheConflictByUsingLocalOtpAux">Updated remote OTP auxiliary file: Local counter was higher.</string>
+
+	<string name="SynchronizingOtpAuxFile">Synchronizing OTP auxiliary file…</string>
+	
+	<string name="database_file">database file</string>
+	<string name="otp_aux_file">OTP auxiliary file</string>
+
+	<string name="ErrorOcurred">An error occured:</string>
+
+	<string name="synchronize_database_menu">Synchronize database…</string>
+
+	<string name="CannotMoveGroupHere">Cannot move group to this group.</string>
+
+	<string name="donate_question">Today, it\'s Oktoberfest! If you like Keepass2Android: wouldn\'t today be a good day to buy me a beer?</string>
+	<string name="donate_bday_question">May 10th? It\'s my birthday! If you like this app, why not send me some birthday greetings along with a little birthday gift? This would really make me happy! :-)</string>
+	<string name="donate_missedbday_question">Oh, you missed my birthday on May 10th! If you like this app, why not send me some birthday greetings and a little birthday gift? It is not yet too late to make me happy! :-)</string>
+	<string name="ok_donate">Tell me more!</string>
+	<string name="no_thanks">No, I don\'t like it that much</string>
+
+	<string name="hint_sftp_host">host (ex: 192.168.0.1)</string>
+	<string name="hint_sftp_port">port</string>
+	<string name="initial_directory">Initial directory (optional):</string>
+	<string name="enter_sftp_login_title">Enter SFTP login data:</string>
+
+	<string name="select_storage_type">Select the storage type:</string>
+	
+
+	<string name="filestoragename_file">Local file</string>
+	<string name="filestoragename_androidget">Get from third-party app</string>
+	<string name="filestoragename_androidsend">Send to third-party app</string>
+	<string name="filestoragename_ftp">FTP</string>
+	<string name="filestoragename_http">HTTP (WebDav)</string>
+	<string name="filestoragename_https">HTTPS (WebDav)</string>
+	<string name="filestoragename_dropbox">Dropbox</string>
+	<string name="filestoragename_dropboxKP2A">Dropbox (KP2A folder)</string>
+	<string name="filestoragehelp_dropboxKP2A">If you do not want to give KP2A access to your full Dropbox, you may select this option. It will request only access to the folder Apps/Keepass2Android. This is especially suited when creating a new database. If you already have a database, click this option to create the folder, then place your file inside the folder (from your PC) and then select this option again for opening the file.</string>
+	<string name="filestoragename_gdrive">Google Drive</string>
+	<string name="filestoragename_skydrive">OneDrive</string>
+	<string name="filestoragename_sftp">SFTP (SSH File Transfer)</string>
+
+	<string name="filestorage_setup_title">File access initialization</string>
+
+	<string name="database_location">Database location</string>
+	<string name="help_database_location">You can store your database locally on your Android device or in the cloud (non-Offline version only). Keepass2Android makes the database available even if you are offline. As the database is securely encrypted with AES 256 bit encryption, nobody will be able to access your passwords except you. We recommend to select Dropbox: It\'s accessible on all your devices and even provides backups of previous file versions.</string>
+	<string name="hint_database_location">Select where you want to store the database:</string>
+	<string name="button_change_location">Change location</string>
+
+	<string name="master_password">Master password</string>
+	<string name="help_master_password">Your database is encrypted with the password you enter here. Choose a strong password in order to keep the database safe! Tip: Make up a sentence or two and use the first letters of the words as password. Include punctuation marks.</string>
+	<string name="hint_master_password">Select a master password to protect your database:</string>
+
+	<string name="key_file">Key file</string>
+	<string name="help_key_file">A key file is basically a password stored in a file. Key files are typically stronger than master passwords, because the key can be a lot more complicated; however it\'s also harder to keep them secret. If you store your database in the cloud, don\'t store the key file there as well! This would make it completely useless! Important: Do not change the contents of the key file after creating the database!</string>
+	<string name="hint_key_file">Choose if you want to use a key file in addition to your master password:</string>
+	<string name="use_key_file">Use key file</string>
+
+	<string name="error_adding_keyfile">Error while adding the keyfile!</string>
+
+	<string name="init_otp">Load OTP auxiliary file…</string>
+	<string name="otp_explanation">Enter the next One-time-passwords (OTPs). Swipe your Yubikey NEO at the back of your device to enter via NFC.</string>
+	<string name="otp_hint">OTP %1$d</string>
+	<string name="CouldntLoadOtpAuxFile">Could not load auxiliary OTP file!</string>
+	<string name="CouldntLoadOtpAuxFile_Hint">Please use the OtpKeyProv plugin in KeePass 2.x (PC) to configure your database for use with OTPs!</string>
+	<string name="otp_discarded_because_no_db">Please select database first. OTP is discarded for security reasons.</string>
+	<string name="otp_discarded_no_space">OTP discarded: All OTPs already entered!</string>
+	<string name="otp_discarded_because_db_open">Please close database first. OTP is discarded.</string>
+	<string name="otps_pending">(One or more OTPs already available)</string>
+	<string name="otpsecret_hint">OTP secret (e.g. 01 23 ab cd…)</string>
+	<string name="CouldntParseOtpSecret">Error parsing OTP secret!</string>
+	<string name="OtpKeyError">Failed to create OTP key! Make sure you have entered the correct OTPs.</string>
+	<string name="ErrorUpdatingOtpAuxFile">Error updating OTP auxiliary file!</string>
+	<string name="SavingOtpAuxFile">Saving auxiliary OTP file…</string>
+
+	<string name="loading">Loading…</string>
+	
+	<string name="enable_plugin_title">Enable plug-in?</string>
+	<string name="enable_plugin_question">Keepass2Android detected a plug-in with name: %1$s from package name: %2$s. Do you want to enable this plug-in? It will have access to the data stored in your Keepass databases.</string>
+	
+	<string name="plugins">Plug-ins</string>
+	<string name="plugin_packagename">Package name:</string>
+	<string name="plugin_description">Description (not verified):</string>
+	<string name="plugin_author">Author (not verified):</string>
+	<string name="plugin_enabled">enabled</string>
+	<string name="plugin_disabled">disabled</string>
+	<string name="plugins_text">Click plug-in to enable/disable</string>
+
+	<string name="get_regular_version">Get more storage types</string>
+
+	<string name="CertificateWarning">Warning: Server certificate validation failed: %1$s. Install appropriate root certificate on your device or see settings!</string>
+	<string name="CertificateFailure">Error: Server certificate validation failed! Install appropriate root certificate on your device or see settings!</string>
+
+	<string name="export_fileformats_title">Select file format</string>
+	
+	<string name="ChangeLog_title">Change log</string>
+	
+	<string name="ChangeLog_0_9_3_r5">
+		<b>Version 0.9.3 r5</b>\n
+		* Incorporated fixes from Xamarin: Keepass2Android now compatible with ART on Android 4.4.2. Finally!\n
+		* Bug fixes: bugs in synchronization (refresh display, correct check for changes on http), bugs on Android 2.x devices, bugs in Google Drive and OneDrive storage implementations, clear clipboard on close database, bug opening attachments, display problems with keyboard\n
+	</string>
+
+	<string name="ChangeLog_0_9_3">
+		<b>Version 0.9.3</b>\n
+		* New keyboard with many improvements. See settings to customize.\n
+		* Read-only support for kdb (Keepass 1 files). Experimental!\n
+		* Added SFTP support\n
+		* Added workaround for bug in ART (Android 4.4.2)\n
+		* Bug fixes\n
+	</string>
+
+	<string name="ChangeLog_0_9_2">
+		<b>Version 0.9.2</b>\n
+		* Added OTP support (compatible with OtpKeyProv plugin)\n
+		* Integrated NFC support for OTPs from YubiKey NEO \n
+		* Several UI improvements\n
+		* Integrated Keepass 2.24 library\n
+		* Added option to kill the app process (see settings)\n
+		* Improved SSL certificate validation\n
+		* Bug fixes\n
+	</string>
+
+	<string name="ChangeLog_0_9_1">
+		<b>Version 0.9.1</b>\n
+		* Integrated SkyDrive support (Keepass2Android regular edition only)\n
+		* Fixed problems with Google Drive integration\n
+		* Added NTLM support
+	</string>
+
+
+		<string name="ChangeLog_0_9">
+		<b>Version 0.9</b>\n
+		* Integrated Dropbox and Google Drive support (read/write databases; Keepass2Android regular edition only)\n
+		* Integrated custom file browser (based on android-filechooser by HBA)\n
+		* Improved user interface for creating new databases\n
+		* Included custom font DejaVu Sans Mono for displaying passwords\n
+		* Bug fixes
+	</string>
+
+	
+	<string name="ChangeLog_0_8_6">
+		<b>Version 0.8.6</b>\n
+		* Support for Twofish cipher\n
+		* Allow editing of groups\n
+		* Allow moving of entries and groups\n
+		* QuickUnlock icon can be made transparent (see settings)\n
+		* Bug fixes
+	</string>
+
+	<string name="ChangeLog_0_8_5">
+		<b>Version 0.8.5</b>\n
+		* Remote files are stored in the local application cache to allow offline usage (including editing and later synchronization). See settings. \n
+		* Notification icon to visualize the lock-state of the database (see settings)\n
+		* Improved determination of lock-state in some situations\n
+		* Database files are loaded to memory while you are typing your password for increased loading speed (see settings)\n
+		* Entries can be added to root group\n
+		* Bug fixes (resolving reference fields, problems with keyboard on Italian an Chinese devices)
+	</string>
+		<string name="ChangeLog_0_8_4">
+		<b>Version 0.8.4</b>\n
+		* External database changes are detected and merged when saving\n
+		* Improved loading performance\n
+		* Improved search toolbar with suggestions\n
+		* New App logo!\n
+		* Added support for .kdbp format for faster loading/saving\n
+		* Improved editing of extra strings and hidden display when protected\n
+		Thanks to Alex Vallat for his code contributions!\n
+		Thanks to Niki Hüttner (www.close-cut.de) for the new logo!\n
+	</string>
+		<string name="ChangeLog_0_8_3"><b>Version 0.8.3</b>\n
+* Username/TAN index displayed in entry list (see settings)\n
+* Entries can be created if search from browser doesn\'t return results\n
+* KP2A keyboard provides possibility to search for credentials for current app\n
+* App automatically closes after selecting an entry for use in keyboard\n
+* Keyboard selection dialog automatically opens after search for URL (see settings)\n
+* Placeholders in entry fields are replaced before copying (most placeholders supported)\n
+* minor bug fixes
+  </string>
+  <string name="ChangeLog_0_8_2"><b>Version 0.8.2</b>\n
+* Support for Digest Authentication in WebDAV\n
+* Bugfixes (OI File manager, Open URL)
+</string>
+  <string name="ChangeLog_0_8_1"><b>Version 0.8.1</b>\n
+* KP2A Offline and "Online" can be installed both again\n
+* Added new translations (thanks to all contributors!)
+</string>
+  <string name="ChangeLog_0_8"><b>Version 0.8</b>\n
+* Improved user interface especially for Android 4.x devices\n
+* Allow using deliberate file managers for selecting existing files\n
+* Added safer way for opening attachments (through cache directory)\n
+* fixed bugs in Edit activity\n
+* probably introduced new bugs :-)
+</string>
+  <string name="ChangeLog_keptDonate">Extended possibility to donate a beer or something else</string>
+<string name="ChangeLog_0_7"><b>Version 0.7</b>\n
+* Increased loading speed: key transformations now 10x faster!\n
+* Added Keepass2Android soft-keyboard: Switch to this keyboard for entering credentials. Shields you from clipboard-based password sniffers (disable old clipboard notifications in the options)\n
+* Added option to donate a beer or something else (see menu)</string>
+  <string name="ChangeLog"><b>Version 0.6.2</b>\n
+* Google Drive/Dropbox/... integration: Use the official Google Drive or Dropbox App and open any .kdbx-file. This will now bring up KP2A.\n
+* Improved Search Dialog \n
+* Improved search results for Share URL with subdomains\n
+* Added options to give feedback, and rate and translate the app in the menu\n
+\n
+<b>Version 0.6.1</b>\n
+* Detect when database changes in the background (i.e. due to activity of a sync app)\n
+* Improved searching for URLs from the browser\n
+* Confirm dialog when discarding changes\n
+\n
+<b>Version 0.6</b>\n
+Initial public release
+  </string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>5 minutes</item>
+	<item>10 minutes</item>
+	<item>15 minutes</item>
+	<item>30 minutes</item>
+	<item>1 hour</item>
+    <item>Never</item>
+  </string-array>
+	<string-array name="export_fileformat_options">
+		<item>Keepass 2 database (.kdbx)</item>
+		<item>Keepass 2 XML (unencrypted) (.xml)</item>
+		<item>Keepass CSV (unencrypted) (.csv)</item>
+	</string-array>
+  <string-array name="list_size_options">
+    <item>Small</item>
+    <item>Medium</item>
+    <item>Large</item>
+  </string-array>
+
+	<string-array name="design_options">
+		<item>Holo Light</item>
+		<item>Holo Dark</item>
+	</string-array>
+
+	<string name="design_title">Design</string>
+
+	<string-array name="cred_remember_modes">
+    <item>Do not remember username and password</item>
+    <item>Remember username only</item>
+    <item>Remember username and password</item>
+  </string-array>
+	<string-array name="password_modes">
+		<item>Password only</item>
+		<item>Password + Key file</item>
+		<item>Password + OTP</item>
+		<item>Password + OTP secret (recovery mode)</item>
+	</string-array>
+	<string-array name="AcceptAllServerCertificates_options">
+		<item>Ignore certificate validation failures</item>
+		<item>Warn when validation fails</item>
+		<item>Do not accept invalid certificates</item>
+	</string-array>
+
+</resources>
diff --git a/src/PluginHostTest/Resources/Values/styles.xml b/src/PluginHostTest/Resources/Values/styles.xml
new file mode 100644
index 00000000..3becb33f
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/styles.xml
@@ -0,0 +1,136 @@
+<?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>
+	<style name="Base">
+		<item name="OpenFileDrawable">@drawable/collections_collection</item>
+		<item name="CreateDbDrawable">@drawable/collections_new_label</item>
+		<item name="OpenUrlDrawable">@drawable/location_web_site</item>
+		<item name="ic_action_search_drawable">@drawable/ic_action_search_holodark</item>
+		<item name="ic_launcher_folder_small">@drawable/ic_launcher_folder_small</item>
+	</style>
+	<style name="NoTitleBar"></style>
+    <style name="Dialog" parent="android:Theme.Dialog"></style>
+	<style name="GroupTextSmall" parent="android:Theme">
+		<item name="@android:textColor">@color/group</item>
+		<item name="@android:textSize">15sp</item>
+	</style>
+	<style name="GroupText" parent="android:Theme">
+		<item name="@android:textColor">@color/group</item>
+		<item name="@android:textSize">20sp</item>
+	</style>
+	<style name="GroupTextLarge" parent="android:Theme">
+		<item name="@android:textColor">@color/group</item>
+		<item name="@android:textSize">28sp</item>
+	</style>
+	<style name="ElementTextSmall">
+		<item name="@android:textSize">15sp</item>
+	</style>
+	<style name="ElementText">
+		<item name="@android:textSize">20sp</item>
+	</style>
+	<style name="ElementTextLarge">
+		<item name="@android:textSize">28sp</item>
+	</style>
+	<style name="GroupLabel">
+		<item name="@android:textSize">20sp</item>
+	</style>
+	<style name="WhiteOnBlack">
+		<item name="@android:background">#666666</item>
+		<item name="@android:textColor">@android:color/primary_text_dark</item>
+		<item name="@android:textSize">20sp</item>
+	</style>
+	<style name="GroupAndEntryHeader">
+		<item name="@android:background">#202020</item>
+		<item name="@android:textColor">#ffffff</item>
+		<item name="@android:textSize">20sp</item>
+	</style>
+	<style name="WhiteOnBlackSmall" parent="WhiteOnBlack">
+		<item name="@android:textSize">12sp</item>
+	</style>
+	<style name="WhiteOnDarkSmall" parent="WhiteOnBlack">
+		<item name="@android:textSize">12sp</item>
+		<item name="@android:background">#222222</item>
+	</style>
+	<style name="EntryFieldHeader" parent="WhiteOnDarkSmall">
+		<item name="@android:textSize">12sp</item>
+	</style>
+	<style name="ElementTextTitle" parent="WhiteOnBlack">
+		<item name="@android:textColor">@color/group</item>
+		<item name="@android:background">@android:color/transparent</item>
+	</style>
+	<style name="EntryItem">
+		<item name="@android:padding">5sp</item>
+	</style>
+	<style name="MinusButton">
+        <item name="android:src">@drawable/ic_menu_remove_field_holo_light</item>
+    </style>
+	<style name="EntryFieldHeader">
+        <item name="android:drawableBottom">@drawable/section_header</item>
+        <item name="android:drawablePadding">1dp</item>
+        <item name="android:layout_marginBottom">3dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">@color/emphasis</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="@android:background">@android:color/transparent</item>
+    </style>
+	<style name="InfoHeader">
+		<item name="android:drawableBottom">@drawable/section_header</item>
+		<item name="android:drawablePadding">1dp</item>
+		<item name="android:layout_marginBottom">3dp</item>
+		<item name="android:layout_marginTop">8dp</item>
+		<item name="android:paddingLeft">0dp</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:textColor">@color/emphasis</item>
+		<item name="android:textSize">14sp</item>
+		<item name="android:textStyle">bold</item>
+		<item name="@android:background">@android:color/transparent</item>
+	</style>
+    
+    <style name="EditEntryButton">
+    </style>
+
+	<style name="ExtraFieldHeader">
+        <item name="android:drawablePadding">1dp</item>
+        <item name="android:layout_marginBottom">3dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">@color/emphasis2</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="@android:background">@android:color/transparent</item>
+    </style>
+
+	<style name="PaddedContainer">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:padding">16dp</item>
+	</style>
+
+	<style name="PaddedElement">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:padding">8dp</item>
+	</style>
+
+</resources>
\ No newline at end of file
diff --git a/src/PluginHostTest/TextViewSelect.cs b/src/PluginHostTest/TextViewSelect.cs
new file mode 100644
index 00000000..73fa8aed
--- /dev/null
+++ b/src/PluginHostTest/TextViewSelect.cs
@@ -0,0 +1,84 @@
+/*
+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 3 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/>.
+  */
+using System;
+using Android.Content;
+using Android.Runtime;
+using Android.Widget;
+using Android.Text.Method;
+using Android.Util;
+using Java.Lang;
+
+namespace keepass2android.view
+{
+	
+	public class TextViewSelect : TextView {
+
+		public TextViewSelect (IntPtr javaReference, JniHandleOwnership transfer)
+			: base(javaReference, transfer)
+		{
+			Initialize();
+		}
+
+
+		public TextViewSelect(Context context): base(context, null, Android.Resource.Attribute.TextViewStyle) {
+			Initialize();
+		}
+		
+		public TextViewSelect(Context context, IAttributeSet attrs): base(context, attrs, Android.Resource.Attribute.TextViewStyle) {
+			Initialize();
+		}
+
+		void Initialize ()
+		{
+			Focusable = true;
+			FocusableInTouchMode = true;
+		}
+		
+		public TextViewSelect(Context context, IAttributeSet attrs, int defStyle): base(context, attrs, defStyle) {
+
+			Initialize ();
+		}
+		
+		
+		
+		protected override IMovementMethod DefaultMovementMethod
+		{
+			get
+			{
+				return ArrowKeyMovementMethod.Instance;
+			}
+		}
+		
+		
+		protected override bool DefaultEditable
+		{
+			get
+			{
+				return false;
+			}
+		}
+		
+		
+		public override void SetText(ICharSequence text, BufferType type) {
+			base.SetText (text, BufferType.Editable);
+
+		}
+		
+	}
+
+}
+
diff --git a/src/PluginHostTest/TextWithHelp.cs b/src/PluginHostTest/TextWithHelp.cs
new file mode 100644
index 00000000..3d27b56c
--- /dev/null
+++ b/src/PluginHostTest/TextWithHelp.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.Content.Res;
+using Android.OS;
+using Android.Runtime;
+using Android.Util;
+using Android.Views;
+using Android.Widget;
+using PluginHostTest;
+
+namespace keepass2android.views
+{
+	public class TextWithHelp : RelativeLayout
+	{
+		private Kp2aShortHelpView _kp2AShortHelpView;
+
+		public TextWithHelp(Context context, IAttributeSet attrs) :
+			base(context, attrs)
+		{
+			Initialize(attrs);
+		}
+
+		public TextWithHelp(Context context, string text, string helpText) :
+			base(context, null)
+		{
+			Initialize(text, helpText);
+		}
+
+
+		public TextWithHelp(Context context, IAttributeSet attrs, int defStyle) :
+			base(context, attrs, defStyle)
+		{
+			Initialize(attrs);
+		}
+
+		private void Initialize(IAttributeSet attrs)
+		{
+
+			TypedArray a = Context.ObtainStyledAttributes(attrs, Resource.Styleable.TextWithHelp);
+			
+			string helpText = a.GetString(Resource.Styleable.TextWithHelp_help_text);
+
+			const string xmlns = "http://schemas.android.com/apk/res/android";
+			string text = Context.GetString(attrs.GetAttributeResourceValue(xmlns, "text",Resource.String.ApplicationName /*TODO*/));
+			Initialize(text, helpText);
+		}
+
+		private void Initialize(string text, string helpText)
+		{
+			LayoutInflater inflater = (LayoutInflater)Context.GetSystemService(Context.LayoutInflaterService);
+			inflater.Inflate(Resource.Layout.text_with_help, this);
+
+			_kp2AShortHelpView = ((Kp2aShortHelpView)FindViewById(Resource.Id.help));
+			_kp2AShortHelpView.HelpText = helpText;
+
+			((TextView) FindViewById(Resource.Id.text)).Text = text;
+		}
+
+		public string HelpText
+		{
+			get { return _kp2AShortHelpView.HelpText; }
+			set { _kp2AShortHelpView.HelpText = value; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginSdkBinding/Additions/AboutAdditions.txt b/src/PluginSdkBinding/Additions/AboutAdditions.txt
new file mode 100644
index 00000000..08caee33
--- /dev/null
+++ b/src/PluginSdkBinding/Additions/AboutAdditions.txt
@@ -0,0 +1,48 @@
+Additions allow you to add arbitrary C# to the generated classes
+before they are compiled.  This can be helpful for providing convenience
+methods or adding pure C# classes.
+
+== Adding Methods to Generated Classes ==
+
+Let's say the library being bound has a Rectangle class with a constructor
+that takes an x and y position, and a width and length size.  It will look like
+this:
+
+public partial class Rectangle
+{
+    public Rectangle (int x, int y, int width, int height)
+	{
+	    // JNI bindings
+	}
+}
+
+Imagine we want to add a constructor to this class that takes a Point and
+Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
+with a partial class containing our new method:
+
+public partial class Rectangle
+{
+    public Rectangle (Point location, Size size) :
+	    this (location.X, location.Y, size.Width, size.Height)
+	{
+	}
+}
+
+At compile time, the additions class will be added to the generated class
+and the final assembly will a Rectangle class with both constructors.
+
+
+== Adding C# Classes ==
+
+Another thing that can be done is adding fully C# managed classes to the
+generated library.  In the above example, let's assume that there isn't a
+Point class available in Java or our library.  The one we create doesn't need
+to interact with Java, so we'll create it like a normal class in C#.
+
+By adding a Point.cs file with this class, it will end up in the binding library:
+
+public class Point
+{
+    public int X { get; set; }
+	public int Y { get; set; }
+}
\ No newline at end of file
diff --git a/src/PluginSdkBinding/Jars/AboutJars.txt b/src/PluginSdkBinding/Jars/AboutJars.txt
new file mode 100644
index 00000000..c359b62f
--- /dev/null
+++ b/src/PluginSdkBinding/Jars/AboutJars.txt
@@ -0,0 +1,24 @@
+This directory is for Android .jars.
+
+There are 2 types of jars that are supported:
+
+== Input Jar ==
+
+This is the jar that bindings should be generated for.
+
+For example, if you were binding the Google Maps library, this would
+be Google's "maps.jar".
+
+Set the build action for these jars in the properties page to "InputJar".
+
+
+== Reference Jars ==
+
+These are jars that are referenced by the input jar.  C# bindings will
+not be created for these jars.  These jars will be used to resolve
+types used by the input jar.
+
+NOTE: Do not add "android.jar" as a reference jar.  It will be added automatically
+based on the Target Framework selected.
+
+Set the build action for these jars in the properties page to "ReferenceJar".
\ No newline at end of file
diff --git a/src/PluginSdkBinding/PluginSdkBinding.csproj b/src/PluginSdkBinding/PluginSdkBinding.csproj
new file mode 100644
index 00000000..02729bd4
--- /dev/null
+++ b/src/PluginSdkBinding/PluginSdkBinding.csproj
@@ -0,0 +1,64 @@
+<?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>{3DA3911E-36DE-465E-8F15-F1991B6437E5}</ProjectGuid>
+    <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PluginSdkBinding</RootNamespace>
+    <AssemblyName>PluginSdkBinding</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkVersion>v2.2</TargetFrameworkVersion>
+  </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>
+  </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>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Mono.Android" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Jars\AboutJars.txt" />
+    <None Include="Additions\AboutAdditions.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Transforms\Metadata.xml" />
+    <TransformFile Include="Transforms\EnumFields.xml" />
+    <TransformFile Include="Transforms\EnumMethods.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedJar Include="..\java\Keepass2AndroidPluginSDK\bin\keepass2androidpluginsdk.jar">
+      <Link>Jars\keepass2androidpluginsdk.jar</Link>
+    </EmbeddedJar>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.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/PluginSdkBinding/Properties/AssemblyInfo.cs b/src/PluginSdkBinding/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..3d0cc069
--- /dev/null
+++ b/src/PluginSdkBinding/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("PluginSdkBinding")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PluginSdkBinding")]
+[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/PluginSdkBinding/Transforms/EnumFields.xml b/src/PluginSdkBinding/Transforms/EnumFields.xml
new file mode 100644
index 00000000..22959957
--- /dev/null
+++ b/src/PluginSdkBinding/Transforms/EnumFields.xml
@@ -0,0 +1,14 @@
+<enum-field-mappings>
+  <!--
+  This example converts the constants Fragment_id, Fragment_name,
+  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
+  to an enum called Android.Support.V4.App.FragmentTagType with values
+  Id, Name, and Tag.
+  
+  <mapping jni-class="android/support/v4/app/FragmentActivity$FragmentTag" clr-enum-type="Android.Support.V4.App.FragmentTagType">
+    <field jni-name="Fragment_name" clr-name="Name" value="0" />
+    <field jni-name="Fragment_id" clr-name="Id" value="1" />
+    <field jni-name="Fragment_tag" clr-name="Tag" value="2" />
+  </mapping>
+  -->
+</enum-field-mappings>
\ No newline at end of file
diff --git a/src/PluginSdkBinding/Transforms/EnumMethods.xml b/src/PluginSdkBinding/Transforms/EnumMethods.xml
new file mode 100644
index 00000000..49216c61
--- /dev/null
+++ b/src/PluginSdkBinding/Transforms/EnumMethods.xml
@@ -0,0 +1,13 @@
+<enum-method-mappings>
+  <!--
+  This example changes the Java method:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
+  to be:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
+  when bound in C#.
+  
+  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
+    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
+  </mapping>
+  -->
+</enum-method-mappings>
\ No newline at end of file
diff --git a/src/PluginSdkBinding/Transforms/Metadata.xml b/src/PluginSdkBinding/Transforms/Metadata.xml
new file mode 100644
index 00000000..2587ddc4
--- /dev/null
+++ b/src/PluginSdkBinding/Transforms/Metadata.xml
@@ -0,0 +1,9 @@
+<metadata>
+  <!--
+  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']" />
+  
+  This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
+  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
+  -->
+</metadata>
diff --git a/src/java/Keepass2AndroidPluginSDK/.classpath b/src/java/Keepass2AndroidPluginSDK/.classpath
new file mode 100644
index 00000000..7bc01d9a
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/src/java/Keepass2AndroidPluginSDK/.project b/src/java/Keepass2AndroidPluginSDK/.project
new file mode 100644
index 00000000..ee51db99
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Keepass2AndroidPluginSDK</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/src/java/Keepass2AndroidPluginSDK/.settings/org.eclipse.jdt.core.prefs b/src/java/Keepass2AndroidPluginSDK/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..b080d2dd
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/src/java/Keepass2AndroidPluginSDK/.settings/org.eclipse.ltk.core.refactoring.prefs b/src/java/Keepass2AndroidPluginSDK/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 00000000..b196c64a
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/src/java/Keepass2AndroidPluginSDK/AndroidManifest.xml b/src/java/Keepass2AndroidPluginSDK/AndroidManifest.xml
new file mode 100644
index 00000000..dae30b7c
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="keepass2android.pluginsdk"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="19" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+    </application>
+
+</manifest>
diff --git a/src/java/Keepass2AndroidPluginSDK/lint.xml b/src/java/Keepass2AndroidPluginSDK/lint.xml
new file mode 100644
index 00000000..ee0eead5
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/lint.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>
\ No newline at end of file
diff --git a/src/java/Keepass2AndroidPluginSDK/proguard-project.txt b/src/java/Keepass2AndroidPluginSDK/proguard-project.txt
new file mode 100644
index 00000000..f2fe1559
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/src/java/Keepass2AndroidPluginSDK/project.properties b/src/java/Keepass2AndroidPluginSDK/project.properties
new file mode 100644
index 00000000..91d2b024
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-19
+android.library=true
diff --git a/src/java/Keepass2AndroidPluginSDK/res/drawable-hdpi/ic_launcher.png b/src/java/Keepass2AndroidPluginSDK/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 00000000..96a442e5
Binary files /dev/null and b/src/java/Keepass2AndroidPluginSDK/res/drawable-hdpi/ic_launcher.png differ
diff --git a/src/java/Keepass2AndroidPluginSDK/res/drawable-mdpi/ic_launcher.png b/src/java/Keepass2AndroidPluginSDK/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 00000000..359047df
Binary files /dev/null and b/src/java/Keepass2AndroidPluginSDK/res/drawable-mdpi/ic_launcher.png differ
diff --git a/src/java/Keepass2AndroidPluginSDK/res/drawable-xhdpi/ic_launcher.png b/src/java/Keepass2AndroidPluginSDK/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..71c6d760
Binary files /dev/null and b/src/java/Keepass2AndroidPluginSDK/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/src/java/Keepass2AndroidPluginSDK/res/values-v11/styles.xml b/src/java/Keepass2AndroidPluginSDK/res/values-v11/styles.xml
new file mode 100644
index 00000000..3c02242a
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/res/values-v11/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!--
+        Base application theme for API 11+. This theme completely replaces
+        AppBaseTheme from res/values/styles.xml on API 11+ devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
+        <!-- API 11 theme customizations can go here. -->
+    </style>
+
+</resources>
diff --git a/src/java/Keepass2AndroidPluginSDK/res/values-v14/styles.xml b/src/java/Keepass2AndroidPluginSDK/res/values-v14/styles.xml
new file mode 100644
index 00000000..a91fd037
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/res/values-v14/styles.xml
@@ -0,0 +1,12 @@
+<resources>
+
+    <!--
+        Base application theme for API 14+. This theme completely replaces
+        AppBaseTheme from BOTH res/values/styles.xml and
+        res/values-v11/styles.xml on API 14+ devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+        <!-- API 14 theme customizations can go here. -->
+    </style>
+
+</resources>
diff --git a/src/java/Keepass2AndroidPluginSDK/res/values/strings.xml b/src/java/Keepass2AndroidPluginSDK/res/values/strings.xml
new file mode 100644
index 00000000..dd1d9aaf
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/res/values/strings.xml
@@ -0,0 +1,5 @@
+<resources>
+
+    <string name="app_name">Keepass2Android Plugin SDK</string>
+
+</resources>
diff --git a/src/java/Keepass2AndroidPluginSDK/res/values/styles.xml b/src/java/Keepass2AndroidPluginSDK/res/values/styles.xml
new file mode 100644
index 00000000..6ce89c7b
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/res/values/styles.xml
@@ -0,0 +1,20 @@
+<resources>
+
+    <!--
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Light">
+        <!--
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        -->
+    </style>
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    </style>
+
+</resources>
diff --git a/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/AccessManager.java b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/AccessManager.java
new file mode 100644
index 00000000..e4f94ad3
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/AccessManager.java
@@ -0,0 +1,109 @@
+package keepass2android.pluginsdk;
+
+import java.util.ArrayList;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.preference.PreferenceManager;
+
+
+public class AccessManager 
+{
+	private static final String PREF_KEY_SCOPE = "scope";
+	private static final String PREF_KEY_TOKEN = "token";
+
+	public static String stringArrayToString(ArrayList<String> values) {
+	    JSONArray a = new JSONArray();
+	    for (int i = 0; i < values.size(); i++) {
+	        a.put(values.get(i));
+	    }
+	    if (!values.isEmpty()) {
+	        return a.toString();
+	    } else {
+	        return null;
+	    }
+	    
+	}
+
+	public static ArrayList<String> stringToStringArray(String s) {
+	    ArrayList<String> strings = new ArrayList<String>();
+	    if ((s != null) && (s != "")) {
+	        try {
+	            JSONArray a = new JSONArray(s);
+	            for (int i = 0; i < a.length(); i++) {
+	                String url = a.optString(i);
+	                strings.add(url);
+	            }
+	        } catch (JSONException e) {
+	            e.printStackTrace();
+	        }
+	    }
+	    return strings;
+	}
+	
+	public static void storeAccessToken(Context ctx, String hostPackage, String accessToken, ArrayList<String> scopes)
+	{
+		 SharedPreferences prefs = getPrefsForHost(ctx, hostPackage);
+		 
+		 //
+		 if (accessToken.equals(prefs.getString(PREF_KEY_TOKEN, "")))
+		 {
+			 //token already available
+			 return;
+		 }
+		 
+		 Editor edit = prefs.edit();
+		 edit.putString(PREF_KEY_TOKEN, accessToken);
+		 edit.putString(PREF_KEY_SCOPE, stringArrayToString(scopes));
+		 edit.commit();
+		 
+	}
+
+	private static SharedPreferences getPrefsForHost(Context ctx,
+			String hostPackage) {
+		SharedPreferences prefs = ctx.getSharedPreferences("KP2A.PluginAccess."+hostPackage, Context.MODE_PRIVATE);
+		return prefs;
+	}
+
+	public static String tryGetAccessToken(Context ctx, String hostPackage, ArrayList<String> scopes) {
+		
+		SharedPreferences prefs = getPrefsForHost(ctx, hostPackage);
+		ArrayList<String> currentScope = stringToStringArray(prefs.getString(PREF_KEY_SCOPE, ""));
+		if (isSubset(scopes, currentScope))
+		{
+			return prefs.getString(PREF_KEY_TOKEN, null);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public static boolean isSubset(ArrayList<String> requiredScopes,
+			ArrayList<String> availableScopes) {
+		for (String r: requiredScopes){
+			if (availableScopes.indexOf(r)<0)
+				return false;
+		}
+		return true;
+	}
+
+	public static void removeAccessToken(Context ctx, String hostPackage,
+			String accessToken) {
+		SharedPreferences prefs = getPrefsForHost(ctx, hostPackage);
+
+		if (prefs.getString(PREF_KEY_TOKEN, "").equals(accessToken))
+		{
+			Editor edit = prefs.edit();
+			edit.clear();
+			edit.commit();
+
+		}
+	 
+	}
+}
diff --git a/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/PluginAccessBroadcastReceiver.java b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/PluginAccessBroadcastReceiver.java
new file mode 100644
index 00000000..bfa8370f
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/PluginAccessBroadcastReceiver.java
@@ -0,0 +1,95 @@
+package keepass2android.pluginsdk;
+
+import java.util.ArrayList;
+
+import android.R.anim;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Broadcast flow between Host and Plugin
+ * ======================================
+ * 
+ * The host is responsible for deciding when to initiate the session. It 
+ * should initiate the session as soon as plugins are required or when a plugin 
+ * has been updated through the OS.
+ * It will then send a broadcast to request the currently required scope.
+ * The plugin then sends a broadcast to the app which scope is required. If an 
+ * access token is already available, it's sent along with the requset.
+ * 
+ * If a previous permission has been revoked (or the app settings cleared or the 
+ * permissions have been extended or the token is invalid for any other reason) 
+ * the host will answer with a Revoked-Permission broadcast (i.e. the plugin is 
+ * unconnected.)
+ * 
+ *  Unconnected plugins must be permitted by the user (requiring user action). 
+ *  When the user grants access, the plugin will receive an access token for 
+ *  the host. This access token is valid for the requested scope. If the scope
+ *  changes (e.g after an update of the plugin), the access token becomes invalid.
+ *
+ */
+public abstract class PluginAccessBroadcastReceiver extends BroadcastReceiver {
+	@Override
+	public void onReceive(Context ctx, Intent intent) {
+		String action = intent.getAction();
+		android.util.Log.d("KP2A.pluginsdk", "received broadcast with action="+action);
+		if (action.equals(Strings.ACTION_TRIGGER_REQUEST_ACCESS))
+		{
+			requestAccess(ctx, intent);	
+		} else if (action.equals(Strings.ACTION_RECEIVE_ACCESS))
+		{
+			receiveAccess(ctx, intent);
+		} else if (action.equals(Strings.ACTION_REVOKE_ACCESS))
+		{
+			revokeAccess(ctx, intent);
+		} else
+		{
+			//TODO handle unexpected action
+		}		
+	}
+	
+	
+
+	private void revokeAccess(Context ctx, Intent intent) {
+		String senderPackage = intent.getStringExtra(Strings.EXTRA_SENDER);
+		String accessToken = intent.getStringExtra(Strings.EXTRA_ACCESS_TOKEN);
+		//this intent must send the invalid(ated) token to prevent malicious apps
+		//from revoking access of all plugins.
+		AccessManager.removeAccessToken(ctx, senderPackage, accessToken);
+	}
+
+
+
+	private void receiveAccess(Context ctx, Intent intent) {
+		String senderPackage = intent.getStringExtra(Strings.EXTRA_SENDER);
+		String accessToken = intent.getStringExtra(Strings.EXTRA_ACCESS_TOKEN);
+		AccessManager.storeAccessToken(ctx, senderPackage, accessToken, getScopes());
+	}
+
+	public void requestAccess(Context ctx, Intent intent) {
+		String senderPackage = intent.getStringExtra(Strings.EXTRA_SENDER);
+		String requestToken = intent.getStringExtra(Strings.EXTRA_REQUEST_TOKEN);
+		Intent rpi = new Intent(Strings.ACTION_REQUEST_ACCESS);
+		rpi.setPackage(senderPackage);
+		rpi.putExtra(Strings.EXTRA_SENDER, ctx.getPackageName());
+		rpi.putExtra(Strings.EXTRA_REQUEST_TOKEN, requestToken);
+		
+		String token = AccessManager.tryGetAccessToken(ctx, senderPackage, getScopes());
+		if (token != null)
+		{
+			rpi.putExtra(Strings.EXTRA_ACCESS_TOKEN, token);
+		}
+		
+		rpi.putStringArrayListExtra(Strings.EXTRA_SCOPES, getScopes());
+		
+		ctx.sendBroadcast(rpi);
+	}
+
+	/** 
+	 * 
+	 * @return the list of required scopes for this plugin. 
+	 */
+	abstract public ArrayList<String> getScopes();
+
+}
diff --git a/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/Strings.java b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/Strings.java
new file mode 100644
index 00000000..2ea28c46
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/Strings.java
@@ -0,0 +1,19 @@
+package keepass2android.pluginsdk;
+
+public class Strings {
+	public static final String SCOPE_DATABASE_ACTIONS = "keepass2android.SCOPE_DATABASE_ACTIONS";
+	public static final String SCOPE_CURRENT_ENTRY = "keepass2android.SCOPE_CURRENT_ENTRY";
+	
+	public static final String EXTRA_SCOPES = "keepass2android.EXTRA_SCOPES";
+	public static final String EXTRA_SENDER = "keepass2android.EXTRA_SENDER";
+	public static final String EXTRA_REQUEST_TOKEN = "keepass2android.EXTRA_REQUEST_TOKEN";
+
+	public static final String ACTION_TRIGGER_REQUEST_ACCESS = "keepass2android.ACTION_TRIGGER_REQUEST_ACCESS";
+	public static final String ACTION_REQUEST_ACCESS = "keepass2android.ACTION_REQUEST_ACCESS";
+	public static final String ACTION_RECEIVE_ACCESS = "keepass2android.ACTION_RECEIVE_ACCESS";
+	public static final String ACTION_REVOKE_ACCESS = "keepass2android.ACTION_REVOKE_ACCESS";
+
+	public static final String EXTRA_ACCESS_TOKEN = "EXTRA_ACCESS_TOKEN";
+	
+	//static final String SCOPE_DATABASE_ACTIONS = "keepass2android.SCOPE_DATABASE_ACTIONS";
+}