diff --git a/project/ToolkitBuild.xml b/project/ToolkitBuild.xml
index b87e641a9..82ac29fa3 100644
--- a/project/ToolkitBuild.xml
+++ b/project/ToolkitBuild.xml
@@ -29,6 +29,7 @@
    <set name="NATIVE_TOOLKIT_SDL_ANGLE" value="1" if="NME_ANGLE" />
    <set name="NATIVE_TOOLKIT_STATIC_ANGLE" value="1" if="NME_ANGLE" />
 
+   <set name="NME_LOCAL_TOOLKIT" value="1" if="android" />
 
    <include name="${HXCPP}/build-tool/BuildCommon.xml"/>
    <!-- 
diff --git a/src/nme/android/Bluetooth.hx b/src/nme/android/Bluetooth.hx
index 38aaebbfa..3488174e0 100644
--- a/src/nme/android/Bluetooth.hx
+++ b/src/nme/android/Bluetooth.hx
@@ -4,14 +4,6 @@ import nme.JNI;
 
 @:nativeProperty
 class BluetoothDeviceCallback
-{
-   var onDevices:Int->Array<String>->Void;
-   public function new(inCallback:Int->Array<String>->Void) onDevices = inCallback;
-   public function setDevicesAsync(inCode:Int, inDevices:Array<String>) onDevices(inCode,inDevices);
-}
-
-@:nativeProperty
-class Bluetooth
 {
    // ASync return codes
    public static inline var DISABLED = -2;
@@ -20,6 +12,26 @@ class Bluetooth
    public static inline var SCANNING = 1;
    public static inline var NONE_PAIRED = 2;
 
+   var onDevices:BluetoothScan->Void;
+
+   public function new(inCallback:BluetoothScan->Void) onDevices = inCallback;
+   public function setDevicesAsync(inCode:Int, inDevices:Array<String>)
+   {
+      onDevices( switch(inCode) {
+         case DISABLED: BluetoothDisabled;
+         case MISSING: BluetoothMissing;
+         case SCANNING: BluetoothScanning;
+         case NONE_PAIRED: BluetoothNonePaired;
+         case OK: BluetoothDevices(inDevices);
+         case _: trace("Bad device code?:" + inCode); BluetoothMissing;
+      } );
+   }
+}
+
+@:nativeProperty
+class Bluetooth
+{
+
    var handle:Dynamic;
 
 
@@ -41,7 +53,7 @@ class Bluetooth
       isSetup = true;
    }
 
-   static public function getDeviceListAsync(onDevices:Int->Array<String>->Void,inFullScan:Bool)
+   static public function getDeviceListAsync(onDevices:BluetoothScan->Void,inFullScan:Bool)
    {
       devicesAsync(new BluetoothDeviceCallback(onDevices),inFullScan);
    }
diff --git a/src/nme/android/BluetoothScan.hx b/src/nme/android/BluetoothScan.hx
new file mode 100644
index 000000000..bfea54452
--- /dev/null
+++ b/src/nme/android/BluetoothScan.hx
@@ -0,0 +1,10 @@
+package nme.android;
+
+enum BluetoothScan
+{
+   BluetoothDisabled;
+   BluetoothMissing;
+   BluetoothNonePaired;
+   BluetoothScanning;
+   BluetoothDevices(devices:Array<String>);
+}
diff --git a/src/nme/android/Permission.hx b/src/nme/android/Permission.hx
new file mode 100644
index 000000000..472f5b2a8
--- /dev/null
+++ b/src/nme/android/Permission.hx
@@ -0,0 +1,60 @@
+package nme.android;
+
+import nme.JNI;
+
+import nme.android.PermissionType;
+
+@:nativeProperty
+class Permission
+{
+   public static var BLUETOOTH_SCAN = "android.permission.BLUETOOTH_SCAN";
+   public static var BLUETOOTH_CONNECT = "android.permission.BLUETOOTH_CONNECT";
+
+
+   public static function getPermission(permission:String) : PermissionType
+   {
+      #if android
+      var code = sHasPermission(permission);
+      switch(code)
+      {
+         case 0: return PermissionGranted;
+         case 1: return PermissionShowRationaleToRequest;
+         case 2: return PermissionRequestNeeded;
+         default:
+            throw "Unknown permission code:" + code;
+      }
+      #else
+      return PermissionDenied;
+      #end
+   }
+
+   public static function requestPermission(permission:String, onPermission:PermissionType->Void)
+   {
+      #if android
+      sRequestPermission(permission, {
+         onGrant: () -> onPermission(PermissionGranted),
+         onDeny: () -> onPermission(PermissionDenied),
+      });
+      #end
+   }
+
+   public static function requestPermissions(permissions:Array<String>, onPermission:String->Bool->Void)
+   {
+      #if android
+      sRequestPermissions(permissions, {
+         onGrant: (p) -> onPermission(p,true),
+         onDeny: (p) -> onPermission(p,false),
+      });
+      #end
+   }
+
+
+   #if android
+   static var sHasPermission = JNI.createStaticMethod("org/haxe/nme/GameActivity", "hasPermission", "(Ljava/lang/String;)I");
+
+   static var sRequestPermission = JNI.createStaticMethod("org/haxe/nme/GameActivity", "requestPermission", "(Ljava/lang/String;Lorg/haxe/nme/HaxeObject;)V");
+   static var sRequestPermissions = JNI.createStaticMethod("org/haxe/nme/GameActivity", "requestPermissions", "([Ljava/lang/String;Lorg/haxe/nme/HaxeObject;)V");
+   #end
+}
+
+
diff --git a/src/nme/android/PermissionType.hx b/src/nme/android/PermissionType.hx
new file mode 100644
index 000000000..42af1cee2
--- /dev/null
+++ b/src/nme/android/PermissionType.hx
@@ -0,0 +1,9 @@
+package nme.android;
+
+enum PermissionType
+{
+   PermissionGranted;
+   PermissionShowRationaleToRequest;
+   PermissionRequestNeeded;
+   PermissionDenied;
+}
diff --git a/templates/android/PROJ-gradle/app/build.gradle b/templates/android/PROJ-gradle/app/build.gradle
index 01ccee807..c5febcd79 100644
--- a/templates/android/PROJ-gradle/app/build.gradle
+++ b/templates/android/PROJ-gradle/app/build.gradle
@@ -1,3 +1,7 @@
+plugins {
+    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
+}
+
 apply plugin: 'com.android.application'
 ::if NME_FIREBASE::
 apply plugin: 'com.google.gms.google-services'
@@ -115,6 +119,19 @@ dependencies {
       ::end::
     ::end::
 
+    def core_version = "1.13.1"
+
+    // Java language implementation
+    implementation "androidx.core:core:$core_version"
+    // Kotlin
+    implementation "androidx.core:core-ktx:$core_version"
+    implementation "androidx.activity:activity:1.2.0"
+    implementation "androidx.fragment:fragment:1.3.0"
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
+
+
     dependencies {
         ::foreach (ANDROID_LIBRARY_PROJECTS)::
         api project(':::name::')::end::
diff --git a/templates/android/PROJ-gradle/app/src/main/AndroidManifest.xml b/templates/android/PROJ-gradle/app/src/main/AndroidManifest.xml
index 7a3dc7eb8..5f5b1774b 100644
--- a/templates/android/PROJ-gradle/app/src/main/AndroidManifest.xml
+++ b/templates/android/PROJ-gradle/app/src/main/AndroidManifest.xml
@@ -48,7 +48,7 @@
     <uses-sdk android:minSdkVersion="::ANDROID_MIN_API_LEVEL::"
               android:targetSdkVersion="::ANDROID_TARGET_API_LEVEL::" />
    
-   ::foreach appPermission:: <uses-permission android:name="::permission::" android:required="::required::" />
+    ::foreach appPermission:: ::permissionXml::
 ::end::
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.INTERNET" />
diff --git a/templates/android/PROJ/AndroidManifest.xml b/templates/android/PROJ/AndroidManifest.xml
index 13c6906b0..b9be4caca 100644
--- a/templates/android/PROJ/AndroidManifest.xml
+++ b/templates/android/PROJ/AndroidManifest.xml
@@ -38,7 +38,7 @@
              />
 
 	
-   ::foreach appPermission:: <uses-permission android:name="::permission::" android:required="::required::" />
+   ::foreach appPermission:: ::permissionXml::
 ::end::
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.INTERNET" />
diff --git a/templates/android/extension-api/src/org/haxe/nme/NME.java b/templates/android/extension-api/src/org/haxe/nme/NME.java
index ca4fa33b8..7483e4268 100644
--- a/templates/android/extension-api/src/org/haxe/nme/NME.java
+++ b/templates/android/extension-api/src/org/haxe/nme/NME.java
@@ -38,4 +38,5 @@ public class NME {
      public static native Object callObjectFunction(long inHandle,String function, Object[] args);
      public static native double callNumericFunction(long inHandle,String function, Object[] args);
      public static native void releaseReference(long inHandle);
+     public static native void onPermission(String permission, int inResult);
 }
diff --git a/templates/android/java/org/haxe/nme/Bluetooth.java b/templates/android/java/org/haxe/nme/Bluetooth.java
index e0faf0949..9ddab7ceb 100644
--- a/templates/android/java/org/haxe/nme/Bluetooth.java
+++ b/templates/android/java/org/haxe/nme/Bluetooth.java
@@ -10,6 +10,7 @@
 
 import java.io.Closeable;
 
+import android.bluetooth.BluetoothManager;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
@@ -23,6 +24,7 @@
 import android.content.IntentFilter;
 import android.app.Activity;
 import android.annotation.SuppressLint;
+import org.json.*;
 
 // You will need to add the permission android.permission.BLUETOOTH/BLUETOOTH_ADMIN to use this
 @SuppressLint("MissingPermission") 
@@ -43,6 +45,7 @@ public class Bluetooth
 
    static BluetoothAdapter sBluetoothAdapter;
    static HashMap<String,BluetoothDevice> sDeviceMap = new HashMap<String,BluetoothDevice>();
+   static boolean isScanning = false;
 
    BluetoothDevice mDevice;
    BluetoothSocket mSocket;
@@ -51,11 +54,15 @@ public class Bluetooth
    byte [] mBuffer;
    
 
-   public Bluetooth(String inName)
+   public Bluetooth(String inAddress)
    {
-      sBluetoothAdapter.cancelDiscovery();
+      if (isScanning)
+      {
+         Log.e(TAG,"cancelDiscovery..");
+         sBluetoothAdapter.cancelDiscovery();
+      }
 
-      mDevice = sDeviceMap.get(inName);
+      mDevice = sDeviceMap.get(inAddress);
       if (mDevice!=null)
       {
          // Get a BluetoothSocket to connect with the given BluetoothDevice
@@ -128,11 +135,18 @@ static void postDevices(final HaxeObject inHandler,final int inState, final Stri
       );
    }
 
+   static int sScanId = 0;
    static void scanDevices(final HaxeObject inHandler)
    {
+      Log.e(TAG,"cancelDiscovery..");
+      sBluetoothAdapter.cancelDiscovery();
+
+      final int recScanId = ++sScanId;
+      Log.e(TAG,"scanDevices.." + recScanId );
       postDevices(inHandler, SCANNING , null );
 
       final ArrayList<String> scannedDevices = new ArrayList<String>();
+      sDeviceMap = new HashMap<String,BluetoothDevice>();
 
       final BroadcastReceiver[] receiverRef = new BroadcastReceiver [1];
       final Activity activity = GameActivity.getInstance().getActivity();
@@ -141,22 +155,17 @@ static void scanDevices(final HaxeObject inHandler)
       final BroadcastReceiver receiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
+            if (isInitialStickyBroadcast())
+            {
+               Log.e(TAG,"onReceive isInitialStickyBroadcast");
+               return;
+            }
+
             String action = intent.getAction();
 
-            // When discovery finds a device
-            if (BluetoothDevice.ACTION_FOUND.equals(action)) {
-                // Get the BluetoothDevice object from the Intent
-                BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-                Log.e(TAG,"Found device " + device.getName() );
-                // If it's already paired, skip it
-                //if (device.getBondState() != BluetoothDevice.BOND_BONDED
-                    scannedDevices.add(device.getName());
-                sDeviceMap.put(device.getName(), device );
-            // When discovery is finished send the devices...
-            } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
-               Log.e(TAG,"Finished discovery");
-               String [] devices = scannedDevices.toArray(new String[scannedDevices.size()]);
-               postDevices(inHandler, devices.length==0 ? NO_PAIRED_DEVICES : BLUETOOTH_OK, devices );
+            if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action))
+            {
+               Log.e(TAG,"Finished discovery:" + recScanId + "/" + sScanId);
                if (receiverRef[0]!=null)
                {
                   Log.e(TAG,"unregisterReceiver");
@@ -164,13 +173,50 @@ public void onReceive(Context context, Intent intent) {
                   receiverRef[0] = null;
                }
             }
+
+            if (recScanId!=sScanId)
+            {
+               Log.e(TAG,"Overlapping scans?" + recScanId + "/" + sScanId);
+               return;
+            }
+            // When discovery finds a device
+            else if (BluetoothDevice.ACTION_FOUND.equals(action))
+            {
+                // Get the BluetoothDevice object from the Intent
+                BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                try
+                {
+                   JSONObject obj= new JSONObject();
+                   obj.put("name", device.getName() );
+                   obj.put("string", device.toString() );
+                   obj.put("address", device.getAddress() );
+                   obj.put("alias", device.getAlias() );
+                   obj.put("bondState", device.getBondState() );
+                   obj.put("type", device.getType() );
+                   Log.e(TAG,"Found device " + obj.toString() );
+                   // If it's already paired, skip it
+                   //if (device.getBondState() != BluetoothDevice.BOND_BONDED
+                   scannedDevices.add(obj.toString());
+                }
+                catch (JSONException e)
+                {
+                   Log.e(TAG, "Error in device serialization." + device.toString() );
+                }
+                sDeviceMap.put(device.getAddress(), device );
+            // When discovery is finished send the devices...
+            }
+            else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action))
+            {
+               Log.e(TAG,"Finished discovery - send");
+               String [] devices = scannedDevices.toArray(new String[scannedDevices.size()]);
+               postDevices(inHandler, devices.length==0 ? NO_PAIRED_DEVICES : BLUETOOTH_OK, devices );
+            }
          }
        };
        receiverRef[0] = receiver;
-
-       sBluetoothAdapter.cancelDiscovery();
  
        // Register for broadcasts when a device is discovered
+       Log.e(TAG,"registerReceiver..");
        IntentFilter filter = new IntentFilter(BluetoothDevice.ACTION_FOUND);
        activity.registerReceiver(receiver, filter);
 
@@ -186,12 +232,13 @@ public void onReceive(Context context, Intent intent) {
                 Log.e(TAG,"unregisterReceiver");
                 activity.unregisterReceiver(receiverRef[0]);
                 receiverRef[0] = null;
+                isScanning = false;
              }
           } } );
-    
-       // Unregister broadcast listeners
 
-       sBluetoothAdapter.startDiscovery();
+
+
+      sBluetoothAdapter.startDiscovery();
 
    }
 
@@ -219,15 +266,26 @@ static void sendDevices(HaxeObject inHandler)
       postDevices(inHandler, pairedDevices.size()==0 ? NO_PAIRED_DEVICES : BLUETOOTH_OK, result);
    }
 
-   public static void getDeviceListAsync(final HaxeObject inHandler,final boolean inFullScan)
+   static boolean getAdapter()
    {
-      if (sBluetoothAdapter==null)
-         sBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+      if (sBluetoothAdapter!=null)
+         return true;
 
-      if (sBluetoothAdapter==null)
+      Log.e(TAG,"Get adapter...");
+      GameActivity activity = GameActivity.getInstance();
+      BluetoothManager bluetoothManager = activity.getSystemService(BluetoothManager.class);
+      sBluetoothAdapter = bluetoothManager.getAdapter();
+      return sBluetoothAdapter!=null;
+   }
+
+   public static void getDeviceListAsync(final HaxeObject inHandler,final boolean inFullScan)
+   {
+      if (!getAdapter())
       {
-          postDevices(inHandler,NO_BLUETOOTH, null);
+         postDevices(inHandler,NO_BLUETOOTH, null);
+         return;
       }
+
       if (!sBluetoothAdapter.isEnabled())
       {
          Log.e(TAG,"Enable bluetooth...");
@@ -331,9 +389,8 @@ public int close()
 
    public static Bluetooth create(String inDeviceName)
    {
-      if (sBluetoothAdapter==null)
-         sBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-
+      if (!getAdapter())
+         return null;
       return new Bluetooth(inDeviceName);
    }
 
diff --git a/templates/android/java/org/haxe/nme/GameActivity.java b/templates/android/java/org/haxe/nme/GameActivity.java
index d32ff9afb..e74abaaec 100644
--- a/templates/android/java/org/haxe/nme/GameActivity.java
+++ b/templates/android/java/org/haxe/nme/GameActivity.java
@@ -49,6 +49,7 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.ArrayList;
+import java.util.Map;
 import org.haxe.nme.Value;
 import java.net.NetworkInterface;
 import java.net.InetAddress;
@@ -65,6 +66,15 @@
 import java.io.StringWriter;
 import java.io.PrintWriter;
 
+import androidx.core.content.ContextCompat;
+import android.content.pm.PackageManager;
+import androidx.activity.result.contract.ActivityResultContracts.RequestPermission;
+import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions;
+import androidx.activity.result.contract.ActivityResultContract;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.core.app.ActivityCompat;
+
+
 ::if NME_APPLOVIN_KEY::
 import com.applovin.sdk.AppLovinSdk;
 ::end::
@@ -699,6 +709,83 @@ public static GameActivity getInstance()
       return activity;
    }
 
+   // Register the permissions callback, which handles the user's response to the
+   // system permissions dialog. Save the return value, an instance of
+   // ActivityResultLauncher, as an instance variable.
+   HaxeObject pendingPermission = null;
+   public  ActivityResultLauncher<String> requestPermissionLauncher =
+       registerForActivityResult(new RequestPermission(), isGranted -> {
+          final HaxeObject cb = pendingPermission;
+          final String func = isGranted ? "onGrant" : "onDeny";
+          pendingPermission = null;
+          if (cb!=null)
+             mView.queueEvent(new Runnable() {
+             public void run() {
+                  cb.call0(func);
+               }
+            });
+    });
+
+   public  ActivityResultLauncher<String[]> requestMultiplePermissionLauncher =
+       registerForActivityResult(new RequestMultiplePermissions(), inResultMap -> {
+          final HaxeObject cb = pendingPermission;
+          final Map<String,Boolean> resultMap = inResultMap;
+          pendingPermission = null;
+          if (cb!=null)
+             mView.queueEvent(new Runnable() {
+             public void run() {
+               for(String permission : resultMap.keySet()) {
+                  cb.call1( resultMap.get(permission) ? "onGrant" : "onDeny", permission );
+                }
+               }
+            });
+    });
+
+
+
+   // Returns :
+   //   0 = Immediate accept
+   //   1 = Show UI with option to decline
+   //   2 = Make Request
+   public static int hasPermission(final String permission)
+   {
+      final GameActivity ga = activity;
+      Log.e(TAG,"CHECK:" +  permission );
+      if (ContextCompat.checkSelfPermission(ga, permission) == PackageManager.PERMISSION_GRANTED) {
+          // You can use the API that requires the permission.
+          return 0;
+      } else if (ActivityCompat.shouldShowRequestPermissionRationale(ga, permission)) {
+          // In an educational UI, explain to the user why your app requires this
+          // permission for a specific feature to behave as expected, and what
+          // features are disabled if it's declined. In this UI, include a
+          // "cancel" or "no thanks" button that lets the user continue
+          // using your app without granting the permission.
+          return 1;
+      } else {
+          return 2;
+      }
+   }
+
+   public static void requestPermission(final String permission, final HaxeObject inHandler)
+   {
+       final GameActivity ga = activity;
+       queueRunnable( new Runnable() { @Override public void run() {
+          // The registered ActivityResultCallback gets the result of this request.
+          ga.pendingPermission = inHandler;
+          ga.requestPermissionLauncher.launch(permission);
+       } });
+   }
+
+   public static void requestPermissions(final String permissions[], final HaxeObject inHandler)
+   {
+       final GameActivity ga = activity;
+       queueRunnable( new Runnable() { @Override public void run() {
+          // The registered ActivityResultCallback gets the result of this request.
+          ga.pendingPermission = inHandler;
+          ga.requestMultiplePermissionLauncher.launch(permissions);
+       } });
+   }
+
    ::if !ANDROIDVIEW::
    public Activity getActivity()
    {
diff --git a/templates/android/java/org/haxe/nme/MainView.java b/templates/android/java/org/haxe/nme/MainView.java
index 8e6820d6b..f144f0ab9 100644
--- a/templates/android/java/org/haxe/nme/MainView.java
+++ b/templates/android/java/org/haxe/nme/MainView.java
@@ -313,7 +313,6 @@ void queuePoll()
       }
    }
 
-
    // Called diectly by NME...
    static public void renderNow()
    {
diff --git a/tools/nme/src/platforms/EmscriptenPlatform.hx b/tools/nme/src/platforms/EmscriptenPlatform.hx
index aed5abdeb..5e4df9701 100644
--- a/tools/nme/src/platforms/EmscriptenPlatform.hx
+++ b/tools/nme/src/platforms/EmscriptenPlatform.hx
@@ -105,11 +105,12 @@ class EmscriptenPlatform extends DesktopPlatform
       {
          var server = new nme.net.http.Server(
             new nme.net.http.FileServer([FileSystem.fullPath(applicationDirectory) ],
-              new nme.net.http.StdioHandler(),
+              new nme.net.http.StdioHandler( Sys.println ),
                ).onRequest  );
 
          var port = 2323;
          server.listen(port);
+         trace("Serving :" + port);
          new nme.net.URLRequest('http://localhost:$port/index.html' ).launchBrowser();
 
          server.untilDeath();
diff --git a/tools/nme/src/project/AndroidPermission.hx b/tools/nme/src/project/AndroidPermission.hx
index 29c3d109b..86d1142b2 100644
--- a/tools/nme/src/project/AndroidPermission.hx
+++ b/tools/nme/src/project/AndroidPermission.hx
@@ -1,11 +1,24 @@
 class AndroidPermission
 {
-   var permission:String;
-   var required:String;
+   public var permission:String;
+   public var required:String;
+   public var maxSdkVersion:String;
+   public var usesPermissionFlags:String;
+   public var permissionXml:String;
 
-   public function new(inPermission:String, inRequired:String)
+   public function new(inPermission:String)
    {
       permission = inPermission;
-      required = inRequired!="" && inRequired!=null ? inRequired : "true";
+      required = "true";
+      maxSdkVersion = null;
+      usesPermissionFlags = null;
    }
+
+   public function update() { permissionXml = getXml(); }
+
+  public function getXml() {
+    var req = required!=null ? ' android:required="$required" ' : "";
+    var flag = usesPermissionFlags!=null ? ' android:usesPermissionFlags="$usesPermissionFlags" ' : "";
+    return '<uses-permission android:name="$permission" $req $flag />';
+ }
 }
diff --git a/tools/nme/src/project/NMEProject.hx b/tools/nme/src/project/NMEProject.hx
index c300ba3d2..d7fbc0d91 100644
--- a/tools/nme/src/project/NMEProject.hx
+++ b/tools/nme/src/project/NMEProject.hx
@@ -43,7 +43,7 @@ class AndroidConfig
       appFeature = [];
       viewPackageName = "com.nmehost";
       viewTestDir = "";
-      gameActivityBase = "Activity";
+      gameActivityBase = "androidx.activity.ComponentActivity";
       gameActivityViewBase = "android.app.Fragment";
       extensions = new Map<String,Bool>();
    }
diff --git a/tools/nme/src/project/NMMLParser.hx b/tools/nme/src/project/NMMLParser.hx
index 666541e31..976b6067e 100644
--- a/tools/nme/src/project/NMMLParser.hx
+++ b/tools/nme/src/project/NMMLParser.hx
@@ -547,8 +547,16 @@ class NMMLParser
                   project.androidConfig.appActivity.push(value);
 
                case "appPermission":
-                  project.androidConfig.appPermission.push(
-                      new AndroidPermission(value, childElement.has.required ? substitute(childElement.att.required) : "") );
+                  var permission = new AndroidPermission(value);
+                  if (childElement.has.required)
+                      permission.required = substitute(childElement.att.required);
+                  if (childElement.has.maxSdkVersion)
+                      permission.maxSdkVersion = substitute(childElement.att.maxSdkVersion);
+                  if (childElement.has.usesPermissionFlags)
+                      permission.usesPermissionFlags = substitute(childElement.att.usesPermissionFlags);
+                  permission.update();
+
+                  project.androidConfig.appPermission.push(permission);
 
                case "appFeature":
                   project.androidConfig.appFeature.push(