diff --git a/README.md b/README.md
index 2fb35c46c..b8127dd49 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,18 @@
 <div align="center">
   <img src="https://libre-tube.github.io/images/gh-banner.png" width="auto" height="auto" alt="LibreTube">
 
-[![GPL-v3](https://libre-tube.github.io/images/license-widget.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)
-[![Matrix](https://libre-tube.github.io/images/mat-widget.svg)](https://matrix.to/#/#LibreTube:matrix.org)
-[![Telegram](https://libre-tube.github.io/images/tg-widget.svg)](https://t.me/libretube)
-[![Twitter](https://libre-tube.github.io/images/tw-widget.svg)](https://twitter.com/libretube)
-[![Reddit](https://libre-tube.github.io/images/rd-widget.svg)](https://www.reddit.com/r/Libretube/)
-[![Discord](https://libre-tube.github.io/images/discord-widget.svg)](https://discord.gg/Qc34xCj2GV)
+[![GPL-v3](https://libre-tube.github.io/assets/widgets/license-widget.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)
+[![Matrix](https://libre-tube.github.io/assets/widgets/mat-widget.svg)](https://matrix.to/#/#LibreTube:matrix.org)
+[![Mastodon](https://libre-tube.github.io/assets/widgets/mast-widget.svg)](https://fosstodon.org/@libretube)
+[![Telegram](https://libre-tube.github.io/assets/widgets/tg-widget.svg)](https://t.me/libretube)
+[![Reddit](https://libre-tube.github.io/assets/widgets/rd-widget.svg)](https://www.reddit.com/r/Libretube/)
+[![Discord](https://libre-tube.github.io/assets/widgets/discord-widget.svg)](https://discord.gg/Qc34xCj2GV)
 
 </div><div align="center" style="width:100%; display:flex; justify-content:space-between;">
 
-[<img src="https://libre-tube.github.io/images/fdrload.png" alt="Get it on F-Droid" width="30%">](https://f-droid.org/en/packages/com.github.libretube/)
-[<img src="https://libre-tube.github.io/images/izzyload.png" alt="Get it on IzzyOnDroid" width="30%">](https://apt.izzysoft.de/fdroid/index/apk/com.github.libretube)<br/>
-[<img src="https://libre-tube.github.io/images/ghload.png" alt="Get it on GitHub" width="30%">](https://github.com/libre-tube/LibreTube/releases/latest)
+[<img src="https://libre-tube.github.io/assets/badges/fdrload.png" alt="Get it on F-Droid" width="30%">](https://f-droid.org/en/packages/com.github.libretube/)
+[<img src="https://libre-tube.github.io/assets/badges/izzyload.png" alt="Get it on IzzyOnDroid" width="30%">](https://apt.izzysoft.de/fdroid/index/apk/com.github.libretube)<br/>
+[<img src="https://libre-tube.github.io/assets/badges/ghload.png" alt="Get it on GitHub" width="30%">](https://github.com/libre-tube/LibreTube/releases/latest)
 
 </div>
 
diff --git a/app/build.gradle b/app/build.gradle
index c931cc13d..ff5d81a1a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,8 +46,6 @@ android {
         }
 
         debug {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             debuggable true
             applicationIdSuffix ".debug"
             resValue "string", "app_name", "LibreTube Debug"
@@ -127,4 +125,4 @@ dependencies {
 
 static def getUnixTime() {
     return Instant.now().getEpochSecond()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/libretube/LibreTubeApp.kt b/app/src/main/java/com/github/libretube/LibreTubeApp.kt
index 791d5771d..282d1f6c1 100644
--- a/app/src/main/java/com/github/libretube/LibreTubeApp.kt
+++ b/app/src/main/java/com/github/libretube/LibreTubeApp.kt
@@ -12,12 +12,12 @@ import com.github.libretube.constants.BACKGROUND_CHANNEL_ID
 import com.github.libretube.constants.DOWNLOAD_CHANNEL_ID
 import com.github.libretube.constants.PUSH_CHANNEL_ID
 import com.github.libretube.db.DatabaseHolder
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.NotificationHelper
+import com.github.libretube.helpers.PreferenceHelper
+import com.github.libretube.helpers.ProxyHelper
+import com.github.libretube.helpers.ShortcutHelper
 import com.github.libretube.util.ExceptionHandler
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.NotificationHelper
-import com.github.libretube.util.PreferenceHelper
-import com.github.libretube.util.ProxyHelper
-import com.github.libretube.util.ShortcutHelper
 
 class LibreTubeApp : Application() {
     override fun onCreate() {
diff --git a/app/src/main/java/com/github/libretube/api/PipedApi.kt b/app/src/main/java/com/github/libretube/api/PipedApi.kt
index 98e032389..c8fb8fdf7 100644
--- a/app/src/main/java/com/github/libretube/api/PipedApi.kt
+++ b/app/src/main/java/com/github/libretube/api/PipedApi.kt
@@ -109,7 +109,14 @@ interface PipedApi {
     suspend fun getFeed(@Query("authToken") token: String?): List<StreamItem>
 
     @GET("feed/unauthenticated")
-    suspend fun getUnauthenticatedFeed(@Query("channels") channels: String): List<StreamItem>
+    suspend fun getUnauthenticatedFeed(
+        @Query("channels") channels: String
+    ): List<StreamItem>
+
+    @POST("feed/unauthenticated")
+    suspend fun getUnauthenticatedFeed(
+        @Body channels: List<String>
+    ): List<StreamItem>
 
     @GET("subscribed")
     suspend fun isSubscribed(
@@ -121,7 +128,14 @@ interface PipedApi {
     suspend fun subscriptions(@Header("Authorization") token: String): List<Subscription>
 
     @GET("subscriptions/unauthenticated")
-    suspend fun unauthenticatedSubscriptions(@Query("channels") channels: String): List<Subscription>
+    suspend fun unauthenticatedSubscriptions(
+        @Query("channels") channels: String
+    ): List<Subscription>
+
+    @POST("subscriptions/unauthenticated")
+    suspend fun unauthenticatedSubscriptions(
+        @Body channels: List<String>
+    ): List<Subscription>
 
     @POST("subscribe")
     suspend fun subscribe(
diff --git a/app/src/main/java/com/github/libretube/api/PlaylistsHelper.kt b/app/src/main/java/com/github/libretube/api/PlaylistsHelper.kt
index 2930cbcf4..95579ed12 100644
--- a/app/src/main/java/com/github/libretube/api/PlaylistsHelper.kt
+++ b/app/src/main/java/com/github/libretube/api/PlaylistsHelper.kt
@@ -2,6 +2,7 @@ package com.github.libretube.api
 
 import android.content.Context
 import android.util.Log
+import androidx.core.text.isDigitsOnly
 import com.github.libretube.R
 import com.github.libretube.api.obj.Playlist
 import com.github.libretube.api.obj.PlaylistId
@@ -12,20 +13,17 @@ import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.db.obj.LocalPlaylist
 import com.github.libretube.enums.PlaylistType
 import com.github.libretube.extensions.TAG
-import com.github.libretube.extensions.awaitQuery
 import com.github.libretube.extensions.toID
 import com.github.libretube.extensions.toLocalPlaylistItem
 import com.github.libretube.extensions.toStreamItem
 import com.github.libretube.extensions.toastFromMainThread
+import com.github.libretube.helpers.PreferenceHelper
+import com.github.libretube.helpers.ProxyHelper
 import com.github.libretube.obj.ImportPlaylist
-import com.github.libretube.util.PreferenceHelper
-import com.github.libretube.util.ProxyHelper
 import java.io.IOException
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import retrofit2.HttpException
 
@@ -35,26 +33,22 @@ object PlaylistsHelper {
 
     private val token get() = PreferenceHelper.getToken()
 
-    val loggedIn: Boolean get() = token != ""
+    val loggedIn: Boolean get() = token.isNotEmpty()
 
-    suspend fun getPlaylists(): List<Playlists> {
-        if (loggedIn) return RetrofitInstance.authApi.getUserPlaylists(token)
-
-        val localPlaylists = awaitQuery {
+    suspend fun getPlaylists(): List<Playlists> = withContext(Dispatchers.IO) {
+        if (loggedIn) {
+            RetrofitInstance.authApi.getUserPlaylists(token)
+        } else {
             DatabaseHolder.Database.localPlaylistsDao().getAll()
+                .map {
+                    Playlists(
+                        id = it.playlist.id.toString(),
+                        name = it.playlist.name,
+                        thumbnail = ProxyHelper.rewriteUrl(it.playlist.thumbnailUrl),
+                        videos = it.videos.size.toLong()
+                    )
+                }
         }
-        val playlists = mutableListOf<Playlists>()
-        localPlaylists.forEach {
-            playlists.add(
-                Playlists(
-                    id = it.playlist.id.toString(),
-                    name = it.playlist.name,
-                    thumbnail = ProxyHelper.rewriteUrl(it.playlist.thumbnailUrl),
-                    videos = it.videos.size.toLong()
-                )
-            )
-        }
-        return playlists
     }
 
     suspend fun getPlaylist(playlistId: String): Playlist {
@@ -63,9 +57,8 @@ object PlaylistsHelper {
             PlaylistType.PRIVATE -> RetrofitInstance.authApi.getPlaylist(playlistId)
             PlaylistType.PUBLIC -> RetrofitInstance.api.getPlaylist(playlistId)
             PlaylistType.LOCAL -> {
-                val relation = awaitQuery {
-                    DatabaseHolder.Database.localPlaylistsDao().getAll()
-                }.first { it.playlist.id.toString() == playlistId }
+                val relation = DatabaseHolder.Database.localPlaylistsDao().getAll()
+                    .first { it.playlist.id.toString() == playlistId }
                 return Playlist(
                     name = relation.playlist.name,
                     thumbnailUrl = ProxyHelper.rewriteUrl(relation.playlist.thumbnailUrl),
@@ -76,38 +69,26 @@ object PlaylistsHelper {
         }
     }
 
-    suspend fun createPlaylist(
-        playlistName: String,
-        appContext: Context
-    ): String? {
+    suspend fun createPlaylist(playlistName: String, appContext: Context?): String? {
         if (!loggedIn) {
-            awaitQuery {
-                DatabaseHolder.Database.localPlaylistsDao().createPlaylist(
-                    LocalPlaylist(
-                        name = playlistName,
-                        thumbnailUrl = ""
-                    )
-                )
+            val playlist = LocalPlaylist(name = playlistName, thumbnailUrl = "")
+            DatabaseHolder.Database.localPlaylistsDao().createPlaylist(playlist)
+            return DatabaseHolder.Database.localPlaylistsDao().getAll()
+                .last().playlist.id.toString()
+        } else {
+            return try {
+                RetrofitInstance.authApi.createPlaylist(token, Playlists(name = playlistName))
+            } catch (e: IOException) {
+                appContext?.toastFromMainThread(R.string.unknown_error)
+                return null
+            } catch (e: HttpException) {
+                Log.e(TAG(), e.toString())
+                appContext?.toastFromMainThread(R.string.server_error)
+                return null
+            }.playlistId.also {
+                appContext?.toastFromMainThread(R.string.playlistCreated)
             }
-            return awaitQuery {
-                DatabaseHolder.Database.localPlaylistsDao().getAll()
-            }.last().playlist.id.toString()
         }
-        val response = try {
-            RetrofitInstance.authApi.createPlaylist(token, Playlists(name = playlistName))
-        } catch (e: IOException) {
-            appContext.toastFromMainThread(R.string.unknown_error)
-            return null
-        } catch (e: HttpException) {
-            Log.e(TAG(), e.toString())
-            appContext.toastFromMainThread(R.string.server_error)
-            return null
-        }
-        if (response.playlistId != null) {
-            appContext.toastFromMainThread(R.string.playlistCreated)
-            return response.playlistId
-        }
-        return null
     }
 
     suspend fun addToPlaylist(playlistId: String, vararg videos: StreamItem): Boolean {
@@ -117,22 +98,19 @@ object PlaylistsHelper {
 
             for (video in videos) {
                 val localPlaylistItem = video.toLocalPlaylistItem(playlistId)
-                awaitQuery {
-                    // avoid duplicated videos in a playlist
-                    DatabaseHolder.Database.localPlaylistsDao()
-                        .deletePlaylistItemsByVideoId(playlistId, localPlaylistItem.videoId)
+                // avoid duplicated videos in a playlist
+                DatabaseHolder.Database.localPlaylistsDao()
+                    .deletePlaylistItemsByVideoId(playlistId, localPlaylistItem.videoId)
 
-                    // add the new video to the database
-                    DatabaseHolder.Database.localPlaylistsDao().addPlaylistVideo(localPlaylistItem)
+                // add the new video to the database
+                DatabaseHolder.Database.localPlaylistsDao().addPlaylistVideo(localPlaylistItem)
 
-                    if (localPlaylist.playlist.thumbnailUrl == "") {
-                        // set the new playlist thumbnail URL
-                        localPlaylistItem.thumbnailUrl?.let {
-                            localPlaylist.playlist.thumbnailUrl = it
-                            DatabaseHolder.Database.localPlaylistsDao().updatePlaylist(
-                                localPlaylist.playlist
-                            )
-                        }
+                val playlist = localPlaylist.playlist
+                if (playlist.thumbnailUrl == "") {
+                    // set the new playlist thumbnail URL
+                    localPlaylistItem.thumbnailUrl?.let {
+                        playlist.thumbnailUrl = it
+                        DatabaseHolder.Database.localPlaylistsDao().updatePlaylist(playlist)
                     }
                 }
             }
@@ -144,89 +122,72 @@ object PlaylistsHelper {
     }
 
     suspend fun renamePlaylist(playlistId: String, newName: String): Boolean {
-        if (!loggedIn) {
-            val playlist = awaitQuery {
-                DatabaseHolder.Database.localPlaylistsDao().getAll()
-            }.first { it.playlist.id.toString() == playlistId }.playlist
+        return if (!loggedIn) {
+            val playlist = DatabaseHolder.Database.localPlaylistsDao().getAll()
+                .first { it.playlist.id.toString() == playlistId }.playlist
             playlist.name = newName
-            awaitQuery {
-                DatabaseHolder.Database.localPlaylistsDao().updatePlaylist(playlist)
-            }
-            return true
+            DatabaseHolder.Database.localPlaylistsDao().updatePlaylist(playlist)
+            true
+        } else {
+            val playlist = PlaylistId(playlistId, newName = newName)
+            RetrofitInstance.authApi.renamePlaylist(token, playlist).playlistId != null
         }
-
-        return RetrofitInstance.authApi.renamePlaylist(
-            token,
-            PlaylistId(playlistId, newName = newName)
-        ).playlistId != null
     }
 
-    suspend fun removeFromPlaylist(playlistId: String, index: Int) {
-        if (!loggedIn) {
-            val transaction = awaitQuery {
-                DatabaseHolder.Database.localPlaylistsDao().getAll()
-            }.first { it.playlist.id.toString() == playlistId }
-            awaitQuery {
-                DatabaseHolder.Database.localPlaylistsDao().removePlaylistVideo(
-                    transaction.videos[index]
-                )
-            }
-            if (transaction.videos.size > 1) {
-                if (index == 0) {
-                    transaction.videos[1].thumbnailUrl?.let {
-                        transaction.playlist.thumbnailUrl = it
-                    }
-                    awaitQuery {
-                        DatabaseHolder.Database.localPlaylistsDao().updatePlaylist(
-                            transaction.playlist
-                        )
-                    }
-                }
-                return
-            }
-            // remove thumbnail if playlist now empty
-            awaitQuery {
-                transaction.playlist.thumbnailUrl = ""
-                DatabaseHolder.Database.localPlaylistsDao().updatePlaylist(transaction.playlist)
-            }
-            return
-        }
-
-        RetrofitInstance.authApi.removeFromPlaylist(
-            PreferenceHelper.getToken(),
-            PlaylistId(
-                playlistId = playlistId,
-                index = index
+    suspend fun removeFromPlaylist(playlistId: String, index: Int): Boolean {
+        return if (!loggedIn) {
+            val transaction = DatabaseHolder.Database.localPlaylistsDao().getAll()
+                .first { it.playlist.id.toString() == playlistId }
+            DatabaseHolder.Database.localPlaylistsDao().removePlaylistVideo(
+                transaction.videos[index]
             )
-        )
+            // set a new playlist thumbnail if the first video got removed
+            if (index == 0) {
+                transaction.playlist.thumbnailUrl = transaction.videos.getOrNull(1)?.thumbnailUrl ?: ""
+            }
+            DatabaseHolder.Database.localPlaylistsDao().updatePlaylist(transaction.playlist)
+            true
+        } else {
+            RetrofitInstance.authApi.removeFromPlaylist(
+                PreferenceHelper.getToken(),
+                PlaylistId(playlistId = playlistId, index = index)
+            ).message == "ok"
+        }
     }
 
-    suspend fun importPlaylists(appContext: Context, playlists: List<ImportPlaylist>) {
-        for (playlist in playlists) {
-            val playlistId = createPlaylist(playlist.name!!, appContext) ?: continue
-            // if logged in, add the playlists by their ID via an api call
-            val success: Boolean = if (loggedIn) {
-                addToPlaylist(
-                    playlistId,
-                    *playlist.videos.map {
-                        StreamItem(url = it)
-                    }.toTypedArray()
-                )
-            } else {
-                // if not logged in, all video information needs to become fetched manually
-                try {
-                    val streamItems = playlist.videos.map {
-                        RetrofitInstance.api.getStreams(it).toStreamItem(it)
+    suspend fun importPlaylists(playlists: List<ImportPlaylist>) = withContext(Dispatchers.IO) {
+        playlists.map { playlist ->
+            val playlistId = createPlaylist(playlist.name!!, null)
+            async {
+                playlistId ?: return@async
+                // if logged in, add the playlists by their ID via an api call
+                if (loggedIn) {
+                    addToPlaylist(
+                        playlistId,
+                        *playlist.videos.map {
+                            StreamItem(url = it)
+                        }.toTypedArray()
+                    )
+                } else {
+                    // if not logged in, all video information needs to become fetched manually
+                    runCatching {
+                        val streamItems = playlist.videos.map {
+                            async {
+                                try {
+                                    RetrofitInstance.api.getStreams(it).toStreamItem(it)
+                                } catch (e: Exception) {
+                                    null
+                                }
+                            }
+                        }
+                            .awaitAll()
+                            .filterNotNull()
+
+                        addToPlaylist(playlistId, *streamItems.toTypedArray())
                     }
-                    addToPlaylist(playlistId, *streamItems.toTypedArray())
-                } catch (e: Exception) {
-                    false
                 }
             }
-            appContext.toastFromMainThread(
-                if (success) R.string.importsuccess else R.string.server_error
-            )
-        }
+        }.awaitAll()
     }
 
     suspend fun exportPlaylists(): List<ImportPlaylist> = withContext(Dispatchers.IO) {
@@ -241,49 +202,35 @@ object PlaylistsHelper {
             }
     }
 
-    fun clonePlaylist(context: Context, playlistId: String) {
+    suspend fun clonePlaylist(context: Context, playlistId: String): String? {
         val appContext = context.applicationContext
         if (!loggedIn) {
-            CoroutineScope(Dispatchers.IO).launch {
-                val playlist = try {
-                    RetrofitInstance.api.getPlaylist(playlistId)
-                } catch (e: Exception) {
-                    appContext.toastFromMainThread(R.string.server_error)
-                    return@launch
-                }
-                val newPlaylist = createPlaylist(playlist.name ?: "Unknown name", appContext)
-                newPlaylist ?: return@launch
-
-                addToPlaylist(newPlaylist, *playlist.relatedStreams.toTypedArray())
-
-                var nextPage = playlist.nextpage
-                while (nextPage != null) {
-                    nextPage = try {
-                        RetrofitInstance.api.getPlaylistNextPage(playlistId, nextPage).apply {
-                            addToPlaylist(newPlaylist, *relatedStreams.toTypedArray())
-                        }.nextpage
-                    } catch (e: Exception) {
-                        return@launch
-                    }
-                }
-            }
-            return
-        }
-
-        CoroutineScope(Dispatchers.IO).launch {
-            val response = try {
-                RetrofitInstance.authApi.clonePlaylist(
-                    token,
-                    PlaylistId(playlistId)
-                )
+            val playlist = try {
+                RetrofitInstance.api.getPlaylist(playlistId)
             } catch (e: Exception) {
-                Log.e(TAG(), e.toString())
-                return@launch
+                appContext.toastFromMainThread(R.string.server_error)
+                return null
             }
-            appContext?.toastFromMainThread(
-                if (response.playlistId != null) R.string.playlistCloned else R.string.server_error
-            )
+            val newPlaylist = createPlaylist(playlist.name ?: "Unknown name", appContext) ?: return null
+
+            addToPlaylist(newPlaylist, *playlist.relatedStreams.toTypedArray())
+
+            var nextPage = playlist.nextpage
+            while (nextPage != null) {
+                nextPage = try {
+                    RetrofitInstance.api.getPlaylistNextPage(playlistId, nextPage).apply {
+                        addToPlaylist(newPlaylist, *relatedStreams.toTypedArray())
+                    }.nextpage
+                } catch (e: Exception) {
+                    break
+                }
+            }
+            return playlistId
         }
+
+        return runCatching {
+            RetrofitInstance.authApi.clonePlaylist(token, PlaylistId(playlistId))
+        }.getOrNull()?.playlistId
     }
 
     fun getPrivatePlaylistType(): PlaylistType {
@@ -291,8 +238,12 @@ object PlaylistsHelper {
     }
 
     private fun getPrivatePlaylistType(playlistId: String): PlaylistType {
-        if (playlistId.all { it.isDigit() }) return PlaylistType.LOCAL
-        if (playlistId.matches(pipedPlaylistRegex)) return PlaylistType.PRIVATE
-        return PlaylistType.PUBLIC
+        return if (playlistId.isDigitsOnly()) {
+            PlaylistType.LOCAL
+        } else if (playlistId.matches(pipedPlaylistRegex)) {
+            PlaylistType.PRIVATE
+        } else {
+            PlaylistType.PUBLIC
+        }
     }
 }
diff --git a/app/src/main/java/com/github/libretube/api/RetrofitInstance.kt b/app/src/main/java/com/github/libretube/api/RetrofitInstance.kt
index 743280989..34e852e63 100644
--- a/app/src/main/java/com/github/libretube/api/RetrofitInstance.kt
+++ b/app/src/main/java/com/github/libretube/api/RetrofitInstance.kt
@@ -2,7 +2,7 @@ package com.github.libretube.api
 
 import com.github.libretube.constants.PIPED_API_URL
 import com.github.libretube.constants.PreferenceKeys
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import okhttp3.MediaType.Companion.toMediaType
 import retrofit2.Retrofit
diff --git a/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt b/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt
index 945020b7a..a54e8ffa4 100644
--- a/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt
+++ b/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt
@@ -10,13 +10,15 @@ import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.db.obj.LocalSubscription
 import com.github.libretube.extensions.TAG
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 
 object SubscriptionHelper {
+    private const val GET_SUBSCRIPTIONS_LIMIT = 100
+
     suspend fun subscribe(channelId: String) {
         val token = PreferenceHelper.getToken()
         if (token.isNotEmpty()) {
@@ -102,17 +104,20 @@ object SubscriptionHelper {
         }
     }
 
-    suspend fun getFormattedLocalSubscriptions(): String {
-        return Database.localSubscriptionDao().getAll()
-            .joinToString(",") { it.channelId }
-    }
-
     suspend fun getSubscriptions(): List<Subscription> {
         val token = PreferenceHelper.getToken()
         return if (token.isNotEmpty()) {
             RetrofitInstance.authApi.subscriptions(token)
         } else {
-            RetrofitInstance.authApi.unauthenticatedSubscriptions(getFormattedLocalSubscriptions())
+            val subscriptions = Database.localSubscriptionDao().getAll().map { it.channelId }
+            when {
+                subscriptions.size > GET_SUBSCRIPTIONS_LIMIT -> RetrofitInstance.authApi.unauthenticatedSubscriptions(
+                    subscriptions
+                )
+                else -> RetrofitInstance.authApi.unauthenticatedSubscriptions(
+                    subscriptions.joinToString(",")
+                )
+            }
         }
     }
 
@@ -121,7 +126,15 @@ object SubscriptionHelper {
         return if (token.isNotEmpty()) {
             RetrofitInstance.authApi.getFeed(token)
         } else {
-            RetrofitInstance.authApi.getUnauthenticatedFeed(getFormattedLocalSubscriptions())
+            val subscriptions = Database.localSubscriptionDao().getAll().map { it.channelId }
+            when {
+                subscriptions.size > GET_SUBSCRIPTIONS_LIMIT -> RetrofitInstance.authApi.getUnauthenticatedFeed(
+                    subscriptions
+                )
+                else -> RetrofitInstance.authApi.getUnauthenticatedFeed(
+                    subscriptions.joinToString(",")
+                )
+            }
         }
     }
 }
diff --git a/app/src/main/java/com/github/libretube/constants/Constants.kt b/app/src/main/java/com/github/libretube/constants/Constants.kt
index 0cb67f250..1b3d36c96 100644
--- a/app/src/main/java/com/github/libretube/constants/Constants.kt
+++ b/app/src/main/java/com/github/libretube/constants/Constants.kt
@@ -18,11 +18,11 @@ const val FAQ_URL = "https://libre-tube.github.io/#faq"
 /**
  * Social media links for the community fragment
  */
-const val TELEGRAM_URL = "https://t.me/libretube"
 const val MATRIX_URL = "https://matrix.to/#/#LibreTube:matrix.org"
+const val MASTODON_URL = "https://fosstodon.org/@libretube"
+const val TELEGRAM_URL = "https://t.me/libretube"
 const val DISCORD_URL = "https://discord.com/invite/Qc34xCj2GV"
 const val REDDIT_URL = "https://www.reddit.com/r/Libretube/"
-const val TWITTER_URL = "https://twitter.com/libretube"
 
 /**
  * Share Dialog
diff --git a/app/src/main/java/com/github/libretube/db/DatabaseHelper.kt b/app/src/main/java/com/github/libretube/db/DatabaseHelper.kt
index a71f51057..35b58768a 100644
--- a/app/src/main/java/com/github/libretube/db/DatabaseHelper.kt
+++ b/app/src/main/java/com/github/libretube/db/DatabaseHelper.kt
@@ -7,7 +7,7 @@ import com.github.libretube.db.obj.SearchHistoryItem
 import com.github.libretube.db.obj.WatchHistoryItem
 import com.github.libretube.extensions.query
 import com.github.libretube.extensions.toID
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 
 object DatabaseHelper {
     private const val MAX_SEARCH_HISTORY_SIZE = 20
diff --git a/app/src/main/java/com/github/libretube/db/dao/LocalPlaylistsDao.kt b/app/src/main/java/com/github/libretube/db/dao/LocalPlaylistsDao.kt
index f0eb47950..bba3429fe 100644
--- a/app/src/main/java/com/github/libretube/db/dao/LocalPlaylistsDao.kt
+++ b/app/src/main/java/com/github/libretube/db/dao/LocalPlaylistsDao.kt
@@ -14,29 +14,26 @@ import com.github.libretube.db.obj.LocalPlaylistWithVideos
 interface LocalPlaylistsDao {
     @Transaction
     @Query("SELECT * FROM LocalPlaylist")
-    fun getAll(): List<LocalPlaylistWithVideos>
+    suspend fun getAll(): List<LocalPlaylistWithVideos>
 
     @Insert
-    fun createPlaylist(playlist: LocalPlaylist)
+    suspend fun createPlaylist(playlist: LocalPlaylist)
 
     @Update
-    fun updatePlaylist(playlist: LocalPlaylist)
-
-    @Delete
-    fun deletePlaylist(playlist: LocalPlaylist)
+    suspend fun updatePlaylist(playlist: LocalPlaylist)
 
     @Query("DELETE FROM localPlaylist WHERE id = :playlistId")
-    fun deletePlaylistById(playlistId: String)
+    suspend fun deletePlaylistById(playlistId: String)
 
     @Insert
-    fun addPlaylistVideo(playlistVideo: LocalPlaylistItem)
+    suspend fun addPlaylistVideo(playlistVideo: LocalPlaylistItem)
 
     @Delete
-    fun removePlaylistVideo(playlistVideo: LocalPlaylistItem)
+    suspend fun removePlaylistVideo(playlistVideo: LocalPlaylistItem)
 
     @Query("DELETE FROM localPlaylistItem WHERE playlistId = :playlistId")
-    fun deletePlaylistItemsByPlaylistId(playlistId: String)
+    suspend fun deletePlaylistItemsByPlaylistId(playlistId: String)
 
     @Query("DELETE FROM localPlaylistItem WHERE playlistId = :playlistId AND videoId = :videoId")
-    fun deletePlaylistItemsByVideoId(playlistId: String, videoId: String)
+    suspend fun deletePlaylistItemsByVideoId(playlistId: String, videoId: String)
 }
diff --git a/app/src/main/java/com/github/libretube/extensions/ToStreamItem.kt b/app/src/main/java/com/github/libretube/extensions/ToStreamItem.kt
index 7f1e718b7..14b42969e 100644
--- a/app/src/main/java/com/github/libretube/extensions/ToStreamItem.kt
+++ b/app/src/main/java/com/github/libretube/extensions/ToStreamItem.kt
@@ -3,7 +3,7 @@ package com.github.libretube.extensions
 import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.api.obj.Streams
 import com.github.libretube.db.obj.LocalPlaylistItem
-import com.github.libretube.util.ProxyHelper
+import com.github.libretube.helpers.ProxyHelper
 
 fun Streams.toStreamItem(videoId: String): StreamItem {
     return StreamItem(
diff --git a/app/src/main/java/com/github/libretube/extensions/ToastFromMainThread.kt b/app/src/main/java/com/github/libretube/extensions/ToastFromMainThread.kt
index 2be369899..22d6337ab 100644
--- a/app/src/main/java/com/github/libretube/extensions/ToastFromMainThread.kt
+++ b/app/src/main/java/com/github/libretube/extensions/ToastFromMainThread.kt
@@ -4,6 +4,8 @@ import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import android.widget.Toast
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 fun Context.toastFromMainThread(text: String) {
     Handler(Looper.getMainLooper()).post {
@@ -18,3 +20,11 @@ fun Context.toastFromMainThread(text: String) {
 fun Context.toastFromMainThread(stringId: Int) {
     toastFromMainThread(getString(stringId))
 }
+
+suspend fun Context.toastFromMainDispatcher(text: String) = withContext(Dispatchers.Main) {
+    Toast.makeText(this@toastFromMainDispatcher, text, Toast.LENGTH_SHORT).show()
+}
+
+suspend fun Context.toastFromMainDispatcher(stringId: Int) {
+    toastFromMainDispatcher(getString(stringId))
+}
diff --git a/app/src/main/java/com/github/libretube/util/AudioHelper.kt b/app/src/main/java/com/github/libretube/helpers/AudioHelper.kt
similarity index 97%
rename from app/src/main/java/com/github/libretube/util/AudioHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/AudioHelper.kt
index 603933cd5..d373ac6b3 100644
--- a/app/src/main/java/com/github/libretube/util/AudioHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/AudioHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.content.Context
 import android.media.AudioManager
diff --git a/app/src/main/java/com/github/libretube/util/BackgroundHelper.kt b/app/src/main/java/com/github/libretube/helpers/BackgroundHelper.kt
similarity index 98%
rename from app/src/main/java/com/github/libretube/util/BackgroundHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/BackgroundHelper.kt
index 77ae845e8..662e29396 100644
--- a/app/src/main/java/com/github/libretube/util/BackgroundHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/BackgroundHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.app.ActivityManager
 import android.content.Context
diff --git a/app/src/main/java/com/github/libretube/util/BackupHelper.kt b/app/src/main/java/com/github/libretube/helpers/BackupHelper.kt
similarity index 52%
rename from app/src/main/java/com/github/libretube/util/BackupHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/BackupHelper.kt
index 21411cec4..b520066ff 100644
--- a/app/src/main/java/com/github/libretube/util/BackupHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/BackupHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.content.Context
 import android.net.Uri
@@ -11,8 +11,7 @@ import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.extensions.TAG
 import com.github.libretube.obj.BackupFile
 import com.github.libretube.obj.PreferenceItem
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runBlocking
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.booleanOrNull
 import kotlinx.serialization.json.decodeFromStream
 import kotlinx.serialization.json.encodeToStream
@@ -23,67 +22,63 @@ import kotlinx.serialization.json.longOrNull
 /**
  * Backup and restore the preferences
  */
-class BackupHelper(private val context: Context) {
+object BackupHelper {
     /**
      * Write a [BackupFile] containing the database content as well as the preferences
      */
-    fun createAdvancedBackup(uri: Uri?, backupFile: BackupFile) {
-        uri?.let {
-            try {
-                context.contentResolver.openOutputStream(it)?.use { outputStream ->
-                    JsonHelper.json.encodeToStream(backupFile, outputStream)
-                }
-            } catch (e: Exception) {
-                Log.e(TAG(), "Error while writing backup: $e")
+    @OptIn(ExperimentalSerializationApi::class)
+    fun createAdvancedBackup(context: Context, uri: Uri, backupFile: BackupFile) {
+        try {
+            context.contentResolver.openOutputStream(uri)?.use { outputStream ->
+                JsonHelper.json.encodeToStream(backupFile, outputStream)
             }
+        } catch (e: Exception) {
+            Log.e(TAG(), "Error while writing backup: $e")
         }
     }
 
     /**
      * Restore data from a [BackupFile]
      */
-    fun restoreAdvancedBackup(uri: Uri?) {
-        val backupFile = uri?.let {
-            context.contentResolver.openInputStream(it)?.use { inputStream ->
-                JsonHelper.json.decodeFromStream<BackupFile>(inputStream)
-            }
+    @OptIn(ExperimentalSerializationApi::class)
+    suspend fun restoreAdvancedBackup(context: Context, uri: Uri) {
+        val backupFile = context.contentResolver.openInputStream(uri)?.use {
+            JsonHelper.json.decodeFromStream<BackupFile>(it)
         } ?: return
 
-        runBlocking(Dispatchers.IO) {
-            Database.watchHistoryDao().insertAll(
-                *backupFile.watchHistory.orEmpty().toTypedArray()
-            )
-            Database.searchHistoryDao().insertAll(
-                *backupFile.searchHistory.orEmpty().toTypedArray()
-            )
-            Database.watchPositionDao().insertAll(
-                *backupFile.watchPositions.orEmpty().toTypedArray()
-            )
-            Database.localSubscriptionDao().insertAll(backupFile.localSubscriptions.orEmpty())
-            Database.customInstanceDao().insertAll(
-                *backupFile.customInstances.orEmpty().toTypedArray()
-            )
-            Database.playlistBookmarkDao().insertAll(
-                *backupFile.playlistBookmarks.orEmpty().toTypedArray()
-            )
+        Database.watchHistoryDao().insertAll(
+            *backupFile.watchHistory.orEmpty().toTypedArray()
+        )
+        Database.searchHistoryDao().insertAll(
+            *backupFile.searchHistory.orEmpty().toTypedArray()
+        )
+        Database.watchPositionDao().insertAll(
+            *backupFile.watchPositions.orEmpty().toTypedArray()
+        )
+        Database.localSubscriptionDao().insertAll(backupFile.localSubscriptions.orEmpty())
+        Database.customInstanceDao().insertAll(
+            *backupFile.customInstances.orEmpty().toTypedArray()
+        )
+        Database.playlistBookmarkDao().insertAll(
+            *backupFile.playlistBookmarks.orEmpty().toTypedArray()
+        )
 
-            backupFile.localPlaylists.orEmpty().forEach {
-                Database.localPlaylistsDao().createPlaylist(it.playlist)
-                val playlistId = Database.localPlaylistsDao().getAll().last().playlist.id
-                it.videos.forEach {
-                    it.playlistId = playlistId
-                    Database.localPlaylistsDao().addPlaylistVideo(it)
-                }
+        backupFile.localPlaylists.orEmpty().forEach {
+            Database.localPlaylistsDao().createPlaylist(it.playlist)
+            val playlistId = Database.localPlaylistsDao().getAll().last().playlist.id
+            it.videos.forEach {
+                it.playlistId = playlistId
+                Database.localPlaylistsDao().addPlaylistVideo(it)
             }
-
-            restorePreferences(backupFile.preferences)
         }
+
+        restorePreferences(context, backupFile.preferences)
     }
 
     /**
      * Restore the shared preferences from a backup file
      */
-    private fun restorePreferences(preferences: List<PreferenceItem>?) {
+    private fun restorePreferences(context: Context, preferences: List<PreferenceItem>?) {
         if (preferences == null) return
         PreferenceManager.getDefaultSharedPreferences(context).edit(commit = true) {
             // clear the previous settings
diff --git a/app/src/main/java/com/github/libretube/util/BrightnessHelper.kt b/app/src/main/java/com/github/libretube/helpers/BrightnessHelper.kt
similarity index 98%
rename from app/src/main/java/com/github/libretube/util/BrightnessHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/BrightnessHelper.kt
index 09b3ec427..f96a7b04c 100644
--- a/app/src/main/java/com/github/libretube/util/BrightnessHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/BrightnessHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.app.Activity
 import android.view.WindowManager
diff --git a/app/src/main/java/com/github/libretube/helpers/ClipboardHelper.kt b/app/src/main/java/com/github/libretube/helpers/ClipboardHelper.kt
new file mode 100644
index 000000000..fd20a9039
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/helpers/ClipboardHelper.kt
@@ -0,0 +1,14 @@
+package com.github.libretube.helpers
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import androidx.core.content.getSystemService
+import com.github.libretube.R
+
+object ClipboardHelper {
+    fun save(context: Context, text: String) {
+        val clip = ClipData.newPlainText(context.getString(R.string.copied), text)
+        context.getSystemService<ClipboardManager>()!!.setPrimaryClip(clip)
+    }
+}
diff --git a/app/src/main/java/com/github/libretube/util/DashHelper.kt b/app/src/main/java/com/github/libretube/helpers/DashHelper.kt
similarity index 99%
rename from app/src/main/java/com/github/libretube/util/DashHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/DashHelper.kt
index 2f44f07e5..f26d7e726 100644
--- a/app/src/main/java/com/github/libretube/util/DashHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/DashHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import com.github.libretube.api.obj.PipedStream
 import com.github.libretube.api.obj.Streams
diff --git a/app/src/main/java/com/github/libretube/util/DownloadHelper.kt b/app/src/main/java/com/github/libretube/helpers/DownloadHelper.kt
similarity index 98%
rename from app/src/main/java/com/github/libretube/util/DownloadHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/DownloadHelper.kt
index a9f513519..fcf315785 100644
--- a/app/src/main/java/com/github/libretube/util/DownloadHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/DownloadHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/com/github/libretube/util/ImageHelper.kt b/app/src/main/java/com/github/libretube/helpers/ImageHelper.kt
similarity index 97%
rename from app/src/main/java/com/github/libretube/util/ImageHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/ImageHelper.kt
index 31fc77438..a5151d44f 100644
--- a/app/src/main/java/com/github/libretube/util/ImageHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/ImageHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -13,6 +13,7 @@ import coil.request.CachePolicy
 import coil.request.ImageRequest
 import com.github.libretube.api.CronetHelper
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.util.DataSaverMode
 import java.io.File
 import java.io.FileOutputStream
 import okio.use
diff --git a/app/src/main/java/com/github/libretube/util/ImportHelper.kt b/app/src/main/java/com/github/libretube/helpers/ImportHelper.kt
similarity index 57%
rename from app/src/main/java/com/github/libretube/util/ImportHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/ImportHelper.kt
index 3163f341f..6674f1bf5 100644
--- a/app/src/main/java/com/github/libretube/util/ImportHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/ImportHelper.kt
@@ -1,60 +1,51 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.app.Activity
 import android.net.Uri
 import android.util.Log
-import android.widget.Toast
 import com.github.libretube.R
 import com.github.libretube.api.JsonHelper
 import com.github.libretube.api.PlaylistsHelper
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.SubscriptionHelper
+import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.extensions.TAG
-import com.github.libretube.extensions.toastFromMainThread
+import com.github.libretube.extensions.toastFromMainDispatcher
 import com.github.libretube.obj.ImportPlaylist
 import com.github.libretube.obj.ImportPlaylistFile
 import com.github.libretube.obj.NewPipeSubscription
 import com.github.libretube.obj.NewPipeSubscriptions
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.decodeFromStream
 import kotlinx.serialization.json.encodeToStream
 import okio.use
 
-class ImportHelper(
-    private val activity: Activity
-) {
+object ImportHelper {
     /**
      * Import subscriptions by a file uri
      */
-    fun importSubscriptions(uri: Uri?) {
-        if (uri == null) return
+    suspend fun importSubscriptions(activity: Activity, uri: Uri) {
         try {
-            val applicationContext = activity.applicationContext
-            val channels = getChannelsFromUri(uri)
-            CoroutineScope(Dispatchers.IO).launch {
-                SubscriptionHelper.importSubscriptions(channels)
-            }.invokeOnCompletion {
-                applicationContext.toastFromMainThread(R.string.importsuccess)
-            }
+            SubscriptionHelper.importSubscriptions(getChannelsFromUri(activity, uri))
+            activity.toastFromMainDispatcher(R.string.importsuccess)
         } catch (e: IllegalArgumentException) {
             Log.e(TAG(), e.toString())
-            activity.toastFromMainThread(
+            activity.toastFromMainDispatcher(
                 activity.getString(R.string.unsupported_file_format) +
                     " (${activity.contentResolver.getType(uri)})"
             )
         } catch (e: Exception) {
             Log.e(TAG(), e.toString())
-            Toast.makeText(activity, e.localizedMessage, Toast.LENGTH_SHORT).show()
+            e.localizedMessage?.let {
+                activity.toastFromMainDispatcher(it)
+            }
         }
     }
 
     /**
      * Get a list of channel IDs from a file [Uri]
      */
-    private fun getChannelsFromUri(uri: Uri): List<String> {
+    private fun getChannelsFromUri(activity: Activity, uri: Uri): List<String> {
         return when (val fileType = activity.contentResolver.getType(uri)) {
             "application/json", "application/*", "application/octet-stream" -> {
                 // NewPipe subscriptions format
@@ -82,36 +73,31 @@ class ImportHelper(
     /**
      * Write the text to the document
      */
-    fun exportSubscriptions(uri: Uri?) {
-        if (uri == null) return
-        runBlocking(Dispatchers.IO) {
-            val token = PreferenceHelper.getToken()
-            val subs = if (token.isNotEmpty()) {
-                RetrofitInstance.authApi.subscriptions(token)
-            } else {
-                RetrofitInstance.authApi.unauthenticatedSubscriptions(
-                    SubscriptionHelper.getFormattedLocalSubscriptions()
-                )
-            }
-            val newPipeChannels = subs.map {
-                NewPipeSubscription(it.name, 0, "https://www.youtube.com${it.url}")
-            }
-            val newPipeSubscriptions = NewPipeSubscriptions(subscriptions = newPipeChannels)
-
-            activity.contentResolver.openOutputStream(uri)?.use {
-                JsonHelper.json.encodeToStream(newPipeSubscriptions, it)
-            }
-
-            activity.toastFromMainThread(R.string.exportsuccess)
+    suspend fun exportSubscriptions(activity: Activity, uri: Uri) {
+        val token = PreferenceHelper.getToken()
+        val subs = if (token.isNotEmpty()) {
+            RetrofitInstance.authApi.subscriptions(token)
+        } else {
+            val subscriptions = Database.localSubscriptionDao().getAll().map { it.channelId }
+            RetrofitInstance.authApi.unauthenticatedSubscriptions(subscriptions)
         }
+        val newPipeChannels = subs.map {
+            NewPipeSubscription(it.name, 0, "https://www.youtube.com${it.url}")
+        }
+        val newPipeSubscriptions = NewPipeSubscriptions(subscriptions = newPipeChannels)
+
+        activity.contentResolver.openOutputStream(uri)?.use {
+            JsonHelper.json.encodeToStream(newPipeSubscriptions, it)
+        }
+
+        activity.toastFromMainDispatcher(R.string.exportsuccess)
     }
 
     /**
      * Import Playlists
      */
-    fun importPlaylists(uri: Uri?) {
-        if (uri == null) return
-
+    @OptIn(ExperimentalSerializationApi::class)
+    suspend fun importPlaylists(activity: Activity, uri: Uri) {
         val importPlaylists = mutableListOf<ImportPlaylist>()
 
         when (val fileType = activity.contentResolver.getType(uri)) {
@@ -136,20 +122,22 @@ class ImportHelper(
                 importPlaylists.addAll(playlistFile?.playlists.orEmpty())
             }
             else -> {
-                activity.applicationContext.toastFromMainThread("Unsupported file type $fileType")
+                activity.toastFromMainDispatcher("Unsupported file type $fileType")
                 return
             }
         }
 
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                PlaylistsHelper.importPlaylists(activity, importPlaylists)
-                activity.applicationContext.toastFromMainThread(R.string.success)
-            } catch (e: Exception) {
-                Log.e(TAG(), e.toString())
-                e.localizedMessage?.let {
-                    activity.applicationContext.toastFromMainThread(it)
-                }
+        // convert the YouTube URLs to videoIds
+        importPlaylists.forEach { playlist ->
+            playlist.videos = playlist.videos.map { it.takeLast(11) }
+        }
+        try {
+            PlaylistsHelper.importPlaylists(importPlaylists)
+            activity.toastFromMainDispatcher(R.string.success)
+        } catch (e: Exception) {
+            Log.e(TAG(), e.toString())
+            e.localizedMessage?.let {
+                activity.toastFromMainDispatcher(it)
             }
         }
     }
@@ -157,18 +145,14 @@ class ImportHelper(
     /**
      * Export Playlists
      */
-    fun exportPlaylists(uri: Uri?) {
-        if (uri == null) return
+    suspend fun exportPlaylists(activity: Activity, uri: Uri) {
+        val playlists = PlaylistsHelper.exportPlaylists()
+        val playlistFile = ImportPlaylistFile("Piped", 1, playlists)
 
-        runBlocking {
-            val playlists = PlaylistsHelper.exportPlaylists()
-            val playlistFile = ImportPlaylistFile("Piped", 1, playlists)
-
-            activity.contentResolver.openOutputStream(uri)?.use {
-                JsonHelper.json.encodeToStream(playlistFile, it)
-            }
-
-            activity.toastFromMainThread(R.string.exportsuccess)
+        activity.contentResolver.openOutputStream(uri)?.use {
+            JsonHelper.json.encodeToStream(playlistFile, it)
         }
+
+        activity.toastFromMainDispatcher(R.string.exportsuccess)
     }
 }
diff --git a/app/src/main/java/com/github/libretube/helpers/IntentHelper.kt b/app/src/main/java/com/github/libretube/helpers/IntentHelper.kt
new file mode 100644
index 000000000..0c3c3f095
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/helpers/IntentHelper.kt
@@ -0,0 +1,13 @@
+package com.github.libretube.helpers
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+
+object IntentHelper {
+    fun openLinkFromHref(context: Context, link: String) {
+        val uri = Uri.parse(link)
+        val launchIntent = Intent(Intent.ACTION_VIEW).setData(uri)
+        context.startActivity(launchIntent)
+    }
+}
diff --git a/app/src/main/java/com/github/libretube/util/LocaleHelper.kt b/app/src/main/java/com/github/libretube/helpers/LocaleHelper.kt
similarity index 98%
rename from app/src/main/java/com/github/libretube/util/LocaleHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/LocaleHelper.kt
index 9f28e1915..f6d65cd25 100644
--- a/app/src/main/java/com/github/libretube/util/LocaleHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/LocaleHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.content.Context
 import android.content.res.Configuration
diff --git a/app/src/main/java/com/github/libretube/util/NavBarHelper.kt b/app/src/main/java/com/github/libretube/helpers/NavBarHelper.kt
similarity index 99%
rename from app/src/main/java/com/github/libretube/util/NavBarHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/NavBarHelper.kt
index 4e7d61d96..e2788b5b3 100644
--- a/app/src/main/java/com/github/libretube/util/NavBarHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/NavBarHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.content.Context
 import android.util.Log
diff --git a/app/src/main/java/com/github/libretube/util/NavigationHelper.kt b/app/src/main/java/com/github/libretube/helpers/NavigationHelper.kt
similarity index 91%
rename from app/src/main/java/com/github/libretube/util/NavigationHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/NavigationHelper.kt
index 07d59eb33..794ef2e3a 100644
--- a/app/src/main/java/com/github/libretube/util/NavigationHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/NavigationHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.app.NotificationManager
 import android.content.Context
@@ -10,6 +10,8 @@ import android.os.Looper
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
 import androidx.core.os.postDelayed
+import androidx.fragment.app.commitNow
+import androidx.fragment.app.replace
 import com.github.libretube.R
 import com.github.libretube.constants.IntentData
 import com.github.libretube.constants.PreferenceKeys
@@ -90,17 +92,9 @@ object NavigationHelper {
         )
 
         val activity = context as AppCompatActivity
-        activity.supportFragmentManager.beginTransaction()
-            .remove(PlayerFragment())
-            .commit()
-        activity.supportFragmentManager.beginTransaction()
-            .replace(
-                R.id.container,
-                PlayerFragment().apply {
-                    arguments = bundle
-                }
-            )
-            .commitNow()
+        activity.supportFragmentManager.commitNow {
+            replace<PlayerFragment>(R.id.container, args = bundle)
+        }
     }
 
     fun navigatePlaylist(
diff --git a/app/src/main/java/com/github/libretube/util/NetworkHelper.kt b/app/src/main/java/com/github/libretube/helpers/NetworkHelper.kt
similarity index 97%
rename from app/src/main/java/com/github/libretube/util/NetworkHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/NetworkHelper.kt
index 757fc584c..8f303230e 100644
--- a/app/src/main/java/com/github/libretube/util/NetworkHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/NetworkHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.content.Context
 import android.net.ConnectivityManager
diff --git a/app/src/main/java/com/github/libretube/util/NotificationHelper.kt b/app/src/main/java/com/github/libretube/helpers/NotificationHelper.kt
similarity index 93%
rename from app/src/main/java/com/github/libretube/util/NotificationHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/NotificationHelper.kt
index 04dd98243..4d44b1e70 100644
--- a/app/src/main/java/com/github/libretube/util/NotificationHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/NotificationHelper.kt
@@ -1,10 +1,10 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.content.Context
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.NetworkType
-import androidx.work.PeriodicWorkRequest
+import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import com.github.libretube.constants.NOTIFICATION_WORK_NAME
 import com.github.libretube.constants.PreferenceKeys
@@ -56,8 +56,7 @@ object NotificationHelper {
             .build()
 
         // create the worker
-        val notificationWorker = PeriodicWorkRequest.Builder(
-            NotificationWorker::class.java,
+        val notificationWorker = PeriodicWorkRequestBuilder<NotificationWorker>(
             checkingFrequency,
             TimeUnit.MINUTES
         )
diff --git a/app/src/main/java/com/github/libretube/util/PlayerHelper.kt b/app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt
similarity index 99%
rename from app/src/main/java/com/github/libretube/util/PlayerHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt
index 91bf6b7b5..915bd7c40 100644
--- a/app/src/main/java/com/github/libretube/util/PlayerHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.app.Activity
 import android.app.PendingIntent
diff --git a/app/src/main/java/com/github/libretube/util/PreferenceHelper.kt b/app/src/main/java/com/github/libretube/helpers/PreferenceHelper.kt
similarity index 99%
rename from app/src/main/java/com/github/libretube/util/PreferenceHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/PreferenceHelper.kt
index d72174b5a..c3f54fb8a 100644
--- a/app/src/main/java/com/github/libretube/util/PreferenceHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/PreferenceHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.content.Context
 import android.content.SharedPreferences
diff --git a/app/src/main/java/com/github/libretube/util/ProxyHelper.kt b/app/src/main/java/com/github/libretube/helpers/ProxyHelper.kt
similarity index 97%
rename from app/src/main/java/com/github/libretube/util/ProxyHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/ProxyHelper.kt
index b91a354a5..a1f05117d 100644
--- a/app/src/main/java/com/github/libretube/util/ProxyHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/ProxyHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.constants.PreferenceKeys
diff --git a/app/src/main/java/com/github/libretube/util/ShortcutHelper.kt b/app/src/main/java/com/github/libretube/helpers/ShortcutHelper.kt
similarity index 97%
rename from app/src/main/java/com/github/libretube/util/ShortcutHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/ShortcutHelper.kt
index ea1b14279..5f66735bb 100644
--- a/app/src/main/java/com/github/libretube/util/ShortcutHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/ShortcutHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/com/github/libretube/util/ThemeHelper.kt b/app/src/main/java/com/github/libretube/helpers/ThemeHelper.kt
similarity index 99%
rename from app/src/main/java/com/github/libretube/util/ThemeHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/ThemeHelper.kt
index b75544bd8..1796966c8 100644
--- a/app/src/main/java/com/github/libretube/util/ThemeHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/ThemeHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.app.Activity
 import android.content.ComponentName
diff --git a/app/src/main/java/com/github/libretube/util/WindowHelper.kt b/app/src/main/java/com/github/libretube/helpers/WindowHelper.kt
similarity index 98%
rename from app/src/main/java/com/github/libretube/util/WindowHelper.kt
rename to app/src/main/java/com/github/libretube/helpers/WindowHelper.kt
index 3a36279d2..3220320c8 100644
--- a/app/src/main/java/com/github/libretube/util/WindowHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/WindowHelper.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.os.Build
 import android.view.WindowManager
diff --git a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
index d1413db69..01541746a 100644
--- a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
+++ b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
@@ -29,9 +29,9 @@ import com.github.libretube.extensions.awaitQuery
 import com.github.libretube.extensions.query
 import com.github.libretube.extensions.toID
 import com.github.libretube.extensions.toStreamItem
+import com.github.libretube.helpers.PlayerHelper
+import com.github.libretube.helpers.PlayerHelper.loadPlaybackParams
 import com.github.libretube.util.NowPlayingNotification
-import com.github.libretube.util.PlayerHelper
-import com.github.libretube.util.PlayerHelper.loadPlaybackParams
 import com.github.libretube.util.PlayingQueue
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
diff --git a/app/src/main/java/com/github/libretube/services/DownloadService.kt b/app/src/main/java/com/github/libretube/services/DownloadService.kt
index 64a75c03a..8f04bf6a6 100644
--- a/app/src/main/java/com/github/libretube/services/DownloadService.kt
+++ b/app/src/main/java/com/github/libretube/services/DownloadService.kt
@@ -25,14 +25,14 @@ import com.github.libretube.extensions.getContentLength
 import com.github.libretube.extensions.query
 import com.github.libretube.extensions.toDownloadItems
 import com.github.libretube.extensions.toastFromMainThread
+import com.github.libretube.helpers.DownloadHelper
+import com.github.libretube.helpers.DownloadHelper.getNotificationId
+import com.github.libretube.helpers.ImageHelper
 import com.github.libretube.obj.DownloadStatus
 import com.github.libretube.receivers.NotificationReceiver
 import com.github.libretube.receivers.NotificationReceiver.Companion.ACTION_DOWNLOAD_PAUSE
 import com.github.libretube.receivers.NotificationReceiver.Companion.ACTION_DOWNLOAD_RESUME
 import com.github.libretube.ui.activities.MainActivity
-import com.github.libretube.util.DownloadHelper
-import com.github.libretube.util.DownloadHelper.getNotificationId
-import com.github.libretube.util.ImageHelper
 import java.io.File
 import java.net.HttpURLConnection
 import java.net.SocketTimeoutException
diff --git a/app/src/main/java/com/github/libretube/services/UpdateService.kt b/app/src/main/java/com/github/libretube/services/UpdateService.kt
index ba836c593..9ed9be389 100644
--- a/app/src/main/java/com/github/libretube/services/UpdateService.kt
+++ b/app/src/main/java/com/github/libretube/services/UpdateService.kt
@@ -11,7 +11,7 @@ import android.os.Environment
 import android.os.IBinder
 import android.widget.Toast
 import com.github.libretube.R
-import com.github.libretube.util.DownloadHelper
+import com.github.libretube.helpers.DownloadHelper
 import java.io.File
 
 class UpdateService : Service() {
diff --git a/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt
index bc4cf4b13..c9e2aecc9 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt
@@ -1,10 +1,6 @@
 package com.github.libretube.ui.activities
 
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import androidx.core.text.HtmlCompat
@@ -16,7 +12,10 @@ import com.github.libretube.constants.PIPED_GITHUB_URL
 import com.github.libretube.constants.WEBLATE_URL
 import com.github.libretube.constants.WEBSITE_URL
 import com.github.libretube.databinding.ActivityAboutBinding
+import com.github.libretube.helpers.ClipboardHelper
+import com.github.libretube.helpers.IntentHelper
 import com.github.libretube.ui.base.BaseActivity
+import com.google.android.material.card.MaterialCardView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 
@@ -34,7 +33,7 @@ class AboutActivity : BaseActivity() {
         }
 
         binding.appIcon.setOnClickListener {
-            val sendIntent: Intent = Intent().apply {
+            val sendIntent = Intent().apply {
                 action = Intent.ACTION_SEND
                 putExtra(Intent.EXTRA_TEXT, GITHUB_URL)
                 type = "text/plain"
@@ -44,37 +43,10 @@ class AboutActivity : BaseActivity() {
             startActivity(shareIntent)
         }
 
-        binding.website.setOnClickListener {
-            openLinkFromHref(WEBSITE_URL)
-        }
-        binding.website.setOnLongClickListener {
-            onLongClick(WEBSITE_URL)
-            true
-        }
-
-        binding.piped.setOnClickListener {
-            openLinkFromHref(PIPED_GITHUB_URL)
-        }
-        binding.piped.setOnLongClickListener {
-            onLongClick(PIPED_GITHUB_URL)
-            true
-        }
-
-        binding.translate.setOnClickListener {
-            openLinkFromHref(WEBLATE_URL)
-        }
-        binding.translate.setOnLongClickListener {
-            onLongClick(WEBLATE_URL)
-            true
-        }
-
-        binding.github.setOnClickListener {
-            openLinkFromHref(GITHUB_URL)
-        }
-        binding.github.setOnLongClickListener {
-            onLongClick(GITHUB_URL)
-            true
-        }
+        setupCard(binding.website, WEBSITE_URL)
+        setupCard(binding.piped, PIPED_GITHUB_URL)
+        setupCard(binding.translate, WEBLATE_URL)
+        setupCard(binding.github, GITHUB_URL)
 
         binding.license.setOnClickListener {
             showLicense()
@@ -89,18 +61,19 @@ class AboutActivity : BaseActivity() {
         }
     }
 
-    private fun openLinkFromHref(link: String) {
-        val uri = Uri.parse(link)
-        val intent = Intent(Intent.ACTION_VIEW).setData(uri)
-        startActivity(intent)
+    private fun setupCard(card: MaterialCardView, link: String) {
+        card.setOnClickListener {
+            IntentHelper.openLinkFromHref(this, link)
+        }
+        card.setOnLongClickListener {
+            onLongClick(link)
+            true
+        }
     }
 
     private fun onLongClick(href: String) {
         // copy the link to the clipboard
-        val clipboard: ClipboardManager =
-            getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-        val clip = ClipData.newPlainText(getString(R.string.copied), href)
-        clipboard.setPrimaryClip(clip)
+        ClipboardHelper.save(this, href)
         // show the snackBar with open action
         Snackbar.make(
             binding.root,
@@ -108,7 +81,7 @@ class AboutActivity : BaseActivity() {
             Snackbar.LENGTH_LONG
         )
             .setAction(R.string.open_copied) {
-                openLinkFromHref(href)
+                IntentHelper.openLinkFromHref(this, href)
             }
             .setAnimationMode(Snackbar.ANIMATION_MODE_FADE)
             .show()
diff --git a/app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt
index 56fae56d2..bff219596 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt
@@ -1,16 +1,16 @@
 package com.github.libretube.ui.activities
 
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import com.github.libretube.constants.DISCORD_URL
 import com.github.libretube.constants.FAQ_URL
+import com.github.libretube.constants.MASTODON_URL
 import com.github.libretube.constants.MATRIX_URL
 import com.github.libretube.constants.REDDIT_URL
 import com.github.libretube.constants.TELEGRAM_URL
-import com.github.libretube.constants.TWITTER_URL
 import com.github.libretube.databinding.ActivityHelpBinding
+import com.github.libretube.helpers.IntentHelper
 import com.github.libretube.ui.base.BaseActivity
+import com.google.android.material.card.MaterialCardView
 
 class HelpActivity : BaseActivity() {
     private lateinit var binding: ActivityHelpBinding
@@ -25,34 +25,17 @@ class HelpActivity : BaseActivity() {
             onBackPressedDispatcher.onBackPressed()
         }
 
-        binding.faq.setOnClickListener {
-            openLinkFromHref(FAQ_URL)
-        }
-
-        binding.matrix.setOnClickListener {
-            openLinkFromHref(MATRIX_URL)
-        }
-
-        binding.telegram.setOnClickListener {
-            openLinkFromHref(TELEGRAM_URL)
-        }
-
-        binding.discord.setOnClickListener {
-            openLinkFromHref(DISCORD_URL)
-        }
-
-        binding.reddit.setOnClickListener {
-            openLinkFromHref(REDDIT_URL)
-        }
-
-        binding.twitter.setOnClickListener {
-            openLinkFromHref(TWITTER_URL)
-        }
+        setupCard(binding.faq, FAQ_URL)
+        setupCard(binding.matrix, MATRIX_URL)
+        setupCard(binding.mastodon, MASTODON_URL)
+        setupCard(binding.telegram, TELEGRAM_URL)
+        setupCard(binding.discord, DISCORD_URL)
+        setupCard(binding.reddit, REDDIT_URL)
     }
 
-    private fun openLinkFromHref(link: String) {
-        val uri = Uri.parse(link)
-        val intent = Intent(Intent.ACTION_VIEW).setData(uri)
-        startActivity(intent)
+    private fun setupCard(card: MaterialCardView, link: String) {
+        card.setOnClickListener {
+            IntentHelper.openLinkFromHref(this, link)
+        }
     }
 }
diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
index 05f4d25e5..5c13ab6ca 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
@@ -27,6 +27,12 @@ import com.github.libretube.constants.IntentData
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.ActivityMainBinding
 import com.github.libretube.extensions.toID
+import com.github.libretube.helpers.NavBarHelper
+import com.github.libretube.helpers.NavigationHelper
+import com.github.libretube.helpers.NetworkHelper
+import com.github.libretube.helpers.PreferenceHelper
+import com.github.libretube.helpers.ThemeHelper
+import com.github.libretube.helpers.WindowHelper
 import com.github.libretube.services.ClosingService
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.dialogs.ErrorDialog
@@ -36,12 +42,6 @@ import com.github.libretube.ui.models.PlayerViewModel
 import com.github.libretube.ui.models.SearchViewModel
 import com.github.libretube.ui.models.SubscriptionsViewModel
 import com.github.libretube.ui.tools.SleepTimer
-import com.github.libretube.util.NavBarHelper
-import com.github.libretube.util.NavigationHelper
-import com.github.libretube.util.NetworkHelper
-import com.github.libretube.util.PreferenceHelper
-import com.github.libretube.util.ThemeHelper
-import com.github.libretube.util.WindowHelper
 import com.google.android.material.elevation.SurfaceColors
 
 class MainActivity : BaseActivity() {
diff --git a/app/src/main/java/com/github/libretube/ui/activities/NoInternetActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/NoInternetActivity.kt
index 4ab4ce987..83a4580d5 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/NoInternetActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/NoInternetActivity.kt
@@ -4,12 +4,13 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.addCallback
 import androidx.fragment.app.commit
+import androidx.fragment.app.replace
 import com.github.libretube.R
 import com.github.libretube.databinding.ActivityNointernetBinding
+import com.github.libretube.helpers.NavigationHelper
+import com.github.libretube.helpers.NetworkHelper
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.fragments.DownloadsFragment
-import com.github.libretube.util.NavigationHelper
-import com.github.libretube.util.NetworkHelper
 import com.google.android.material.snackbar.Snackbar
 
 class NoInternetActivity : BaseActivity() {
@@ -33,10 +34,10 @@ class NoInternetActivity : BaseActivity() {
         }
 
         binding.downloads.setOnClickListener {
-            supportFragmentManager.beginTransaction()
-                .replace(R.id.noInternet_container, DownloadsFragment())
-                .addToBackStack(null)
-                .commit()
+            supportFragmentManager.commit {
+                replace<DownloadsFragment>(R.id.noInternet_container)
+                addToBackStack(null)
+            }
         }
 
         setContentView(binding.root)
diff --git a/app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt
index d56276ea0..04367ea19 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt
@@ -16,12 +16,12 @@ import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.enums.FileType
 import com.github.libretube.extensions.awaitQuery
 import com.github.libretube.extensions.updateParameters
+import com.github.libretube.helpers.PlayerHelper
+import com.github.libretube.helpers.PlayerHelper.loadPlaybackParams
+import com.github.libretube.helpers.WindowHelper
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.extensions.setAspectRatio
 import com.github.libretube.ui.models.PlayerViewModel
-import com.github.libretube.util.PlayerHelper
-import com.github.libretube.util.PlayerHelper.loadPlaybackParams
-import com.github.libretube.util.WindowHelper
 import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
diff --git a/app/src/main/java/com/github/libretube/ui/activities/RouterActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/RouterActivity.kt
index 1af65395b..a6d42a91f 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/RouterActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/RouterActivity.kt
@@ -7,8 +7,8 @@ import android.os.Bundle
 import android.util.Log
 import com.github.libretube.constants.IntentData
 import com.github.libretube.extensions.TAG
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.ui.base.BaseActivity
-import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.TextUtils
 
 class RouterActivity : BaseActivity() {
diff --git a/app/src/main/java/com/github/libretube/ui/activities/SettingsActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/SettingsActivity.kt
index 68d4605f4..d8eaa2e8f 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/SettingsActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/SettingsActivity.kt
@@ -24,10 +24,9 @@ class SettingsActivity : BaseActivity() {
         }
 
         if (savedInstanceState == null) {
-            supportFragmentManager
-                .beginTransaction()
-                .replace(R.id.settings, MainSettings())
-                .commit()
+            supportFragmentManager.commit {
+                replace<MainSettings>(R.id.settings)
+            }
         }
 
         // new way of dealing with back presses instead of onBackPressed()
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/BottomSheetAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/BottomSheetAdapter.kt
index f17ca2535..b58462ce4 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/BottomSheetAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/BottomSheetAdapter.kt
@@ -1,11 +1,11 @@
 package com.github.libretube.ui.adapters
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.databinding.BottomSheetItemBinding
 import com.github.libretube.obj.BottomSheetItem
+import com.github.libretube.ui.extensions.setDrawables
 import com.github.libretube.ui.viewholders.BottomSheetViewHolder
 
 class BottomSheetAdapter(
@@ -23,17 +23,12 @@ class BottomSheetAdapter(
 
     override fun onBindViewHolder(holder: BottomSheetViewHolder, position: Int) {
         val item = items[position]
-        holder.binding.apply {
+        holder.binding.root.apply {
             val current = item.getCurrent()
-            title.text =
-                if (current != null) "${item.title} ($current)" else item.title
-            if (item.drawable != null) {
-                drawable.setImageResource(item.drawable)
-            } else {
-                drawable.visibility = View.GONE
-            }
+            text = if (current != null) "${item.title} ($current)" else item.title
+            setDrawables(start = item.drawable)
 
-            root.setOnClickListener {
+            setOnClickListener {
                 item.onClick.invoke()
                 listener.invoke(position)
             }
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/ChaptersAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/ChaptersAdapter.kt
index 8b7f64a68..3dc32e5a2 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/ChaptersAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/ChaptersAdapter.kt
@@ -7,9 +7,9 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.api.obj.ChapterSegment
 import com.github.libretube.databinding.ChapterColumnBinding
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.ThemeHelper
 import com.github.libretube.ui.viewholders.ChaptersViewHolder
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.ThemeHelper
 import com.google.android.exoplayer2.ExoPlayer
 
 class ChaptersAdapter(
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt
index 1b4d75f6b..15301c038 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt
@@ -1,17 +1,19 @@
 package com.github.libretube.ui.adapters
 
 import android.annotation.SuppressLint
-import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.MarginLayoutParams
 import android.widget.Toast
 import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
+import androidx.fragment.app.replace
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.api.JsonHelper
@@ -19,13 +21,14 @@ import com.github.libretube.api.obj.Comment
 import com.github.libretube.constants.IntentData
 import com.github.libretube.databinding.CommentsRowBinding
 import com.github.libretube.extensions.formatShort
+import com.github.libretube.helpers.ClipboardHelper
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.NavigationHelper
+import com.github.libretube.helpers.ThemeHelper
 import com.github.libretube.ui.fragments.CommentsRepliesFragment
 import com.github.libretube.ui.viewholders.CommentsViewHolder
-import com.github.libretube.util.ClipboardHelper
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.TextUtils
-import com.github.libretube.util.ThemeHelper
+import kotlinx.serialization.encodeToString
 
 class CommentsAdapter(
     private val fragment: Fragment?,
@@ -65,7 +68,7 @@ class CommentsAdapter(
             if (comment.verified) verifiedImageView.visibility = View.VISIBLE
             if (comment.pinned) pinnedImageView.visibility = View.VISIBLE
             if (comment.hearted) heartedImageView.visibility = View.VISIBLE
-            if (comment.repliesPage != null) repliesAvailable.visibility = View.VISIBLE
+            if (comment.repliesPage != null) repliesCount.visibility = View.VISIBLE
             if (comment.replyCount > 0L) {
                 repliesCount.text = comment.replyCount.formatShort()
             }
@@ -77,7 +80,6 @@ class CommentsAdapter(
 
             if (isRepliesAdapter) {
                 repliesCount.visibility = View.GONE
-                repliesAvailable.visibility = View.GONE
 
                 // highlight the comment that is being replied to
                 if (comment == comments.firstOrNull()) {
@@ -87,31 +89,28 @@ class CommentsAdapter(
                     root.updatePadding(top = 20)
                     root.updateLayoutParams<MarginLayoutParams> { bottomMargin = 20 }
                 } else {
-                    root.background = AppCompatResources.getDrawable(root.context, R.drawable.rounded_ripple)
+                    root.background = AppCompatResources.getDrawable(
+                        root.context,
+                        R.drawable.rounded_ripple
+                    )
                 }
             }
 
             if (!isRepliesAdapter && comment.repliesPage != null) {
-                val repliesFragment = CommentsRepliesFragment().apply {
-                    arguments = Bundle().apply {
-                        putString(IntentData.videoId, videoId)
-                        putString(
-                            IntentData.comment,
-                            JsonHelper.json.encodeToString(Comment.serializer(), comment)
-                        )
-                    }
-                }
                 root.setOnClickListener {
-                    fragment!!.parentFragmentManager
-                        .beginTransaction()
-                        .replace(R.id.commentFragContainer, repliesFragment)
-                        .addToBackStack(null)
-                        .commit()
+                    val args = bundleOf(
+                        IntentData.videoId to videoId,
+                        IntentData.comment to JsonHelper.json.encodeToString(comment)
+                    )
+                    fragment!!.parentFragmentManager.commit {
+                        replace<CommentsRepliesFragment>(R.id.commentFragContainer, args = args)
+                        addToBackStack(null)
+                    }
                 }
             }
 
             root.setOnLongClickListener {
-                ClipboardHelper(root.context).save(comment.commentText ?: "")
+                ClipboardHelper.save(root.context, comment.commentText ?: "")
                 Toast.makeText(root.context, R.string.copied, Toast.LENGTH_SHORT).show()
                 true
             }
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt
index a61a25b07..df46893c3 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt
@@ -14,9 +14,9 @@ import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.db.obj.DownloadWithItems
 import com.github.libretube.extensions.formatAsFileSize
 import com.github.libretube.extensions.query
+import com.github.libretube.helpers.ImageHelper
 import com.github.libretube.ui.activities.OfflinePlayerActivity
 import com.github.libretube.ui.viewholders.DownloadsViewHolder
-import com.github.libretube.util.ImageHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.io.File
 
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/IconsSheetAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/IconsSheetAdapter.kt
index a1805b683..00daa1f59 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/IconsSheetAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/IconsSheetAdapter.kt
@@ -8,9 +8,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.AppIconItemBinding
+import com.github.libretube.helpers.PreferenceHelper
+import com.github.libretube.helpers.ThemeHelper
 import com.github.libretube.ui.viewholders.IconsSheetViewHolder
-import com.github.libretube.util.PreferenceHelper
-import com.github.libretube.util.ThemeHelper
 
 class IconsSheetAdapter : RecyclerView.Adapter<IconsSheetViewHolder>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): IconsSheetViewHolder {
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/LegacySubscriptionAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/LegacySubscriptionAdapter.kt
index d339f00ba..f4ecf65f7 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/LegacySubscriptionAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/LegacySubscriptionAdapter.kt
@@ -5,11 +5,11 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.databinding.LegacySubscriptionChannelBinding
 import com.github.libretube.extensions.toID
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.sheets.ChannelOptionsBottomSheet
 import com.github.libretube.ui.viewholders.LegacySubscriptionViewHolder
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.NavigationHelper
 
 class LegacySubscriptionAdapter(
     private val subscriptions: List<com.github.libretube.api.obj.Subscription>
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/PlayingQueueAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/PlayingQueueAdapter.kt
index d0875c073..dec3d6921 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/PlayingQueueAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/PlayingQueueAdapter.kt
@@ -8,10 +8,10 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.databinding.QueueRowBinding
 import com.github.libretube.extensions.toID
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.ThemeHelper
 import com.github.libretube.ui.viewholders.PlayingQueueViewHolder
-import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.PlayingQueue
-import com.github.libretube.util.ThemeHelper
 
 class PlayingQueueAdapter : RecyclerView.Adapter<PlayingQueueViewHolder>() {
 
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt
index 5fba1f429..93d331783 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt
@@ -13,13 +13,13 @@ import com.github.libretube.databinding.VideoRowBinding
 import com.github.libretube.enums.PlaylistType
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.toID
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.extensions.setFormattedDuration
 import com.github.libretube.ui.extensions.setWatchProgressLength
 import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
 import com.github.libretube.ui.viewholders.PlaylistViewHolder
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.NavigationHelper
 import java.io.IOException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -84,9 +84,7 @@ class PlaylistAdapter(
 
             if (!streamItem.uploaderUrl.isNullOrBlank()) {
                 channelContainer.setOnClickListener {
-                    streamItem.uploaderUrl?.toID()?.let {
-                        NavigationHelper.navigateChannel(root.context, it)
-                    }
+                    NavigationHelper.navigateChannel(root.context, streamItem.uploaderUrl.toID())
                 }
             }
 
@@ -96,7 +94,7 @@ class PlaylistAdapter(
                     removeFromPlaylist(root.context, position)
                 }
             }
-            watchProgress.setWatchProgressLength(videoId, streamItem.duration!!)
+            watchProgress.setWatchProgressLength(videoId, streamItem.duration)
         }
     }
 
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/PlaylistBookmarkAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/PlaylistBookmarkAdapter.kt
index 08863c48c..d96cf9703 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/PlaylistBookmarkAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/PlaylistBookmarkAdapter.kt
@@ -12,10 +12,10 @@ import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.db.obj.PlaylistBookmark
 import com.github.libretube.enums.PlaylistType
 import com.github.libretube.extensions.query
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet
 import com.github.libretube.ui.viewholders.PlaylistBookmarkViewHolder
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.NavigationHelper
 
 class PlaylistBookmarkAdapter(
     private val bookmarks: List<PlaylistBookmark>,
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/PlaylistsAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/PlaylistsAdapter.kt
index 4c4f4b7b6..2a650a922 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/PlaylistsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/PlaylistsAdapter.kt
@@ -7,12 +7,12 @@ import com.github.libretube.R
 import com.github.libretube.api.obj.Playlists
 import com.github.libretube.databinding.PlaylistsRowBinding
 import com.github.libretube.enums.PlaylistType
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.dialogs.DeletePlaylistDialog
 import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet
 import com.github.libretube.ui.viewholders.PlaylistsViewHolder
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.NavigationHelper
 
 class PlaylistsAdapter(
     private val playlists: MutableList<Playlists>,
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt
index c99229616..05f5f11f1 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt
@@ -4,7 +4,8 @@ import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
 import com.github.libretube.R
 import com.github.libretube.api.obj.ContentItem
 import com.github.libretube.databinding.ChannelRowBinding
@@ -13,6 +14,8 @@ import com.github.libretube.databinding.VideoRowBinding
 import com.github.libretube.enums.PlaylistType
 import com.github.libretube.extensions.formatShort
 import com.github.libretube.extensions.toID
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.extensions.setFormattedDuration
 import com.github.libretube.ui.extensions.setWatchProgressLength
@@ -21,25 +24,9 @@ import com.github.libretube.ui.sheets.ChannelOptionsBottomSheet
 import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet
 import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
 import com.github.libretube.ui.viewholders.SearchViewHolder
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.TextUtils
 
-class SearchAdapter(
-    private val searchItems: MutableList<ContentItem>
-) :
-    RecyclerView.Adapter<SearchViewHolder>() {
-
-    fun updateItems(newItems: List<ContentItem>) {
-        val searchItemsSize = searchItems.size
-        searchItems.addAll(newItems)
-        notifyItemRangeInserted(searchItemsSize, newItems.size)
-    }
-
-    override fun getItemCount(): Int {
-        return searchItems.size
-    }
-
+class SearchAdapter : ListAdapter<ContentItem, SearchViewHolder>(SearchCallback) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SearchViewHolder {
         val layoutInflater = LayoutInflater.from(parent.context)
 
@@ -58,7 +45,7 @@ class SearchAdapter(
     }
 
     override fun onBindViewHolder(holder: SearchViewHolder, position: Int) {
-        val searchItem = searchItems[position]
+        val searchItem = currentList[position]
 
         val videoRowBinding = holder.videoRowBinding
         val channelRowBinding = holder.channelRowBinding
@@ -68,11 +55,13 @@ class SearchAdapter(
             bindWatch(searchItem, videoRowBinding)
         } else if (channelRowBinding != null) {
             bindChannel(searchItem, channelRowBinding)
-        } else if (playlistRowBinding != null) bindPlaylist(searchItem, playlistRowBinding)
+        } else if (playlistRowBinding != null) {
+            bindPlaylist(searchItem, playlistRowBinding)
+        }
     }
 
     override fun getItemViewType(position: Int): Int {
-        return when (searchItems[position].type) {
+        return when (currentList[position].type) {
             "stream" -> 0
             "channel" -> 1
             "playlist" -> 2
@@ -116,10 +105,7 @@ class SearchAdapter(
     }
 
     @SuppressLint("SetTextI18n")
-    private fun bindChannel(
-        item: ContentItem,
-        binding: ChannelRowBinding
-    ) {
+    private fun bindChannel(item: ContentItem, binding: ChannelRowBinding) {
         binding.apply {
             ImageHelper.loadImage(item.thumbnail, searchChannelImage)
             searchChannelName.text = item.name
@@ -144,10 +130,7 @@ class SearchAdapter(
         }
     }
 
-    private fun bindPlaylist(
-        item: ContentItem,
-        binding: PlaylistsRowBinding
-    ) {
+    private fun bindPlaylist(item: ContentItem, binding: PlaylistsRowBinding) {
         binding.apply {
             ImageHelper.loadImage(item.thumbnail, playlistThumbnail)
             if (item.videos != -1L) videoCount.text = item.videos.toString()
@@ -169,4 +152,14 @@ class SearchAdapter(
             }
         }
     }
+
+    private object SearchCallback : DiffUtil.ItemCallback<ContentItem>() {
+        override fun areItemsTheSame(oldItem: ContentItem, newItem: ContentItem): Boolean {
+            return oldItem.url == newItem.url
+        }
+
+        override fun areContentsTheSame(oldItem: ContentItem, newItem: ContentItem): Boolean {
+            return true
+        }
+    }
 }
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt
index c0e2c37e1..e5ec8d60d 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt
@@ -6,12 +6,12 @@ import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.api.obj.Subscription
 import com.github.libretube.databinding.ChannelSubscriptionRowBinding
 import com.github.libretube.extensions.toID
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.extensions.setupSubscriptionButton
 import com.github.libretube.ui.sheets.ChannelOptionsBottomSheet
 import com.github.libretube.ui.viewholders.SubscriptionChannelViewHolder
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.NavigationHelper
 
 class SubscriptionChannelAdapter(
     private val subscriptions: MutableList<Subscription>
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt
index 326edefd5..cf2139337 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt
@@ -20,14 +20,14 @@ import com.github.libretube.databinding.VideoRowBinding
 import com.github.libretube.extensions.dpToPx
 import com.github.libretube.extensions.formatShort
 import com.github.libretube.extensions.toID
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.NavigationHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.extensions.setFormattedDuration
 import com.github.libretube.ui.extensions.setWatchProgressLength
 import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
 import com.github.libretube.ui.viewholders.VideosViewHolder
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.NavigationHelper
-import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.TextUtils
 
 class VideosAdapter(
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/WatchHistoryAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/WatchHistoryAdapter.kt
index 3359efefe..bed0f0b77 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/WatchHistoryAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/WatchHistoryAdapter.kt
@@ -8,13 +8,13 @@ import com.github.libretube.databinding.VideoRowBinding
 import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.db.obj.WatchHistoryItem
 import com.github.libretube.extensions.query
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.extensions.setFormattedDuration
 import com.github.libretube.ui.extensions.setWatchProgressLength
 import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
 import com.github.libretube.ui.viewholders.WatchHistoryViewHolder
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.NavigationHelper
 
 class WatchHistoryAdapter(
     private val watchHistory: MutableList<WatchHistoryItem>
diff --git a/app/src/main/java/com/github/libretube/ui/base/BaseActivity.kt b/app/src/main/java/com/github/libretube/ui/base/BaseActivity.kt
index 189aad047..c56566e63 100644
--- a/app/src/main/java/com/github/libretube/ui/base/BaseActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/base/BaseActivity.kt
@@ -2,8 +2,8 @@ package com.github.libretube.ui.base
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.github.libretube.util.LocaleHelper
-import com.github.libretube.util.ThemeHelper
+import com.github.libretube.helpers.LocaleHelper
+import com.github.libretube.helpers.ThemeHelper
 
 /**
  * Activity that applies the LibreTube theme and the in-app language
diff --git a/app/src/main/java/com/github/libretube/ui/base/BasePreferenceFragment.kt b/app/src/main/java/com/github/libretube/ui/base/BasePreferenceFragment.kt
index 49879195d..8fcc90d42 100644
--- a/app/src/main/java/com/github/libretube/ui/base/BasePreferenceFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/base/BasePreferenceFragment.kt
@@ -7,8 +7,8 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.github.libretube.R
 import com.github.libretube.databinding.DialogTextPreferenceBinding
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.activities.SettingsActivity
-import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 /**
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/BackupDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/BackupDialog.kt
index ae0ce72b5..34c50f58e 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/BackupDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/BackupDialog.kt
@@ -7,9 +7,9 @@ import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
 import com.github.libretube.db.DatabaseHolder.Companion.Database
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.obj.BackupFile
 import com.github.libretube.obj.PreferenceItem
-import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt
index 63e1e54d9..0f8000fc1 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt
@@ -7,6 +7,7 @@ import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
 import com.github.libretube.api.PlaylistsHelper
 import com.github.libretube.databinding.DialogCreatePlaylistBinding
+import com.github.libretube.extensions.toastFromMainThread
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -24,8 +25,19 @@ class CreatePlaylistDialog(
 
         binding.clonePlaylist.setOnClickListener {
             val playlistUrl = binding.playlistUrl.text.toString().toHttpUrlOrNull()
+            val appContext = context?.applicationContext
+
             playlistUrl?.queryParameter("list")?.let {
-                PlaylistsHelper.clonePlaylist(requireContext(), it)
+                CoroutineScope(Dispatchers.IO).launch {
+                    val playlistId = PlaylistsHelper.clonePlaylist(requireContext(), it)?.also {
+                        withContext(Dispatchers.Main) {
+                            onSuccess.invoke()
+                        }
+                    }
+                    appContext?.toastFromMainThread(
+                        if (playlistId != null) R.string.playlistCloned else R.string.server_error
+                    )
+                }
                 dismiss()
             } ?: run {
                 Toast.makeText(context, R.string.invalid_url, Toast.LENGTH_SHORT).show()
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/DeleteAccountDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/DeleteAccountDialog.kt
index c08746e62..295a91bbd 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/DeleteAccountDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/DeleteAccountDialog.kt
@@ -12,7 +12,7 @@ import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.obj.DeleteUserRequest
 import com.github.libretube.databinding.DialogDeleteAccountBinding
 import com.github.libretube.extensions.TAG
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class DeleteAccountDialog : DialogFragment() {
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/DeletePlaylistDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/DeletePlaylistDialog.kt
index 091966ad8..01bef8455 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/DeletePlaylistDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/DeletePlaylistDialog.kt
@@ -4,16 +4,15 @@ import android.app.Dialog
 import android.os.Bundle
 import android.util.Log
 import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.obj.PlaylistId
 import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.enums.PlaylistType
 import com.github.libretube.extensions.TAG
-import com.github.libretube.extensions.awaitQuery
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -28,44 +27,41 @@ class DeletePlaylistDialog(
             .setTitle(R.string.deletePlaylist)
             .setMessage(R.string.areYouSure)
             .setPositiveButton(R.string.yes) { _, _ ->
-                PreferenceHelper.getToken()
-                deletePlaylist()
+                lifecycleScope.launch(Dispatchers.IO) {
+                    deletePlaylist()
+                }
             }
             .setNegativeButton(R.string.cancel, null)
             .show()
     }
 
-    private fun deletePlaylist() {
+    private suspend fun deletePlaylist() {
         if (playlistType == PlaylistType.LOCAL) {
-            awaitQuery {
-                DatabaseHolder.Database.localPlaylistsDao().deletePlaylistById(playlistId)
-                DatabaseHolder.Database.localPlaylistsDao().deletePlaylistItemsByPlaylistId(
-                    playlistId
-                )
+            DatabaseHolder.Database.localPlaylistsDao().deletePlaylistById(playlistId)
+            DatabaseHolder.Database.localPlaylistsDao().deletePlaylistItemsByPlaylistId(playlistId)
+            withContext(Dispatchers.Main) {
+                onSuccess()
             }
-            onSuccess.invoke()
             return
         }
 
-        CoroutineScope(Dispatchers.IO).launch {
-            val response = try {
-                RetrofitInstance.authApi.deletePlaylist(
-                    PreferenceHelper.getToken(),
-                    PlaylistId(playlistId)
-                )
-            } catch (e: Exception) {
-                Log.e(TAG(), e.toString())
-                return@launch
-            }
-            try {
-                if (response.message == "ok") {
-                    withContext(Dispatchers.Main) {
-                        onSuccess.invoke()
-                    }
+        val response = try {
+            RetrofitInstance.authApi.deletePlaylist(
+                PreferenceHelper.getToken(),
+                PlaylistId(playlistId)
+            )
+        } catch (e: Exception) {
+            Log.e(TAG(), e.toString())
+            return
+        }
+        try {
+            if (response.message == "ok") {
+                withContext(Dispatchers.Main) {
+                    onSuccess()
                 }
-            } catch (e: Exception) {
-                Log.e(TAG(), e.toString())
             }
+        } catch (e: Exception) {
+            Log.e(TAG(), e.toString())
         }
     }
 }
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/DownloadDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/DownloadDialog.kt
index e165e1f47..7aa5a33e1 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/DownloadDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/DownloadDialog.kt
@@ -15,7 +15,7 @@ import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.obj.Streams
 import com.github.libretube.databinding.DialogDownloadBinding
 import com.github.libretube.extensions.TAG
-import com.github.libretube.util.DownloadHelper
+import com.github.libretube.helpers.DownloadHelper
 import com.github.libretube.util.TextUtils
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.io.IOException
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/ErrorDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/ErrorDialog.kt
index 68a154997..6a71f24f9 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/ErrorDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/ErrorDialog.kt
@@ -6,8 +6,8 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
-import com.github.libretube.util.ClipboardHelper
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.ClipboardHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class ErrorDialog : DialogFragment() {
@@ -22,7 +22,7 @@ class ErrorDialog : DialogFragment() {
             .setMessage(errorLog)
             .setNegativeButton(R.string.okay, null)
             .setPositiveButton(R.string.copy) { _, _ ->
-                ClipboardHelper(requireContext()).save(errorLog)
+                ClipboardHelper.save(requireContext(), errorLog)
                 Toast.makeText(context, R.string.copied, Toast.LENGTH_SHORT).show()
             }
             .show()
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt
index 5281ed074..9a6afdeeb 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt
@@ -12,7 +12,7 @@ import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.obj.Login
 import com.github.libretube.databinding.DialogLoginBinding
 import com.github.libretube.extensions.TAG
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.util.TextUtils
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt
index 72f7d730b..3d48aacf5 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt
@@ -8,7 +8,7 @@ import androidx.core.app.ActivityCompat
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
 import com.github.libretube.databinding.DialogLogoutBinding
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class LogoutDialog : DialogFragment() {
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/NavBarOptionsDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/NavBarOptionsDialog.kt
index deb142297..181394b3a 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/NavBarOptionsDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/NavBarOptionsDialog.kt
@@ -8,8 +8,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.databinding.DialogNavbarOptionsBinding
+import com.github.libretube.helpers.NavBarHelper
 import com.github.libretube.ui.adapters.NavBarOptionsAdapter
-import com.github.libretube.util.NavBarHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class NavBarOptionsDialog : DialogFragment() {
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/RequireRestartDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/RequireRestartDialog.kt
index 5011d2657..cf245f828 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/RequireRestartDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/RequireRestartDialog.kt
@@ -5,7 +5,7 @@ import android.os.Bundle
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class RequireRestartDialog : DialogFragment() {
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/ShareDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/ShareDialog.kt
index 67fbcf391..08550f499 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/ShareDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/ShareDialog.kt
@@ -13,8 +13,8 @@ import com.github.libretube.databinding.DialogShareBinding
 import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.enums.ShareObjectType
 import com.github.libretube.extensions.awaitQuery
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.obj.ShareData
-import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class ShareDialog(
diff --git a/app/src/main/java/com/github/libretube/ui/extensions/SetDrawables.kt b/app/src/main/java/com/github/libretube/ui/extensions/SetDrawables.kt
new file mode 100644
index 000000000..5d9cc62c4
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/ui/extensions/SetDrawables.kt
@@ -0,0 +1,18 @@
+package com.github.libretube.ui.extensions
+
+import android.widget.TextView
+import androidx.appcompat.content.res.AppCompatResources
+
+fun TextView.setDrawables(
+    start: Int? = null,
+    top: Int? = null,
+    end: Int? = null,
+    bottom: Int? = null
+) {
+    setCompoundDrawablesRelativeWithIntrinsicBounds(
+        start?.let { AppCompatResources.getDrawable(context, it) },
+        top?.let { AppCompatResources.getDrawable(context, it) },
+        end?.let { AppCompatResources.getDrawable(context, it) },
+        bottom?.let { AppCompatResources.getDrawable(context, it) }
+    )
+}
diff --git a/app/src/main/java/com/github/libretube/ui/extensions/SetWatchProgressLength.kt b/app/src/main/java/com/github/libretube/ui/extensions/SetWatchProgressLength.kt
index d11f979ed..05bbede85 100644
--- a/app/src/main/java/com/github/libretube/ui/extensions/SetWatchProgressLength.kt
+++ b/app/src/main/java/com/github/libretube/ui/extensions/SetWatchProgressLength.kt
@@ -1,8 +1,7 @@
 package com.github.libretube.ui.extensions
 
 import android.view.View
-import android.view.ViewTreeObserver
-import android.widget.LinearLayout
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.updateLayoutParams
 import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.extensions.awaitQuery
@@ -13,8 +12,11 @@ import com.github.libretube.extensions.awaitQuery
  * @param duration The duration of the video in seconds
  * @return Whether the video is already watched more than 90%
  */
-fun View?.setWatchProgressLength(videoId: String, duration: Long): Boolean {
-    val view = this!!
+fun View.setWatchProgressLength(videoId: String, duration: Long): Boolean {
+    updateLayoutParams<ConstraintLayout.LayoutParams> {
+        matchConstraintPercentWidth = 0f
+    }
+    visibility = View.GONE
 
     val progress = try {
         awaitQuery {
@@ -26,22 +28,13 @@ fun View?.setWatchProgressLength(videoId: String, duration: Long): Boolean {
         ?.toFloat()?.div(1000)
 
     if (progress == null || duration == 0L) {
-        view.visibility = View.GONE
         return false
     }
 
-    view.viewTreeObserver
-        .addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
-            override fun onGlobalLayout() {
-                this@setWatchProgressLength.viewTreeObserver.removeOnGlobalLayoutListener(this)
-                val fullWidth = (parent as LinearLayout).width
-                val newWidth = fullWidth * (progress / duration.toFloat())
-                view.updateLayoutParams {
-                    width = newWidth.toInt()
-                }
-                view.visibility = View.VISIBLE
-            }
-        })
+    updateLayoutParams<ConstraintLayout.LayoutParams> {
+        matchConstraintPercentWidth = progress / duration.toFloat()
+    }
+    visibility = View.VISIBLE
 
     return progress / duration.toFloat() > 0.9
 }
diff --git a/app/src/main/java/com/github/libretube/ui/extensions/SetupNotificationBell.kt b/app/src/main/java/com/github/libretube/ui/extensions/SetupNotificationBell.kt
index 335192635..854569d98 100644
--- a/app/src/main/java/com/github/libretube/ui/extensions/SetupNotificationBell.kt
+++ b/app/src/main/java/com/github/libretube/ui/extensions/SetupNotificationBell.kt
@@ -1,7 +1,7 @@
 package com.github.libretube.ui.extensions
 
 import com.github.libretube.R
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.button.MaterialButton
 
 fun MaterialButton.setupNotificationBell(channelId: String) {
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/AudioPlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/AudioPlayerFragment.kt
index 40512ce0c..0a737e5dd 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/AudioPlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/AudioPlayerFragment.kt
@@ -1,5 +1,6 @@
 package com.github.libretube.ui.fragments
 
+import android.annotation.SuppressLint
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
@@ -17,22 +18,28 @@ import com.github.libretube.R
 import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.databinding.FragmentAudioPlayerBinding
 import com.github.libretube.enums.ShareObjectType
+import com.github.libretube.extensions.normalize
 import com.github.libretube.extensions.toID
+import com.github.libretube.helpers.AudioHelper
+import com.github.libretube.helpers.BackgroundHelper
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.obj.ShareData
 import com.github.libretube.services.BackgroundMode
 import com.github.libretube.ui.activities.MainActivity
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.dialogs.ShareDialog
+import com.github.libretube.ui.interfaces.AudioPlayerOptions
+import com.github.libretube.ui.listeners.AudioPlayerThumbnailListener
 import com.github.libretube.ui.sheets.PlaybackOptionsSheet
 import com.github.libretube.ui.sheets.PlayingQueueSheet
 import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
-import com.github.libretube.util.BackgroundHelper
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.PlayingQueue
 
-class AudioPlayerFragment : BaseFragment() {
+class AudioPlayerFragment : BaseFragment(), AudioPlayerOptions {
     private lateinit var binding: FragmentAudioPlayerBinding
+    private lateinit var audioHelper: AudioHelper
+
     private val onTrackChangeListener: (StreamItem) -> Unit = {
         updateStreamInfo()
     }
@@ -64,6 +71,7 @@ class AudioPlayerFragment : BaseFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        audioHelper = AudioHelper(requireContext())
         Intent(activity, BackgroundMode::class.java).also { intent ->
             activity?.bindService(intent, connection, Context.BIND_AUTO_CREATE)
         }
@@ -78,6 +86,7 @@ class AudioPlayerFragment : BaseFragment() {
         return binding.root
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -129,13 +138,8 @@ class AudioPlayerFragment : BaseFragment() {
             ).show(childFragmentManager, null)
         }
 
-        binding.thumbnail.setOnClickListener {
-            val current = PlayingQueue.getCurrent()
-            current?.let {
-                VideoOptionsBottomSheet(it.url!!.toID(), it.title!!)
-                    .show(childFragmentManager)
-            }
-        }
+        val listener = AudioPlayerThumbnailListener(requireContext(), this)
+        binding.thumbnail.setOnTouchListener(listener)
 
         // Listen for track changes due to autoplay or the notification
         PlayingQueue.addOnTrackChangedListener(onTrackChangeListener)
@@ -146,6 +150,11 @@ class AudioPlayerFragment : BaseFragment() {
 
         // load the stream info into the UI
         updateStreamInfo()
+
+        // update the currently shown volume
+        binding.volumeProgressBar.let { bar ->
+            bar.progress = audioHelper.getVolumeWithScale(bar.max)
+        }
     }
 
     /**
@@ -232,4 +241,48 @@ class AudioPlayerFragment : BaseFragment() {
 
         super.onDestroy()
     }
+
+    override fun onSingleTap() {
+        if (isPaused) playerService?.play() else playerService?.pause()
+    }
+
+    override fun onLongTap() {
+        val current = PlayingQueue.getCurrent()
+        VideoOptionsBottomSheet(current?.url?.toID() ?: return, current.title ?: return)
+            .show(childFragmentManager)
+    }
+
+    override fun onSwipe(distanceY: Float) {
+        binding.volumeControls.visibility = View.VISIBLE
+        updateVolume(distanceY)
+    }
+
+    override fun onSwipeEnd() {
+        binding.volumeControls.visibility = View.GONE
+    }
+
+    private fun updateVolume(distance: Float) {
+        val bar = binding.volumeProgressBar
+        binding.volumeControls.apply {
+            if (visibility == View.GONE) {
+                visibility = View.VISIBLE
+                // Volume could be changed using other mediums, sync progress
+                // bar with new value.
+                bar.progress = audioHelper.getVolumeWithScale(bar.max)
+            }
+        }
+
+        if (bar.progress == 0) {
+            binding.volumeImageView.setImageResource(
+                when {
+                    distance > 0 -> R.drawable.ic_volume_up
+                    else -> R.drawable.ic_volume_off
+                }
+            )
+        }
+        bar.incrementProgressBy(distance.toInt() / 3)
+        audioHelper.setVolumeWithScale(bar.progress, bar.max)
+
+        binding.volumeTextView.text = "${bar.progress.normalize(0, bar.max, 0, 100)}"
+    }
 }
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt
index 625f4eda9..b0cf372dd 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt
@@ -19,6 +19,7 @@ import com.github.libretube.enums.ShareObjectType
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.formatShort
 import com.github.libretube.extensions.toID
+import com.github.libretube.helpers.ImageHelper
 import com.github.libretube.obj.ChannelTabs
 import com.github.libretube.obj.ShareData
 import com.github.libretube.ui.adapters.SearchAdapter
@@ -26,11 +27,10 @@ import com.github.libretube.ui.adapters.VideosAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.dialogs.ShareDialog
 import com.github.libretube.ui.extensions.setupSubscriptionButton
-import com.github.libretube.util.ImageHelper
 import java.io.IOException
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import retrofit2.HttpException
 
 class ChannelFragment : BaseFragment() {
@@ -45,8 +45,6 @@ class ChannelFragment : BaseFragment() {
 
     private var onScrollEnd: () -> Unit = {}
 
-    private val scope = CoroutineScope(Dispatchers.IO)
-
     val possibleTabs = listOf(
         ChannelTabs.Channels,
         ChannelTabs.Playlists,
@@ -227,18 +225,18 @@ class ChannelFragment : BaseFragment() {
     }
 
     private fun loadTab(tab: ChannelTab) {
-        scope.launch {
+        lifecycleScope.launch {
             val response = try {
-                RetrofitInstance.api.getChannelTab(tab.data)
+                withContext(Dispatchers.IO) {
+                    RetrofitInstance.api.getChannelTab(tab.data)
+                }
             } catch (e: Exception) {
                 return@launch
             }
 
-            val adapter = SearchAdapter(response.content.toMutableList())
-
-            runOnUiThread {
-                binding.channelRecView.adapter = adapter
-            }
+            val adapter = SearchAdapter()
+            binding.channelRecView.adapter = adapter
+            adapter.submitList(response.content)
 
             var tabNextPage = response.nextpage
             onScrollEnd = {
@@ -284,18 +282,18 @@ class ChannelFragment : BaseFragment() {
         adapter: SearchAdapter,
         onNewNextPage: (String?) -> Unit
     ) {
-        scope.launch {
+        lifecycleScope.launch {
             val newContent = try {
-                RetrofitInstance.api.getChannelTab(tab.data, nextPage)
+                withContext(Dispatchers.IO) {
+                    RetrofitInstance.api.getChannelTab(tab.data, nextPage)
+                }
             } catch (e: Exception) {
                 Log.e(TAG(), "Exception: $e")
                 null
             }
-            onNewNextPage.invoke(newContent?.nextpage)
-            runOnUiThread {
-                newContent?.content?.let {
-                    adapter.updateItems(it)
-                }
+            onNewNextPage(newContent?.nextpage)
+            newContent?.content?.let {
+                adapter.submitList(adapter.currentList + it)
             }
         }
     }
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/CommentsMainFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/CommentsMainFragment.kt
index bf8c5020d..2e9adacfe 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/CommentsMainFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/CommentsMainFragment.kt
@@ -58,7 +58,7 @@ class CommentsMainFragment : Fragment() {
         viewModel.commentsPage.observe(viewLifecycleOwner) {
             it ?: return@observe
             binding.progress.visibility = View.GONE
-            if (it.disabled == true) {
+            if (it.disabled) {
                 binding.errorTV.visibility = View.VISIBLE
                 return@observe
             }
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/DownloadsFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/DownloadsFragment.kt
index 77bb48329..b23146823 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/DownloadsFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/DownloadsFragment.kt
@@ -19,13 +19,13 @@ import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.db.obj.DownloadWithItems
 import com.github.libretube.extensions.awaitQuery
 import com.github.libretube.extensions.formatAsFileSize
+import com.github.libretube.helpers.DownloadHelper
 import com.github.libretube.obj.DownloadStatus
 import com.github.libretube.receivers.DownloadReceiver
 import com.github.libretube.services.DownloadService
 import com.github.libretube.ui.adapters.DownloadsAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.viewholders.DownloadsViewHolder
-import com.github.libretube.util.DownloadHelper
 import java.io.File
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.collectLatest
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt
index 97f75c4be..360a6cd7a 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt
@@ -18,11 +18,11 @@ import com.github.libretube.databinding.FragmentHomeBinding
 import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.extensions.awaitQuery
 import com.github.libretube.extensions.toastFromMainThread
+import com.github.libretube.helpers.LocaleHelper
 import com.github.libretube.ui.adapters.PlaylistBookmarkAdapter
 import com.github.libretube.ui.adapters.PlaylistsAdapter
 import com.github.libretube.ui.adapters.VideosAdapter
 import com.github.libretube.ui.base.BaseFragment
-import com.github.libretube.util.LocaleHelper
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt
index d61693c03..d868af09e 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt
@@ -21,13 +21,13 @@ import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.awaitQuery
 import com.github.libretube.extensions.dpToPx
+import com.github.libretube.helpers.NavBarHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.adapters.PlaylistBookmarkAdapter
 import com.github.libretube.ui.adapters.PlaylistsAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.dialogs.CreatePlaylistDialog
 import com.github.libretube.ui.models.PlayerViewModel
-import com.github.libretube.util.NavBarHelper
-import com.github.libretube.util.PreferenceHelper
 
 class LibraryFragment : BaseFragment() {
 
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
index f9da8f9d8..e79c92976 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
@@ -35,6 +35,7 @@ import androidx.core.os.postDelayed
 import androidx.core.text.parseAsHtml
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.commit
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -67,6 +68,13 @@ import com.github.libretube.extensions.query
 import com.github.libretube.extensions.toID
 import com.github.libretube.extensions.toStreamItem
 import com.github.libretube.extensions.updateParameters
+import com.github.libretube.helpers.BackgroundHelper
+import com.github.libretube.helpers.DashHelper
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.NavigationHelper
+import com.github.libretube.helpers.PlayerHelper
+import com.github.libretube.helpers.PlayerHelper.loadPlaybackParams
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.obj.ShareData
 import com.github.libretube.obj.VideoResolution
 import com.github.libretube.services.BackgroundMode
@@ -81,24 +89,17 @@ import com.github.libretube.ui.dialogs.ShareDialog
 import com.github.libretube.ui.extensions.setAspectRatio
 import com.github.libretube.ui.extensions.setupSubscriptionButton
 import com.github.libretube.ui.interfaces.OnlinePlayerOptions
+import com.github.libretube.ui.listeners.SeekbarPreviewListener
 import com.github.libretube.ui.models.CommentsViewModel
 import com.github.libretube.ui.models.PlayerViewModel
 import com.github.libretube.ui.sheets.BaseBottomSheet
 import com.github.libretube.ui.sheets.CommentsSheet
 import com.github.libretube.ui.sheets.PlayingQueueSheet
-import com.github.libretube.util.BackgroundHelper
-import com.github.libretube.util.DashHelper
 import com.github.libretube.util.DataSaverMode
 import com.github.libretube.util.HtmlParser
-import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.LinkHandler
-import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.NowPlayingNotification
-import com.github.libretube.util.PlayerHelper
-import com.github.libretube.util.PlayerHelper.loadPlaybackParams
 import com.github.libretube.util.PlayingQueue
-import com.github.libretube.util.PreferenceHelper
-import com.github.libretube.util.SeekbarPreviewListener
 import com.github.libretube.util.TextUtils
 import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlayer
@@ -1510,9 +1511,9 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
     private fun killPlayerFragment() {
         viewModel.isFullscreen.value = false
         binding.playerMotionLayout.transitionToEnd()
-        mainActivity.supportFragmentManager.beginTransaction()
-            .remove(this)
-            .commit()
+        mainActivity.supportFragmentManager.commit {
+            remove(this@PlayerFragment)
+        }
 
         onDestroy()
     }
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
index 63e4f9875..980f525fd 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
@@ -26,13 +26,13 @@ import com.github.libretube.extensions.dpToPx
 import com.github.libretube.extensions.query
 import com.github.libretube.extensions.toID
 import com.github.libretube.extensions.toPlaylistBookmark
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.ui.adapters.PlaylistAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.extensions.serializable
 import com.github.libretube.ui.models.PlayerViewModel
 import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.PlayingQueue
 import com.github.libretube.util.TextUtils
 
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt
index 54a84c9b8..860b019cd 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt
@@ -16,9 +16,11 @@ import com.github.libretube.db.DatabaseHelper
 import com.github.libretube.db.obj.SearchHistoryItem
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.hideKeyboard
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.adapters.SearchAdapter
 import com.github.libretube.ui.base.BaseFragment
-import com.github.libretube.util.PreferenceHelper
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import java.io.IOException
 import retrofit2.HttpException
 
@@ -85,7 +87,9 @@ class SearchResultFragment : BaseFragment() {
         lifecycleScope.launchWhenCreated {
             view?.let { context?.hideKeyboard(it) }
             val response = try {
-                RetrofitInstance.api.getSearchResults(query, apiSearchFilter)
+                withContext(Dispatchers.IO) {
+                    RetrofitInstance.api.getSearchResults(query, apiSearchFilter)
+                }
             } catch (e: IOException) {
                 println(e)
                 Log.e(TAG(), "IOException, you might not have internet connection $e")
@@ -94,11 +98,10 @@ class SearchResultFragment : BaseFragment() {
                 Log.e(TAG(), "HttpException, unexpected response")
                 return@launchWhenCreated
             }
-            runOnUiThread {
-                searchAdapter = SearchAdapter(response.items.toMutableList())
-                binding.searchRecycler.adapter = searchAdapter
-                binding.noSearchResult.isVisible = response.items.isEmpty()
-            }
+            searchAdapter = SearchAdapter()
+            binding.searchRecycler.adapter = searchAdapter
+            searchAdapter.submitList(response.items)
+            binding.noSearchResult.isVisible = response.items.isEmpty()
             nextPage = response.nextpage
         }
     }
@@ -106,11 +109,13 @@ class SearchResultFragment : BaseFragment() {
     private fun fetchNextSearchItems() {
         lifecycleScope.launchWhenCreated {
             val response = try {
-                RetrofitInstance.api.getSearchResultsNextPage(
-                    query,
-                    apiSearchFilter,
-                    nextPage!!
-                )
+                withContext(Dispatchers.IO) {
+                    RetrofitInstance.api.getSearchResultsNextPage(
+                        query,
+                        apiSearchFilter,
+                        nextPage!!
+                    )
+                }
             } catch (e: IOException) {
                 println(e)
                 Log.e(TAG(), "IOException, you might not have internet connection")
@@ -120,10 +125,8 @@ class SearchResultFragment : BaseFragment() {
                 return@launchWhenCreated
             }
             nextPage = response.nextpage!!
-            kotlin.runCatching {
-                if (response.items.isNotEmpty()) {
-                    searchAdapter.updateItems(response.items)
-                }
+            if (response.items.isNotEmpty()) {
+                searchAdapter.submitList(searchAdapter.currentList + response.items)
             }
         }
     }
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
index 3cfecbb8a..526ec633e 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
@@ -13,13 +13,13 @@ import com.github.libretube.R
 import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.FragmentSubscriptionsBinding
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.adapters.LegacySubscriptionAdapter
 import com.github.libretube.ui.adapters.SubscriptionChannelAdapter
 import com.github.libretube.ui.adapters.VideosAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.models.SubscriptionsViewModel
 import com.github.libretube.ui.sheets.BaseBottomSheet
-import com.github.libretube.util.PreferenceHelper
 
 class SubscriptionsFragment : BaseFragment() {
     private lateinit var binding: FragmentSubscriptionsBinding
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/TrendsFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/TrendsFragment.kt
index 2a78b0496..ec2187af8 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/TrendsFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/TrendsFragment.kt
@@ -12,10 +12,10 @@ import com.github.libretube.R
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.databinding.FragmentTrendsBinding
 import com.github.libretube.extensions.TAG
+import com.github.libretube.helpers.LocaleHelper
 import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.ui.adapters.VideosAdapter
 import com.github.libretube.ui.base.BaseFragment
-import com.github.libretube.util.LocaleHelper
 import com.google.android.material.snackbar.Snackbar
 import java.io.IOException
 import retrofit2.HttpException
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt
index ec8293b70..f39eca543 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt
@@ -19,12 +19,12 @@ import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.extensions.awaitQuery
 import com.github.libretube.extensions.dpToPx
 import com.github.libretube.extensions.query
+import com.github.libretube.helpers.NavigationHelper
+import com.github.libretube.helpers.ProxyHelper
 import com.github.libretube.ui.adapters.WatchHistoryAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.models.PlayerViewModel
-import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.PlayingQueue
-import com.github.libretube.util.ProxyHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class WatchHistoryFragment : BaseFragment() {
diff --git a/app/src/main/java/com/github/libretube/ui/interfaces/AudioPlayerOptions.kt b/app/src/main/java/com/github/libretube/ui/interfaces/AudioPlayerOptions.kt
new file mode 100644
index 000000000..91a0198fb
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/ui/interfaces/AudioPlayerOptions.kt
@@ -0,0 +1,12 @@
+package com.github.libretube.ui.interfaces
+
+interface AudioPlayerOptions {
+
+    fun onSingleTap()
+
+    fun onLongTap()
+
+    fun onSwipe(distanceY: Float)
+
+    fun onSwipeEnd()
+}
diff --git a/app/src/main/java/com/github/libretube/ui/listeners/AudioPlayerThumbnailListener.kt b/app/src/main/java/com/github/libretube/ui/listeners/AudioPlayerThumbnailListener.kt
new file mode 100644
index 000000000..05e747704
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/ui/listeners/AudioPlayerThumbnailListener.kt
@@ -0,0 +1,81 @@
+package com.github.libretube.ui.listeners
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import android.view.GestureDetector
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewConfiguration
+import androidx.core.os.postDelayed
+import com.github.libretube.ui.interfaces.AudioPlayerOptions
+import kotlin.math.abs
+
+class AudioPlayerThumbnailListener(context: Context, private val listener: AudioPlayerOptions) :
+    View.OnTouchListener {
+
+    private val handler = Handler(Looper.getMainLooper())
+    private val gestureDetector = GestureDetector(context, GestureListener(), handler)
+    private var isMoving = false
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onTouch(v: View, event: MotionEvent): Boolean {
+        if (event.action == MotionEvent.ACTION_UP && isMoving) {
+            isMoving = false
+            listener.onSwipeEnd()
+            return false
+        }
+
+        runCatching {
+            gestureDetector.onTouchEvent(event)
+        }
+
+        return true
+    }
+
+    private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
+
+        override fun onDown(e: MotionEvent): Boolean {
+            if (isMoving) return false
+
+            handler.postDelayed(ACTION_INTERVAL, SINGLE_PRESS_TOKEN) {
+                if (!isMoving) listener.onSingleTap()
+            }
+
+            return true
+        }
+
+        override fun onScroll(
+            e1: MotionEvent,
+            e2: MotionEvent,
+            distanceX: Float,
+            distanceY: Float
+        ): Boolean {
+            val insideThreshHold = abs(e2.y - e1.y) <= MOVEMENT_THRESHOLD
+
+            // If the movement is inside threshold or scroll is horizontal then return false
+            if (!isMoving && (insideThreshHold || abs(distanceX) > abs(distanceY))) {
+                return false
+            }
+
+            isMoving = true
+
+            listener.onSwipe(distanceY)
+            return true
+        }
+
+        override fun onLongPress(e: MotionEvent) {
+            // remove to single press action from the queue
+            handler.removeCallbacksAndMessages(SINGLE_PRESS_TOKEN)
+
+            listener.onLongTap()
+        }
+    }
+
+    companion object {
+        private const val MOVEMENT_THRESHOLD = 10
+        private val ACTION_INTERVAL = ViewConfiguration.getLongPressTimeout().toLong()
+        private const val SINGLE_PRESS_TOKEN = "singlePress"
+    }
+}
diff --git a/app/src/main/java/com/github/libretube/util/PlayerGestureController.kt b/app/src/main/java/com/github/libretube/ui/listeners/PlayerGestureController.kt
similarity index 98%
rename from app/src/main/java/com/github/libretube/util/PlayerGestureController.kt
rename to app/src/main/java/com/github/libretube/ui/listeners/PlayerGestureController.kt
index 42150da11..f59d8aa3b 100644
--- a/app/src/main/java/com/github/libretube/util/PlayerGestureController.kt
+++ b/app/src/main/java/com/github/libretube/ui/listeners/PlayerGestureController.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.ui.listeners
 
 import android.annotation.SuppressLint
 import android.content.res.Configuration
@@ -12,6 +12,7 @@ import android.view.ScaleGestureDetector
 import android.view.View
 import androidx.activity.viewModels
 import androidx.core.os.postDelayed
+import com.github.libretube.helpers.PlayerHelper
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.interfaces.PlayerGestureOptions
 import com.github.libretube.ui.models.PlayerViewModel
diff --git a/app/src/main/java/com/github/libretube/util/SeekbarPreviewListener.kt b/app/src/main/java/com/github/libretube/ui/listeners/SeekbarPreviewListener.kt
similarity index 98%
rename from app/src/main/java/com/github/libretube/util/SeekbarPreviewListener.kt
rename to app/src/main/java/com/github/libretube/ui/listeners/SeekbarPreviewListener.kt
index cad92c8a6..5740a9aa9 100644
--- a/app/src/main/java/com/github/libretube/util/SeekbarPreviewListener.kt
+++ b/app/src/main/java/com/github/libretube/ui/listeners/SeekbarPreviewListener.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.ui.listeners
 
 import android.graphics.Bitmap
 import android.view.View
@@ -9,6 +9,7 @@ import androidx.core.math.MathUtils
 import androidx.core.view.updateLayoutParams
 import coil.request.ImageRequest
 import com.github.libretube.api.obj.PreviewFrames
+import com.github.libretube.helpers.ImageHelper
 import com.github.libretube.obj.PreviewFrame
 import com.google.android.exoplayer2.ui.TimeBar
 
diff --git a/app/src/main/java/com/github/libretube/ui/models/SubscriptionsViewModel.kt b/app/src/main/java/com/github/libretube/ui/models/SubscriptionsViewModel.kt
index 03fdcfd1d..8dc4c846e 100644
--- a/app/src/main/java/com/github/libretube/ui/models/SubscriptionsViewModel.kt
+++ b/app/src/main/java/com/github/libretube/ui/models/SubscriptionsViewModel.kt
@@ -9,7 +9,7 @@ import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.api.obj.Subscription
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.toID
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
diff --git a/app/src/main/java/com/github/libretube/ui/preferences/AdvancedSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/AdvancedSettings.kt
index 3c92363c8..61b3d3965 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/AdvancedSettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/AdvancedSettings.kt
@@ -6,9 +6,9 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.base.BasePreferenceFragment
-import com.github.libretube.util.ImageHelper
-import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class AdvancedSettings : BasePreferenceFragment() {
diff --git a/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt
index 3e5aa8615..ecea86cc6 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt
@@ -7,12 +7,12 @@ import androidx.preference.Preference
 import androidx.preference.SwitchPreferenceCompat
 import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.adapters.IconsSheetAdapter
 import com.github.libretube.ui.base.BasePreferenceFragment
 import com.github.libretube.ui.dialogs.NavBarOptionsDialog
 import com.github.libretube.ui.dialogs.RequireRestartDialog
 import com.github.libretube.ui.sheets.IconsBottomSheet
-import com.github.libretube.util.PreferenceHelper
 
 class AppearanceSettings : BasePreferenceFragment() {
     override val titleResourceId: Int = R.string.appearance
diff --git a/app/src/main/java/com/github/libretube/ui/preferences/BackupRestoreSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/BackupRestoreSettings.kt
index fc065ae99..9deee4061 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/BackupRestoreSettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/BackupRestoreSettings.kt
@@ -1,79 +1,79 @@
 package com.github.libretube.ui.preferences
 
-import android.net.Uri
 import android.os.Bundle
-import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import com.github.libretube.R
+import com.github.libretube.helpers.BackupHelper
+import com.github.libretube.helpers.ImportHelper
 import com.github.libretube.obj.BackupFile
 import com.github.libretube.ui.base.BasePreferenceFragment
 import com.github.libretube.ui.dialogs.BackupDialog
-import com.github.libretube.util.BackupHelper
-import com.github.libretube.util.ImportHelper
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
 class BackupRestoreSettings : BasePreferenceFragment() {
     private val backupDateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH:mm:ss")
+    private var backupFile = BackupFile()
 
     override val titleResourceId: Int = R.string.backup_restore
 
     // backup and restore database
-    private lateinit var getBackupFile: ActivityResultLauncher<String>
-    private lateinit var createBackupFile: ActivityResultLauncher<String>
-    private var backupFile = BackupFile()
+    private val getBackupFile = registerForActivityResult(ActivityResultContracts.GetContent()) {
+        it?.let {
+            lifecycleScope.launch(Dispatchers.IO) {
+                BackupHelper.restoreAdvancedBackup(requireContext(), it)
+            }
+        }
+    }
+    private val createBackupFile = registerForActivityResult(CreateDocument(JSON)) {
+        it?.let {
+            lifecycleScope.launch(Dispatchers.IO) {
+                BackupHelper.createAdvancedBackup(requireContext(), it, backupFile)
+            }
+        }
+    }
 
     /**
      * result listeners for importing and exporting subscriptions
      */
-    private lateinit var getSubscriptionsFile: ActivityResultLauncher<String>
-    private lateinit var createSubscriptionsFile: ActivityResultLauncher<String>
+    private val getSubscriptionsFile = registerForActivityResult(
+        ActivityResultContracts.GetContent()
+    ) {
+        it?.let {
+            lifecycleScope.launch(Dispatchers.IO) {
+                ImportHelper.importSubscriptions(requireActivity(), it)
+            }
+        }
+    }
+    private val createSubscriptionsFile = registerForActivityResult(CreateDocument(JSON)) {
+        it?.let {
+            lifecycleScope.launch(Dispatchers.IO) {
+                ImportHelper.exportSubscriptions(requireActivity(), it)
+            }
+        }
+    }
 
     /**
      * result listeners for importing and exporting playlists
      */
-    private lateinit var getPlaylistsFile: ActivityResultLauncher<String>
-    private lateinit var createPlaylistsFile: ActivityResultLauncher<String>
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        getSubscriptionsFile =
-            registerForActivityResult(
-                ActivityResultContracts.GetContent()
-            ) { uri ->
-                ImportHelper(requireActivity()).importSubscriptions(uri)
+    private val getPlaylistsFile = registerForActivityResult(ActivityResultContracts.GetContent()) {
+        it?.let {
+            lifecycleScope.launch(Dispatchers.IO) {
+                ImportHelper.importPlaylists(requireActivity(), it)
             }
-        createSubscriptionsFile = registerForActivityResult(
-            CreateDocument("application/json")
-        ) { uri ->
-            ImportHelper(requireActivity()).exportSubscriptions(uri)
         }
-
-        getPlaylistsFile = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
-            ImportHelper(requireActivity()).importPlaylists(uri)
-        }
-
-        createPlaylistsFile = registerForActivityResult(
-            CreateDocument("application/json")
-        ) { uri ->
-            ImportHelper(requireActivity()).exportPlaylists(uri)
-        }
-
-        getBackupFile =
-            registerForActivityResult(
-                ActivityResultContracts.GetContent()
-            ) { uri: Uri? ->
-                BackupHelper(requireContext()).restoreAdvancedBackup(uri)
+    }
+    private val createPlaylistsFile = registerForActivityResult(CreateDocument(JSON)) {
+        it?.let {
+            lifecycleScope.launch(Dispatchers.IO) {
+                ImportHelper.exportPlaylists(requireActivity(), it)
             }
-
-        createBackupFile = registerForActivityResult(
-            CreateDocument("application/json")
-        ) { uri: Uri? ->
-            BackupHelper(requireContext()).createAdvancedBackup(uri, backupFile)
         }
-
-        super.onCreate(savedInstanceState)
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -116,8 +116,12 @@ class BackupRestoreSettings : BasePreferenceFragment() {
 
         val restoreAdvancedBackup = findPreference<Preference>("restore")
         restoreAdvancedBackup?.setOnPreferenceClickListener {
-            getBackupFile.launch("application/json")
+            getBackupFile.launch(JSON)
             true
         }
     }
+
+    companion object {
+        private const val JSON = "application/json"
+    }
 }
diff --git a/app/src/main/java/com/github/libretube/ui/preferences/GeneralSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/GeneralSettings.kt
index 5d28cf875..a698caef4 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/GeneralSettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/GeneralSettings.kt
@@ -7,10 +7,10 @@ import androidx.preference.Preference
 import androidx.preference.SwitchPreferenceCompat
 import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.helpers.LocaleHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.base.BasePreferenceFragment
 import com.github.libretube.ui.dialogs.RequireRestartDialog
-import com.github.libretube.util.LocaleHelper
-import com.github.libretube.util.PreferenceHelper
 
 class GeneralSettings : BasePreferenceFragment() {
     override val titleResourceId: Int = R.string.general
diff --git a/app/src/main/java/com/github/libretube/ui/preferences/InstanceSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/InstanceSettings.kt
index da14044ea..662e7034b 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/InstanceSettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/InstanceSettings.kt
@@ -15,12 +15,12 @@ import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.extensions.awaitQuery
 import com.github.libretube.extensions.toastFromMainThread
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.base.BasePreferenceFragment
 import com.github.libretube.ui.dialogs.CustomInstanceDialog
 import com.github.libretube.ui.dialogs.DeleteAccountDialog
 import com.github.libretube.ui.dialogs.LoginDialog
 import com.github.libretube.ui.dialogs.LogoutDialog
-import com.github.libretube.util.PreferenceHelper
 
 class InstanceSettings : BasePreferenceFragment() {
     override val titleResourceId: Int = R.string.instance
diff --git a/app/src/main/java/com/github/libretube/ui/preferences/MainSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/MainSettings.kt
index a9ff2410c..12bdfee16 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/MainSettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/MainSettings.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.commitNow
 import androidx.preference.Preference
 import com.github.libretube.BuildConfig
 import com.github.libretube.R
@@ -124,9 +125,9 @@ class MainSettings : BasePreferenceFragment() {
     }
 
     private fun navigateToSettingsFragment(newFragment: Fragment): Boolean {
-        parentFragmentManager.beginTransaction()
-            .replace(R.id.settings, newFragment)
-            .commitNow()
+        parentFragmentManager.commitNow {
+            replace(R.id.settings, newFragment)
+        }
         return true
     }
 }
diff --git a/app/src/main/java/com/github/libretube/ui/preferences/NotificationSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/NotificationSettings.kt
index 34807ebdf..3e23d33a4 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/NotificationSettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/NotificationSettings.kt
@@ -6,9 +6,9 @@ import androidx.preference.SwitchPreferenceCompat
 import androidx.work.ExistingPeriodicWorkPolicy
 import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.helpers.NotificationHelper
 import com.github.libretube.ui.base.BasePreferenceFragment
 import com.github.libretube.ui.views.TimePickerPreference
-import com.github.libretube.util.NotificationHelper
 
 class NotificationSettings : BasePreferenceFragment() {
     override val titleResourceId: Int = R.string.notifications
diff --git a/app/src/main/java/com/github/libretube/ui/preferences/PlayerSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/PlayerSettings.kt
index f77cb80a7..0587ca184 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/PlayerSettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/PlayerSettings.kt
@@ -12,9 +12,9 @@ import androidx.preference.Preference
 import androidx.preference.SwitchPreferenceCompat
 import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.helpers.LocaleHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.base.BasePreferenceFragment
-import com.github.libretube.util.LocaleHelper
-import com.github.libretube.util.PreferenceHelper
 
 class PlayerSettings : BasePreferenceFragment() {
     override val titleResourceId: Int = R.string.player
diff --git a/app/src/main/java/com/github/libretube/ui/sheets/ChannelOptionsBottomSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/ChannelOptionsBottomSheet.kt
index f3edef523..eaf86e581 100644
--- a/app/src/main/java/com/github/libretube/ui/sheets/ChannelOptionsBottomSheet.kt
+++ b/app/src/main/java/com/github/libretube/ui/sheets/ChannelOptionsBottomSheet.kt
@@ -7,10 +7,10 @@ import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.enums.ShareObjectType
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.toID
+import com.github.libretube.helpers.BackgroundHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.obj.ShareData
 import com.github.libretube.ui.dialogs.ShareDialog
-import com.github.libretube.util.BackgroundHelper
-import com.github.libretube.util.NavigationHelper
 import kotlinx.coroutines.runBlocking
 
 /**
diff --git a/app/src/main/java/com/github/libretube/ui/sheets/PlaybackOptionsSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/PlaybackOptionsSheet.kt
index caaa79898..01bc6ff15 100644
--- a/app/src/main/java/com/github/libretube/ui/sheets/PlaybackOptionsSheet.kt
+++ b/app/src/main/java/com/github/libretube/ui/sheets/PlaybackOptionsSheet.kt
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.PlaybackBottomSheetBinding
 import com.github.libretube.extensions.round
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.PlaybackParameters
 
diff --git a/app/src/main/java/com/github/libretube/ui/sheets/PlaylistOptionsBottomSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/PlaylistOptionsBottomSheet.kt
index f652a9246..835445bcd 100644
--- a/app/src/main/java/com/github/libretube/ui/sheets/PlaylistOptionsBottomSheet.kt
+++ b/app/src/main/java/com/github/libretube/ui/sheets/PlaylistOptionsBottomSheet.kt
@@ -11,11 +11,12 @@ import com.github.libretube.extensions.awaitQuery
 import com.github.libretube.extensions.query
 import com.github.libretube.extensions.toID
 import com.github.libretube.extensions.toPlaylistBookmark
+import com.github.libretube.extensions.toastFromMainThread
+import com.github.libretube.helpers.BackgroundHelper
 import com.github.libretube.obj.ShareData
 import com.github.libretube.ui.dialogs.DeletePlaylistDialog
 import com.github.libretube.ui.dialogs.RenamePlaylistDialog
 import com.github.libretube.ui.dialogs.ShareDialog
-import com.github.libretube.util.BackgroundHelper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -59,14 +60,23 @@ class PlaylistOptionsBottomSheet(
                         val playlist = PlaylistsHelper.getPlaylist(playlistId)
                         BackgroundHelper.playOnBackground(
                             context = requireContext(),
-                            videoId = playlist.relatedStreams!![0].url!!.toID(),
+                            videoId = playlist.relatedStreams[0].url!!.toID(),
                             playlistId = playlistId
                         )
                     }
                 }
                 // Clone the playlist to the users Piped account
                 getString(R.string.clonePlaylist) -> {
-                    PlaylistsHelper.clonePlaylist(requireContext(), playlistId)
+                    val appContext = context?.applicationContext
+                    CoroutineScope(Dispatchers.IO).launch {
+                        val playlistId = PlaylistsHelper.clonePlaylist(
+                            requireContext().applicationContext,
+                            playlistId
+                        )
+                        appContext?.toastFromMainThread(
+                            if (playlistId != null) R.string.playlistCloned else R.string.server_error
+                        )
+                    }
                 }
                 // share the playlist
                 getString(R.string.share) -> {
diff --git a/app/src/main/java/com/github/libretube/ui/sheets/VideoOptionsBottomSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/VideoOptionsBottomSheet.kt
index fb75cf325..a6243de9c 100644
--- a/app/src/main/java/com/github/libretube/ui/sheets/VideoOptionsBottomSheet.kt
+++ b/app/src/main/java/com/github/libretube/ui/sheets/VideoOptionsBottomSheet.kt
@@ -5,11 +5,11 @@ import com.github.libretube.R
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.enums.ShareObjectType
 import com.github.libretube.extensions.toStreamItem
+import com.github.libretube.helpers.BackgroundHelper
 import com.github.libretube.obj.ShareData
 import com.github.libretube.ui.dialogs.AddToPlaylistDialog
 import com.github.libretube.ui.dialogs.DownloadDialog
 import com.github.libretube.ui.dialogs.ShareDialog
-import com.github.libretube.util.BackgroundHelper
 import com.github.libretube.util.PlayingQueue
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/github/libretube/ui/tools/SleepTimer.kt b/app/src/main/java/com/github/libretube/ui/tools/SleepTimer.kt
index 54c6c1386..45b59a9ac 100644
--- a/app/src/main/java/com/github/libretube/ui/tools/SleepTimer.kt
+++ b/app/src/main/java/com/github/libretube/ui/tools/SleepTimer.kt
@@ -7,8 +7,8 @@ import android.os.Process
 import androidx.core.os.postDelayed
 import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.activities.MainActivity
-import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.snackbar.Snackbar
 
 object SleepTimer {
diff --git a/app/src/main/java/com/github/libretube/ui/views/AppNameTextView.kt b/app/src/main/java/com/github/libretube/ui/views/AppNameTextView.kt
index aad8a7f5a..848b62c42 100644
--- a/app/src/main/java/com/github/libretube/ui/views/AppNameTextView.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/AppNameTextView.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.util.TypedValue
 import androidx.appcompat.widget.AppCompatTextView
-import com.github.libretube.util.ThemeHelper
+import com.github.libretube.helpers.ThemeHelper
 
 class AppNameTextView : AppCompatTextView {
     constructor(context: Context, attributeSet: AttributeSet?) : super(context, attributeSet)
diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
index 132654c0c..bc46f7f9c 100644
--- a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
@@ -23,19 +23,19 @@ import com.github.libretube.databinding.ExoStyledPlayerControlViewBinding
 import com.github.libretube.databinding.PlayerGestureControlsViewBinding
 import com.github.libretube.extensions.dpToPx
 import com.github.libretube.extensions.normalize
+import com.github.libretube.helpers.AudioHelper
+import com.github.libretube.helpers.BrightnessHelper
+import com.github.libretube.helpers.PlayerHelper
 import com.github.libretube.obj.BottomSheetItem
 import com.github.libretube.ui.activities.MainActivity
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.interfaces.OnlinePlayerOptions
 import com.github.libretube.ui.interfaces.PlayerGestureOptions
 import com.github.libretube.ui.interfaces.PlayerOptions
+import com.github.libretube.ui.listeners.PlayerGestureController
 import com.github.libretube.ui.models.PlayerViewModel
 import com.github.libretube.ui.sheets.BaseBottomSheet
 import com.github.libretube.ui.sheets.PlaybackOptionsSheet
-import com.github.libretube.util.AudioHelper
-import com.github.libretube.util.BrightnessHelper
-import com.github.libretube.util.PlayerGestureController
-import com.github.libretube.util.PlayerHelper
 import com.github.libretube.util.PlayingQueue
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.Player
@@ -196,7 +196,7 @@ internal class CustomExoPlayerView(
     }
 
     private fun cancelHideControllerTask() {
-        handler.removeCallbacksAndMessages(HIDE_CONTROLLER_TOKEN)
+        handler?.removeCallbacksAndMessages(HIDE_CONTROLLER_TOKEN)
     }
 
     override fun hideController() {
@@ -618,10 +618,8 @@ internal class CustomExoPlayerView(
         player?.let { player ->
             if (player.isPlaying) {
                 player.pause()
-                if (!isControllerFullyVisible) showController()
             } else {
                 player.play()
-                if (isControllerFullyVisible) hideController()
             }
         }
     }
diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomSwipeToRefresh.kt b/app/src/main/java/com/github/libretube/ui/views/CustomSwipeToRefresh.kt
index 733e7ea1e..8d2d7d1f2 100644
--- a/app/src/main/java/com/github/libretube/ui/views/CustomSwipeToRefresh.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/CustomSwipeToRefresh.kt
@@ -8,7 +8,8 @@ import android.view.MotionEvent.ACTION_MOVE
 import android.view.ViewConfiguration
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.libretube.R
-import com.github.libretube.util.ThemeHelper
+import com.github.libretube.helpers.ThemeHelper
+import com.google.android.material.elevation.SurfaceColors
 import kotlin.math.abs
 
 class CustomSwipeToRefresh(context: Context?, attrs: AttributeSet?) :
@@ -19,7 +20,7 @@ class CustomSwipeToRefresh(context: Context?, attrs: AttributeSet?) :
     init {
         setColorSchemeColors(ThemeHelper.getThemeColor(this.context, R.attr.colorPrimary))
         setProgressBackgroundColorSchemeColor(
-            ThemeHelper.getThemeColor(this.context, R.attr.colorSurface)
+            SurfaceColors.getColorForElevation(this.context, 20f)
         )
     }
 
diff --git a/app/src/main/java/com/github/libretube/ui/views/DrawableTextView.kt b/app/src/main/java/com/github/libretube/ui/views/DrawableTextView.kt
new file mode 100644
index 000000000..0d5909310
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/ui/views/DrawableTextView.kt
@@ -0,0 +1,75 @@
+package com.github.libretube.ui.views
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.view.Gravity
+import androidx.appcompat.widget.AppCompatTextView
+import com.github.libretube.R
+
+/**
+ * TextView with custom sizable drawable support.
+ * It may only be used for icons as it gives same width and height to the drawable.
+ */
+class DrawableTextView(
+    context: Context,
+    attrs: AttributeSet? = null
+) : AppCompatTextView(context, attrs) {
+
+    private var drawableStartDimen = 0F
+    private var drawableTopDimen = 0F
+    private var drawableEndDimen = 0F
+    private var drawableBottomDimen = 0F
+
+    init {
+        val ta = getContext().obtainStyledAttributes(attrs, R.styleable.DrawableTextView, 0, 0)
+        try {
+            drawableStartDimen = getDimen(ta, R.styleable.DrawableTextView_drawableStartDimen)
+            drawableTopDimen = getDimen(ta, R.styleable.DrawableTextView_drawableTopDimen)
+            drawableEndDimen = getDimen(ta, R.styleable.DrawableTextView_drawableEndDimen)
+            drawableBottomDimen = getDimen(ta, R.styleable.DrawableTextView_drawableBottomDimen)
+
+            gravity = ta.getInt(
+                R.styleable.DrawableTextView_android_gravity,
+                Gravity.CENTER_VERTICAL
+            )
+            compoundDrawablePadding = ta.getDimensionPixelOffset(
+                R.styleable.DrawableTextView_android_drawablePadding,
+                20
+            )
+        } finally {
+            ta.recycle()
+        }
+    }
+
+    private fun getDimen(ta: TypedArray, index: Int): Float {
+        return ta.getDimensionPixelOffset(index, 0).toFloat()
+    }
+
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        super.onLayout(changed, left, top, right, bottom)
+        val relDrawables = adjust(compoundDrawablesRelative)
+        setCompoundDrawablesRelative(
+            relDrawables[0],
+            relDrawables[1],
+            relDrawables[2],
+            relDrawables[3]
+        )
+    }
+
+    private fun adjust(drawables: Array<Drawable?>): Array<Drawable?> {
+        listOf(drawableStartDimen, drawableTopDimen, drawableEndDimen, drawableBottomDimen).forEachIndexed { index, dimen ->
+            drawables[index] = drawables[index].getAdjustedDrawable(dimen)
+        }
+        return drawables
+    }
+
+    private fun Drawable?.getAdjustedDrawable(dimen: Float): Drawable? {
+        this ?: return null
+        dimen.toInt().let {
+            if (it > 0) setBounds(0, 0, it, it)
+        }
+        return this
+    }
+}
diff --git a/app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt b/app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt
index ffd97eefb..36615a265 100644
--- a/app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt
@@ -11,8 +11,8 @@ import com.github.libretube.R
 import com.github.libretube.api.obj.Segment
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.extensions.dpToPx
-import com.github.libretube.util.PreferenceHelper
-import com.github.libretube.util.ThemeHelper
+import com.github.libretube.helpers.PreferenceHelper
+import com.github.libretube.helpers.ThemeHelper
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.ui.DefaultTimeBar
 
diff --git a/app/src/main/java/com/github/libretube/ui/views/SliderPreference.kt b/app/src/main/java/com/github/libretube/ui/views/SliderPreference.kt
index 1f927013a..6aee66187 100644
--- a/app/src/main/java/com/github/libretube/ui/views/SliderPreference.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/SliderPreference.kt
@@ -7,7 +7,7 @@ import androidx.preference.Preference
 import com.github.libretube.R
 import com.github.libretube.databinding.DialogSliderBinding
 import com.github.libretube.extensions.round
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 /**
diff --git a/app/src/main/java/com/github/libretube/ui/views/TimePickerPreference.kt b/app/src/main/java/com/github/libretube/ui/views/TimePickerPreference.kt
index f319b2ac5..248f527a3 100644
--- a/app/src/main/java/com/github/libretube/ui/views/TimePickerPreference.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/TimePickerPreference.kt
@@ -5,7 +5,7 @@ import android.text.format.DateFormat.is24HourFormat
 import android.util.AttributeSet
 import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.Preference
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.timepicker.MaterialTimePicker
 import com.google.android.material.timepicker.TimeFormat
 import java.time.LocalTime
diff --git a/app/src/main/java/com/github/libretube/util/ClipboardHelper.kt b/app/src/main/java/com/github/libretube/util/ClipboardHelper.kt
deleted file mode 100644
index 47ad931ff..000000000
--- a/app/src/main/java/com/github/libretube/util/ClipboardHelper.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.github.libretube.util
-
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import com.github.libretube.R
-
-class ClipboardHelper(
-    private val context: Context
-) {
-    fun save(text: String) {
-        val clipboard: ClipboardManager =
-            context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-        val clip = ClipData.newPlainText(context.getString(R.string.copied), text)
-        clipboard.setPrimaryClip(clip)
-    }
-}
diff --git a/app/src/main/java/com/github/libretube/util/DataSaverMode.kt b/app/src/main/java/com/github/libretube/util/DataSaverMode.kt
index 619ce58d2..29cf85aff 100644
--- a/app/src/main/java/com/github/libretube/util/DataSaverMode.kt
+++ b/app/src/main/java/com/github/libretube/util/DataSaverMode.kt
@@ -2,6 +2,8 @@ package com.github.libretube.util
 
 import android.content.Context
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.helpers.NetworkHelper
+import com.github.libretube.helpers.PreferenceHelper
 
 object DataSaverMode {
     fun isEnabled(context: Context): Boolean {
diff --git a/app/src/main/java/com/github/libretube/util/ExceptionHandler.kt b/app/src/main/java/com/github/libretube/util/ExceptionHandler.kt
index 3d790d7c8..e6ab250df 100644
--- a/app/src/main/java/com/github/libretube/util/ExceptionHandler.kt
+++ b/app/src/main/java/com/github/libretube/util/ExceptionHandler.kt
@@ -1,5 +1,7 @@
 package com.github.libretube.util
 
+import com.github.libretube.helpers.PreferenceHelper
+
 class ExceptionHandler(
     private val defaultExceptionHandler: Thread.UncaughtExceptionHandler?
 ) : Thread.UncaughtExceptionHandler {
diff --git a/app/src/main/java/com/github/libretube/util/NowPlayingNotification.kt b/app/src/main/java/com/github/libretube/util/NowPlayingNotification.kt
index 234a1cbd2..761130a6f 100644
--- a/app/src/main/java/com/github/libretube/util/NowPlayingNotification.kt
+++ b/app/src/main/java/com/github/libretube/util/NowPlayingNotification.kt
@@ -24,6 +24,8 @@ import com.github.libretube.compat.PendingIntentCompat
 import com.github.libretube.constants.BACKGROUND_CHANNEL_ID
 import com.github.libretube.constants.IntentData
 import com.github.libretube.constants.PLAYER_NOTIFICATION_ID
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.PlayerHelper
 import com.github.libretube.ui.activities.MainActivity
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.Player
diff --git a/app/src/main/java/com/github/libretube/util/TextUtils.kt b/app/src/main/java/com/github/libretube/util/TextUtils.kt
index 1da931d67..26d29d5f9 100644
--- a/app/src/main/java/com/github/libretube/util/TextUtils.kt
+++ b/app/src/main/java/com/github/libretube/util/TextUtils.kt
@@ -41,11 +41,7 @@ object TextUtils {
      * @return Time in seconds
      */
     fun parseTimestamp(t: String): Long? {
-        if (t.all { c -> c.isDigit() }) {
-            return t.toLong()
-        }
-
-        return Duration.parseOrNull(t)?.inWholeSeconds
+        return t.toLongOrNull() ?: Duration.parseOrNull(t)?.inWholeSeconds
     }
 
     /**
diff --git a/app/src/main/java/com/github/libretube/workers/NotificationWorker.kt b/app/src/main/java/com/github/libretube/workers/NotificationWorker.kt
index 2ea3e01bc..004f20e6d 100644
--- a/app/src/main/java/com/github/libretube/workers/NotificationWorker.kt
+++ b/app/src/main/java/com/github/libretube/workers/NotificationWorker.kt
@@ -8,7 +8,7 @@ import android.os.Build
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import androidx.work.Worker
+import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.github.libretube.R
 import com.github.libretube.api.SubscriptionHelper
@@ -19,17 +19,18 @@ import com.github.libretube.constants.PUSH_CHANNEL_ID
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.toID
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.activities.MainActivity
 import com.github.libretube.ui.views.TimePickerPreference
-import com.github.libretube.util.PreferenceHelper
 import java.time.LocalTime
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 /**
  * The notification worker which checks for new streams in a certain frequency
  */
 class NotificationWorker(appContext: Context, parameters: WorkerParameters) :
-    Worker(appContext, parameters) {
+    CoroutineWorker(appContext, parameters) {
 
     private val notificationManager = NotificationManagerCompat.from(appContext)
 
@@ -41,7 +42,7 @@ class NotificationWorker(appContext: Context, parameters: WorkerParameters) :
         DOWNLOAD_PROGRESS_NOTIFICATION_ID
     }
 
-    override fun doWork(): Result {
+    override suspend fun doWork(): Result {
         if (!checkTime()) Result.success()
         // check whether there are new streams and notify if there are some
         val result = checkForNewStreams()
@@ -82,71 +83,68 @@ class NotificationWorker(appContext: Context, parameters: WorkerParameters) :
     /**
      * check whether new streams are available in subscriptions
      */
-    private fun checkForNewStreams(): Boolean {
-        var success = true
-
+    private suspend fun checkForNewStreams(): Boolean {
         Log.d(TAG(), "Work manager started")
 
-        runBlocking {
-            // fetch the users feed
-            val videoFeed = try {
+        // fetch the users feed
+        val videoFeed = try {
+            withContext(Dispatchers.IO) {
                 SubscriptionHelper.getFeed()
-            } catch (e: Exception) {
-                success = false
-                return@runBlocking
             }
-
-            val lastSeenStreamId = PreferenceHelper.getLastSeenVideoId()
-            val latestFeedStreamId = videoFeed.firstOrNull()?.url?.toID() ?: return@runBlocking
-
-            // first time notifications are enabled or no new video available
-            if (lastSeenStreamId == "" || lastSeenStreamId == latestFeedStreamId) {
-                PreferenceHelper.setLatestVideoId(lastSeenStreamId)
-                return@runBlocking
-            }
-
-            // filter the new videos until the last seen video in the feed
-            val newStreams = videoFeed.takeWhile { it.url!!.toID() != lastSeenStreamId }
-
-            // return if the previous video didn't get found
-            if (newStreams.isEmpty()) return@runBlocking
-
-            // hide for notifications unsubscribed channels
-            val channelsToIgnore = PreferenceHelper.getIgnorableNotificationChannels()
-            val filteredVideos = newStreams.filter {
-                channelsToIgnore.none { channelId ->
-                    channelId == it.uploaderUrl?.toID()
-                }
-            }
-
-            // group the new streams by the uploader
-            val channelGroups = filteredVideos.groupBy { it.uploaderUrl }
-
-            Log.d(TAG(), "Create notifications for new videos")
-
-            // create a notification for each new stream
-            channelGroups.forEach { (_, streams) ->
-                createNotification(
-                    group = streams.first().uploaderUrl!!.toID(),
-                    title = streams.first().uploaderName.toString(),
-                    urlPath = streams.first().uploaderUrl!!,
-                    isGroupSummary = true
-                )
-
-                streams.forEach { streamItem ->
-                    createNotification(
-                        title = streamItem.title.toString(),
-                        description = streamItem.uploaderName.toString(),
-                        urlPath = streamItem.url!!,
-                        group = streamItem.uploaderUrl!!.toID()
-                    )
-                }
-            }
-            // save the latest streams that got notified about
-            PreferenceHelper.setLatestVideoId(videoFeed.first().url!!.toID())
+        } catch (e: Exception) {
+            return false
         }
+
+        val lastSeenStreamId = PreferenceHelper.getLastSeenVideoId()
+        val latestFeedStreamId = videoFeed.firstOrNull()?.url?.toID() ?: return true
+
+        // first time notifications are enabled or no new video available
+        if (lastSeenStreamId == "" || lastSeenStreamId == latestFeedStreamId) {
+            PreferenceHelper.setLatestVideoId(lastSeenStreamId)
+            return true
+        }
+
+        // filter the new videos until the last seen video in the feed
+        val newStreams = videoFeed.takeWhile { it.url!!.toID() != lastSeenStreamId }
+
+        // return if the previous video didn't get found
+        if (newStreams.isEmpty()) return true
+
+        // hide for notifications unsubscribed channels
+        val channelsToIgnore = PreferenceHelper.getIgnorableNotificationChannels()
+        val filteredVideos = newStreams.filter {
+            channelsToIgnore.none { channelId ->
+                channelId == it.uploaderUrl?.toID()
+            }
+        }
+
+        // group the new streams by the uploader
+        val channelGroups = filteredVideos.groupBy { it.uploaderUrl }
+
+        Log.d(TAG(), "Create notifications for new videos")
+
+        // create a notification for each new stream
+        channelGroups.forEach { (_, streams) ->
+            createNotification(
+                group = streams.first().uploaderUrl!!.toID(),
+                title = streams.first().uploaderName.toString(),
+                urlPath = streams.first().uploaderUrl!!,
+                isGroupSummary = true
+            )
+
+            streams.forEach { streamItem ->
+                createNotification(
+                    title = streamItem.title.toString(),
+                    description = streamItem.uploaderName.toString(),
+                    urlPath = streamItem.url!!,
+                    group = streamItem.uploaderUrl!!.toID()
+                )
+            }
+        }
+        // save the latest streams that got notified about
+        PreferenceHelper.setLatestVideoId(videoFeed.first().url!!.toID())
         // return whether the work succeeded
-        return success
+        return true
     }
 
     /**
diff --git a/app/src/main/res/drawable/ic_dislike.xml b/app/src/main/res/drawable/ic_dislike.xml
new file mode 100644
index 000000000..a9d9224ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dislike.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15,3L6,3c-0.83,0 -1.54,0.5 -1.84,1.22l-3.02,7.05c-0.09,0.23 -0.14,0.47 -0.14,0.73v2c0,1.1 0.9,2 2,2h6.31l-0.95,4.57 -0.03,0.32c0,0.41 0.17,0.79 0.44,1.06L9.83,23l6.59,-6.59c0.36,-0.36 0.58,-0.86 0.58,-1.41L17,5c0,-1.1 -0.9,-2 -2,-2zM19,3v12h4L23,3h-4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_mastodon.xml b/app/src/main/res/drawable/ic_mastodon.xml
new file mode 100644
index 000000000..87be939df
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mastodon.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="25.72888dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="216.41"
+    android:viewportHeight="232.01">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M107.87,0C78.2,0.24 49.67,3.45 33.05,11.09C33.05,11.09 0.07,25.84 0.07,76.17C0.07,87.7 -0.16,101.48 0.21,116.09C1.41,165.31 9.23,213.82 54.74,225.86C75.72,231.42 93.74,232.58 108.25,231.78C134.56,230.33 149.33,222.39 149.33,222.39L148.46,203.3C148.46,203.3 129.66,209.23 108.54,208.51C87.62,207.79 65.53,206.25 62.15,180.57C61.84,178.31 61.68,175.9 61.68,173.36C61.68,173.36 82.22,178.38 108.25,179.58C124.16,180.31 139.09,178.64 154.24,176.84C183.31,173.36 208.63,155.45 211.81,139.09C216.82,113.31 216.41,76.17 216.41,76.17C216.41,25.84 183.43,11.09 183.43,11.09C166.81,3.45 138.26,0.24 108.59,0L107.87,0zM74.3,39.33C86.65,39.33 96.01,44.07 102.19,53.57L108.21,63.65L114.22,53.57C120.41,44.07 129.76,39.33 142.12,39.33C152.8,39.33 161.4,43.08 167.97,50.4C174.34,57.72 177.51,67.62 177.51,80.08L177.51,141.02L153.37,141.02L153.37,81.87C153.37,69.4 148.12,63.07 137.63,63.07C126.02,63.07 120.21,70.58 120.21,85.42L120.21,117.8L96.21,117.8L96.21,85.42C96.21,70.58 90.39,63.07 78.79,63.07C68.29,63.07 63.05,69.4 63.05,81.87L63.05,141.02L38.9,141.02L38.9,80.08C38.9,67.62 42.08,57.72 48.45,50.4C55.01,43.08 63.62,39.33 74.3,39.33z"
+        tools:ignore="VectorPath" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_twitter.xml b/app/src/main/res/drawable/ic_twitter.xml
deleted file mode 100644
index b27dbedcf..000000000
--- a/app/src/main/res/drawable/ic_twitter.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="310"
-    android:viewportHeight="310">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M302.97,57.39c-4.87,2.16 -9.88,3.98 -14.99,5.46c6.06,-6.85 10.68,-14.91 13.49,-23.73c0.63,-1.98 -0.02,-4.14 -1.65,-5.43c-1.62,-1.29 -3.88,-1.45 -5.66,-0.39c-10.86,6.44 -22.59,11.07 -34.88,13.78c-12.38,-12.1 -29.2,-18.98 -46.58,-18.98c-36.69,0 -66.55,29.85 -66.55,66.55c0,2.89 0.18,5.76 0.55,8.6C101.16,99.24 58.83,76.86 29.76,41.2c-1.04,-1.27 -2.63,-1.96 -4.27,-1.83c-1.63,0.13 -3.1,1.05 -3.93,2.47c-5.9,10.12 -9.01,21.69 -9.01,33.46c0,16.03 5.72,31.25 15.84,43.14c-3.08,-1.07 -6.06,-2.4 -8.91,-3.98c-1.53,-0.85 -3.39,-0.84 -4.91,0.03c-1.52,0.87 -2.47,2.47 -2.51,4.22c-0.01,0.29 -0.01,0.59 -0.01,0.89c0,23.93 12.88,45.48 32.58,57.23c-1.69,-0.17 -3.38,-0.41 -5.06,-0.74c-1.73,-0.33 -3.51,0.28 -4.68,1.6c-1.17,1.32 -1.56,3.16 -1.02,4.84c7.29,22.76 26.06,39.5 48.75,44.6c-18.82,11.79 -40.34,17.96 -62.93,17.96c-4.71,0 -9.45,-0.28 -14.1,-0.83c-2.31,-0.27 -4.51,1.09 -5.29,3.28c-0.79,2.19 0.05,4.64 2.01,5.89c29.02,18.61 62.58,28.44 97.05,28.44c67.75,0 110.14,-31.95 133.76,-58.75c29.46,-33.42 46.36,-77.66 46.36,-121.37c0,-1.83 -0.03,-3.67 -0.08,-5.51c11.62,-8.76 21.63,-19.35 29.77,-31.54c1.24,-1.85 1.1,-4.3 -0.33,-6C307.39,57.04 305.01,56.49 302.97,57.39z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index e06e93f56..ece2000c5 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -16,14 +17,15 @@
             app:navigationIcon="?homeAsUpIndicator"
             app:title="@string/about" />
 
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/appIcon"
-            android:layout_width="90dp"
-            android:layout_height="90dp"
+        <ImageView
+            android:id="@+id/app_icon"
+            android:layout_width="120dp"
+            android:layout_height="120dp"
             android:layout_gravity="center"
             android:layout_marginTop="30dp"
-            android:src="@mipmap/ic_launcher_round"
-            app:shapeAppearance="@style/CircleImageView" />
+            android:src="@drawable/ic_launcher_lockscreen"
+            app:tint="?attr/colorSecondary"
+            tools:ignore="ContentDescription" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -39,17 +41,10 @@
             android:id="@+id/website"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_region" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/website" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/website"
+                app:drawableStartCompat="@drawable/ic_region" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -57,17 +52,10 @@
             android:id="@+id/github"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_github" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/github" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/github"
+                app:drawableStartCompat="@drawable/ic_github" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -75,17 +63,10 @@
             android:id="@+id/piped"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_piped" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/piped" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/piped"
+                app:drawableStartCompat="@drawable/ic_piped" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -93,17 +74,10 @@
             android:id="@+id/translate"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_weblate" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/translate" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/translate"
+                app:drawableStartCompat="@drawable/ic_weblate" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -111,17 +85,10 @@
             android:id="@+id/license"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_license" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/license" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/license"
+                app:drawableStartCompat="@drawable/ic_license" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -129,17 +96,10 @@
             android:id="@+id/device"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_device" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/device_info" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/device_info"
+                app:drawableStartCompat="@drawable/ic_device" />
 
         </com.google.android.material.card.MaterialCardView>
 
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
index e7fea8bd7..729a33e2d 100644
--- a/app/src/main/res/layout/activity_help.xml
+++ b/app/src/main/res/layout/activity_help.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -14,32 +15,26 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:navigationIcon="?homeAsUpIndicator"
-            app:title="@string/community" />
+            app:title="@string/help" />
 
-        <com.google.android.material.imageview.ShapeableImageView
-            android:layout_width="90dp"
-            android:layout_height="90dp"
+        <ImageView
+            android:layout_width="120dp"
+            android:layout_height="120dp"
             android:layout_gravity="center"
             android:layout_marginTop="30dp"
             android:layout_marginBottom="40dp"
-            android:src="@mipmap/ic_launcher_round"
-            app:shapeAppearance="@style/CircleImageView" />
+            android:src="@drawable/ic_launcher_lockscreen"
+            app:tint="?attr/colorSecondary"
+            tools:ignore="ContentDescription" />
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/faq"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_help" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/faq" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/faq"
+                app:drawableStartCompat="@drawable/ic_help" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -47,17 +42,24 @@
             android:id="@+id/matrix"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="Matrix"
+                app:drawableStartCompat="@drawable/ic_matrix"
+                tools:ignore="HardcodedText" />
 
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_matrix" />
+        </com.google.android.material.card.MaterialCardView>
 
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/matrix" />
 
-            </LinearLayout>
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/mastodon"
+            style="@style/AboutCard">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="Mastodon"
+                app:drawableStartCompat="@drawable/ic_mastodon"
+                tools:ignore="HardcodedText" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -65,17 +67,11 @@
             android:id="@+id/telegram"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_telegram" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/telegram" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="Telegram"
+                app:drawableStartCompat="@drawable/ic_telegram"
+                tools:ignore="HardcodedText" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -83,17 +79,11 @@
             android:id="@+id/discord"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_discord" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/discord" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="Discord"
+                app:drawableStartCompat="@drawable/ic_discord"
+                tools:ignore="HardcodedText" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -101,35 +91,11 @@
             android:id="@+id/reddit"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_reddit" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/reddit" />
-
-            </LinearLayout>
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/twitter"
-            style="@style/AboutCard">
-
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_twitter" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/twitter" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="Reddit"
+                app:drawableStartCompat="@drawable/ic_reddit"
+                tools:ignore="HardcodedText" />
 
         </com.google.android.material.card.MaterialCardView>
 
diff --git a/app/src/main/res/layout/bottom_sheet_item.xml b/app/src/main/res/layout/bottom_sheet_item.xml
index dbcd835d2..76231da51 100644
--- a/app/src/main/res/layout/bottom_sheet_item.xml
+++ b/app/src/main/res/layout/bottom_sheet_item.xml
@@ -1,27 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:orientation="horizontal"
     android:paddingHorizontal="30dp"
-    android:paddingVertical="12dp">
-
-    <ImageView
-        android:id="@+id/drawable"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_gravity="center"
-        android:layout_marginEnd="25dp"
-        tools:src="@drawable/ic_download" />
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:textSize="16sp"
-        tools:text="Option" />
-
-</LinearLayout>
\ No newline at end of file
+    android:paddingVertical="12dp"
+    android:gravity="center_vertical"
+    android:drawablePadding="25dp"
+    android:textSize="16sp"
+    tools:drawableStart="@drawable/ic_download"
+    tools:text="Option" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/comments_row.xml b/app/src/main/res/layout/comments_row.xml
index 1c619b9f7..6f27c1706 100644
--- a/app/src/main/res/layout/comments_row.xml
+++ b/app/src/main/res/layout/comments_row.xml
@@ -11,126 +11,118 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
         android:animateLayoutChanges="true"
-        android:orientation="vertical"
+        android:layout_marginBottom="16dp"
+        android:orientation="horizontal"
         android:paddingStart="15dp"
         android:paddingEnd="15dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/commentor_image"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_marginEnd="16dp"
+            android:background="@android:color/darker_gray"
+            app:shapeAppearance="@style/CircleImageView"
+            tools:src="@mipmap/ic_launcher" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <com.google.android.material.imageview.ShapeableImageView
-                android:id="@+id/commentor_image"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:layout_marginEnd="16dp"
-                android:background="@android:color/darker_gray"
-                app:shapeAppearance="@style/CircleImageView"
-                app:srcCompat="@mipmap/ic_launcher" />
+            android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/comment_infos"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:maxLines="2"
-                        android:textSize="14sp"
-                        android:textColor="?android:attr/textColorSecondary"
-                        tools:text="Author and Time" />
-
-                    <ImageView
-                        android:id="@+id/verified_imageView"
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_marginStart="4dp"
-                        android:layout_marginTop="4dp"
-                        android:visibility="gone"
-                        app:srcCompat="@drawable/ic_verified" />
-
-                    <ImageView
-                        android:id="@+id/pinned_imageView"
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_marginStart="4dp"
-                        android:layout_marginTop="4dp"
-                        android:visibility="gone"
-                        app:srcCompat="@drawable/ic_pinned" />
-                </LinearLayout>
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/comment_text"
-                    android:layout_width="match_parent"
+                    android:id="@+id/comment_infos"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="8dp"
-                    android:textSize="15sp"
-                    android:autoLink="web"
-                    tools:text="Comment Text" />
+                    android:ellipsize="end"
+                    android:maxLines="2"
+                    android:textAlignment="viewStart"
+                    android:textSize="14sp"
+                    android:textColor="?android:attr/textColorSecondary"
+                    tools:text="Octacat • 10h" />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal">
+                <ImageView
+                    android:id="@+id/verified_imageView"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginStart="4dp"
+                    android:visibility="gone"
+                    app:srcCompat="@drawable/ic_verified"
+                    tools:visibility="visible" />
 
-                    <ImageView
-                        android:id="@+id/likes_imageView"
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_marginTop="2dp"
-                        app:srcCompat="@drawable/ic_thumb_up" />
+                <ImageView
+                    android:id="@+id/pinned_imageView"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginStart="4dp"
+                    android:visibility="gone"
+                    app:srcCompat="@drawable/ic_pinned"
+                    tools:visibility="visible" />
+            </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/likes_textView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="6dp"
-                        tools:text="LikeCount" />
+            <TextView
+                android:id="@+id/comment_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="8dp"
+                android:textSize="15sp"
+                android:autoLink="web"
+                android:textAlignment="viewStart"
+                tools:text="Comment Text" />
 
-                    <ImageView
-                        android:id="@+id/hearted_imageView"
-                        android:layout_width="14dp"
-                        android:layout_height="14dp"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginTop="3dp"
-                        android:visibility="gone"
-                        app:srcCompat="@drawable/ic_hearted" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-                    <ImageView
-                        android:id="@+id/replies_available"
-                        android:layout_width="14dp"
-                        android:layout_height="14dp"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginTop="3dp"
-                        android:visibility="gone"
-                        app:srcCompat="@drawable/ic_comment" />
+                <com.github.libretube.ui.views.DrawableTextView
+                    android:id="@+id/likes_textView"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginEnd="5dp"
+                    android:gravity="center_vertical"
+                    android:includeFontPadding="false"
+                    android:drawablePadding="6dp"
+                    app:drawableStartCompat="@drawable/ic_thumb_up"
+                    app:drawableStartDimen="16dp"
+                    tools:text="1.2k" />
 
-                    <TextView
-                        android:id="@+id/replies_count"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="6dp"
-                        tools:text="ReplyCount" />
+                <ImageView
+                    android:id="@+id/hearted_imageView"
+                    android:layout_width="14dp"
+                    android:layout_height="14dp"
+                    android:layout_marginEnd="8dp"
+                    android:visibility="gone"
+                    app:srcCompat="@drawable/ic_hearted"
+                    tools:visibility="visible" />
 
-                </LinearLayout>
+                <com.github.libretube.ui.views.DrawableTextView
+                    android:id="@+id/replies_count"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:drawablePadding="6dp"
+                    android:gravity="center_vertical"
+                    android:includeFontPadding="false"
+                    android:visibility="gone"
+                    app:drawableStartCompat="@drawable/ic_comment"
+                    app:drawableStartDimen="16dp"
+                    tools:text="53"
+                    tools:visibility="visible" />
 
             </LinearLayout>
 
         </LinearLayout>
 
+
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/comments_sheet.xml b/app/src/main/res/layout/comments_sheet.xml
index 197927b86..c79509a14 100644
--- a/app/src/main/res/layout/comments_sheet.xml
+++ b/app/src/main/res/layout/comments_sheet.xml
@@ -49,6 +49,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:layout_marginHorizontal="10dp"
+                    android:textAlignment="viewStart"
                     tools:text="Title" />
 
                 <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/fragment_audio_player.xml b/app/src/main/res/layout/fragment_audio_player.xml
index 40c1b5a1a..a574140c7 100644
--- a/app/src/main/res/layout/fragment_audio_player.xml
+++ b/app/src/main/res/layout/fragment_audio_player.xml
@@ -23,6 +23,41 @@
             app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Small"
             tools:src="@tools:sample/backgrounds/scenic" />
 
+        <LinearLayout
+            android:id="@+id/volumeControls"
+            android:layout_width="42dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@drawable/controls_layout_bg"
+            android:orientation="vertical"
+            android:visibility="gone"
+            tools:ignore="RtlHardcoded">
+
+            <TextView
+                android:id="@+id/volume_textView"
+                style="@style/SwipeControlString"
+                android:layout_gravity="center"
+                app:autoSizeTextType="uniform" />
+
+            <ProgressBar
+                android:id="@+id/volume_progressBar"
+                style="@android:style/Widget.ProgressBar.Horizontal"
+                android:layout_width="7dp"
+                android:layout_height="100dp"
+                android:layout_gravity="center"
+                android:layout_marginVertical="4dp"
+                android:progressDrawable="@drawable/vertical_progressbar" />
+
+            <ImageView
+                android:id="@+id/volume_imageView"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_gravity="center"
+                android:contentDescription="@string/volume"
+                android:src="@drawable/ic_volume_up" />
+
+        </LinearLayout>
+
         <ProgressBar
             android:id="@+id/progress"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 105509636..752a8d331 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -15,7 +15,7 @@
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -43,6 +43,7 @@
                             android:text="@string/watch_history"
                             android:textSize="18sp"
                             android:textStyle="bold"
+                            android:textAlignment="viewStart"
                             app:drawableStartCompat="@drawable/ic_time_outlined" />
 
                         <TextView
@@ -56,6 +57,7 @@
                             android:text="@string/downloads"
                             android:textSize="18sp"
                             android:textStyle="bold"
+                            android:textAlignment="viewStart"
                             app:drawableStartCompat="@drawable/ic_download" />
 
                     </LinearLayout>
@@ -82,6 +84,7 @@
                             android:text="@string/playlists"
                             android:padding="8dp"
                             android:textSize="18sp"
+                            android:textAlignment="viewStart"
                             android:textStyle="bold" />
 
                         <RelativeLayout
@@ -113,7 +116,7 @@
                             android:id="@+id/playlist_recView"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:nestedScrollingEnabled="false"/>
+                            android:nestedScrollingEnabled="false" />
 
                     </LinearLayout>
 
@@ -147,7 +150,7 @@
                             android:id="@+id/bookmarks_recView"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:nestedScrollingEnabled="false"/>
+                            android:nestedScrollingEnabled="false" />
 
                     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 73c3f7e2f..01fb7a38f 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -29,6 +29,8 @@
                 android:id="@+id/player_title_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:layout_gravity="center_vertical"
                 android:orientation="vertical">
 
                 <LinearLayout
@@ -70,43 +72,28 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:layout_marginEnd="5dp"
                         tools:text="10M views    2 days ago " />
 
-                    <LinearLayout
+                    <com.github.libretube.ui.views.DrawableTextView
+                        android:id="@+id/textLike"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="3dp"
-                        android:layout_marginTop="2dp">
+                        android:layout_marginHorizontal="5dp"
+                        android:drawablePadding="5dp"
+                        app:drawableStartCompat="@drawable/ic_like"
+                        app:drawableStartDimen="12dp"
+                        tools:text="4.2K" />
 
-                        <ImageView
-                            android:layout_width="12dp"
-                            android:layout_height="12dp"
-                            android:layout_gravity="center"
-                            android:src="@drawable/ic_like" />
-
-                        <TextView
-                            android:id="@+id/textLike"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginHorizontal="5dp"
-                            tools:text="4.2K" />
-
-                        <ImageView
-                            android:layout_width="12dp"
-                            android:layout_height="12dp"
-                            android:layout_gravity="center"
-                            android:layout_marginStart="5dp"
-                            android:rotation="180"
-                            android:src="@drawable/ic_like" />
-
-                        <TextView
-                            android:id="@+id/textDislike"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginHorizontal="5dp"
-                            tools:text="1.3K" />
-
-                    </LinearLayout>
+                    <com.github.libretube.ui.views.DrawableTextView
+                        android:id="@+id/textDislike"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="5dp"
+                        android:drawablePadding="5dp"
+                        app:drawableStartCompat="@drawable/ic_dislike"
+                        app:drawableStartDimen="12dp"
+                        tools:text="1.3K" />
 
                 </LinearLayout>
 
@@ -210,26 +197,25 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginHorizontal="5dp"
+                    android:layout_gravity="start|center_vertical"
+                    android:layout_marginStart="5dp"
+                    android:layout_marginEnd="8dp"
                     android:layout_weight="1"
                     android:layoutDirection="locale"
                     android:orientation="vertical">
 
                     <TextView
                         android:id="@+id/player_channelName"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:textSize="15sp" />
 
                     <TextView
                         android:id="@+id/player_channelSubCount"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:textSize="11sp"
@@ -263,30 +249,14 @@
                 android:layout_margin="16dp"
                 app:cardCornerRadius="18dp">
 
-                <LinearLayout
+                <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_margin="8dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/commentsToggle_textView"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
-                        android:layout_weight="1"
-                        android:text="@string/comments"
-                        android:textSize="17sp" />
-
-                    <ImageView
-                        android:id="@+id/commentsToggle_imageView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginEnd="3dp"
-                        android:src="@drawable/ic_arrow_up_down" />
-
-                </LinearLayout>
+                    android:paddingHorizontal="8dp"
+                    android:text="@string/comments"
+                    android:textAlignment="viewStart"
+                    app:drawableEndCompat="@drawable/ic_arrow_up_down" />
 
             </com.google.android.material.card.MaterialCardView>
 
@@ -356,29 +326,19 @@
             app:strokeWidth="1dp"
             tools:ignore="RtlSymmetry">
 
-            <LinearLayout
+            <com.github.libretube.ui.views.DrawableTextView
                 android:id="@+id/sb_skip_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="10dp"
-                android:visibility="gone">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/skip_segment"
-                    android:textColor="@android:color/white"
-                    android:textSize="18sp" />
-
-                <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_gravity="center"
-                    android:layout_marginHorizontal="10dp"
-                    android:src="@drawable/ic_next"
-                    app:tint="@android:color/white" />
-
-            </LinearLayout>
+                android:visibility="gone"
+                android:text="@string/skip_segment"
+                android:textColor="@android:color/white"
+                android:textSize="18sp"
+                android:drawablePadding="20dp"
+                app:drawableEndCompat="@drawable/ic_next"
+                app:drawableEndDimen="20dp"
+                app:drawableTint="@android:color/white" />
 
         </com.google.android.material.card.MaterialCardView>
 
diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml
index 94ed78fbd..8ecf17855 100644
--- a/app/src/main/res/layout/fragment_subscriptions.xml
+++ b/app/src/main/res/layout/fragment_subscriptions.xml
@@ -69,27 +69,14 @@
                     android:layout_marginBottom="12dp"
                     app:cardCornerRadius="18dp">
 
-                    <LinearLayout
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="8dp">
-
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="8dp"
-                            android:layout_weight="1"
-                            android:text="@string/subscriptions"
-                            android:textSize="17sp" />
-
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginEnd="3dp"
-                            android:src="@drawable/ic_arrow_up_down" />
-
-                    </LinearLayout>
+                        android:layout_margin="8dp"
+                        android:paddingHorizontal="8dp"
+                        android:text="@string/subscriptions"
+                        android:textAlignment="viewStart"
+                        app:drawableEndCompat="@drawable/ic_arrow_up_down" />
 
                 </com.google.android.material.card.MaterialCardView>
 
diff --git a/app/src/main/res/layout/searchhistory_row.xml b/app/src/main/res/layout/searchhistory_row.xml
index e8cb42e26..2e4de6833 100644
--- a/app/src/main/res/layout/searchhistory_row.xml
+++ b/app/src/main/res/layout/searchhistory_row.xml
@@ -1,40 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:orientation="horizontal"
     android:background="?android:attr/selectableItemBackground"
     android:paddingHorizontal="16dp"
-    android:paddingVertical="8dp">
+    android:gravity="center_vertical"
+    android:paddingVertical="8dp"
+    android:layout_height="wrap_content">
 
-    <ImageView
-        android:id="@+id/history_icon"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        android:src="@drawable/ic_history"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
+    <com.github.libretube.ui.views.DrawableTextView
         android:id="@+id/history_text"
         android:layout_width="0dp"
+        android:layout_weight="1"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/delete_history"
-        app:layout_constraintStart_toEndOf="@id/history_icon"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:textAlignment="viewStart"
+        android:drawablePadding="15dp"
+        android:layout_marginEnd="10dp"
+        app:drawableStartCompat="@drawable/ic_history"
+        tools:text="Suggestion item" />
 
     <ImageView
         android:id="@+id/delete_history"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="5dp"
         android:src="@drawable/ic_close"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:shapeAppearanceOverlay="@style/roundedImageViewRounded" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/searchsuggestion_row.xml b/app/src/main/res/layout/searchsuggestion_row.xml
index 589932d99..2ec8814db 100644
--- a/app/src/main/res/layout/searchsuggestion_row.xml
+++ b/app/src/main/res/layout/searchsuggestion_row.xml
@@ -1,35 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:orientation="horizontal"
     android:background="?android:attr/selectableItemBackground"
     android:paddingHorizontal="16dp"
-    android:paddingVertical="8dp">
+    android:gravity="center_vertical"
+    android:paddingVertical="8dp"
+    android:layout_height="wrap_content">
 
-    <ImageView
-        android:id="@+id/search_icon"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        android:src="@drawable/ic_search"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
+    <com.github.libretube.ui.views.DrawableTextView
         android:id="@+id/suggestion_text"
         android:layout_width="0dp"
+        android:layout_weight="1"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/arrow"
-        app:layout_constraintStart_toEndOf="@id/search_icon"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:textAlignment="viewStart"
+        android:drawablePadding="15dp"
+        android:layout_marginEnd="10dp"
+        app:drawableStartCompat="@drawable/ic_search"
+        tools:text="Suggestion item" />
 
     <ImageView
         android:id="@+id/arrow"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="5dp"
@@ -37,4 +31,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:shapeAppearanceOverlay="@style/roundedImageViewRounded" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/trending_row.xml b/app/src/main/res/layout/trending_row.xml
index 7ebb58466..4a3580733 100644
--- a/app/src/main/res/layout/trending_row.xml
+++ b/app/src/main/res/layout/trending_row.xml
@@ -20,16 +20,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <ImageView
-            android:id="@+id/thumbnail"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:orientation="vertical">
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/thumbnail"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
 
             <androidx.cardview.widget.CardView
                 android:layout_width="wrap_content"
@@ -39,7 +38,9 @@
                 android:layout_marginBottom="5dp"
                 app:cardBackgroundColor="@color/duration_background_color"
                 app:cardCornerRadius="8dp"
-                app:cardElevation="0dp">
+                app:cardElevation="0dp"
+                app:layout_constraintBottom_toTopOf="@id/watch_progress"
+                app:layout_constraintEnd_toEndOf="parent">
 
                 <TextView
                     android:id="@+id/thumbnail_duration"
@@ -55,10 +56,11 @@
             <View
                 android:id="@+id/watch_progress"
                 style="@style/WatchProgress"
-                android:layout_height="5dp" />
-
-        </LinearLayout>
+                android:layout_height="5dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
 
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 
 
@@ -73,6 +75,7 @@
         android:maxLines="2"
         android:textSize="15sp"
         android:textStyle="bold"
+        android:textAlignment="viewStart"
         app:layout_constraintEnd_toEndOf="@+id/thumbnailcard"
         app:layout_constraintStart_toEndOf="@+id/channel_image"
         app:layout_constraintTop_toBottomOf="@+id/thumbnailcard"
@@ -85,6 +88,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:paddingBottom="16dp"
+        android:textAlignment="viewStart"
         app:layout_constraintEnd_toEndOf="@+id/textView_title"
         app:layout_constraintStart_toStartOf="@+id/textView_title"
         app:layout_constraintTop_toBottomOf="@+id/textView_title"
diff --git a/app/src/main/res/layout/video_row.xml b/app/src/main/res/layout/video_row.xml
index 165098b27..ba752d7c6 100644
--- a/app/src/main/res/layout/video_row.xml
+++ b/app/src/main/res/layout/video_row.xml
@@ -25,17 +25,15 @@
         app:layout_constraintVertical_bias="0.0"
         app:strokeWidth="0dp">
 
-        <ImageView
-            android:id="@+id/thumbnail"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:srcCompat="@tools:sample/backgrounds/scenic" />
+            android:layout_height="match_parent">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/thumbnail"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:srcCompat="@tools:sample/backgrounds/scenic" />
 
             <androidx.cardview.widget.CardView
                 android:layout_width="wrap_content"
@@ -45,7 +43,9 @@
                 android:layout_marginBottom="5dp"
                 app:cardBackgroundColor="@color/duration_background_color"
                 app:cardCornerRadius="8dp"
-                app:cardElevation="0dp">
+                app:cardElevation="0dp"
+                app:layout_constraintBottom_toTopOf="@id/watch_progress"
+                app:layout_constraintEnd_toEndOf="parent">
 
                 <TextView
                     android:id="@+id/thumbnail_duration"
@@ -61,9 +61,10 @@
 
             <View
                 android:id="@+id/watch_progress"
-                style="@style/WatchProgress" />
-
-        </LinearLayout>
+                style="@style/WatchProgress"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </com.google.android.material.card.MaterialCardView>
 
@@ -73,6 +74,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:ellipsize="end"
+        android:textAlignment="viewStart"
         android:maxLines="2"
         app:layout_constraintEnd_toStartOf="@id/delete_video"
         app:layout_constraintStart_toEndOf="@id/thumbnail_card"
@@ -83,6 +85,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
+        android:textAlignment="viewStart"
         android:maxLines="1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/thumbnail_card"
@@ -97,7 +100,8 @@
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guideline"
-        app:layout_constraintTop_toBottomOf="@id/video_info">
+        app:layout_constraintTop_toBottomOf="@id/video_info"
+        android:layout_gravity="start|center_vertical">
 
         <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/channel_image"
@@ -107,9 +111,8 @@
 
         <TextView
             android:id="@+id/channel_name"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
             android:layout_marginStart="8dp"
             android:ellipsize="end"
             android:maxLines="1" />
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index af132d9f1..3a8fd743c 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -216,11 +216,6 @@
     <string name="landscape">افقي</string>
     <string name="portrait">عمودي</string>
     <string name="community">المجتمع</string>
-    <string name="discord">ديسكورد</string>
-    <string name="matrix">المصفوفة</string>
-    <string name="telegram">تيليجرام</string>
-    <string name="reddit">ريديت</string>
-    <string name="twitter">تويتر</string>
     <string name="turnInternetOn">يرجى تشغيل Wi-Fi أو بيانات الجوال للاتصال بالإنترنت.</string>
     <string name="open">فتح …</string>
     <string name="chapters">الفصول</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">تخطي الصمت</string>
     <string name="help">التعليمات</string>
     <string name="faq">الأسئلة المتداولة</string>
+    <string name="replies">الردود</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index d9356e230..164be0eea 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -5,7 +5,7 @@
     <string name="search_hint">Axtarış</string>
     <string name="videos">Videolar</string>
     <string name="subscribe">Abunə Ol</string>
-    <string name="unsubscribe">Abunəlikdən çıx</string>
+    <string name="unsubscribe">Abunə olma</string>
     <string name="share">Paylaş</string>
     <string name="save">Saxla</string>
     <string name="download">Yüklə</string>
@@ -15,13 +15,13 @@
     <string name="register">Qeydiyyatdan keç</string>
     <string name="logout">Çıx</string>
     <string name="cancel">Ləğv et</string>
-    <string name="loggedIn">Daxil olundu.</string>
+    <string name="loggedIn">Giriş edildi.</string>
     <string name="loggedout">Çıxıldı.</string>
     <string name="registered">Qeydiyyatdan keçilib. İndi kanallara abunə ola bilərsiniz.</string>
     <string name="already_logged_in">Artıq daxil olunub.İstəsəniz hesabınızdan çıxa bilərsiniz.</string>
     <string name="login_first">Zəhmət olmasa, daxil ol və təkrar cəhd et.</string>
     <string name="startpage">Ev</string>
-    <string name="subscriptions">Abunəliklər</string>
+    <string name="subscriptions">Abunələr</string>
     <string name="library">Kitabxana</string>
     <string name="instances">Seç…</string>
     <string name="customInstance">Fərdi</string>
@@ -38,7 +38,7 @@
     <string name="music_songs">YT Musiqi Mahnıları</string>
     <string name="music_videos">YT Musiqi Videoları</string>
     <string name="music_playlists">YT Musiqi Pleylistləri</string>
-    <string name="defaultTab">Defolt Panel</string>
+    <string name="defaultTab">Standart Panel</string>
     <string name="sponsorblock">SponsorBlok</string>
     <string name="sponsorblock_summary">https://sponsor.ajay.app API\'sini istifadə edir</string>
     <string name="category_intro_description">Həqiqi məzmunu olmayan aralıq. Fasilə, statik çərçivə, təkrarlanan animasiya ola bilər. Məlumat ehtiva edən keçidlər üçün istifadə edilməməlidir.</string>
@@ -54,33 +54,33 @@
     <string name="success">Bitdi.</string>
     <string name="comments">Şərhlər</string>
     <string name="noInternet">Əvvəlcə İnternetə Qoşul.</string>
-    <string name="retry">Yenidən Cəhd Et</string>
+    <string name="retry">Təkrar Cəhd Et</string>
     <string name="segment_skipped">Seqment ötürüldü</string>
     <string name="sponsorblock_state">Aç</string>
     <string name="category_sponsor_description">Ödənişli reklam, tövsiyələr və birbaşa reklamlar.Öz reklamı və ya səbəblərə, yaradıcılara, veb saytlara və məhsullara pulsuz orijinal elanlar üçün deyil.</string>
     <string name="category_interaction">İnteraksiya xatırladıcı(bəyən və abunə ol)</string>
     <string name="category_intro">Fasilə/Giriş Animasiyası</string>
     <string name="login_register">Daxil ol/qeydiyyatdan keç</string>
-    <string name="please_login">Zəhmət olmasa, əvvəlcə tənzimləmələrdə daxil ol və ya qeydiyyatdan keç.</string>
+    <string name="please_login">Zəhmət olmasa, əvvəlcə tənzimləmələrdə giriş et və ya qeydiyyatdan keç.</string>
     <string name="importsuccess">Abunə olundu</string>
     <string name="subscribeIsEmpty">Əvvəlcə bəzi kanallara abunə ol.</string>
     <string name="cannotDownload">Bu yayımı endirmək mümkün deyil.</string>
     <string name="dlcomplete">Endirmə tamamlandı.</string>
-    <string name="dlisinprogress">Başqa endirmə artıq davam edir, zəhmət olmasa, bitənə qədər gözlə.</string>
+    <string name="dlisinprogress">Artıq digər endirmə davam edir, zəhmət olmasa, bitənə qədər gözlə.</string>
     <string name="downloadfailed">Endirmə alınmadı.</string>
     <string name="vlc">VLC\'də Aç</string>
     <string name="vlcerror">VLC-də açmaq mümkün olmadı. O, quraşdırılmamış ola bilər.</string>
     <string name="import_from_yt">Abunəlikləri idxal et</string>
     <string name="import_from_yt_summary">YouTube və ya NewPipe\'dan</string>
     <string name="app_theme">Tema</string>
-    <string name="server_error">Serverlə problem yaşanır. Başqa nümunə cəhd edilsinmi\?</string>
+    <string name="server_error">Serverlə problem yaşanır. Başqa nümunə sınansın\?</string>
     <string name="unknown_error">Şəbəkə xətası.</string>
     <string name="error">Nəsə xəta baş verdi.</string>
     <string name="empty">İstifadəçi adı və şifrə daxil etməlisiniz.</string>
     <string name="notgmail">Bu Piped hesabı üçündür.</string>
     <string name="defres">Video görüntü imkanı</string>
     <string name="grid">Şəbəkə sütunları</string>
-    <string name="emptyList">Burada heç nə yoxdur.</string>
+    <string name="emptyList">Bura boşdur.</string>
     <string name="deletePlaylist">Pleylisti sil</string>
     <string name="areYouSure">Pleylist silinsinmi\?</string>
     <string name="createPlaylist">Pleylist yarat</string>
@@ -119,7 +119,7 @@
     <string name="update_available">%1$s Versiyası Mövcuddur</string>
     <string name="update_available_text">Onu endirmək üçün GitHub\'da buraxılışlara keçilsinmi\?</string>
     <string name="appearance">Xarici Görünüş</string>
-    <string name="app_behavior">Davranma</string>
+    <string name="app_behavior">Davranış</string>
     <string name="downloads">Yüklənənlər</string>
     <string name="video_format">Video formatı</string>
     <string name="video_format_summary">Səs və video birlikdə endirildisə, faylların dönüşdürülməsi.</string>
@@ -132,9 +132,9 @@
     <string name="playback_speed">Oynatma sürəti</string>
     <string name="advanced">Qabaqcıl</string>
     <string name="player">Oynadıcı</string>
-    <string name="appearance_summary">Tətbiqi zövqünüzə uyğunlaşdırın.</string>
+    <string name="appearance_summary">Tətbiqi zövqünüzə görə uyğunlaşdırın.</string>
     <string name="advanced_summary">Yüklənənlər və sıfırla</string>
-    <string name="update_summary">Yeniləmə üçün yoxla</string>
+    <string name="update_summary">Yeniləmək üçün yoxla</string>
     <string name="no_update_available">Ən son versiyanı işlədirsiniz.</string>
     <string name="live">Canlı</string>
     <string name="authors">Müəlliflər</string>
@@ -148,7 +148,7 @@
     <string name="internal_storage">Daxili yaddaş</string>
     <string name="download_folder_summary">Endirilmiş medianın saxlanıldığı qovluğun adı.</string>
     <string name="views">%1$s baxış</string>
-    <string name="defaultIcon">Defolt</string>
+    <string name="defaultIcon">Standart</string>
     <string name="legacyIcon">İtmiş miras</string>
     <string name="fireIcon">Dəbdəbəli yanğın</string>
     <string name="gradientIcon">Pərgar meyli</string>
@@ -188,14 +188,14 @@
     <string name="hideTrendingPage">\"Trenddə olan\" səhifəsini gizlət</string>
     <string name="quality">Keyfiyyət</string>
     <string name="behavior">Davranış</string>
-    <string name="player_summary">Defolt tənzimləmələr və davranış</string>
+    <string name="player_summary">Standartlar və davranış</string>
     <string name="seek_increment">Axtarış artımı</string>
     <string name="instance_frontend_url">Nümunə üçün URL</string>
-    <string name="autoplay_summary">Cari videodan sonra növbəti videonu avtomatik oynat.</string>
+    <string name="autoplay_summary">Hazırkı videodan sonra növbəti videonu avtomatik oynat.</string>
     <string name="pauseOnScreenOff">Avtomatik fasilə</string>
     <string name="pauseOnScreenOff_summary">Ekran söndürüldükdə oynatmanı dayandır.</string>
     <string name="clonePlaylist">Pleylisti klonla</string>
-    <string name="reset">İlkin tənzimləmələri qaytar</string>
+    <string name="reset">Standartları qaytar</string>
     <string name="reset_message">Bütün tənzimləmələr sıfırlansın və sistemdən çıxılsın\?</string>
     <string name="account">Hesab</string>
     <string name="restore">Bərpa Et</string>
@@ -204,7 +204,7 @@
     <string name="watch_history">Baxış Tarixçəsi</string>
     <string name="watch_positions">Mövqe xatırlat</string>
     <string name="watch_positions_summary">Son oynatma mövqeyindən davam etdir</string>
-    <string name="auth_instances">Təsdiqləyici nümunəni seç</string>
+    <string name="auth_instances">Təsdiqləyici nümunə seç</string>
     <string name="auth_instance_summary">Təsdiqlənmiş dəvətlər üçün fərqli nümunə istifadə et.</string>
     <string name="auth_instance">Təsdiqləyici nümunə</string>
     <string name="github">GitHub</string>
@@ -216,13 +216,8 @@
     <string name="portrait">Portret</string>
     <string name="landscape">Landşaft</string>
     <string name="community">Cəmiyyət</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
-    <string name="discord">Discord</string>
     <string name="open">Aç…</string>
-    <string name="turnInternetOn">Lütfən, İnternetə qoşulmaq üçün Wi-Fi və ya mobil məlumatı açın.</string>
+    <string name="turnInternetOn">Zəhmət olmasa, İnternetə qoşulmaq üçün Wi-Fi və ya mobil məlumatı açın.</string>
     <string name="chapters">Bölmələr</string>
     <string name="change_playback_speed">Oynatma sürəti</string>
     <string name="require_restart_message">Yeni dəyişiklikləri işlətmək üçün tətbiqi yenidən başlat.</string>
@@ -237,10 +232,10 @@
     <string name="pure_theme">Təmiz tema</string>
     <string name="pure_theme_summary">Təmiz ağ/qara tema</string>
     <string name="no_player_found">Xarici oynadıcı tapılmadı. Zəhmət olmasa, birinin quraşdırıldığından əmin olun.</string>
-    <string name="data_saver_mode">Məlumata qənaət rejimi</string>
+    <string name="data_saver_mode">Məlumat qənaəti rejimi</string>
     <string name="autoRotatePlayer_summary">Cihaz fırladıldıqda tam ekran oynat.</string>
     <string name="search_history_summary">Axtarışları saxla</string>
-    <string name="watch_history_summary">Baxılan videoları yerli olaraq saxla</string>
+    <string name="watch_history_summary">Baxılan videoların yerli olaraq saxlanılması</string>
     <string name="reset_watch_positions">Sıfırla</string>
     <string name="system_caption_style">Sistem altyazı üsulu</string>
     <string name="captions">Altyazılar</string>
@@ -302,7 +297,7 @@
     <string name="resize_mode_zoom">Yaxınlaşdır</string>
     <string name="resize_mode_fit">Uyğunlaşdır</string>
     <string name="repeat_mode_none">Heç biri</string>
-    <string name="repeat_mode_current">Cari</string>
+    <string name="repeat_mode_current">Hazırkı</string>
     <string name="backup_restore">Nüsxələ &amp; bərpa et</string>
     <string name="backup">Nüsxələ</string>
     <string name="picture_in_picture">Şəkil içində Şəkil</string>
@@ -337,10 +332,10 @@
     <string name="background_channel_description">Səs oynadıcını idarə etmək üçün düymələrlə bildiriş göstərir.</string>
     <string name="play_next">Sonrakında oynat</string>
     <string name="navigation_bar">Naviqasiya çubuğu</string>
-    <string name="select_at_least_one">Lütfən, ən az bir element seç</string>
-    <string name="change_region">Trend\'in cari ölkə üçün əlçatan olmadığı görünür.Lütfən, tənzimləmələrdə başqasını seç.</string>
+    <string name="select_at_least_one">Xahiş edirik, ən az bir element seç</string>
+    <string name="change_region">Trend\'in hazırkı ölkə üçün əlçatan olmadığı görünür.Xahiş edirik, tənzimləmələrdə başqasını seç.</string>
     <string name="limit_hls">HLS\'ni 1080p ilə məhdudlaşdır</string>
-    <string name="default_load_interval">Defolt</string>
+    <string name="default_load_interval">Standart</string>
     <string name="progressive_load_interval">Qabaqcıl, yükləmə intervalı ölçüsü</string>
     <string name="progressive_load_interval_summary">Daha aşağı dəyər ilkin video yükləməni sürətləndirə bilər.</string>
     <string name="views_placeholder">baxış</string>
@@ -360,7 +355,7 @@
     <string name="sb_markers_summary">Vaxt çubuğunda seqmentləri nişanla.</string>
     <string name="livestreams">Canlı yayımlar</string>
     <string name="alternative_videos_layout">Alternativ video tərtibatı</string>
-    <string name="defaultIconLight">Defolt işıqlı</string>
+    <string name="defaultIconLight">Standart işıqlı</string>
     <string name="playlistCloned">Pleylist klonlandı</string>
     <string name="confirm_unsubscribe">%1$s abunəliyini ləğv etmək istədiyinizə əminsiniz\?</string>
     <string name="confirm_unsubscribing">Abunəlik ləğvini təsdiqlə</string>
@@ -370,18 +365,18 @@
     <string name="start_time">Başlama vaxtı</string>
     <string name="end_time">Bitmə vaxtı</string>
     <string name="notification_time">Bildiriş vaxtı</string>
-    <string name="notification_time_summary">Bildirişlərin göstərilməsinə icazə verilən vaxt aralığı.</string>
+    <string name="notification_time_summary">Bildirişləri göstərmək üçün icazə verilən vaxt aralığı.</string>
     <string name="alternative_trending_layout">Alternativ trend tərtibatı</string>
     <string name="navbar_order">Ardıcıllıq</string>
     <string name="layout">Tərtibat</string>
     <string name="alternative_player_layout">Alternativ oynadıcı tərtibatı</string>
     <string name="alternative_player_layout_summary">Əlaqəli videoları aşağıda deyil, şərhlərin üstündə cərgə kimi göstər.</string>
     <string name="audio_track">Səs treki</string>
-    <string name="default_audio_track">Defolt</string>
+    <string name="default_audio_track">Standart</string>
     <string name="unsupported_file_format">Dəstəklənməyən fayl formatı!</string>
     <string name="auto_quality">Avtomatik</string>
     <string name="hls_instead_of_dash">HLS istifadə et</string>
-    <string name="hls_instead_of_dash_summary">DASH əvəzinə HLS istifadə et (daha yavaş olacaq, tövsiyə edilmir)</string>
+    <string name="hls_instead_of_dash_summary">DASH əvəzinə HLS istifadə et (daha yavaş olacaq, tövsiyə edilmədi)</string>
     <string name="limit_to_runtime">İş vaxtı məhdudiyyət</string>
     <string name="open_queue_from_notification">Bildirişdən növbə aç</string>
     <string name="trends">Trendlər</string>
@@ -393,21 +388,21 @@
     <string name="bookmarks_empty">Hələ əlfəcinlər yoxdur!</string>
     <string name="queue_insert_related_videos">Əlaqəli videoları yerləşdir</string>
     <string name="local_playlists">Yerli pleylistlər</string>
-    <string name="select_other_start_tab">Lütfən, əvvəla başqa başlanğıc paneli seç!</string>
+    <string name="select_other_start_tab">Xahiş edirik, əvvəla başqa başlatma paneli seç!</string>
     <string name="not_enabled">Menyu elementi aktiv deyil!</string>
     <string name="brightness">Parlaqlıq</string>
     <string name="auto">Avtomatik</string>
     <string name="swipe_controls_summary">Parlaqlığı və səs səviyyəsini nizamlamaq üçün sürüşdürmə jesti istifadə et.</string>
     <string name="volume">Səs səviyyəsi</string>
     <string name="swipe_controls">Sürüşdürmə nəzarətləri</string>
-    <string name="defaults">Defolt</string>
+    <string name="defaults">Standartlar</string>
     <string name="pop_up">Ani pəncərə</string>
     <string name="no_comments_available">Bu videoda şərhlər əlçatan deyil.</string>
     <string name="comments_disabled">Şərhlər yükləyici tərəfindən deaktiv edilib.</string>
     <string name="double_tap_seek">Axtarmaq üçün iki dəfə kliklə</string>
     <string name="double_tap_seek_summary">Oynadıcı mövqeyini geri və ya irəli çəkmək üçün sola yaxud sağa iki dəfə kliklə.</string>
     <string name="all_caught_up">Hamısını yuxarıda tutmusunuz</string>
-    <string name="all_caught_up_summary">Bütün yeni videolara baxmısınız</string>
+    <string name="all_caught_up_summary">Bütün yeni videoları gördünüz</string>
     <string name="captions_size">Altyazı ölçüsü</string>
     <string name="import_playlists">Pleylistləri idxal et</string>
     <string name="export_playlists">Pleylistləri ixrac et</string>
@@ -422,7 +417,7 @@
     <string name="theme_monochrome">Minimalist Tək Rəngli</string>
     <string name="play_latest_videos">Ən son videoları oynat</string>
     <string name="nothing_selected">Heç nə seçilməyib!</string>
-    <string name="color_violet">Hərtərəfli Bənövşəyi</string>
+    <string name="color_violet">Bütöv Bənövşəyi</string>
     <string name="failed_fetching_instances">Mövcud nümunələri əldə etmək mümkün olmadı.</string>
     <string name="hide_watched_from_feed">Baxılan videoları axından gizlət</string>
     <string name="hide_watched_from_feed_summary">Abunəliklər panelində 90% daha çox baxılan videoları göstərmə.</string>
@@ -432,15 +427,15 @@
     <string name="remove_bookmark">Əlfəcini sil</string>
     <string name="add_to_bookmarks">Əlfəcinlərə əlavə et</string>
     <string name="forward">İrəli</string>
-    <string name="pause">Fasilə ver</string>
+    <string name="pause">Dayandır</string>
     <string name="alternative_pip_controls">Alternativ PiP nəzarətləri</string>
-    <string name="alternative_pip_controls_summary">Yalnız səsi göstər və irəli və geri çevirmək əvəzində PiP-də idarəetmələri ötür</string>
+    <string name="alternative_pip_controls_summary">PiP\'də, irəli və geri çevirmək əvəzinə \"yalnız səs\" düyməsin göstər və idarəetmələri ötür</string>
     <string name="rewind">Geri sar</string>
     <string name="audio_player">Səs oynadıcı</string>
     <string name="audio_only_mode">Yalnız səs rejimi</string>
     <string name="audio_only_mode_summary">LibreTube-u musiqi oynadıcıya dəyiş.</string>
     <string name="no_subtitle">Altyazı yoxdur</string>
-    <string name="download_paused">Endirməyə fasilə verildi</string>
+    <string name="download_paused">Endirmə dayandırıldı</string>
     <string name="download_completed">Endirmə tamamlandı</string>
     <string name="concurrent_downloads">Maksimal paralel endirmələr</string>
     <string name="concurrent_downloads_limit_reached">Maksimal paralel endirmə limitinə çatıldı.</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">Səssizliyi ötür</string>
     <string name="help">Kömək</string>
     <string name="faq">T-TSS</string>
+    <string name="replies">Cavablar</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index cf4a019da..590bdcf20 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -3,8 +3,6 @@
     <string name="clonePlaylist">Клониране на плейлист</string>
     <string name="deleteAccount">Изтриване на регистрацията</string>
     <string name="community">Общност</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
     <string name="reset_watch_positions">Нулиране</string>
     <string name="startpage">Начало</string>
     <string name="subscriptions">Абонаменти</string>
@@ -83,9 +81,6 @@
     <string name="github">GitHub</string>
     <string name="audio_video">Звук и видео</string>
     <string name="portrait">Портрет</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="selected">Избрано</string>
     <string name="never">Никога</string>
     <string name="library">Библиотека</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index cd62a3ec9..e3d5eb41d 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -204,24 +204,19 @@
     <string name="turnInternetOn">দয়া করেন ওয়াই-ফাই অথবা মোবাইল ডেটা অন করুন ইন্টারনেটের সাথে যুক্ত হতে।</string>
     <string name="open">খুলুন…</string>
     <string name="auth_instance_summary">অথেনটিকেশনের জন্য ভিন্ন ইন্সটেন্স ব্যবহার করুন।</string>
-    <string name="reddit">রেডিট</string>
     <string name="always">সবসময়</string>
     <string name="never">কখনই না</string>
-    <string name="telegram">টেলিগ্রাম</string>
-    <string name="discord">ডিস্কর্ড</string>
     <string name="watch_history">দেখার ইতিহাস</string>
     <string name="watch_positions">পজিশন মনে রাখুন</string>
     <string name="hls">HLS</string>
     <string name="auto_rotation">স্বয়ংক্রিয়-রোটেশন</string>
     <string name="landscape">ল্যান্ডস্কেপ</string>
     <string name="portrait">পোর্টেইট</string>
-    <string name="twitter">টুইটার</string>
     <string name="watch_positions_summary">শেষ প্লেব্যাক পজিশন থেকে শুরু করুন</string>
     <string name="auth_instances">অথেনটিকেশনের জন্য ইন্সটেন্স বাছাই করুন</string>
     <string name="github">গিটহাব</string>
     <string name="audio_video">অডিও এবং ভিডিও</string>
     <string name="community">কমিউনিটি</string>
-    <string name="matrix">ম্যাট্রিক্স</string>
     <string name="change_playback_speed">প্লে-ব্যাকের গতি</string>
     <string name="selected">বাছাইকৃত</string>
     <string name="require_restart_message">এই পরিবর্তনটি কার্যকর করতে হলে রিস্টার্ট করুন।</string>
@@ -395,4 +390,5 @@
     <string name="bookmark">বুকমার্ক</string>
     <string name="clear_bookmarks">বুকমার্ক মুছে দিন</string>
     <string name="bookmarks_empty">কোনো বুকমার্ক নেই!</string>
+    <string name="pop_up">পপ-আপ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 460d249ca..1c19a3fab 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -188,12 +188,7 @@
     <string name="auto_rotation">Automatické otáčení</string>
     <string name="landscape">Na šířku</string>
     <string name="portrait">Na výšku</string>
-    <string name="twitter">Twitter</string>
     <string name="community">Komunita</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
     <string name="update_available">Je dostupná verze %1$s</string>
     <string name="update_available_text">Přejít na vydání na GitHubu a stáhnout ji\?</string>
     <string name="appearance">Vzhled</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">Přeskočit ticho</string>
     <string name="help">Nápověda</string>
     <string name="faq">Často kladené dotazy</string>
+    <string name="replies">Odpovědi</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 63ef5c22f..ff94d90c4 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -208,12 +208,7 @@
     <string name="auto_rotation">Automatisk rotation</string>
     <string name="landscape">Landskab</string>
     <string name="portrait">Portræt</string>
-    <string name="twitter">Twitter</string>
     <string name="community">Fællesskab</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
     <string name="downloading">Downloader…</string>
     <string name="no_audio">Ingen lyd</string>
     <string name="no_video">Ingen video</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 16fd501e5..c5f4cb67a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -211,11 +211,6 @@
     <string name="landscape">Landschaft</string>
     <string name="portrait">Porträt</string>
     <string name="community">Community</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="legacyIcon">Verlorenes Vermächtnis</string>
     <string name="category_filler">Füllungstangente/Witze</string>
     <string name="none">Keine</string>
@@ -441,4 +436,14 @@
     <string name="download_completed">Herunterladen abgeschlossen</string>
     <string name="unknown">Unbekannt</string>
     <string name="resume">Fortsetzen</string>
+    <string name="alternative_pip_controls_summary">\"Nur Audio\"- und Skip-Steuerung anzeigen im Bild-in-Bild-Modus anstelle von Vor- und Zurückspulen</string>
+    <string name="replies">Antworten</string>
+    <string name="concurrent_downloads_limit_reached">Maximale Anzahl gleichzeitiger Downloads erreicht.</string>
+    <string name="audio_only_mode_summary">LibreTube in einen Musikplayer umwandeln.</string>
+    <string name="faq">Häufig gestellte Fragen</string>
+    <string name="audio_player">Audio-Player</string>
+    <string name="help">Hilfe</string>
+    <string name="concurrent_downloads">Maximale Anzahl gleichzeitiger Downloads</string>
+    <string name="sleep_timer">Einschlaf-Timer</string>
+    <string name="skip_silence">Stille überspringen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index ce134a83b..d195dd7c3 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -215,12 +215,7 @@
     <string name="auto_rotation">Αυτόματη περιστροφή</string>
     <string name="landscape">Τοπίο</string>
     <string name="portrait">Πορτρέτο</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
     <string name="community">Κοινότητα</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="twitter">Twitter</string>
     <string name="system_caption_style">Στυλ λεζάντας συστήματος</string>
     <string name="always">Πάντα</string>
     <string name="selected">Επιλεγμένα</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 44fa77ba2..c11f44e49 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -215,12 +215,7 @@
     <string name="portrait">Vertical</string>
     <string name="aspect_ratio">Relación de aspecto del vídeo</string>
     <string name="auto_rotation">Rotación automática</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
     <string name="community">Comunidad</string>
-    <string name="discord">Discord</string>
-    <string name="twitter">Twitter</string>
     <string name="turnInternetOn">Por favor, active la WiFi o los datos móviles para conectarse a Internet.</string>
     <string name="open">Abrir…</string>
     <string name="chapters">Capítulos</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">Saltar silencio</string>
     <string name="help">Ayuda</string>
     <string name="faq">Preguntas frecuentes</string>
+    <string name="replies">Respuestas</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index ca7908225..b53dac537 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -216,11 +216,6 @@
     <string name="landscape">Paisaia</string>
     <string name="portrait">Erretratua</string>
     <string name="community">Komunitatea</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="reddit">Reddit</string>
-    <string name="telegram">Telegram</string>
-    <string name="twitter">Twitter</string>
     <string name="open">Ireki…</string>
     <string name="chapters">Kapituluak</string>
     <string name="change_playback_speed">Erreprodukzio abiadura</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4a3d1e218..2e66d44a6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -215,12 +215,7 @@
     <string name="landscape">Paysage</string>
     <string name="portrait">Portrait</string>
     <string name="aspect_ratio">Rapport d\'aspect vidéo</string>
-    <string name="matrix">Matrix</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
-    <string name="telegram">Telegram</string>
     <string name="community">Communauté</string>
-    <string name="discord">Discord</string>
     <string name="open">Ouvrir …</string>
     <string name="turnInternetOn">Veuillez activer le Wi-Fi ou les données mobiles pour vous connecter à internet.</string>
     <string name="chapters">Chapitres</string>
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
index 19e0198a6..6a93ea602 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -112,11 +112,6 @@
     <string name="audio_video">ઓડિયો અને વિડિયો</string>
     <string name="fullscreen_orientation">સંપૂર્ણસ્ક્રીન દિશા</string>
     <string name="aspect_ratio">વિડિયો એસ્પેક્ટ રેશિયો</string>
-    <string name="discord">ઝઘડો</string>
-    <string name="matrix">મેટ્રિક્સ</string>
-    <string name="telegram">ટેલિગ્રામ</string>
-    <string name="reddit">રેડિટ</string>
-    <string name="twitter">Twitter</string>
     <string name="chapters">પ્રકરણો</string>
     <string name="require_restart">એપ્લિકેશન પુનઃપ્રારંભ જરૂરી</string>
     <string name="navLabelVisibility">લેબલ દૃશ્યતા</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index fe1568c71..69e94ad48 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -345,11 +345,6 @@
     <string name="github">गिटहब</string>
     <string name="fullscreen_orientation">फुलस्क्रीन ओरिएंटेशन</string>
     <string name="community">समुदाय</string>
-    <string name="discord">डिसकौरड</string>
-    <string name="matrix">मैट्रिक्स</string>
-    <string name="telegram">टेलीग्राम</string>
-    <string name="reddit">रैडिट</string>
-    <string name="twitter">ट्विटर</string>
     <string name="open">खोलें…</string>
     <string name="chapters">अध्याय</string>
     <string name="change_playback_speed">प्लेबैक गति</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">चुप्पी छोड़ें</string>
     <string name="help">सहायता</string>
     <string name="faq">आम सवाल</string>
+    <string name="replies">जवाब</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index ed777a3b9..d7930ebc6 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -200,11 +200,6 @@
     <string name="hls">HLS</string>
     <string name="github">GitHub</string>
     <string name="community">Közösség</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="chapters">Fejezetek</string>
     <string name="change_playback_speed">Lejátszási sebesség</string>
     <string name="require_restart">Alkalmazás újraindítása szükséges</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">Csend átugrása</string>
     <string name="help">Súgó</string>
     <string name="faq">GYIK</string>
+    <string name="replies">Válaszok</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 875acfd73..073341bc4 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -224,11 +224,6 @@
     <string name="aspect_ratio">Rasio aspek video</string>
     <string name="auto_rotation">Putar secara otomatis</string>
     <string name="community">Komunitas</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="misc">Lainnya</string>
     <string name="break_reminder">Pengingat istirahat</string>
     <string name="take_a_break">Waktunya istirahat</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">Lewati keheningan</string>
     <string name="help">Bantuan</string>
     <string name="faq">SSD</string>
+    <string name="replies">Balasan</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e39dee016..11b099329 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -214,13 +214,8 @@
     <string name="auto_rotation">Rotazione automatica</string>
     <string name="landscape">Orizzontale</string>
     <string name="community">Comunità</string>
-    <string name="discord">Discord</string>
-    <string name="twitter">Twitter</string>
     <string name="aspect_ratio">Rapporto d\'aspetto del video</string>
     <string name="portrait">Verticale</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
     <string name="turnInternetOn">Connettiti a Internet attivando Wi-Fi o dati mobili.</string>
     <string name="open">Apri…</string>
     <string name="chapters">Capitoli</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">Salta il silenzio</string>
     <string name="help">Aiuto</string>
     <string name="faq">Domande frequenti</string>
+    <string name="replies">Risposte</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index da38021d7..891837fa8 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -213,14 +213,9 @@
     <string name="fullscreen_orientation">כיוון מסך מלא</string>
     <string name="landscape">לרוחב</string>
     <string name="community">קהילה</string>
-    <string name="discord">דיסקורד</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">טלגרם</string>
-    <string name="reddit">Reddit</string>
     <string name="auto_rotation">הטיה אוטומטית</string>
     <string name="portrait">לאורך</string>
     <string name="aspect_ratio">יחס רוחב-גובה של סרטון</string>
-    <string name="twitter">טוויטר</string>
     <string name="turnInternetOn">נא להפעיל את הרשת האלחוטית או החיבור הסלולרי כדי להתחבר לאינטרנט.</string>
     <string name="open">פתיחה…</string>
     <string name="chapters">פרקים</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">דילוג על שקט</string>
     <string name="help">עזרה</string>
     <string name="faq">שו״ת</string>
+    <string name="replies">תגובות</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c994ddc6b..11883d473 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -198,11 +198,6 @@
     <string name="landscape">横</string>
     <string name="portrait">縦</string>
     <string name="community">コミュニティ</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="downloads">ダウンロード</string>
     <string name="video_format">動画の形式</string>
     <string name="video_format_summary">音声と動画の両方をダウンロードした場合のファイル形式の変換。</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 2c27ea60a..a30460c17 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -273,7 +273,6 @@
     <string name="general_summary">언어 및 지역</string>
     <string name="audio_video_summary">품질 및 형식</string>
     <string name="queue">대기열</string>
-    <string name="twitter">트위터</string>
     <string name="none">없음</string>
     <string name="open_copied">열다</string>
     <string name="device_info">기기 정보</string>
@@ -318,8 +317,6 @@
     <string name="swipe_controls">컨트롤 변경</string>
     <string name="swipe_controls_summary">스와이프 제스처를 사용하여 밝기와 음량을 조정하십시오.</string>
     <string name="skip_segment">세그먼트 건너뛰기</string>
-    <string name="telegram">텔레그램</string>
-    <string name="reddit">레딧</string>
     <string name="selected">선택된</string>
     <string name="copied_to_clipboard">클립보드에 복사됨</string>
     <string name="volume">음량</string>
@@ -385,7 +382,6 @@
     <string name="resize_mode_fill">채우기</string>
     <string name="always">항상</string>
     <string name="network_metered">미터링됨</string>
-    <string name="matrix">매트릭스</string>
     <string name="never">전혀 아닌</string>
     <string name="repeat_mode_none">없음</string>
     <string name="resize_mode_zoom">확대</string>
@@ -422,7 +418,6 @@
     <string name="hide_watched_from_feed">시청한 영상 피드에서 숨기기</string>
     <string name="hide_watched_from_feed_summary">구독 탭에 90% 이상 시청한 비디오를 보여주지 않습니다.</string>
     <string name="sb_markers">마커</string>
-    <string name="discord">디스코드</string>
     <string name="pinch_control">핀치 컨트롤</string>
     <string name="misc">기타</string>
     <string name="playlistUrl">재생목록 URL</string>
@@ -430,4 +425,16 @@
     <string name="shuffle">셔플</string>
     <string name="add_to_bookmarks">북마크에 추가</string>
     <string name="remove_bookmark">북마크 제거</string>
+    <string name="replies">답글</string>
+    <string name="unknown">알 수 없음</string>
+    <string name="faq">FAQ</string>
+    <string name="concurrent_downloads">최대 동시 다운로드 수</string>
+    <string name="skip_silence">무음 건너뛰기</string>
+    <string name="concurrent_downloads_limit_reached">최대 동시 다운로드 수에 도달하였습니다.</string>
+    <string name="download_completed">다운로드 완료</string>
+    <string name="pause">일시정지</string>
+    <string name="sleep_timer">취침 타이머</string>
+    <string name="audio_player">오디오 플레이어</string>
+    <string name="audio_only_mode">오디오 모드</string>
+    <string name="audio_only_mode_summary">LibreTube 를 음악 플에어이로 바꿉니다.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index bf893a96f..7a104696a 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -114,11 +114,6 @@
     <string name="audio_video">Garsas ir vaizdas</string>
     <string name="portrait">Portretas</string>
     <string name="community">Bendruomenė</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="turnInternetOn">Norėdami prisijungti prie interneto, įjunkite Wi-Fi arba mobiliuosius duomenis.</string>
     <string name="chapters">Skirsniai</string>
     <string name="require_restart">Būtina iš naujo paleisti programėlę</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index edc33b93e..3725d9661 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -222,11 +222,6 @@
     <string name="landscape">Horizontāla</string>
     <string name="portrait">Vertikāla</string>
     <string name="community">Kopiena</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="navLabelVisibility">Rādīt tekstu navigācijas panelī</string>
     <string name="always">Vienmēr</string>
     <string name="never">Nekad</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 391877bec..d501e63d4 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -222,11 +222,6 @@
     <string name="landscape">Liggende</string>
     <string name="portrait">Stående</string>
     <string name="community">Gemenskap</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="none">Ingen</string>
     <string name="always">Alltid</string>
     <string name="pure_theme_summary">Ren svarthvitt-drakt</string>
diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml
index c6f831238..9dc057f86 100644
--- a/app/src/main/res/values-or/strings.xml
+++ b/app/src/main/res/values-or/strings.xml
@@ -199,10 +199,6 @@
     <string name="audio_video">ଅଡିଓ ଏବଂ ଭିଡିଓ</string>
     <string name="aspect_ratio">ଭିଡିଓ ଦିଗ ଅନୁପାତ</string>
     <string name="portrait">ଆନୁଲମ୍ବିକ</string>
-    <string name="discord">ଦିସ୍କର୍ଡ</string>
-    <string name="matrix">ମେଟ୍ରିକ୍</string>
-    <string name="telegram">ଟେଲିଗ୍ରାମ</string>
-    <string name="reddit">ରେଡିଟ</string>
     <string name="always">ସର୍ବଦା</string>
     <string name="selected">ମନୋନୀତ</string>
     <string name="never">କେବେ ନୁହ</string>
@@ -300,7 +296,6 @@
     <string name="community">ସମ୍ପ୍ରଦାୟ</string>
     <string name="change_playback_speed">ପ୍ଲେବେକ୍ ବେଗ</string>
     <string name="require_restart">ଆପ୍ ପୁନଆରମ୍ଭ ଆବଶ୍ୟକ</string>
-    <string name="twitter">ଟୁଇଟର</string>
     <string name="open">ଖୋଲନ୍ତୁ…</string>
     <string name="legacy_subscriptions">ପୁରୁଣା ସଦସ୍ୟତା ଦୃଶ୍ୟ</string>
     <string name="chapters">ଅଧ୍ୟାୟ ଗୁଡ଼ିକ</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">ନୀରବତା ଛାଡିଦିଅ</string>
     <string name="help">ସାହାଯ୍ୟ</string>
     <string name="faq">FAQ</string>
+    <string name="replies">ଉତ୍ତର ଗୁଡିକ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 140528f64..cc1dbacac 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -113,7 +113,7 @@
     <string name="color_blue">ਅਨੰਦਮਈ ਨੀਲਾ</string>
     <string name="color_yellow">ਜ਼ੋਰਦਾਰ ਪੀਲਾ</string>
     <string name="color_green">ਆਕਰਸ਼ਕ ਹਰਾ</string>
-    <string name="color_purple">ਅਨੰਦਦਾਇਕ ਜਾਮਨੀ</string>
+    <string name="color_purple">ਅਨੰਦਦਾਇਕ ਜਾਮਣੀ</string>
     <string name="oledTheme">ਕਾਲ੍ਹਾ</string>
     <string name="material_you">ਮਟੀਰੀਅਲ ਯੂ</string>
     <string name="sponsorblock_notifications">ਨੋਟੀਫਿਕੇਸ਼ਨ</string>
@@ -220,11 +220,6 @@
     <string name="landscape">ਲੈਂਡਸਕੇਪ</string>
     <string name="portrait">ਪੋਰਟਰੇਟ</string>
     <string name="community">ਭਾਈਚਾਰਾ</string>
-    <string name="discord">ਡਿਸਕੌਰਡ</string>
-    <string name="matrix">ਮੈਟਰਿਕਸ</string>
-    <string name="telegram">ਟੈਲੀਗ੍ਰਾਮ</string>
-    <string name="twitter">ਟਵਿੱਟਰ</string>
-    <string name="reddit">ਰੈਡਿੱਟ</string>
     <string name="turnInternetOn">ਕਿਰਪਾ ਕਰਕੇ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਵਾਈ-ਫਾਈ ਜਾਂ ਮੋਬਾਈਲ ਡਾਟਾ ਚਾਲੂ ਕਰੋ।</string>
     <string name="open">ਖੋਲ੍ਹੋ…</string>
     <string name="chapters">ਚੈਪਟਰ</string>
@@ -450,4 +445,5 @@
     <string name="help">ਸਹਾਇਤਾ</string>
     <string name="faq">ਆਮ ਸਵਾਲ</string>
     <string name="sleep_timer">ਸਲੀਪ ਟਾਈਮਰ</string>
+    <string name="replies">ਜਵਾਬ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3bc4ba29c..cfb42fef4 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -238,8 +238,6 @@
     <string name="fullscreen_orientation">Wyświetlanie pełnoekranowe</string>
     <string name="portrait">Wymuś tryb pionowy</string>
     <string name="community">Społeczność</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
     <string name="chapters">Rozdziały</string>
     <string name="change_playback_speed">Prędkość odtwarzania</string>
     <string name="pure_theme_summary">Czysty biały/czarny motyw</string>
@@ -303,12 +301,9 @@
     <string name="worst_quality">Najgorsza</string>
     <string name="torchIcon">Modna lampka</string>
     <string name="aspect_ratio">Użyj proporcji obrazu wideo</string>
-    <string name="reddit">Reddit</string>
     <string name="pauseOnScreenOff_summary">Zatrzymaj odtwarzanie, gdy ekran jest wyłączony.</string>
     <string name="unlimited">Bez limitu</string>
     <string name="auto_rotation">Automatyczne obracanie</string>
-    <string name="telegram">Telegram</string>
-    <string name="twitter">Twitter</string>
     <string name="none">Brak</string>
     <string name="history_size">Maksymalny rozmiar historii</string>
     <string name="update_now">Zainstalować teraz nową wersję LibreTube\?</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8536098cd..23e0fe0fe 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -233,11 +233,6 @@
     <string name="landscape">Paisagem</string>
     <string name="portrait">Retrato</string>
     <string name="community">Comunidade</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="live">Ao vivo</string>
     <string name="no_video">Sem vídeo</string>
     <string name="audio">Áudio</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">Pular silêncio</string>
     <string name="help">Ajuda</string>
     <string name="faq">FAQ</string>
+    <string name="replies">Respostas</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 345f5de1e..784240da3 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -195,11 +195,6 @@
     <string name="landscape">Horizontal</string>
     <string name="portrait">Vertical</string>
     <string name="community">Comunidade</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="no_audio">Sem áudio</string>
     <string name="no_video">Sem vídeo</string>
     <string name="audio">Áudio</string>
@@ -450,4 +445,5 @@
     <string name="faq">FAQ</string>
     <string name="sleep_timer">Temporizador de sono</string>
     <string name="skip_silence">Ignorar o silêncio</string>
+    <string name="replies">Respostas</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 610d80c7d..c7eea1359 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -214,13 +214,8 @@
     <string name="auth_instances">Выбрать сервер</string>
     <string name="auto_rotation">Автоповорот</string>
     <string name="landscape">Альбомная</string>
-    <string name="reddit">Reddit</string>
     <string name="portrait">Портретная</string>
     <string name="community">Сообщество</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="twitter">Twitter</string>
     <string name="turnInternetOn">Пожалуйста, включите Wi-Fi или мобильный интернет для подключения.</string>
     <string name="open">Открыть…</string>
     <string name="chapters">Эпизоды</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">Пропускать тишину</string>
     <string name="help">Помощь</string>
     <string name="faq">FAQ</string>
+    <string name="replies">Ответы</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 06ad6fef3..7a6071814 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -163,11 +163,6 @@
     <string name="fullscreen_orientation">සම්පූර්ණ තිර නැඹුරුව</string>
     <string name="landscape">භූ දර්ශනය</string>
     <string name="community">ප්‍රජාව</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="turnInternetOn">කරුණාකර අන්තර්ජාලයට සම්බන්ධ වීමට Wi-Fi හෝ ජංගම දත්ත ක්‍රියාත්මක කරන්න.</string>
     <string name="open">විවෘත කරන්න…</string>
     <string name="chapters">පරිච්ඡේද</string>
@@ -446,4 +441,9 @@
     <string name="category_sponsor_description">ගෙවුම් ප්‍රවර්ධනය, ගෙවුම් යොමු කිරීම් සහ සෘජු දැන්වීම්. ස්වයං ප්‍රවර්ධනය හෝ නොමිලේ නිර්මාණකරුවන්, වෙබ් අඩවි සහ නිෂ්පාදන සඳහා සත්‍ය ප්‍රචාරක කටයුතු, සඳහා නොවේ.</string>
     <string name="category_preview_description">මෙම හෝ එහි මාලාවේ අනාගත වීඩියෝවල ඉදිරියට එන අන්තර්ගතය විස්තර කරන කොටස් සඳහා, නමුත් අමතර තොරතුරු ලබා නොදේ. මෙහි පමණක් පෙනෙන ක්ලිප් ඇතුළත් නම්, මෙය බොහෝ දුරට වැරදි කාණ්ඩයකි.</string>
     <string name="alternative_pip_controls_summary">ඉදිරියට සහ පසුපසට යැවීම වෙනුවට PiP හි ශබ්ද පමණක් සහ මඟහරින පාලක පෙන්වන්න</string>
+    <string name="replies">පිළිතුරු</string>
+    <string name="skip_silence">නිහඬ කොටස් මඟ හරින්න</string>
+    <string name="help">උදව්</string>
+    <string name="faq">නිතර අසන ප්‍රශ්න</string>
+    <string name="sleep_timer">නින්ද ටයිමරය</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 88097e645..159120f19 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -22,7 +22,7 @@
     <string name="dlisinprogress">Iné sťahovanie práve prebieha, počkajte kým bude ukončené.</string>
     <string name="downloadfailed">Sťahovanie zlyhalo.</string>
     <string name="vlc">Otvoriť vo VLC</string>
-    <string name="vlcerror">Nemožno otvoriť vo VLC. Možno nie je nainštalovaný.</string>
+    <string name="vlcerror">Nepodarilo sa otvoriť vo VLC. Možno nie je nainštalovaný.</string>
     <string name="import_from_yt">Import odberov</string>
     <string name="import_from_yt_summary">Z YouTube alebo NewPipe</string>
     <string name="server_error">Na serveri sa vyskytol problém. Skúsiť inú inštanciu\?</string>
@@ -175,7 +175,7 @@
     <string name="hide_chapters">Skryť kapitoly</string>
     <string name="category_interaction_description">Ak sa uprostred obsahu nachádza krátka pripomienka, aby ste sa prihlásili k odberu alebo sledovaniu. Ak je dlhý alebo o niečom konkrétnom, mal by byť namiesto toho sebapropagáciou.</string>
     <string name="buffering_goal">Cieľ vyrovnávacej pamäte</string>
-    <string name="category_filler_description">Ide o vedľajšie scény pridané len ako výplň alebo humor, ktoré nie sú potrebné na pochopenie hlavného obsahu videa.</string>
+    <string name="category_filler_description">Pre vedľajšie scény pridané len ako výplň alebo humor, ktoré nie sú potrebné na pochopenie hlavného obsahu videa.</string>
     <string name="category_music_offtopic_description">Len na použitie v hudobných videoklipoch. Mal by pokrývať časti videoklipu, ktoré nie sú súčasťou oficiálnych mixov. Nakoniec by sa video malo čo najviac podobať verzii mixu na Spotify alebo akejkoľvek inej verzii mixu, alebo by malo obmedziť hovorenie alebo iné rušivé prvky.</string>
     <string name="category_outro_description">Informácie po skončení. Nie pre závery s informáciami.</string>
     <string name="turnInternetOn">Prosím zapnite si wifi alebo mobilné dáta aby ste sa pripojili na internet.</string>
@@ -236,7 +236,6 @@
     <string name="audio_video">Audio a video</string>
     <string name="fullscreen_orientation">Orientácia na celú obrazovku</string>
     <string name="landscape">Nastavenie zobrazenia</string>
-    <string name="telegram">Telegram</string>
     <string name="add_to_queue">Pridať do radu</string>
     <string name="misc">Rôzne</string>
     <string name="break_reminder">Pripomienka prestávky</string>
@@ -250,8 +249,6 @@
     <string name="repeat_mode_current">Aktuálne</string>
     <string name="auth_instance_summary">Použi inú inštanciu pre overené hovory.</string>
     <string name="community">Komunita</string>
-    <string name="matrix">Matrix</string>
-    <string name="twitter">Twitter</string>
     <string name="playerVideoFormat">Video formát pre prehrávač</string>
     <string name="no_audio">Bez zvuku</string>
     <string name="no_video">bez videa</string>
@@ -292,4 +289,5 @@
     <string name="best_quality">Najlepšia</string>
     <string name="playerAudioFormat">Audio formát pre prehrávač</string>
     <string name="playerAudioQuality">Kvalita zvuku</string>
+    <string name="replies">Odpovede</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 480d40c4d..51474c2d5 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -164,9 +164,6 @@
     <string name="landscape">Хоризонтално</string>
     <string name="portrait">Вертикално</string>
     <string name="community">Заједница</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="turnInternetOn">Укључите WiFi или мобилне податке да би сте се повезали на интернет.</string>
     <string name="open">Отвори…</string>
     <string name="chapters">Поглавља</string>
@@ -242,8 +239,6 @@
     <string name="player_autoplay">Аутоплеј</string>
     <string name="reset_message">Ресетовати сва подешавања и одјавити се\?</string>
     <string name="audio_video">Аудио и видео</string>
-    <string name="discord">Дискорд</string>
-    <string name="matrix">Matrix</string>
     <string name="change_playback_speed">Брзина репродукције</string>
     <string name="data_saver_mode_summary">Прескочи сличице и друге слике.</string>
     <string name="history_summary">Историја прегледа и претрага</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index a3fd9cadb..9087a2023 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -180,10 +180,5 @@
     <string name="buffering_goal_summary">Maks. antal sekunder videor att buffra.</string>
     <string name="playerVideoFormat">Videoformat for spelaren</string>
     <string name="github">GitHub</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
     <string name="picture_in_picture">Bild i bild</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tk/strings.xml b/app/src/main/res/values-tk/strings.xml
index 853bf4e49..5c02da79f 100644
--- a/app/src/main/res/values-tk/strings.xml
+++ b/app/src/main/res/values-tk/strings.xml
@@ -167,7 +167,6 @@
     <string name="landscape">Landşaft</string>
     <string name="portrait">Portret</string>
     <string name="community">Jemgyýet</string>
-    <string name="discord">Discord</string>
     <string name="turnInternetOn">Wi-Fi ýa-da ykjam maglumatlary açyp, internete birikmegiňizi haýyş edýäris.</string>
     <string name="open">Aç …</string>
     <string name="chapters">Baplar</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 813bce80b..043e2ceb2 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -215,12 +215,7 @@
     <string name="portrait">Dikey</string>
     <string name="landscape">Yatay</string>
     <string name="audio_video">Ses ve video</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="community">Topluluk</string>
-    <string name="discord">Discord</string>
     <string name="open">Açın…</string>
     <string name="turnInternetOn">İnternete bağlanmak için lütfen Wi-Fi veya mobil verileri açın.</string>
     <string name="chapters">Bölümler</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">Sessizliği atla</string>
     <string name="help">Yardım</string>
     <string name="faq">SSS</string>
+    <string name="replies">Cevaplar</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index e176e1148..05b4880af 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -207,11 +207,6 @@
     <string name="landscape">Альбомна</string>
     <string name="portrait">Портретна</string>
     <string name="community">Спільнота</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="instance_name">Ім\'я екземпляра</string>
     <string name="playerVideoFormat">Формат відео для програвача</string>
     <string name="auth_instance">Сервер аутентифікації</string>
@@ -450,4 +445,5 @@
     <string name="faq">ЧаПи</string>
     <string name="sleep_timer">Таймер сну</string>
     <string name="skip_silence">Пропускати тишу</string>
+    <string name="replies">Відповіді</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
new file mode 100644
index 000000000..fff4197b3
--- /dev/null
+++ b/app/src/main/res/values-ur/strings.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="share">شیئر کریں</string>
+    <string name="download">ڈاؤن لوڈ کریں</string>
+    <string name="login">لاگ ان کریں</string>
+    <string name="save">محفوظ کریں</string>
+    <string name="register">رجسٹر کریں</string>
+    <string name="logout">لاگ آؤٹ کریں</string>
+    <string name="loggedIn">لاگ ان ہو گیا۔</string>
+    <string name="registered">رجسٹر ہو گیا. اب آپ چینل سبسکرائب کر سکتے ہیں۔</string>
+    <string name="login_first">براہ کرم لاگ ان کریں اور دوبارہ کوشش کریں۔</string>
+    <string name="instances">منتخب کریں…</string>
+    <string name="already_logged_in">پہلے سے لاگ ان ہے۔ آپ اپنے اکاؤنٹ سے لاگ آؤٹ کر سکتے ہیں۔</string>
+    <string name="videos">ویڈیوز</string>
+    <string name="subscribe">سبسکرائب</string>
+    <string name="loggedout">لاگ آؤٹ ہو گیا۔</string>
+    <string name="search_hint">تلاش کریں</string>
+    <string name="startpage">گھر</string>
+    <string name="subscriptions">سبسکرپشنز</string>
+    <string name="choose_quality_dialog">معیار</string>
+    <string name="yes">ہاں</string>
+    <string name="password">پاس ورڈ</string>
+    <string name="cancel">منسوخ کریں</string>
+    <string name="systemDefault">سسٹم</string>
+    <string name="lightTheme">روشن</string>
+    <string name="darkTheme">اندھیرا</string>
+    <string name="subscribers">%1$s سبسکرائبر</string>
+    <string name="settings">ترتیبات</string>
+    <string name="comments">تبصرے</string>
+    <string name="replies">جوابات</string>
+    <string name="please_login">براہ کرم پہلے سیٹنگز میں لاگ ان یا رجسٹر ہوں۔</string>
+    <string name="region">علاقہ</string>
+    <string name="login_register">لاگ ان/رجسٹر</string>
+    <string name="subscribeIsEmpty">پہلے کچھ چینل سبسکرائب کریں۔</string>
+    <string name="cannotDownload">اس سلسلہ کو ڈاؤن لوڈ نہیں کیا جا سکتا۔</string>
+    <string name="dlcomplete">ڈاؤن لوڈ مکمل ہو گیا۔</string>
+    <string name="dlisinprogress">ایک اور ڈاؤن لوڈ پہلے سے جاری ہے، براہ کرم اس کے مکمل ہونے تک انتظار کریں۔</string>
+    <string name="vlc">VLC میں کھولیں</string>
+    <string name="app_theme">تھیم</string>
+    <string name="unknown_error">نیٹ ورک کی خرابی۔</string>
+    <string name="error">کچھ غلط ہو گیا.</string>
+    <string name="downloadfailed">ڈاؤن لوڈ ناکام ہو گیا۔</string>
+    <string name="import_from_yt">سبسکرپشن درآمد کریں</string>
+    <string name="server_error">سرور میں ایک مسئلہ ہے۔ دوسری انسٹنش آزمائیں؟</string>
+    <string name="vlcerror">VLC میں نہیں کھل سکا۔ شاید یہ انسٹال نہیں ہے۔</string>
+    <string name="import_from_yt_summary">یوٹیوب یا نیو پائپ سے</string>
+    <string name="notgmail">یہ پائپڈ اکاؤنٹ کے لیے ہے۔</string>
+    <string name="defres">ویڈیو ریزولوشن</string>
+    <string name="deletePlaylist">پلے لسٹ ڈیلیٹ کریں</string>
+    <string name="username">صارف نام</string>
+    <string name="empty">آپ کو صارف نام اور پاس ورڈ درج کرنا ہوگا۔</string>
+    <string name="playlistName">پلے لسٹ کا نام</string>
+    <string name="grid">گرڈ کالم</string>
+    <string name="areYouSure">پلے لسٹ ڈیلیٹ کریں؟</string>
+    <string name="createPlaylist">پلے لسٹ بنائیں</string>
+    <string name="playlistCreated">پلے لسٹ بنائی گئی۔</string>
+    <string name="emptyPlaylistName">پلے لسٹ کا نام خالی نہیں ہو سکتا</string>
+    <string name="addToPlaylist">پلے لسٹ میں شامل کریں</string>
+    <string name="success">مکمل۔</string>
+    <string name="fail">ناکام :(</string>
+    <string name="emptyList">یہاں کچھ بھی نہیں ہے.</string>
+    <string name="instance">انسٹنش</string>
+    <string name="location">مقام</string>
+    <string name="website">ویب سائٹ</string>
+    <string name="changeLanguage">زبان</string>
+    <string name="about">ہمارے بارے میں</string>
+    <string name="systemLanguage">سسٹم</string>
+    <string name="customization">موافقت</string>
+    <string name="retry">دوبارہ کوشش کریںدوبارہ کوشش کریں</string>
+    <string name="videoCount">%1$s ویڈیو</string>
+    <string name="noInternet">پہلے انٹرنیٹ سے جڑیں۔</string>
+    <string name="search_history">تلاش کی سرگزشت</string>
+    <string name="okay">ٹھیک ہے</string>
+    <string name="choose_filter">تلاش کا فلٹر منتخب کریں</string>
+    <string name="channels">چینلز</string>
+    <string name="all">تمام</string>
+    <string name="playlists">پلے لسٹس</string>
+    <string name="history">سرگزشت</string>
+    <string name="clear_history">سرگزشت صاف کریں</string>
+    <string name="music_albums">YT میوزک البمز</string>
+    <string name="music_songs">YT میوزک گانے</string>
+    <string name="music_videos">YT میوزک ویڈیوز</string>
+    <string name="music_playlists">YT میوزک پلے لسٹس</string>
+    <string name="defaultTab">ڈیفالٹ ٹیب</string>
+    <string name="library">لائبریری</string>
+    <string name="unsubscribe">ان سبسکرائب</string>
+    <string name="customInstance">حسب ضرورت</string>
+    <string name="importsuccess">سبسکرائب کیا</string>
+    <string name="sponsorblock">اسپانسر بلاک</string>
+    <string name="sponsorblock_summary">https://sponsor.ajay.app API استعمال کرتا ہے</string>
+    <string name="segment_skipped">چھوڑا ہوا طبقہ</string>
+    <string name="sponsorblock_state">آن</string>
+    <string name="category_segments">طبقات</string>
+    <string name="category_sponsor">سپانسر</string>
+    <string name="category_sponsor_description">بامعاوضہ پروموشن، بامعاوضہ حوالہ جات اور براہ راست اشتہارات۔ خود کو فروغ دینے یا اسباب، تخلیق کاروں، ویب سائٹس اور پروڈکٹس کے لیے مفت حقیقی شور مچانے کے لیے نہیں۔</string>
+    <string name="category_interaction">تعامل کی یاد دہانی (پسند کریں اور سبسکرائب کریں)</string>
+    <string name="category_intro">انٹرمیشن/انٹرو اینیمیشن</string>
+    <string name="category_intro_description">اصل مواد کے بغیر وقفہ۔ ایک توقف، جامد فریم، دہرانے والی حرکت پذیری ہو سکتی ہے۔ معلومات پر مشتمل ٹرانزیشن کے لیے استعمال نہیں کیا جانا چاہیے۔</string>
+    <string name="category_outro">اختتامی کارڈ اور کریڈٹ</string>
+    <string name="category_outro_description">اختتام کے بعد معلومات۔ معلومات کے ساتھ نتیجہ اخذ کرنے کے لیے نہیں۔</string>
+    <string name="category_filler">فلر ٹینجنٹ/مذاق</string>
+    <string name="category_music_offtopic">موسیقی: غیر موسیق سیکشن</string>
+    <string name="license">لائسنس</string>
+    <string name="color_accent">لہجے</string>
+    <string name="color_red">آرام دہ سرخ</string>
+    <string name="color_blue">خوشنما نیلا</string>
+    <string name="color_green">گرووی سبز</string>
+    <string name="color_yellow">ییٹنگ پیلا</string>
+    <string name="color_purple">خوشگوار جامنی</string>
+    <string name="oledTheme">سیاہ</string>
+    <string name="material_you">میٹریل یو</string>
+    <string name="sponsorblock_notifications">اطلاعات</string>
+    <string name="app_icon">آئیکن</string>
+    <string name="enabled">چالو</string>
+    <string name="disabled">بند</string>
+    <string name="piped">پائپڈ</string>
+    <string name="youtube">یوٹیوب</string>
+    <string name="playOnBackground">پس منظر میں چلائیں</string>
+    <string name="update_available">ورژن %1$s دستیاب ہے</string>
+    <string name="update_available_text">اسے ڈاؤن لوڈ کرنے کے لیے GitHub پر ریلیز پر جائیں؟</string>
+    <string name="appearance">ہئیت</string>
+    <string name="resume">شروع کریں</string>
+    <string name="player_autoplay">آٹو پلے</string>
+    <string name="instance_frontend_url">انسٹانس فرنٹ اینڈ کا URL</string>
+    <string name="quality">معیار</string>
+    <string name="behavior">رویہ</string>
+    <string name="player_summary">ڈیفالٹس اور رویہ</string>
+    <string name="seek_increment">سیک اضافہ</string>
+    <string name="pauseOnScreenOff_summary">اسکرین آف ہونے پر پلے بیک کو روک دیں۔</string>
+    <string name="autoplay_summary">موجودہ ویڈیو کے بعد اگلی ویڈیو خود بخود چلائیں۔</string>
+    <string name="clonePlaylist">پلے لسٹ کلون کریں</string>
+    <string name="reset">ڈیفالٹس بحال کریں</string>
+    <string name="category_selfpromo">بلا معاوضہ/سیلف پروموشن</string>
+    <string name="category_selfpromo_description">بلا معاوضہ یا خود پروموشن کے علاوہ \"اسپانسر\" کی طرح۔ اس میں تجارتی مال، عطیات، یا اس بارے میں معلومات کے حصے شامل ہیں کہ انہوں نے کس کے ساتھ تعاون کیا۔</string>
+    <string name="category_interaction_description">جب مواد کے بیچ میں پسند کرنے، سبسکرائب کرنے یا پیروی کرنے کے لیے ایک مختصر یاد دہانی ہو۔ اگر طویل ہو یا کسی خاص چیز کے بارے میں، تو اس کی بجائے خود کو فروغ دینا چاہیے۔</string>
+    <string name="category_music_offtopic_description">صرف میوزک ویڈیوز میں استعمال کے لیے۔ اسے ویڈیو کے کچھ حصوں کا احاطہ کرنا چاہیے نہ کہ آفیشل مکسز کا۔ آخر میں، ویڈیو کو Spotify یا کسی دوسرے مخلوط ورژن سے زیادہ سے زیادہ قریب سے مشابہ ہونا چاہیے، یا بات کرنے یا دیگر خلفشار کو کم کرنا چاہیے۔</string>
+    <string name="category_preview">پیش نظار/تذکر</string>
+    <string name="category_filler_description">ٹینجینٹل مناظر کے لیے صرف فلر یا مزاح کے لیے شامل کیے گئے ویڈیو کے مرکزی مواد کو سمجھنے کی ضرورت نہیں ہے۔</string>
+    <string name="category_preview_description">اس سیریز میں آنے والے مواد یا مستقبل کے ویڈیوز کی تفصیل دینے والے حصوں کے لیے، لیکن اضافی معلومات فراہم نہ کریں۔ اگر اس میں ایسے کلپس شامل ہیں جو صرف یہاں ظاہر ہوتے ہیں، تو یہ غلط زمرہ ہے۔</string>
+    <string name="pause">توقف کریں</string>
+    <string name="hideTrendingPage">رجحان ساز صفحہ چھپائیں</string>
+    <string name="pauseOnScreenOff">خودکار توقف</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 49a678b2e..88ac8179f 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -227,12 +227,7 @@
     <string name="required_network">Yêu cầu kết nối mạng</string>
     <string name="network_all">Tất cả</string>
     <string name="landscape">Ngang</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="community">Cộng đồng</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
     <string name="watch_history">Lịch sử xem</string>
     <string name="watch_positions">Nhớ vị trí</string>
     <string name="auth_instance">Instance được xác minh</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d5989365e..5662a6787 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -215,12 +215,7 @@
     <string name="auto_rotation">自动旋转</string>
     <string name="landscape">横屏</string>
     <string name="portrait">竖屏</string>
-    <string name="reddit">Reddit</string>
     <string name="community">社区</string>
-    <string name="twitter">Twitter</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
     <string name="turnInternetOn">请打开 Wi-Fi 或移动数据连接到互联网。</string>
     <string name="open">打开…</string>
     <string name="chapters">章节</string>
@@ -450,4 +445,5 @@
     <string name="skip_silence">跳过静音</string>
     <string name="help">帮助</string>
     <string name="faq">常见问题</string>
+    <string name="replies">回复</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 9fefb45da..d532b1405 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -266,9 +266,6 @@
     <string name="resume">繼續</string>
     <string name="pauseOnScreenOff">自動暫停</string>
     <string name="portrait">肖像</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
     <string name="turnInternetOn">請開啟Wifi或行動數據連上網路。</string>
     <string name="never">永不</string>
     <string name="change_playback_speed">播放速度</string>
@@ -388,8 +385,6 @@
     <string name="aspect_ratio">影片比例</string>
     <string name="auto_rotation">自動旋轉</string>
     <string name="landscape">風景</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="pinch_control">調整音高</string>
     <string name="play_latest_videos">播放最新影片</string>
     <string name="audio_track">音訊曲目</string>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 58159c406..a5ed73221 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -8,4 +8,13 @@
         <attr name="defValue" format="float" />
     </declare-styleable>
 
+    <declare-styleable name="DrawableTextView">
+        <attr name="drawableStartDimen" format="dimension" />
+        <attr name="drawableTopDimen" format="dimension" />
+        <attr name="drawableEndDimen" format="dimension" />
+        <attr name="drawableBottomDimen" format="dimension" />
+        <attr name="android:drawablePadding" />
+        <attr name="android:gravity" />
+    </declare-styleable>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 53d5cef34..90285cd73 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -226,11 +226,6 @@
     <string name="landscape">Landscape</string>
     <string name="portrait">Portrait</string>
     <string name="community">Community</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="turnInternetOn">Please turn on Wi-Fi or mobile data to connect to the Internet.</string>
     <string name="open">Open…</string>
     <string name="chapters">Chapters</string>
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 043068972..487c1f216 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -17,8 +17,8 @@
 
     <style name="AboutCard" parent="Widget.Material3.CardView.Elevated">
 
-        <item name="android:layout_marginLeft">10dp</item>
-        <item name="android:layout_marginRight">5dp</item>
+        <item name="android:layout_marginStart">10dp</item>
+        <item name="android:layout_marginEnd">10dp</item>
         <item name="android:layout_marginBottom">5dp</item>
         <item name="android:layout_marginTop">10dp</item>
         <item name="strokeWidth">0dp</item>
@@ -31,32 +31,16 @@
 
     <style name="AboutItem">
 
-        <item name="android:orientation">horizontal</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginLeft">20dp</item>
-        <item name="android:layout_marginRight">20dp</item>
-        <item name="android:layout_marginTop">15dp</item>
-        <item name="android:layout_marginBottom">15dp</item>
-
-    </style>
-
-    <style name="AboutTextView">
-
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_gravity">center</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textStyle">bold</item>
-
-    </style>
-
-    <style name="AboutImageView">
-
-        <item name="android:layout_height">24dp</item>
-        <item name="android:layout_width">24dp</item>
-        <item name="android:layout_marginRight">10dp</item>
-
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:drawablePadding">20dp</item>
+        <item name="android:paddingStart">15dp</item>
+        <item name="android:paddingEnd">15dp</item>
+        <item name="android:paddingTop">15dp</item>
+        <item name="android:paddingBottom">15dp</item>
     </style>
 
     <style name="CustomDialogButton" parent="@style/Widget.Material3.Button.TextButton">
@@ -137,9 +121,8 @@
 
     <style name="WatchProgress">
 
-        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">4dp</item>
-        <item name="android:layout_gravity">bottom</item>
         <item name="android:background">?attr/colorPrimaryDark</item>
         <item name="android:visibility">gone</item>
 
@@ -182,10 +165,7 @@
 
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingLeft">6dp</item>
-        <item name="android:paddingRight">6dp</item>
-        <item name="android:paddingTop">8dp</item>
-        <item name="android:paddingBottom">8dp</item>
+        <item name="android:padding">8dp</item>
         <item name="android:background">@drawable/rounded_ripple</item>
         <item name="android:orientation">horizontal</item>
 
@@ -232,6 +212,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">20sp</item>
         <item name="android:textColor">?attr/colorControlNormal</item>
+        <item name="android:textAlignment">viewStart</item>
         <item name="android:padding">15dp</item>
         <item name="android:background">?attr/selectableItemBackground</item>
         <item name="android:visibility">gone</item>
diff --git a/app/src/main/res/xml/player_settings.xml b/app/src/main/res/xml/player_settings.xml
index 1b7ac7bbb..3d3dd39c5 100644
--- a/app/src/main/res/xml/player_settings.xml
+++ b/app/src/main/res/xml/player_settings.xml
@@ -54,7 +54,7 @@
         <SwitchPreferenceCompat
             android:icon="@drawable/ic_rotating_circle"
             android:summary="@string/autoRotatePlayer_summary"
-            app:defaultValue="true"
+            app:defaultValue="false"
             app:key="auto_fullscreen"
             app:title="@string/autoRotatePlayer" />
 
diff --git a/build.gradle b/build.gradle
index 81dd9b027..399fe86c2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ea5fb289b..2e6af9a8a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ espresso = "3.5.1"
 workRuntime = "2.7.1"
 exoplayer = "2.18.2"
 retrofit = "2.9.0"
-desugaring = "2.0.0"
+desugaring = "2.0.2"
 cronetEmbedded = "108.5359.79"
 cronetOkHttp = "0.1.0"
 coil = "2.2.2"