diff --git a/src/AutoFillPlugin/Kp2aAccessibilityService.cs b/src/AutoFillPlugin/Kp2aAccessibilityService.cs
index 0a109df3..d716f0a2 100644
--- a/src/AutoFillPlugin/Kp2aAccessibilityService.cs
+++ b/src/AutoFillPlugin/Kp2aAccessibilityService.cs
@@ -91,7 +91,7 @@ namespace keepass2android.AutoFillPlugin
                             AskFillPassword(url, usernameEdit, emptyPasswordFields);
                             cancelNotification = false;
                         }
-                        
+
                     }
 					if (cancelNotification)
 					{
diff --git a/src/AutoFillPlugin/LookupCredentialsActivity.cs b/src/AutoFillPlugin/LookupCredentialsActivity.cs
index 62494366..7003bcf2 100644
--- a/src/AutoFillPlugin/LookupCredentialsActivity.cs
+++ b/src/AutoFillPlugin/LookupCredentialsActivity.cs
@@ -14,7 +14,7 @@ using Keepass2android.Pluginsdk;
 
 namespace keepass2android.AutoFillPlugin
 {
-    [Activity(Label = "@string/LookupTitle", LaunchMode = Android.Content.PM.LaunchMode.SingleInstance)]
+	[Activity(Label = "@string/LookupTitle", LaunchMode = Android.Content.PM.LaunchMode.SingleInstance, Theme="@style/android:Theme.Material.Light")]
     public class LookupCredentialsActivity : Activity
     {
         protected override void OnCreate(Bundle bundle)
diff --git a/src/AutoFillPlugin/MainActivity.cs b/src/AutoFillPlugin/MainActivity.cs
index 71c31ecc..d1a51174 100644
--- a/src/AutoFillPlugin/MainActivity.cs
+++ b/src/AutoFillPlugin/MainActivity.cs
@@ -12,6 +12,7 @@ using Android.Widget;
 
 namespace keepass2android.AutoFillPlugin
 {
+	#if DEBUG
     [Activity(Label = "MainActivity", MainLauncher =true)]
     public class MainActivity : Activity
     {
@@ -22,4 +23,5 @@ namespace keepass2android.AutoFillPlugin
             // Create your application here
         }
     }
+	#endif
 }
\ No newline at end of file
diff --git a/src/AutoFillPlugin/Properties/AndroidManifest.xml b/src/AutoFillPlugin/Properties/AndroidManifest.xml
index 273f2327..b3c3b2a4 100644
--- a/src/AutoFillPlugin/Properties/AndroidManifest.xml
+++ b/src/AutoFillPlugin/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="kp2a.plugin.AutoFill" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="21" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
 	<application android:label="KP2A AutoFillPlugin" android:icon="@drawable/Icon"></application>
 </manifest>
\ No newline at end of file