diff --git a/android-filepicker b/android-filepicker
index cc063d829..2ca9a5a83 160000
--- a/android-filepicker
+++ b/android-filepicker
@@ -1 +1 @@
-Subproject commit cc063d829f29e2ab97033608d3126dfddd610644
+Subproject commit 2ca9a5a83eca2ddf3d87164643fdd53629b2c7ba
diff --git a/build.gradle b/build.gradle
index de5994ae5..5be85071f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
 
diff --git a/gradle.properties b/gradle.properties
index 3b70a938a..fc5c1627f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,4 +17,7 @@ android.enableJetifier=true
 # org.gradle.parallel=true
 kotlin.code.style=official
 kotlin.caching.enabled=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 #org.gradle.unsafe.configuration-cache=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cab423ccd..ddfbd57c4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
-distributionSha256Sum=97a52d145762adc241bad7fd18289bf7f6801e08ece6badf80402fe2b9f250b1
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01
diff --git a/tordnscrypt/build.gradle b/tordnscrypt/build.gradle
index 98f0a94c0..6bff5683e 100644
--- a/tordnscrypt/build.gradle
+++ b/tordnscrypt/build.gradle
@@ -7,6 +7,7 @@ plugins {
 android {
     compileSdkVersion 33
 
+    namespace 'pan.alexander.tordnscrypt'
 
     flavorDimensions "version", "processor"
 
@@ -81,8 +82,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
     }
     buildToolsVersion = '30.0.3'
 
@@ -131,7 +132,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
 }
@@ -145,7 +146,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.recyclerview:recyclerview:1.3.0'
     implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
@@ -156,7 +157,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     implementation 'eu.chainfire:libsuperuser:1.1.1'
     implementation 'com.jrummyapps:android-shell:1.0.1'
-    implementation 'androidx.core:core-ktx:1.10.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation project(':filepicker')
diff --git a/tordnscrypt/owner.gradle b/tordnscrypt/owner.gradle
index 2b60f5aee..ff5e66cc6 100644
--- a/tordnscrypt/owner.gradle
+++ b/tordnscrypt/owner.gradle
@@ -11,6 +11,7 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 android {
     compileSdkVersion 33
 
+    namespace 'pan.alexander.tordnscrypt'
 
     flavorDimensions "version", "processor"
 
@@ -123,8 +124,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
     }
     buildToolsVersion = '30.0.3'
 
@@ -171,7 +172,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
 }
@@ -187,7 +188,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.recyclerview:recyclerview:1.3.0'
     implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
@@ -199,7 +200,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     implementation 'eu.chainfire:libsuperuser:1.1.1'
     implementation 'com.jrummyapps:android-shell:1.0.1'
-    implementation 'androidx.core:core-ktx:1.10.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
     implementation project(':filepicker')
 
diff --git a/tordnscrypt/src/fdroid/AndroidManifest.xml b/tordnscrypt/src/fdroid/AndroidManifest.xml
index 95a04e9fd..c31bffa3e 100644
--- a/tordnscrypt/src/fdroid/AndroidManifest.xml
+++ b/tordnscrypt/src/fdroid/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?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="pan.alexander.tordnscrypt"
     android:installLocation="internalOnly"
     android:targetSandboxVersion="1"
     tools:targetApi="o">
diff --git a/tordnscrypt/src/google_play/AndroidManifest.xml b/tordnscrypt/src/google_play/AndroidManifest.xml
index 0ce742379..262b97683 100644
--- a/tordnscrypt/src/google_play/AndroidManifest.xml
+++ b/tordnscrypt/src/google_play/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?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="pan.alexander.tordnscrypt"
     android:installLocation="internalOnly"
     android:targetSandboxVersion="1"
     tools:targetApi="o">
diff --git a/tordnscrypt/src/main/AndroidManifest.xml b/tordnscrypt/src/main/AndroidManifest.xml
index 75e295826..dfe076e4f 100644
--- a/tordnscrypt/src/main/AndroidManifest.xml
+++ b/tordnscrypt/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?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="pan.alexander.tordnscrypt"
     android:installLocation="internalOnly"
     android:targetSandboxVersion="1"
     tools:targetApi="o">