diff --git a/app/build.gradle b/app/build.gradle
index c7fb330..7bc6ae3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,16 +16,14 @@ android {
             keyPassword properties.getProperty("signing.key.password")
         }
     }
-    compileSdkVersion 31
-    buildToolsVersion "30.0.3"
+    compileSdk 31
 
     defaultConfig {
         applicationId "com.cyb3rko.techniklogger"
-        minSdkVersion 19
-        targetSdkVersion 31
+        minSdk 19
+        targetSdk 31
         versionCode 11
         versionName "2.0.0"
-        multiDexEnabled true
     }
 
     buildTypes {
@@ -36,7 +34,7 @@ android {
         release {
             signingConfig signingConfigs.signingconf
             minifyEnabled true
-            shrinkResources false
+            shrinkResources true
             manifestPlaceholders = [crashlyticsCollectionEnabled:"true"]
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -51,9 +49,6 @@ android {
     buildFeatures {
         viewBinding true
     }
-    packagingOptions {
-        pickFirst'META-INF/library_release.kotlin_module'
-    }
 }
 
 dependencies {
@@ -61,7 +56,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
     implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
diff --git a/build.gradle b/build.gradle
index a704421..1ba59a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.about_libraries_version = "8.3.0"
     repositories {
         google()
         jcenter()
diff --git a/gradle.properties b/gradle.properties
index 4d15d01..e2677d1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # 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=-Xmx2048m
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # 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
@@ -15,7 +15,11 @@ org.gradle.jvmargs=-Xmx2048m
 # 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
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a779203..d0cfe52 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Nov 06 23:24:33 CET 2020
 distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME