diff --git a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
index 563690c0318..132d65962e4 100644
--- a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
+++ b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
@@ -96,10 +96,6 @@
         <category android:name="android.intent.category.BROWSABLE" />
         <category android:name="android.intent.category.DEFAULT" />
 
-        <!-- needed for properly formatted email messages -->
-        <data
-          android:mimeType="application/vnd.keyman"
-          android:scheme="content" />
         <!-- needed for mangled email messages -->
         <data
           android:mimeType="application/keyman"
@@ -109,18 +105,10 @@
           android:mimeType="application/octet-stream"
           android:scheme="content" />
         <data
-          android:mimeType="application/x-keyman-package"
+          android:mimeType="application/vnd.keyman.kmp+zip"
           android:scheme="content" />
       </intent-filter>
 
-      <!--
-                 Capture file open requests (pathPattern is honoured) where no
-                 MIME type is provided in the Intent.  An Intent with a null
-                 MIME type will never be matched by a filter with a set MIME
-                 type, so we need a second intent-filter if we wish to also
-                 match files with this extension and a non-null MIME type
-                 (even if it is non-null but zero length).
-            -->
       <intent-filter android:priority="50">
         <action android:name="android.intent.action.VIEW" />
 
@@ -128,19 +116,30 @@
         <category android:name="android.intent.category.DEFAULT" />
 
         <data android:scheme="file" />
+        <data android:scheme="content" />
+
         <data android:host="*" />
-        <data android:pathPattern="/.*\\.kmp" />
+        <data android:pathPattern=".*\\.kmp" />
+        <data
+          android:mimeType="application/vnd.keyman.kmp+zip"
+          android:scheme="content" />
+
+        <!--
+          Backup MIME intents
+        -->
+        <data
+          android:mimeType="application/octet-stream"
+          android:scheme="content" />
       </intent-filter>
 
       <!--
-                 Capture file open requests (pathPattern is honoured) where a
-                 (possibly blank) MIME type is provided in the Intent.  This
-                 filter may only be necessary for supporting ES File Explorer,
-                 which has the probably buggy behaviour of using an Intent
-                 with a MIME type that is set but zero-length.  It's
-                 impossible to match such a type except by using a global
-                 wildcard.
-            -->
+            Capture file open requests (pathPattern is honoured) where no
+            MIME type is provided in the Intent.  An Intent with a null
+            MIME type will never be matched by a filter with a set MIME
+            type, so we need a second intent-filter if we wish to also
+            match files with this extension and a non-null MIME type
+            (even if it is non-null but zero length).
+      -->
       <intent-filter android:priority="50">
         <action android:name="android.intent.action.VIEW" />
 
@@ -149,25 +148,8 @@
 
         <data android:scheme="file" />
         <data android:host="*" />
-        <data android:mimeType="*/*" />
         <data android:pathPattern="/.*\\.kmp" />
       </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <!-- http:// and  https:// protocols -->
-        <data
-          android:host="*"
-          android:pathPattern="/.*\\.kmp"
-          android:scheme="http" />
-        <data
-          android:host="*"
-          android:pathPattern="/.*\\.kmp"
-          android:scheme="https" />
-      </intent-filter>
 
       <intent-filter>
         <!-- keyman:download// deep linking to https://keyman.com/keyboards/ -->
@@ -204,7 +186,7 @@
 
       </intent-filter>
 
-      <intent-filter android:priority="50">
+      <intent-filter android:priority="50" android:autoVerify="true">
         <!-- KMAPro should also be able to handle /keyboards/install links and convert to /go/package/download -->
         <action android:name="android.intent.action.VIEW" />
 
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/CheckPermissions.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/CheckPermissions.java
index 431d97e3534..5b366969ecf 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/CheckPermissions.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/CheckPermissions.java
@@ -33,13 +33,8 @@ public static boolean isPermissionOK(Activity activity) {
       // API 30-32
       permissionsOK = Environment.isExternalStorageManager() ||
         checkPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE);
-    } else {
-      // API 33+
-      // We had to remove these MEDIA permissions from AndroidManifest.xml so these will end up failing
-      // https://support.google.com/googleplay/android-developer/answer/14115180?hl=en
-      permissionsOK = permissionsOK && checkPermission(activity, Manifest.permission.READ_MEDIA_IMAGES);
-      permissionsOK = permissionsOK && checkPermission(activity, Manifest.permission.READ_MEDIA_VIDEO);
     }
+    // API 33+ needs no special permissions.
 
     return permissionsOK;
   }