diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
new file mode 100644
index 00000000..03fbb423
--- /dev/null
+++ b/.github/workflows/android.yml
@@ -0,0 +1,43 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: set up JDK 11
+      uses: actions/setup-java@v4
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Build with Gradle
+      run: ./gradlew build
+
+    # Upload artifacts so they are available from the run
+    - name: Upload APK(s)
+      uses: actions/upload-artifact@v4
+      with:
+        name: app-apks
+        path: app/build/outputs/apk/**/*.apk
+        # optional: set retention days (default retention configured in repo/org settings)
+        retention-days: 30
+
+    - name: Upload full build directory (optional)
+      uses: actions/upload-artifact@v4
+      with:
+        name: gradle-build
+        path: app/build
+        retention-days: 30
diff --git a/app/build.gradle b/app/build.gradle
index 3950a8c3..ccbe2dee 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,10 @@
 apply plugin: 'com.android.application'
 android {
-    compileSdkVersion 22
-    buildToolsVersion '29.0.3'
-    lintOptions {
-        disable "ExpiredTargetSdkVersion"
-    }
+    compileSdkVersion 36
     defaultConfig {
         applicationId "com.holokenmod"
-        minSdkVersion 8
-        targetSdkVersion 22
+        minSdkVersion 24
+        targetSdkVersion 36
     }
 
     buildTypes {
@@ -17,6 +13,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    namespace 'com.holokenmod'
+    lint {
+        disable 'ExpiredTargetSdkVersion'
+    }
 }
 repositories {
     google()
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5722d68a..5a561bb8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.holokenmod"
     android:versionCode="21"
     android:versionName="1.6.1" android:installLocation="auto">
     <!--
@@ -16,7 +15,8 @@
         >
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b4b02860..53205f33 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,6 +4,7 @@
     android:id="@+id/container"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical"
     tools:context=".MainActivity">
 
diff --git a/app/src/main/res/layout/activity_savegame.xml b/app/src/main/res/layout/activity_savegame.xml
index e848219e..4d4c058b 100644
--- a/app/src/main/res/layout/activity_savegame.xml
+++ b/app/src/main/res/layout/activity_savegame.xml
@@ -4,6 +4,7 @@
     android:id="@+id/saveGameContainer"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:background="#FFf3efe7"
     tools:context=".SaveGameListActivity" >
@@ -22,7 +23,7 @@
         <ImageButton android:id="@+id/discardbutton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/button_discard_light"/>
+                android:src="@drawable/button_discard_light"/>
     </LinearLayout>
    
     <LinearLayout android:layout_width="fill_parent"
diff --git a/app/src/main/res/layout/activity_stats.xml b/app/src/main/res/layout/activity_stats.xml
index c1a72951..5590cd07 100644
--- a/app/src/main/res/layout/activity_stats.xml
+++ b/app/src/main/res/layout/activity_stats.xml
@@ -4,6 +4,7 @@
         android:id="@+id/statsscroller"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        android:fitsSystemWindows="true"
         android:fillViewport="true"
         tools:context=".SettingsActivity" >
 
diff --git a/app/src/main/res/layout/dialog_about.xml b/app/src/main/res/layout/dialog_about.xml
index 84b9384f..e064992a 100644
--- a/app/src/main/res/layout/dialog_about.xml
+++ b/app/src/main/res/layout/dialog_about.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/about_layout" 
+    android:id="@+id/about_layout"
     android:orientation="vertical"
-    android:layout_width="fill_parent" 
+    android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:fitsSystemWindows="true"
     android:padding="10dp" >
     <LinearLayout
         android:orientation="vertical"
diff --git a/app/src/main/res/layout/dialog_help.xml b/app/src/main/res/layout/dialog_help.xml
index 2c0e2f06..1ece27f7 100644
--- a/app/src/main/res/layout/dialog_help.xml
+++ b/app/src/main/res/layout/dialog_help.xml
@@ -5,6 +5,7 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:fitsSystemWindows="true"
     android:padding="10dp" >
     <LinearLayout
         android:orientation="vertical"
diff --git a/app/src/main/res/layout/dialog_mode.xml b/app/src/main/res/layout/dialog_mode.xml
index 5345e8ee..435a7ff6 100644
--- a/app/src/main/res/layout/dialog_mode.xml
+++ b/app/src/main/res/layout/dialog_mode.xml
@@ -4,6 +4,7 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+    android:fitsSystemWindows="true"
     android:id="@+id/mode_layout"
     android:padding="8dp">
     
diff --git a/app/src/main/res/layout/object_savegame.xml b/app/src/main/res/layout/object_savegame.xml
index 06d35fc9..94049513 100644
--- a/app/src/main/res/layout/object_savegame.xml
+++ b/app/src/main/res/layout/object_savegame.xml
@@ -4,6 +4,7 @@
         android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
         android:background="#FFf3efe7">
     
     <com.holokenmod.GridView
diff --git a/build.gradle b/build.gradle
index 1008e89e..b2aa3580 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,13 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+repositories {
+    mavenCentral()
+}// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        jcenter()
         google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:8.13.0'
     }
 }
 
-allprojects {
-    repositories {
-        jcenter()
-    }
-}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..35f8397a
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 89e4ed4e..8698465c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Apr 03 14:47:23 EDT 2020
+#Mon Oct 20 16:28:47 PDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip