diff --git a/project/AndroidManifestTemplate.xml b/project/AndroidManifestTemplate.xml
index bf94d6f7f..d305f4440 100644
--- a/project/AndroidManifestTemplate.xml
+++ b/project/AndroidManifestTemplate.xml
@@ -11,6 +11,8 @@
 				 android:banner="@drawable/banner"
 				 android:isGame="true"
 				 android:extractNativeLibs="true"
+				 android:supportsRtl="true"
+				 android:theme="@style/AppTheme"
 	>
 		<activity android:name=".MainActivity"
 				  android:label="@string/app_name"
diff --git a/project/app/build-template.gradle b/project/app/build-template.gradle
index 0a071b1f3..cc9e820a9 100644
--- a/project/app/build-template.gradle
+++ b/project/app/build-template.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.0"
 
     defaultConfig {
         applicationId "net.olofson.ballfield"
@@ -21,3 +21,6 @@ android {
     dependencies { compile 'com.google.android.gms:play-services-drive:17.0.0' } // ==GOOGLEPLAYGAMESERVICES==
 }
 
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+}
diff --git a/project/build.gradle b/project/build.gradle
index 24bb03929..4758c963b 100644
--- a/project/build.gradle
+++ b/project/build.gradle
@@ -1,15 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-
     repositories {
         google()
         jcenter()
-
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
-
+        classpath "com.android.tools.build:gradle:4.0.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -20,7 +17,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-
     }
 }
 
diff --git a/project/gradle.properties b/project/gradle.properties
index 199d16ede..c52ac9b79 100644
--- a/project/gradle.properties
+++ b/project/gradle.properties
@@ -6,15 +6,14 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
+# Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
-
+android.enableJetifier=true
\ No newline at end of file
diff --git a/project/gradle/wrapper/gradle-wrapper.properties b/project/gradle/wrapper/gradle-wrapper.properties
index 30b240978..fa0e18631 100644
--- a/project/gradle/wrapper/gradle-wrapper.properties
+++ b/project/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Apr 16 21:28:37 EEST 2020
+#Tue Jul 07 20:59:38 EEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/project/res/layout-v28/notification.xml b/project/res/layout-v28/notification.xml
index 862653fb8..999447b01 100644
--- a/project/res/layout-v28/notification.xml
+++ b/project/res/layout-v28/notification.xml
@@ -29,6 +29,7 @@
 		android:layout_toRightOf="@id/notificationIcon"
 		android:id="@+id/notificationText"
 		android:text="App is running"
+		style="@style/TextAppearance.Compat.Notification.Title"
 		android:gravity="center_vertical"
 		android:clickable="true"
 		android:paddingLeft="10dp"
@@ -39,6 +40,7 @@
 		android:layout_height="fill_parent"
 		android:id="@+id/notificationStop"
 		android:text="@string/notification_stop"
+		style="@style/TextAppearance.Compat.Notification.Title"
 		android:gravity="center_vertical"
 		android:singleLine="true"
 		android:layout_alignParentRight="true"
diff --git a/project/res/values/styles.xml b/project/res/values/styles.xml
new file mode 100644
index 000000000..eacbf7ae7
--- /dev/null
+++ b/project/res/values/styles.xml
@@ -0,0 +1,4 @@
+<resources>
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight">
+    </style>
+</resources>