diff --git a/app/build.gradle b/app/build.gradle
index 969e97e7a..794fb472d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,35 +55,34 @@ android {
 }
 
 dependencies {
-    //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
+    //debugImplementation libs.square.leakcanary
 
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'com.google.android.material:material:1.6.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation libs.androidx.appcompat
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.legacySupport
+    implementation libs.androidx.multidex
+    implementation libs.androidx.navigation.fragment
+    implementation libs.androidx.navigation.ui
+    implementation libs.androidx.preference
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation libs.androidx.test.junit
+    androidTestImplementation libs.androidx.test.espressoCore
 
-    implementation 'com.squareup.picasso:picasso:2.8'
-    implementation 'de.hdodenhof:circleimageview:3.1.0'
-    implementation 'com.google.android.exoplayer:exoplayer:2.17.1'
-    implementation 'com.google.android.exoplayer:extension-mediasession:2.17.1'
-    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation libs.circleimageview
 
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-jackson:2.9.0'
-    //do not update jackson annotations! it does not supports <api26
-    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.13.3'
+    implementation libs.material
+    implementation libs.exoplayer
+    implementation(libs.exoplayer.extension.cronet) { exclude group: 'com.google.android.gms' }
+    implementation libs.exoplayer.extension.mediasession
 
-    implementation 'com.arthenica:ffmpeg-kit-min:4.5.1.LTS'
+    implementation libs.square.picasso
+    implementation libs.square.retrofit
+    implementation libs.square.retrofit.converterJackson
+    // Do not update jackson annotations! It does not supports < API 26.
+    implementation libs.jacksonAnnotations
 
+    implementation libs.mobileffmpeg
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
-    implementation('com.google.android.exoplayer:extension-cronet:2.17.1') { exclude group: 'com.google.android.gms' }
-    implementation 'org.chromium.net:cronet-embedded:101.4951.41'
-
+    coreLibraryDesugaring libs.desugaring
+    implementation libs.cronet.embedded
 }
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 23bfac0cf..9d2859ea8 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -31,19 +31,19 @@
     <string name="defres">Videon oletustarkkuus</string>
     <string name="grid">Valitse ruudukon sarakkeet</string>
     <string name="app_theme">Sovelluksen teema</string>
-    <string name="success">Onnistui!</string>
+    <string name="success">Onnistui.</string>
     <string name="about">Tietoja</string>
     <string name="choose_quality_dialog">Valitse laatu:</string>
     <string name="share">Jaa</string>
     <string name="customInstance">Lisää mukautettu instanssi</string>
     <string name="subscribeIsEmpty">Tilaa ensin joitakin kanavia.</string>
-    <string name="dlisinprogress">Toinen lataus on jo käynnissä, odota kunnes se on valmis.</string>
+    <string name="dlisinprogress">Odota kunnes kaikki lataukset ovat valmiita.</string>
     <string name="cannotDownload">Ei voi ladata tätä videota.</string>
     <string name="vlc">Avaa VLC:ssä</string>
     <string name="unknown_error">Verkkovirhe.</string>
     <string name="import_from_yt">Tuo tilaukset YouTubesta</string>
     <string name="error">Jokin meni pieleen.</string>
-    <string name="playlistCreated">Soittolista luotu!</string>
+    <string name="playlistCreated">Soittolista luotu.</string>
     <string name="emptyList">Täällä ei ole mitään.</string>
     <string name="deletePlaylist">Poista soittolista</string>
     <string name="areYouSure">Haluatko varmasti poistaa tämän soittolistan\?</string>
@@ -57,11 +57,11 @@
     <string name="subscriptions">Tilaukset</string>
     <string name="library">Kirjasto</string>
     <string name="videos">Videot</string>
-    <string name="changeLanguage">Vaihda kieltä</string>
+    <string name="changeLanguage">Kieli</string>
     <string name="systemLanguage">Järjestelmän kieli</string>
-    <string name="darkTheme">Tumma teema</string>
+    <string name="darkTheme">Tumma</string>
     <string name="systemDefault">Järjestelmän oletusarvo</string>
-    <string name="lightTheme">Vaalea teema</string>
+    <string name="lightTheme">Vaalea</string>
     <string name="subscribers">%1$s tilaajaa</string>
     <string name="comments">Kommentit</string>
     <string name="noInternet">Ei Internet-yhteyttä</string>
@@ -104,4 +104,13 @@
     <string name="appearance_summary">Tee sovelluksesta haluamasi näköinen.</string>
     <string name="advanced">Edistynyt</string>
     <string name="live">Live</string>
+    <string name="music_playlists">YT Musiikki Soittolistat</string>
+    <string name="segment_skipped">Ohitettu segmentti</string>
+    <string name="category_sponsor">Sponsori</string>
+    <string name="category_selfpromo">Ei maksettu/itsensä mainostaminen</string>
+    <string name="category_segments">Segmentit</string>
+    <string name="category_intro">Väliaika/Intro animaatio</string>
+    <string name="sponsorblock_state">Päällä</string>
+    <string name="category_selfpromo_description">Samankaltainen kuin \"sponsori\" lukuunottamatta ei maksettua tai itsensä mainostamista. Tämä sisältää osiot, jotka sisältävät kauppatavaraa, lahjoituksia tai tietoa keiden kanssa he tekivät yhteistyötä.</string>
+    <string name="category_interaction">Vuorovaikutus muistutus (tykkäys ja tilaus)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 9c2da0098..76d7d574c 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -142,7 +142,7 @@
     <string name="playback_speed">기본 재생 속도</string>
     <string name="advanced">고급</string>
     <string name="player">오디오 및 비디오</string>
-    <string name="advanced_summary">플레이어, 다운로드, 기록</string>
+    <string name="advanced_summary">다운로드, 기록</string>
     <string name="live">실시간</string>
     <string name="download_folder">이름</string>
     <string name="sdcard">SD 카드</string>
@@ -175,7 +175,7 @@
     <string name="buffering_goal_summary">최대 버퍼링할 비디오의 시간(초)입니다.</string>
     <string name="playerVideoFormat">플레이어의 비디오 형식</string>
     <string name="buffering_goal">사전 로딩</string>
-    <string name="legacyIcon">레거시</string>
+    <string name="legacyIcon">잃어버린 레거시</string>
     <string name="torchIcon">세련된 등불</string>
     <string name="fireIcon">멋진 불</string>
     <string name="category_filler">사족/농담</string>
@@ -199,4 +199,5 @@
     <string name="pauseOnScreenOff">자동 일시중지</string>
     <string name="pauseOnScreenOff_summary">화면이 꺼질 경우 동영상 재생을 일시중지합니다.</string>
     <string name="clonePlaylist">재생목록 복제</string>
+    <string name="instance_frontend_url">인스턴스 프론트엔드에 대한 URL</string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 0a229bb5e..719afea14 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,8 @@
+//plugins {
+  //  id 'com.android.application' apply false version '7.2.1'
+    //id 'org.jetbrains.kotlin.android' apply false version '1.7.0'
+//}
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
@@ -15,4 +20,4 @@ buildscript {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
\ No newline at end of file
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 000000000..63fc52d9e
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,43 @@
+[versions]
+appcompat = "1.4.1"
+constraintlayout = "2.1.3"
+material = "1.6.0"
+navigation = "2.4.2"
+legacySupport = "1.0.0"
+preference = "1.2.0"
+extJunit = "1.1.3"
+espresso = "3.4.0"
+picasso = "2.8"
+circleimageview = "3.1.0"
+exoplayer = "2.17.1"
+multidex = "2.0.1"
+retrofit = "2.9.0"
+jacksonAnnotations = "2.13.3"
+mobileffmpeg = "4.5.1.LTS"
+desugaring = "1.1.5"
+cronetEmbedded = "101.4951.41"
+leakcanary = "2.8.1"
+
+[libraries]
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigation" }
+androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigation" }
+androidx-legacySupport = { group = "androidx.legacy", name = "legacy-support-v4", version.ref = "legacySupport" }
+androidx-preference = { group = "androidx.preference", name = "preference-ktx", version.ref = "preference" }
+androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "extJunit" }
+androidx-test-espressoCore = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
+square-picasso = { group = "com.squareup.picasso", name = "picasso", version.ref = "picasso" }
+circleimageview = { group = "de.hdodenhof", name = "circleimageview", version.ref = "circleimageview" }
+exoplayer = { group = "com.google.android.exoplayer", name = "exoplayer", version.ref = "exoplayer" }
+exoplayer-extension-mediasession = { group = "com.google.android.exoplayer", name = "extension-mediasession", version.ref = "exoplayer" }
+androidx-multidex = { group = "androidx.multidex", name = "multidex", version.ref = "multidex" }
+square-retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
+square-retrofit-converterJackson = { group = "com.squareup.retrofit2", name = "converter-jackson", version.ref = "retrofit" }
+jacksonAnnotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version.ref = "jacksonAnnotations" }
+mobileffmpeg = { group = "com.arthenica", name = "ffmpeg-kit-min", version.ref = "mobileffmpeg" }
+desugaring = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugaring" }
+exoplayer-extension-cronet = { group = "com.google.android.exoplayer", name = "extension-cronet", version.ref = "exoplayer" }
+cronet-embedded = { group = "org.chromium.net", name = "cronet-embedded", version.ref = "cronetEmbedded" }
+square-leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "leakcanary" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dbfa5e60e..2a99b6d35 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Dec 09 16:25:51 GST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index be6d8ccca..8ef48f67a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,11 @@
+//pluginManagement {
+  //  repositories {
+        //gradlePluginPortal()
+      //  google()
+    //    mavenCentral()
+  //  }
+//}
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
@@ -5,5 +13,6 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
+
 rootProject.name = "LibreTube"
 include ':app'