diff --git a/app/build.gradle b/app/build.gradle
index f1f0258d..6f9d89ce 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ apply plugin: "com.google.firebase.crashlytics"
 android {
     namespace "info.dvkr.screenstream"
     compileSdkVersion(33)
-    buildToolsVersion("33.0.0")
+    buildToolsVersion("33.0.1")
 
     defaultConfig {
         applicationId = "info.dvkr.screenstream"
@@ -93,7 +93,7 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.0")
 
     implementation(project(":common"))
     implementation(project(":mjpeg"))
@@ -101,7 +101,7 @@ dependencies {
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.activity:activity-ktx:1.6.1")
     implementation("androidx.fragment:fragment-ktx:1.5.5")
-    implementation("androidx.appcompat:appcompat:1.6.0-rc01")
+    implementation("androidx.appcompat:appcompat:1.6.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.recyclerview:recyclerview:1.2.1")
     implementation("com.google.android.material:material:1.7.0")
diff --git a/build.gradle b/build.gradle
index 119f8de0..92f7cae5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools:r8:3.3.75")
-        classpath("com.android.tools.build:gradle:7.3.1")
+        classpath("com.android.tools.build:gradle:7.4.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.21")
         classpath("com.google.gms:google-services:4.3.14")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2")
diff --git a/common/build.gradle b/common/build.gradle
index 53ea61aa..3139a3a7 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -4,7 +4,7 @@ apply plugin: "kotlin-android"
 android {
     namespace "info.dvkr.screenstream.common"
     compileSdkVersion(33)
-    buildToolsVersion("33.0.0")
+    buildToolsVersion("33.0.1")
 
     defaultConfig {
         minSdkVersion(21)
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a..249e5832 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 388b1cbc..ae04661e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
\ No newline at end of file
diff --git a/gradlew b/gradlew
index 1b6c7873..a69d9cb6 100644
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32..f127cfd4 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/mjpeg/build.gradle b/mjpeg/build.gradle
index 688b0a25..3f0c6ba2 100644
--- a/mjpeg/build.gradle
+++ b/mjpeg/build.gradle
@@ -4,7 +4,7 @@ apply plugin: "kotlin-android"
 android {
     namespace "info.dvkr.screenstream.mjpeg"
     compileSdkVersion(33)
-    buildToolsVersion("33.0.0")
+    buildToolsVersion("33.0.1")
 
     defaultConfig {
         minSdkVersion(21)
@@ -37,6 +37,4 @@ dependencies {
     implementation("io.ktor:ktor-server-forwarded-header:2.2.2")
     implementation("io.ktor:ktor-server-status-pages:2.2.2")
     implementation("io.ktor:ktor-server-cors:2.2.2")
-
-    implementation("com.github.iamironz:binaryprefs:1.0.1") //Migrating to datastore
 }
\ No newline at end of file