diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ec7b96c60..eccd4f385 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,186 +1,203 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.geeksville.mesh"
-    tools:ignore="GoogleAppIndexingWarning">
-    <!-- If a device is missing a GPS - we will still be able to work though , must be before uses-permission -->
-    <uses-feature
-        android:name="android.hardware.location"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.location.gps"
-        android:required="false" />
-    <!--
- TODO - wait for targetSdkVersion 31
-    &lt;!&ndash; Request legacy Bluetooth permissions on older devices &ndash;&gt;
-    <uses-permission android:name="android.permission.BLUETOOTH"
-        android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
-        android:maxSdkVersion="30" />
-
-    &lt;!&ndash; API 31+ Bluetooth permissions &ndash;&gt;
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"
-        android:usesPermissionFlags="neverForLocation" />
-    -->
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <!-- Permissions required for providing location (from phone GPS) to mesh -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- This permission is required for analytics - and soon the MQTT gateway -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <!--
-      This permission is optional but recommended so we can be smart
-      about when to send data.
-    -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!--
- Only for debug log writing, disable for production
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    -->
-    <!-- We run our mesh code as a foreground service - FIXME, find a way to stop doing this -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- Needed to open our bluetooth connection to our paired device (after reboot) -->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <!-- For android >=26 we can use the new BLE scanning API, which allows auto launching our service when our device is seen -->
-    <uses-permission android:name="android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND" />
-    <uses-permission android:name="android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND" /> <!-- Uart access -->
-    <!-- zxing library for QR Code scanning using camera -->
-    <uses-permission android:name="android.permission.CAMERA" />
-
-    <uses-feature
-        android:name="android.hardware.bluetooth_le"
-        android:required="false" /> <!-- For the modern BLE scanning API -->
-    <uses-feature
-        android:name="android.software.companion_device_setup"
-        android:required="false" /> <!-- for USB serial access -->
-    <uses-feature
-        android:name="android.hardware.usb.host"
-        android:required="false" />
-
-    <application
-        android:name=".MeshUtilApplication"
-        android:allowBackup="false"
-        android:hardwareAccelerated="true"
-        android:icon="@mipmap/ic_launcher2"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher2_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        tools:replace="android:icon">
-        <activity
-            android:name=".AppIntroduction"
-            android:label="Meshtastic">
-        <!--
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
-        -->
-        </activity>
-
-        <meta-data
-            android:name="com.mixpanel.android.MPConfig.DisableViewCrawler"
-            android:value="true" /> <!-- Default crash collection and analytics off until we (possibly) turn it on in application.onCreate -->
-        <meta-data
-            android:name="firebase_crashlytics_collection_enabled"
-            android:value="false" />
-        <meta-data
-            android:name="firebase_analytics_collection_enabled"
-            android:value="false" />
-        <meta-data
-            android:name="com.google.mlkit.vision.DEPENDENCIES"
-            android:value="barcode_ui" /> <!-- we need bind job service for oreo -->
-        <service
-            android:name=".service.SoftwareUpdateService"
-            android:enabled="true"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" /> <!-- This is the public API for doing mesh radio operations from android apps -->
-        <service
-            android:name=".service.MeshService"
-            android:enabled="true"
-            android:exported="true"
-            tools:ignore="ExportedActivity">
-            <intent-filter>
-                <action android:name="com.geeksville.mesh.Service" />
-            </intent-filter>
-        </service> <!-- zxing for QR Code scanning: lock portrait orientation -->
-        <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="portrait"
-            tools:replace="screenOrientation" />
-        <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:launchMode="singleInstance"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.App.Starting"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-
-                <!--
-                The QR codes to share channel settings are shared as meshtastic URLS
-
-                an approximate example:
-                http://www.meshtastic.org/d/YXNkZnF3ZXJhc2RmcXdlcmFzZGZxd2Vy
-                -->
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="www.meshtastic.org"
-                    android:pathPrefix="/d/"
-                    android:scheme="https" />
-                <data
-                    android:host="www.meshtastic.org"
-                    android:pathPrefix="/D/"
-                    android:scheme="https" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
-            </intent-filter>
-
-            <!-- The USB devices we want to be informed about -->
-            <meta-data
-                android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
-                android:resource="@xml/device_filter" />
-        </activity>
-
-        <receiver
-            android:name=".service.BootCompleteReceiver"
-            android:exported="false">
-
-            <!-- handle boot events -->
-            <intent-filter>
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-                <!-- For HTC devices per https://stackoverflow.com/questions/20441308/boot-completed-not-working-android/46294732#46294732 -->
-                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
-
-                <!-- for testing -->
-                <action android:name="com.geeksville.mesh.SIM_BOOT" />
-            </intent-filter>
-
-            <!-- Also restart our service if the app gets upgraded -->
-            <intent-filter>
-                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-                <!--
-                I was using PACKAGE_REPLACED, but MY_PACKAGE_REPLACED is newer and seems cleaner
-                <data
-                    android:scheme="package"
-                    android:path="com.geeksville.mesh" />
-                -->
-            </intent-filter>
-        </receiver>
-
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.geeksville.mesh"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="GoogleAppIndexingWarning">
+
+    <!-- If a device is missing a GPS - we will still be able to work though , must be before uses-permission-->
+    <uses-feature
+        android:name="android.hardware.location"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.location.gps"
+        android:required="false" />
+
+    <!-- TODO - wait for targetSdkVersion 31
+        &lt;!&ndash; Request legacy Bluetooth permissions on older devices &ndash;&gt;
+        <uses-permission android:name="android.permission.BLUETOOTH"
+            android:maxSdkVersion="30" />
+        <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+            android:maxSdkVersion="30" />
+
+        &lt;!&ndash; API 31+ Bluetooth permissions &ndash;&gt;
+        <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+        <uses-permission android:name="android.permission.BLUETOOTH_SCAN"
+            android:usesPermissionFlags="neverForLocation" />
+    -->
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+    <!-- Permissions required for providing location (from phone GPS) to mesh -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+
+    <!-- This permission is required for analytics - and soon the MQTT gateway -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <!--
+      This permission is optional but recommended so we can be smart
+      about when to send data.
+     -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <!-- Only for debug log writing, disable for production
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    -->
+
+    <!-- We run our mesh code as a foreground service - FIXME, find a way to stop doing this -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
+    <!-- Needed to open our bluetooth connection to our paired device (after reboot) -->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+    <!-- For android >=26 we can use the new BLE scanning API, which allows auto launching our service when our device is seen -->
+    <uses-permission android:name="android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND" />
+    <uses-permission android:name="android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND" />
+
+    <!-- Uart access -->
+
+    <!-- zxing library for QR Code scanning using camera -->
+    <uses-permission android:name="android.permission.CAMERA" />
+
+    <uses-feature
+        android:name="android.hardware.bluetooth_le"
+        android:required="false" />
+
+    <!-- For the modern BLE scanning API -->
+    <uses-feature
+        android:name="android.software.companion_device_setup"
+        android:required="false" />
+
+    <!-- for USB serial access -->
+    <uses-feature
+        android:name="android.hardware.usb.host"
+        android:required="false" />
+
+    <!-- hardware acceleration is required for zxing barcode lib -->
+    <application
+        tools:replace="android:icon"
+        android:name="com.geeksville.mesh.MeshUtilApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher2"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher2_round"
+        android:supportsRtl="true"
+        android:hardwareAccelerated="true"
+        android:theme="@style/AppTheme">
+
+        <meta-data
+            android:name="com.mixpanel.android.MPConfig.DisableViewCrawler"
+            android:value="true" />
+
+        <!-- Default crash collection and analytics off until we (possibly) turn it on in application.onCreate -->
+        <meta-data
+            android:name="firebase_crashlytics_collection_enabled"
+            android:value="false" />
+        <meta-data
+            android:name="firebase_analytics_collection_enabled"
+            android:value="false" />
+        <meta-data
+            android:name="com.google.mlkit.vision.DEPENDENCIES"
+            android:value="barcode_ui"/>
+
+        <!-- we need bind job service for oreo -->
+        <service
+            android:name="com.geeksville.mesh.service.SoftwareUpdateService"
+            android:enabled="true"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+
+        <!-- This is the public API for doing mesh radio operations from android apps -->
+        <service
+            android:name="com.geeksville.mesh.service.MeshService"
+            android:enabled="true"
+            android:exported="true" tools:ignore="ExportedActivity">
+            <intent-filter>
+                <action android:name="com.geeksville.mesh.Service" />
+            </intent-filter>
+        </service>
+
+        <!-- This is a private service which just does direct communication to the radio -->
+        <service
+            android:name="com.geeksville.mesh.service.RadioInterfaceService"
+            android:enabled="true"
+            android:exported="false" />
+
+        <!-- zxing for QR Code scanning: lock portrait orientation -->
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="portrait"
+            tools:replace="screenOrientation" />
+
+        <activity
+            android:name="com.geeksville.mesh.MainActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateAlwaysHidden"
+            android:theme="@style/Theme.App.Starting"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <!-- The QR codes to share channel settings are shared as meshtastic URLS
+
+                an approximate example:
+                http://www.meshtastic.org/d/YXNkZnF3ZXJhc2RmcXdlcmFzZGZxd2Vy
+                -->
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="https"
+                    android:host="www.meshtastic.org"
+                    android:pathPrefix="/d/" />
+                <data
+                    android:scheme="https"
+                    android:host="www.meshtastic.org"
+                    android:pathPrefix="/D/" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
+            </intent-filter>
+
+            <!-- The USB devices we want to be informed about -->
+            <meta-data
+                android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+                android:resource="@xml/device_filter" />
+        </activity>
+
+        <receiver android:name="com.geeksville.mesh.service.BootCompleteReceiver"
+            android:exported="false">
+            <!-- handle boot events -->
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+                <!--For HTC devices per https://stackoverflow.com/questions/20441308/boot-completed-not-working-android/46294732#46294732 -->
+                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
+
+                <!-- for testing -->
+                <action android:name="com.geeksville.mesh.SIM_BOOT" />
+            </intent-filter>
+
+            <!-- Also restart our service if the app gets upgraded -->
+            <intent-filter>
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+                <!-- I was using PACKAGE_REPLACED, but MY_PACKAGE_REPLACED is newer and seems cleaner
+                <data
+                    android:scheme="package"
+                    android:path="com.geeksville.mesh" /> -->
+            </intent-filter>
+        </receiver>
+    </application>
+
 </manifest>
\ No newline at end of file