diff --git a/flutter/Makefile b/flutter/Makefile
index a54bda6..67b2a5a 100644
--- a/flutter/Makefile
+++ b/flutter/Makefile
@@ -1,14 +1,22 @@
 
 
+# Setup
+#
+# flutter config --jdk-dir "/usr/lib/jvm/default-runtime/bin"
+# sudo archlinux-java set java-17-openjdk
+#
+
+
+
 run:
 	flutter pub run build_runner build
-	flutter run
+	_JAVA_OPTIONS="" flutter run
 	
 run-android:
 	ping -c1 10.10.10.177
 	adb connect 10.10.10.177:5555
 	flutter pub run build_runner build
-	flutter run -d 10.10.10.177:5555
+	_JAVA_OPTIONS="" flutter run -d 10.10.10.177:5555
 	
 test:
 	dart analyze
@@ -24,4 +32,8 @@ autoreload:
 	@_utils/autoreload.sh
 	
 icons:
-	flutter pub run flutter_launcher_icons -f "flutter_launcher_icons.yaml"
\ No newline at end of file
+	flutter pub run flutter_launcher_icons -f "flutter_launcher_icons.yaml"
+
+clean:
+	cd android && ./gradlew clean
+	flutter clean
\ No newline at end of file
diff --git a/flutter/android/app/build.gradle b/flutter/android/app/build.gradle
index 2130f2f..c41b2c7 100644
--- a/flutter/android/app/build.gradle
+++ b/flutter/android/app/build.gradle
@@ -38,12 +38,12 @@ android {
 
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     sourceSets {
diff --git a/flutter/android/gradle/wrapper/gradle-wrapper.properties b/flutter/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b9..774fae8 100644
--- a/flutter/android/gradle/wrapper/gradle-wrapper.properties
+++ b/flutter/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip