diff --git a/Software/Android/RoboRoach/build.gradle b/Software/Android/RoboRoach/build.gradle
index 7ff22eb..fff01e2 100644
--- a/Software/Android/RoboRoach/build.gradle
+++ b/Software/Android/RoboRoach/build.gradle
@@ -1,27 +1,25 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 29
     defaultConfig {
         applicationId 'com.backyardbrains.roboroach'
         minSdkVersion 18
-        targetSdkVersion 27
-        versionCode 5
-        versionName "1.2"
+        targetSdkVersion 29
+        versionCode 6
+        versionName "1.3"
     }
 }
 
 ext {
-    supportLibraryVersion = '27.0.2'
     easyPermissionsVersion = '1.1.3'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    // support library
-    implementation "com.android.support:support-compat:$supportLibraryVersion"
+    // androidx library
+    implementation 'androidx.core:core:1.3.2'
     // permissions
     implementation "pub.devrel:easypermissions:$easyPermissionsVersion"
-    implementation 'com.android.support:design:27.0.2'
+    implementation 'com.google.android.material:material:1.3.0'
 }
diff --git a/Software/Android/RoboRoach/src/main/AndroidManifest.xml b/Software/Android/RoboRoach/src/main/AndroidManifest.xml
index 6a9590a..1870a46 100644
--- a/Software/Android/RoboRoach/src/main/AndroidManifest.xml
+++ b/Software/Android/RoboRoach/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
         android:allowBackup="true"
diff --git a/Software/Android/RoboRoach/src/main/java/com/backyardbrains/roboroach/RoboRoachActivity.java b/Software/Android/RoboRoach/src/main/java/com/backyardbrains/roboroach/RoboRoachActivity.java
index e1afc2b..83c3b72 100644
--- a/Software/Android/RoboRoach/src/main/java/com/backyardbrains/roboroach/RoboRoachActivity.java
+++ b/Software/Android/RoboRoach/src/main/java/com/backyardbrains/roboroach/RoboRoachActivity.java
@@ -8,9 +8,6 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.GestureDetector;
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.Menu;
@@ -25,8 +22,15 @@
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ViewFlipper;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 import com.backyardbrains.roboroach.utils.BluetoothUtils;
+
 import java.util.List;
+
 import pub.devrel.easypermissions.AfterPermissionGranted;
 import pub.devrel.easypermissions.AppSettingsDialog;
 import pub.devrel.easypermissions.EasyPermissions;
@@ -567,10 +571,10 @@ private void bleMissing() {
     }
 
     @AfterPermissionGranted(REQUEST_CODE_ACCESS_COARSE_LOCATION_PERM) void checkLocation() {
-        if (!EasyPermissions.hasPermissions(this, Manifest.permission.ACCESS_COARSE_LOCATION)) {
+        if (!EasyPermissions.hasPermissions(this, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION)) {
             // Request the permission
             EasyPermissions.requestPermissions(this, getString(R.string.rationale_access_coarse_location),
-                REQUEST_CODE_ACCESS_COARSE_LOCATION_PERM, Manifest.permission.ACCESS_COARSE_LOCATION);
+                    REQUEST_CODE_ACCESS_COARSE_LOCATION_PERM, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION);
         }
     }
 
diff --git a/Software/Android/RoboRoach/src/main/java/com/backyardbrains/roboroach/utils/BluetoothUtils.java b/Software/Android/RoboRoach/src/main/java/com/backyardbrains/roboroach/utils/BluetoothUtils.java
index f528692..53af265 100644
--- a/Software/Android/RoboRoach/src/main/java/com/backyardbrains/roboroach/utils/BluetoothUtils.java
+++ b/Software/Android/RoboRoach/src/main/java/com/backyardbrains/roboroach/utils/BluetoothUtils.java
@@ -5,7 +5,8 @@
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 /**
  * @author Tihomir Leka <ticapeca at gmail.com.
diff --git a/Software/Android/RoboRoach/src/main/res/layout-land/roboroach_main.xml b/Software/Android/RoboRoach/src/main/res/layout-land/roboroach_main.xml
index 53808d6..85e5c75 100644
--- a/Software/Android/RoboRoach/src/main/res/layout-land/roboroach_main.xml
+++ b/Software/Android/RoboRoach/src/main/res/layout-land/roboroach_main.xml
@@ -1,31 +1,31 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="140dp"
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:text="@string/app_name"
                 android:textSize="22sp"
-                app:fontFamily="@font/comic_book"/>
-        </android.support.v7.widget.Toolbar>
-    </android.support.design.widget.AppBarLayout>
+                app:fontFamily="@font/comic_book" />
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <ViewFlipper
         android:id="@+id/viewFlipper"
@@ -38,10 +38,10 @@
             android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingBottom="@dimen/activity_vertical_margin"
             android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
             android:paddingTop="@dimen/activity_vertical_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingBottom="@dimen/activity_vertical_margin"
             tools:context="com.backyardbrains.roboroach.RoboRoachActivity"
             tools:ignore="MergeRootFrame">
 
@@ -51,7 +51,7 @@
                 android:layout_height="306dp"
                 android:layout_gravity="center"
                 android:src="@drawable/roach"
-                tools:ignore="ContentDescription"/>
+                tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/imageBackpack"
@@ -61,41 +61,41 @@
                 android:layout_marginTop="20dp"
                 android:src="@drawable/backpack"
                 android:visibility="invisible"
-                tools:ignore="ContentDescription"/>
+                tools:ignore="ContentDescription" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/textGoLeft"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
                 android:text="@string/rr_goleft"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                app:fontFamily="@font/comic_book"/>
+                app:fontFamily="@font/comic_book" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/textGoRight"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|center_vertical"
                 android:text="@string/rr_goright"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                app:fontFamily="@font/comic_book"/>
+                app:fontFamily="@font/comic_book" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/textConfig"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|center"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 app:fontFamily="@font/comic_book"
-                tools:text="RoboRoach configuration text"/>
+                tools:text="RoboRoach configuration text" />
         </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:baselineAligned="false">
+            android:baselineAligned="false"
+            android:orientation="horizontal">
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -120,13 +120,13 @@
                             android:layout_gravity="center_vertical"
                             android:layout_margin="10dp"
                             android:text="Gain"
-                            android:textAppearance="?android:attr/textAppearanceSmall"/>
+                            android:textAppearance="?android:attr/textAppearanceSmall" />
 
                         <SeekBar
                             android:id="@+id/sbGain"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"/>
+                            android:layout_weight="1" />
                     </TableRow>
 
                     <TableRow
@@ -140,13 +140,13 @@
                             android:layout_gravity="center_vertical"
                             android:layout_margin="10dp"
                             android:text="Duration"
-                            android:textAppearance="?android:attr/textAppearanceSmall"/>
+                            android:textAppearance="?android:attr/textAppearanceSmall" />
 
                         <SeekBar
                             android:id="@+id/sbDuration"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"/>
+                            android:layout_weight="1" />
                     </TableRow>
 
                     <TableRow
@@ -159,7 +159,7 @@
                             android:layout_height="wrap_content"
                             android:layout_margin="10dp"
                             android:text="Random Mode"
-                            android:textAppearance="?android:attr/textAppearanceSmall"/>
+                            android:textAppearance="?android:attr/textAppearanceSmall" />
                     </TableRow>
 
                     <TableRow
@@ -173,13 +173,13 @@
                             android:layout_gravity="center_vertical"
                             android:layout_margin="10dp"
                             android:text="Frequency"
-                            android:textAppearance="?android:attr/textAppearanceSmall"/>
+                            android:textAppearance="?android:attr/textAppearanceSmall" />
 
                         <SeekBar
                             android:id="@+id/sbFrequency"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"/>
+                            android:layout_weight="1" />
                     </TableRow>
 
                     <TableRow
@@ -193,13 +193,13 @@
                             android:layout_gravity="center_vertical"
                             android:layout_margin="10dp"
                             android:text="Pulse Width"
-                            android:textAppearance="?android:attr/textAppearanceSmall"/>
+                            android:textAppearance="?android:attr/textAppearanceSmall" />
 
                         <SeekBar
                             android:id="@+id/sbPulseWidth"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"/>
+                            android:layout_weight="1" />
                     </TableRow>
 
                     <TableRow
@@ -212,7 +212,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
                             android:layout_weight="1"
-                            android:text="OK"/>
+                            android:text="OK" />
                     </TableRow>
                 </LinearLayout>
             </RelativeLayout>
@@ -226,7 +226,7 @@
                     android:id="@+id/imageView"
                     android:layout_width="match_parent"
                     android:layout_height="150dp"
-                    tools:ignore="ContentDescription"/>
+                    tools:ignore="ContentDescription" />
             </RelativeLayout>
         </LinearLayout>
     </ViewFlipper>
diff --git a/Software/Android/RoboRoach/src/main/res/layout/roboroach_main.xml b/Software/Android/RoboRoach/src/main/res/layout/roboroach_main.xml
index 0af4e45..eb25922 100644
--- a/Software/Android/RoboRoach/src/main/res/layout/roboroach_main.xml
+++ b/Software/Android/RoboRoach/src/main/res/layout/roboroach_main.xml
@@ -1,35 +1,35 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="140dp"
                 android:layout_height="match_parent"
+                android:fontFamily="@font/comic_book"
                 android:gravity="center"
                 android:text="@string/app_name"
-                android:textSize="22sp"
-                android:fontFamily="@font/comic_book"/>
-        </android.support.v7.widget.Toolbar>
-    </android.support.design.widget.AppBarLayout>
+                android:textSize="22sp" />
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
         xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/viewFlipper"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -38,10 +38,10 @@
             android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingBottom="@dimen/activity_vertical_margin"
             android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
             android:paddingTop="@dimen/activity_vertical_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingBottom="@dimen/activity_vertical_margin"
             tools:context="com.backyardbrains.roboroach.RoboRoachActivity"
             tools:ignore="MergeRootFrame">
 
@@ -51,7 +51,7 @@
                 android:layout_height="306dp"
                 android:layout_gravity="center"
                 android:src="@drawable/roach"
-                tools:ignore="ContentDescription"/>
+                tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/imageBackpack"
@@ -61,34 +61,34 @@
                 android:layout_marginTop="20dp"
                 android:src="@drawable/backpack"
                 android:visibility="invisible"
-                tools:ignore="ContentDescription"/>
+                tools:ignore="ContentDescription" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/textGoLeft"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
                 android:text="@string/rr_goleft"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                app:fontFamily="@font/comic_book"/>
+                app:fontFamily="@font/comic_book" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/textGoRight"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|center_vertical"
                 android:text="@string/rr_goright"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                app:fontFamily="@font/comic_book"/>
+                app:fontFamily="@font/comic_book" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/textConfig"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|center"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 app:fontFamily="@font/comic_book"
-                tools:text="RoboRoach configuration text"/>
+                tools:text="RoboRoach configuration text" />
         </FrameLayout>
 
 
@@ -109,13 +109,13 @@
                     android:layout_gravity="center_vertical"
                     android:layout_margin="10dp"
                     android:text="Gain"
-                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <SeekBar
                     android:id="@+id/sbGain"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1" />
             </TableRow>
 
             <TableRow
@@ -129,13 +129,13 @@
                     android:layout_gravity="center_vertical"
                     android:layout_margin="10dp"
                     android:text="Duration"
-                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <SeekBar
                     android:id="@+id/sbDuration"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1" />
             </TableRow>
 
             <TableRow
@@ -148,7 +148,7 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="10dp"
                     android:text="Random Mode"
-                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
             </TableRow>
 
             <TableRow
@@ -162,13 +162,13 @@
                     android:layout_gravity="center_vertical"
                     android:layout_margin="10dp"
                     android:text="Frequency"
-                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <SeekBar
                     android:id="@+id/sbFrequency"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1" />
             </TableRow>
 
 
@@ -183,13 +183,13 @@
                     android:layout_gravity="center_vertical"
                     android:layout_margin="10dp"
                     android:text="Pulse Width"
-                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <SeekBar
                     android:id="@+id/sbPulseWidth"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1" />
             </TableRow>
 
 
@@ -203,7 +203,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:layout_weight="1"
-                    android:text="OK"/>
+                    android:text="OK" />
             </TableRow>
         </LinearLayout>
     </ViewFlipper>
diff --git a/Software/Android/RoboRoach/src/main/res/menu/control.xml b/Software/Android/RoboRoach/src/main/res/menu/control.xml
index bc5617c..9895b22 100644
--- a/Software/Android/RoboRoach/src/main/res/menu/control.xml
+++ b/Software/Android/RoboRoach/src/main/res/menu/control.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_settings"
-        android:title="Settings"
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_settings"
         android:orderInCategory="101"
-        android:showAsAction="ifRoom|withText"/>
+        android:title="Settings"
+        app:showAsAction="ifRoom|withText" />
 </menu>
\ No newline at end of file
diff --git a/Software/Android/build.gradle b/Software/Android/build.gradle
index 8297732..a3d6873 100644
--- a/Software/Android/build.gradle
+++ b/Software/Android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
     }
 }
 
diff --git a/Software/Android/gradle.properties b/Software/Android/gradle.properties
new file mode 100644
index 0000000..5465fec
--- /dev/null
+++ b/Software/Android/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/Software/Android/gradle/wrapper/gradle-wrapper.properties b/Software/Android/gradle/wrapper/gradle-wrapper.properties
index 6e5f358..67e7948 100644
--- a/Software/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/Software/Android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip