diff --git a/app/src/main/java/com/github/libretube/api/ExternalApi.kt b/app/src/main/java/com/github/libretube/api/ExternalApi.kt
index a547a8fbb..ab9c8d3eb 100644
--- a/app/src/main/java/com/github/libretube/api/ExternalApi.kt
+++ b/app/src/main/java/com/github/libretube/api/ExternalApi.kt
@@ -1,8 +1,8 @@
 package com.github.libretube.api
 
+import com.github.libretube.api.obj.Instances
 import com.github.libretube.constants.GITHUB_API_URL
 import com.github.libretube.constants.PIPED_INSTANCES_URL
-import com.github.libretube.api.obj.Instances
 import com.github.libretube.obj.update.UpdateInfo
 import retrofit2.http.GET
 
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 333138350..c39936590 100644
--- a/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt
+++ b/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt
@@ -1,11 +1,11 @@
 package com.github.libretube.api
 
 import android.util.Log
+import com.github.libretube.api.obj.Subscribe
 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.extensions.await
-import com.github.libretube.api.obj.Subscribe
 import com.github.libretube.util.PreferenceHelper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
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 b0a083423..f8ea13d62 100644
--- a/app/src/main/java/com/github/libretube/db/DatabaseHelper.kt
+++ b/app/src/main/java/com/github/libretube/db/DatabaseHelper.kt
@@ -1,12 +1,12 @@
 package com.github.libretube.db
 
+import com.github.libretube.api.obj.Streams
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.db.obj.SearchHistoryItem
 import com.github.libretube.db.obj.WatchHistoryItem
 import com.github.libretube.db.obj.WatchPosition
 import com.github.libretube.extensions.toID
-import com.github.libretube.api.obj.Streams
 import com.github.libretube.util.PreferenceHelper
 
 object DatabaseHelper {
diff --git a/app/src/main/java/com/github/libretube/models/SubscriptionsViewModel.kt b/app/src/main/java/com/github/libretube/models/SubscriptionsViewModel.kt
index cac255157..fd139e4be 100644
--- a/app/src/main/java/com/github/libretube/models/SubscriptionsViewModel.kt
+++ b/app/src/main/java/com/github/libretube/models/SubscriptionsViewModel.kt
@@ -5,10 +5,10 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.SubscriptionHelper
-import com.github.libretube.extensions.TAG
-import com.github.libretube.extensions.toID
 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 kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/github/libretube/obj/NewPipeSubscriptions.kt b/app/src/main/java/com/github/libretube/obj/NewPipeSubscriptions.kt
index 20f2ed2b1..9c19551d2 100644
--- a/app/src/main/java/com/github/libretube/obj/NewPipeSubscriptions.kt
+++ b/app/src/main/java/com/github/libretube/obj/NewPipeSubscriptions.kt
@@ -1,7 +1,5 @@
 package com.github.libretube.obj
 
-import com.github.libretube.obj.NewPipeSubscription
-
 data class NewPipeSubscriptions(
     val app_version: String = "",
     val app_version_int: Int = 0,
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 f18930aad..b3a4f0ae1 100644
--- a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
+++ b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
@@ -13,14 +13,14 @@ import android.widget.Toast
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.github.libretube.R
 import com.github.libretube.api.RetrofitInstance
+import com.github.libretube.api.obj.Segment
+import com.github.libretube.api.obj.Segments
+import com.github.libretube.api.obj.Streams
 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.constants.PreferenceKeys
 import com.github.libretube.extensions.toID
-import com.github.libretube.api.obj.Segment
-import com.github.libretube.api.obj.Segments
-import com.github.libretube.api.obj.Streams
 import com.github.libretube.util.AutoPlayHelper
 import com.github.libretube.util.NowPlayingNotification
 import com.github.libretube.util.PlayerHelper
diff --git a/app/src/main/java/com/github/libretube/sheets/PlaylistOptionsBottomSheet.kt b/app/src/main/java/com/github/libretube/sheets/PlaylistOptionsBottomSheet.kt
index 8134da711..8a1201830 100644
--- a/app/src/main/java/com/github/libretube/sheets/PlaylistOptionsBottomSheet.kt
+++ b/app/src/main/java/com/github/libretube/sheets/PlaylistOptionsBottomSheet.kt
@@ -6,14 +6,14 @@ import android.util.Log
 import android.widget.Toast
 import com.github.libretube.R
 import com.github.libretube.api.RetrofitInstance
+import com.github.libretube.api.obj.PlaylistId
 import com.github.libretube.databinding.DialogTextPreferenceBinding
-import com.github.libretube.ui.dialogs.ShareDialog
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.toID
-import com.github.libretube.api.obj.PlaylistId
+import com.github.libretube.ui.dialogs.ShareDialog
+import com.github.libretube.ui.views.BottomSheet
 import com.github.libretube.util.BackgroundHelper
 import com.github.libretube.util.PreferenceHelper
-import com.github.libretube.ui.views.BottomSheet
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -114,7 +114,8 @@ class PlaylistOptionsBottomSheet(
     private fun importPlaylist(token: String, playlistId: String) {
         CoroutineScope(Dispatchers.IO).launch {
             val response = try {
-                RetrofitInstance.authApi.importPlaylist(token,
+                RetrofitInstance.authApi.importPlaylist(
+                    token,
                     com.github.libretube.api.obj.PlaylistId(playlistId)
                 )
             } catch (e: IOException) {
diff --git a/app/src/main/java/com/github/libretube/sheets/VideoOptionsBottomSheet.kt b/app/src/main/java/com/github/libretube/sheets/VideoOptionsBottomSheet.kt
index 2d82d3fa7..a9a39b859 100644
--- a/app/src/main/java/com/github/libretube/sheets/VideoOptionsBottomSheet.kt
+++ b/app/src/main/java/com/github/libretube/sheets/VideoOptionsBottomSheet.kt
@@ -7,10 +7,10 @@ import com.github.libretube.constants.IntentData
 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.ui.views.BottomSheet
 import com.github.libretube.util.BackgroundHelper
 import com.github.libretube.util.PlayingQueue
 import com.github.libretube.util.PreferenceHelper
-import com.github.libretube.ui.views.BottomSheet
 
 /**
  * Dialog with different options for a selected video.
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 8ee5aaed9..74374a1c8 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
@@ -25,14 +25,14 @@ import com.github.libretube.R
 import com.github.libretube.constants.IntentData
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.ActivityMainBinding
-import com.github.libretube.ui.dialogs.ErrorDialog
 import com.github.libretube.extensions.BaseActivity
 import com.github.libretube.extensions.toID
-import com.github.libretube.ui.fragments.PlayerFragment
 import com.github.libretube.models.PlayerViewModel
 import com.github.libretube.models.SearchViewModel
 import com.github.libretube.models.SubscriptionsViewModel
 import com.github.libretube.services.ClosingService
+import com.github.libretube.ui.dialogs.ErrorDialog
+import com.github.libretube.ui.fragments.PlayerFragment
 import com.github.libretube.util.NavBarHelper
 import com.github.libretube.util.NetworkHelper
 import com.github.libretube.util.PreferenceHelper
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/ChannelAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/ChannelAdapter.kt
index ffd7b38a4..2f80e0ea7 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/ChannelAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/ChannelAdapter.kt
@@ -5,11 +5,11 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
+import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.databinding.VideoRowBinding
 import com.github.libretube.extensions.formatShort
 import com.github.libretube.extensions.setWatchProgressLength
 import com.github.libretube.extensions.toID
-import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.sheets.VideoOptionsBottomSheet
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NavigationHelper
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 7fd29ad10..f75b43b85 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
@@ -4,8 +4,8 @@ import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.databinding.ChapterColumnBinding
 import com.github.libretube.api.obj.ChapterSegment
+import com.github.libretube.databinding.ChapterColumnBinding
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.exoplayer2.ExoPlayer
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 08ee77465..199162429 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
@@ -9,11 +9,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.api.RetrofitInstance
+import com.github.libretube.api.obj.Comment
+import com.github.libretube.api.obj.CommentsPage
 import com.github.libretube.databinding.CommentsRowBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.formatShort
-import com.github.libretube.api.obj.Comment
-import com.github.libretube.api.obj.CommentsPage
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NavigationHelper
 import kotlinx.coroutines.CoroutineScope
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 60ef45b8c..e0b0fa10b 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
@@ -6,10 +6,10 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
-import com.github.libretube.ui.activities.OfflinePlayerActivity
 import com.github.libretube.constants.IntentData
 import com.github.libretube.databinding.DownloadedMediaRowBinding
 import com.github.libretube.obj.DownloadedFile
+import com.github.libretube.ui.activities.OfflinePlayerActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.io.File
 
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 67286c7cb..2bd0ad2bc 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
@@ -3,9 +3,9 @@ package com.github.libretube.ui.adapters
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.github.libretube.api.obj.Subscription
 import com.github.libretube.databinding.LegacySubscriptionChannelBinding
 import com.github.libretube.extensions.toID
-import com.github.libretube.api.obj.Subscription
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NavigationHelper
 
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 7a80e4569..8880c73f7 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
@@ -8,13 +8,13 @@ import android.view.ViewGroup
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.api.RetrofitInstance
+import com.github.libretube.api.obj.PlaylistId
+import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.databinding.PlaylistRowBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.setFormattedDuration
 import com.github.libretube.extensions.setWatchProgressLength
 import com.github.libretube.extensions.toID
-import com.github.libretube.api.obj.PlaylistId
-import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.sheets.VideoOptionsBottomSheet
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NavigationHelper
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 4c8198f31..a4614fa49 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
@@ -8,10 +8,10 @@ import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.api.RetrofitInstance
-import com.github.libretube.databinding.PlaylistsRowBinding
-import com.github.libretube.extensions.TAG
 import com.github.libretube.api.obj.PlaylistId
 import com.github.libretube.api.obj.Playlists
+import com.github.libretube.databinding.PlaylistsRowBinding
+import com.github.libretube.extensions.TAG
 import com.github.libretube.sheets.PlaylistOptionsBottomSheet
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NavigationHelper
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/RepliesAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/RepliesAdapter.kt
index a2b0a9719..ccf0571f8 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/RepliesAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/RepliesAdapter.kt
@@ -4,9 +4,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.github.libretube.api.obj.Comment
 import com.github.libretube.databinding.RepliesRowBinding
 import com.github.libretube.extensions.formatShort
-import com.github.libretube.api.obj.Comment
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NavigationHelper
 
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 bc3d29a2d..4e77f6657 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
@@ -7,6 +7,7 @@ import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.api.SubscriptionHelper
+import com.github.libretube.api.obj.SearchItem
 import com.github.libretube.databinding.ChannelRowBinding
 import com.github.libretube.databinding.PlaylistSearchRowBinding
 import com.github.libretube.databinding.VideoRowBinding
@@ -14,7 +15,6 @@ import com.github.libretube.extensions.formatShort
 import com.github.libretube.extensions.setFormattedDuration
 import com.github.libretube.extensions.setWatchProgressLength
 import com.github.libretube.extensions.toID
-import com.github.libretube.api.obj.SearchItem
 import com.github.libretube.sheets.PlaylistOptionsBottomSheet
 import com.github.libretube.sheets.VideoOptionsBottomSheet
 import com.github.libretube.util.ImageHelper
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 5d320c49f..ee7f36f9d 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
@@ -5,9 +5,9 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.api.SubscriptionHelper
+import com.github.libretube.api.obj.Subscription
 import com.github.libretube.databinding.ChannelSubscriptionRowBinding
 import com.github.libretube.extensions.toID
-import com.github.libretube.api.obj.Subscription
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NavigationHelper
 
@@ -19,7 +19,7 @@ class SubscriptionChannelAdapter(private val subscriptions: MutableList<com.gith
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int):
-            SubscriptionChannelViewHolder {
+        SubscriptionChannelViewHolder {
         val layoutInflater = LayoutInflater.from(parent.context)
         val binding = ChannelSubscriptionRowBinding.inflate(layoutInflater, parent, false)
         return SubscriptionChannelViewHolder(binding)
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/TrendingAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/TrendingAdapter.kt
index d90022d5a..8f4174e0e 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/TrendingAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/TrendingAdapter.kt
@@ -5,12 +5,12 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
+import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.databinding.TrendingRowBinding
 import com.github.libretube.extensions.formatShort
 import com.github.libretube.extensions.setFormattedDuration
 import com.github.libretube.extensions.setWatchProgressLength
 import com.github.libretube.extensions.toID
-import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.sheets.VideoOptionsBottomSheet
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NavigationHelper
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt
index 10b893c00..8b746c157 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt
@@ -11,11 +11,11 @@ import androidx.fragment.app.activityViewModels
 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.constants.IntentData
 import com.github.libretube.databinding.DialogAddtoplaylistBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.models.PlaylistViewModel
-import com.github.libretube.api.obj.PlaylistId
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -92,7 +92,8 @@ class AddToPlaylistDialog : DialogFragment() {
         fun run() {
             lifecycleScope.launchWhenCreated {
                 val response = try {
-                    RetrofitInstance.authApi.addToPlaylist(token,
+                    RetrofitInstance.authApi.addToPlaylist(
+                        token,
                         com.github.libretube.api.obj.PlaylistId(playlistId, videoId)
                     )
                 } catch (e: IOException) {
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 6b6a7c568..c9c0b233b 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
@@ -5,11 +5,11 @@ import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.github.libretube.R
-import com.github.libretube.ui.adapters.BackupOptionsAdapter
 import com.github.libretube.databinding.DialogBackupBinding
 import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.extensions.await
 import com.github.libretube.obj.BackupFile
+import com.github.libretube.ui.adapters.BackupOptionsAdapter
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class BackupDialog(
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 859e3144a..5291a679b 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
@@ -8,10 +8,10 @@ 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.Playlists
 import com.github.libretube.databinding.DialogCreatePlaylistBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.ui.fragments.LibraryFragment
-import com.github.libretube.api.obj.Playlists
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -52,7 +52,8 @@ class CreatePlaylistDialog : DialogFragment() {
     private fun createPlaylist(name: String) {
         lifecycleScope.launchWhenCreated {
             val response = try {
-                RetrofitInstance.authApi.createPlaylist(token,
+                RetrofitInstance.authApi.createPlaylist(
+                    token,
                     com.github.libretube.api.obj.Playlists(name = name)
                 )
             } catch (e: IOException) {
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 ccaabcc52..a9b49fae0 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
@@ -8,9 +8,9 @@ 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.DeleteUserRequest
 import com.github.libretube.databinding.DialogDeleteAccountBinding
 import com.github.libretube.extensions.TAG
-import com.github.libretube.api.obj.DeleteUserRequest
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -45,7 +45,8 @@ class DeleteAccountDialog : DialogFragment() {
             val token = PreferenceHelper.getToken()
 
             try {
-                RetrofitInstance.authApi.deleteAccount(token,
+                RetrofitInstance.authApi.deleteAccount(
+                    token,
                     com.github.libretube.api.obj.DeleteUserRequest(password)
                 )
             } catch (e: Exception) {
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 f46069535..868f37416 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
@@ -12,9 +12,9 @@ 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.Streams
 import com.github.libretube.databinding.DialogDownloadBinding
 import com.github.libretube.extensions.TAG
-import com.github.libretube.api.obj.Streams
 import com.github.libretube.services.DownloadService
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
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 a80454ce7..28bfa929f 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
@@ -8,9 +8,9 @@ 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.Login
 import com.github.libretube.databinding.DialogLoginBinding
 import com.github.libretube.extensions.TAG
-import com.github.libretube.api.obj.Login
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
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 26ce94d5e..e9d0c62a7 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
@@ -7,8 +7,8 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
-import com.github.libretube.ui.adapters.NavBarOptionsAdapter
 import com.github.libretube.databinding.DialogNavbarOptionsBinding
+import com.github.libretube.ui.adapters.NavBarOptionsAdapter
 import com.github.libretube.util.NavBarHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/UpdateDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/UpdateDialog.kt
index e27ead5cf..88c1d636d 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/UpdateDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/UpdateDialog.kt
@@ -8,8 +8,8 @@ import android.os.Bundle
 import android.util.Log
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
-import com.github.libretube.services.UpdateService
 import com.github.libretube.obj.update.UpdateInfo
+import com.github.libretube.services.UpdateService
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class UpdateDialog(
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 e8936e9dd..b88f03142 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
@@ -8,7 +8,6 @@ import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.github.libretube.R
-import com.github.libretube.ui.adapters.ChannelAdapter
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.SubscriptionHelper
 import com.github.libretube.constants.IntentData
@@ -17,6 +16,7 @@ import com.github.libretube.extensions.BaseFragment
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.formatShort
 import com.github.libretube.extensions.toID
+import com.github.libretube.ui.adapters.ChannelAdapter
 import com.github.libretube.util.ImageHelper
 import retrofit2.HttpException
 import java.io.IOException
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 0d93d00bd..c19d552dc 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
@@ -7,9 +7,9 @@ import android.view.ViewGroup
 import androidx.core.view.size
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.ui.adapters.DownloadsAdapter
 import com.github.libretube.databinding.FragmentDownloadsBinding
 import com.github.libretube.extensions.BaseFragment
+import com.github.libretube.ui.adapters.DownloadsAdapter
 import com.github.libretube.util.DownloadHelper
 
 class DownloadsFragment : BaseFragment() {
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 b64d7a43f..aea4f99e1 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
@@ -10,13 +10,13 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.github.libretube.R
-import com.github.libretube.ui.adapters.ChannelAdapter
-import com.github.libretube.ui.adapters.TrendingAdapter
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.FragmentHomeBinding
 import com.github.libretube.extensions.BaseFragment
 import com.github.libretube.extensions.TAG
+import com.github.libretube.ui.adapters.ChannelAdapter
+import com.github.libretube.ui.adapters.TrendingAdapter
 import com.github.libretube.util.LocaleHelper
 import com.github.libretube.util.PreferenceHelper
 import retrofit2.HttpException
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 e0a701a7c..b4eb72b19 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
@@ -12,14 +12,14 @@ import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
-import com.github.libretube.ui.adapters.PlaylistsAdapter
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.FragmentLibraryBinding
-import com.github.libretube.ui.dialogs.CreatePlaylistDialog
 import com.github.libretube.extensions.BaseFragment
 import com.github.libretube.extensions.TAG
 import com.github.libretube.models.PlayerViewModel
+import com.github.libretube.ui.adapters.PlaylistsAdapter
+import com.github.libretube.ui.dialogs.CreatePlaylistDialog
 import com.github.libretube.util.PreferenceHelper
 import retrofit2.HttpException
 import java.io.IOException
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 8f6f24a58..7e60fe5bf 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
@@ -36,10 +36,6 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.github.libretube.R
-import com.github.libretube.ui.activities.MainActivity
-import com.github.libretube.ui.adapters.ChaptersAdapter
-import com.github.libretube.ui.adapters.CommentsAdapter
-import com.github.libretube.ui.adapters.TrendingAdapter
 import com.github.libretube.api.CronetHelper
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.SubscriptionHelper
@@ -50,9 +46,6 @@ import com.github.libretube.databinding.ExoStyledPlayerControlViewBinding
 import com.github.libretube.databinding.FragmentPlayerBinding
 import com.github.libretube.db.DatabaseHelper
 import com.github.libretube.db.DatabaseHolder.Companion.Database
-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.extensions.BaseFragment
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.await
@@ -63,6 +56,13 @@ import com.github.libretube.interfaces.PlayerOptionsInterface
 import com.github.libretube.models.PlayerViewModel
 import com.github.libretube.services.BackgroundMode
 import com.github.libretube.services.DownloadService
+import com.github.libretube.ui.activities.MainActivity
+import com.github.libretube.ui.adapters.ChaptersAdapter
+import com.github.libretube.ui.adapters.CommentsAdapter
+import com.github.libretube.ui.adapters.TrendingAdapter
+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.AutoPlayHelper
 import com.github.libretube.util.BackgroundHelper
 import com.github.libretube.util.ImageHelper
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 98fa55d5c..daac0ed01 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
@@ -10,7 +10,6 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
-import com.github.libretube.ui.adapters.PlaylistAdapter
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.constants.IntentData
 import com.github.libretube.databinding.FragmentPlaylistBinding
@@ -18,6 +17,7 @@ import com.github.libretube.extensions.BaseFragment
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.toID
 import com.github.libretube.sheets.PlaylistOptionsBottomSheet
+import com.github.libretube.ui.adapters.PlaylistAdapter
 import retrofit2.HttpException
 import java.io.IOException
 
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt
index 73aef7d5c..c796f7bc4 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt
@@ -10,9 +10,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.github.libretube.R
-import com.github.libretube.ui.activities.MainActivity
-import com.github.libretube.ui.adapters.SearchHistoryAdapter
-import com.github.libretube.ui.adapters.SearchSuggestionsAdapter
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.databinding.FragmentSearchBinding
 import com.github.libretube.db.DatabaseHolder.Companion.Database
@@ -20,6 +17,9 @@ import com.github.libretube.extensions.BaseFragment
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.await
 import com.github.libretube.models.SearchViewModel
+import com.github.libretube.ui.activities.MainActivity
+import com.github.libretube.ui.adapters.SearchHistoryAdapter
+import com.github.libretube.ui.adapters.SearchSuggestionsAdapter
 import retrofit2.HttpException
 import java.io.IOException
 
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 70895d191..413eef6e8 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
@@ -9,8 +9,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.github.libretube.R
-import com.github.libretube.ui.activities.MainActivity
-import com.github.libretube.ui.adapters.SearchAdapter
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.FragmentSearchResultBinding
@@ -19,6 +17,8 @@ import com.github.libretube.db.obj.SearchHistoryItem
 import com.github.libretube.extensions.BaseFragment
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.hideKeyboard
+import com.github.libretube.ui.activities.MainActivity
+import com.github.libretube.ui.adapters.SearchAdapter
 import com.github.libretube.util.PreferenceHelper
 import retrofit2.HttpException
 import java.io.IOException
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 5bdca20d6..6eaef2abd 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
@@ -10,15 +10,15 @@ import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.github.libretube.R
-import com.github.libretube.ui.adapters.LegacySubscriptionAdapter
-import com.github.libretube.ui.adapters.SubscriptionChannelAdapter
-import com.github.libretube.ui.adapters.TrendingAdapter
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.FragmentSubscriptionsBinding
 import com.github.libretube.extensions.BaseFragment
 import com.github.libretube.models.SubscriptionsViewModel
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.ui.adapters.LegacySubscriptionAdapter
+import com.github.libretube.ui.adapters.SubscriptionChannelAdapter
+import com.github.libretube.ui.adapters.TrendingAdapter
 import com.github.libretube.ui.views.BottomSheet
+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/WatchHistoryFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt
index 0b89e86dc..3ab9820e0 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
@@ -7,12 +7,12 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.ui.adapters.WatchHistoryAdapter
 import com.github.libretube.databinding.FragmentWatchHistoryBinding
 import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.db.obj.WatchHistoryItem
 import com.github.libretube.extensions.BaseFragment
 import com.github.libretube.extensions.await
+import com.github.libretube.ui.adapters.WatchHistoryAdapter
 
 class WatchHistoryFragment : BaseFragment() {
     private lateinit var binding: FragmentWatchHistoryBinding
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 a3dfeae29..bbf458ee9 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
@@ -8,14 +8,14 @@ import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import com.github.libretube.R
-import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.constants.PreferenceKeys
-import com.github.libretube.ui.dialogs.BackupDialog
 import com.github.libretube.obj.BackupFile
+import com.github.libretube.ui.activities.SettingsActivity
+import com.github.libretube.ui.dialogs.BackupDialog
+import com.github.libretube.ui.views.MaterialPreferenceFragment
 import com.github.libretube.util.BackupHelper
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.PreferenceHelper
-import com.github.libretube.ui.views.MaterialPreferenceFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class AdvancedSettings : MaterialPreferenceFragment() {
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 44b997892..16219cc42 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
@@ -9,12 +9,12 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.SwitchPreferenceCompat
 import com.github.libretube.R
-import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.ui.dialogs.RequireRestartDialog
+import com.github.libretube.ui.views.MaterialPreferenceFragment
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ThemeHelper
-import com.github.libretube.ui.views.MaterialPreferenceFragment
 import com.google.android.material.color.DynamicColors
 
 class AppearanceSettings : MaterialPreferenceFragment() {
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 40ce73a57..75ddf94ce 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
@@ -6,12 +6,12 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.SwitchPreferenceCompat
 import com.github.libretube.R
-import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.ui.dialogs.NavBarOptionsDialog
 import com.github.libretube.ui.dialogs.RequireRestartDialog
-import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.ui.views.MaterialPreferenceFragment
+import com.github.libretube.util.PreferenceHelper
 
 class GeneralSettings : MaterialPreferenceFragment() {
 
diff --git a/app/src/main/java/com/github/libretube/ui/preferences/HistorySettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/HistorySettings.kt
index 417872fca..04eb1fb4b 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/HistorySettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/HistorySettings.kt
@@ -3,9 +3,9 @@ package com.github.libretube.ui.preferences
 import android.os.Bundle
 import androidx.preference.Preference
 import com.github.libretube.R
-import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.db.DatabaseHolder.Companion.Database
+import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.ui.views.MaterialPreferenceFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
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 5f58c6f78..ccd1a029c 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
@@ -12,19 +12,19 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.SwitchPreferenceCompat
 import com.github.libretube.R
-import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.db.obj.CustomInstance
+import com.github.libretube.extensions.await
+import com.github.libretube.ui.activities.SettingsActivity
 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.extensions.await
+import com.github.libretube.ui.views.MaterialPreferenceFragment
 import com.github.libretube.util.ImportHelper
 import com.github.libretube.util.PreferenceHelper
-import com.github.libretube.ui.views.MaterialPreferenceFragment
 
 class InstanceSettings : MaterialPreferenceFragment() {
 
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 9c7856d6e..34502f460 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
@@ -5,12 +5,12 @@ import androidx.fragment.app.Fragment
 import androidx.preference.Preference
 import com.github.libretube.BuildConfig
 import com.github.libretube.R
-import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.api.RetrofitInstance
-import com.github.libretube.ui.dialogs.UpdateDialog
 import com.github.libretube.extensions.getStyledSnackBar
-import com.github.libretube.util.NetworkHelper
+import com.github.libretube.ui.activities.SettingsActivity
+import com.github.libretube.ui.dialogs.UpdateDialog
 import com.github.libretube.ui.views.MaterialPreferenceFragment
+import com.github.libretube.util.NetworkHelper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
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 b2402c795..8e87f58de 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
@@ -5,10 +5,10 @@ import androidx.preference.ListPreference
 import androidx.preference.SwitchPreferenceCompat
 import androidx.work.ExistingPeriodicWorkPolicy
 import com.github.libretube.R
-import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.constants.PreferenceKeys
-import com.github.libretube.util.NotificationHelper
+import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.ui.views.MaterialPreferenceFragment
+import com.github.libretube.util.NotificationHelper
 
 class NotificationSettings : MaterialPreferenceFragment() {
 
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 ad4bd1989..cba39cd54 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
@@ -5,10 +5,10 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.SwitchPreferenceCompat
 import com.github.libretube.R
-import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.constants.PreferenceKeys
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.ui.views.MaterialPreferenceFragment
+import com.github.libretube.util.PreferenceHelper
 import java.util.*
 
 class PlayerSettings : MaterialPreferenceFragment() {
diff --git a/app/src/main/java/com/github/libretube/ui/views/BottomSheet.kt b/app/src/main/java/com/github/libretube/ui/views/BottomSheet.kt
index 2f0adf2e2..8838c0337 100644
--- a/app/src/main/java/com/github/libretube/ui/views/BottomSheet.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/BottomSheet.kt
@@ -5,9 +5,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.github.libretube.ui.adapters.BottomSheetAdapter
 import com.github.libretube.databinding.BottomSheetBinding
 import com.github.libretube.obj.BottomSheetItem
+import com.github.libretube.ui.adapters.BottomSheetAdapter
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 open class BottomSheet : BottomSheetDialogFragment() {
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 fae42eafe..6c5e91b24 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
@@ -10,7 +10,6 @@ import android.view.MotionEvent
 import android.view.View
 import androidx.fragment.app.FragmentManager
 import com.github.libretube.R
-import com.github.libretube.ui.activities.MainActivity
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.constants.PreferenceRanges
 import com.github.libretube.databinding.DialogSliderBinding
@@ -20,6 +19,7 @@ import com.github.libretube.extensions.setSliderRangeAndValue
 import com.github.libretube.interfaces.DoubleTapInterface
 import com.github.libretube.interfaces.PlayerOptionsInterface
 import com.github.libretube.obj.BottomSheetItem
+import com.github.libretube.ui.activities.MainActivity
 import com.github.libretube.util.DoubleTapListener
 import com.github.libretube.util.PreferenceHelper
 import com.google.android.exoplayer2.trackselection.TrackSelector
@@ -174,9 +174,9 @@ internal class CustomExoPlayerView(
                         context.getString(R.string.playback_speed),
                         R.drawable.ic_speed,
                         "${
-                            player?.playbackParameters?.speed
-                                .toString()
-                                .replace(".0", "")
+                        player?.playbackParameters?.speed
+                            .toString()
+                            .replace(".0", "")
                         }x"
                     )
                 )
diff --git a/app/src/main/java/com/github/libretube/util/AutoPlayHelper.kt b/app/src/main/java/com/github/libretube/util/AutoPlayHelper.kt
index ade87a04f..4eaeffdce 100644
--- a/app/src/main/java/com/github/libretube/util/AutoPlayHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/AutoPlayHelper.kt
@@ -1,8 +1,8 @@
 package com.github.libretube.util
 
 import com.github.libretube.api.RetrofitInstance
-import com.github.libretube.extensions.toID
 import com.github.libretube.api.obj.StreamItem
+import com.github.libretube.extensions.toID
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
diff --git a/app/src/main/java/com/github/libretube/util/NavigationHelper.kt b/app/src/main/java/com/github/libretube/util/NavigationHelper.kt
index 221db33dd..125ac01c2 100644
--- a/app/src/main/java/com/github/libretube/util/NavigationHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/NavigationHelper.kt
@@ -5,9 +5,9 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
 import com.github.libretube.R
-import com.github.libretube.ui.activities.MainActivity
 import com.github.libretube.constants.IntentData
 import com.github.libretube.extensions.toID
+import com.github.libretube.ui.activities.MainActivity
 import com.github.libretube.ui.fragments.PlayerFragment
 
 object NavigationHelper {
diff --git a/app/src/main/java/com/github/libretube/util/NotificationHelper.kt b/app/src/main/java/com/github/libretube/util/NotificationHelper.kt
index bd52972ee..7780cfbb0 100644
--- a/app/src/main/java/com/github/libretube/util/NotificationHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/NotificationHelper.kt
@@ -13,13 +13,13 @@ import androidx.work.NetworkType
 import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
 import com.github.libretube.R
-import com.github.libretube.ui.activities.MainActivity
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.SubscriptionHelper
 import com.github.libretube.constants.NOTIFICATION_WORK_NAME
 import com.github.libretube.constants.PUSH_CHANNEL_ID
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.extensions.toID
+import com.github.libretube.ui.activities.MainActivity
 import kotlinx.coroutines.async
 import kotlinx.coroutines.runBlocking
 import java.util.concurrent.TimeUnit
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 cc4c4006b..9cce6ee5d 100644
--- a/app/src/main/java/com/github/libretube/util/NowPlayingNotification.kt
+++ b/app/src/main/java/com/github/libretube/util/NowPlayingNotification.kt
@@ -9,9 +9,9 @@ import android.graphics.drawable.BitmapDrawable
 import android.os.Build
 import android.support.v4.media.session.MediaSessionCompat
 import coil.request.ImageRequest
-import com.github.libretube.ui.activities.MainActivity
 import com.github.libretube.constants.BACKGROUND_CHANNEL_ID
 import com.github.libretube.constants.PLAYER_NOTIFICATION_ID
+import com.github.libretube.ui.activities.MainActivity
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
diff --git a/app/src/main/java/com/github/libretube/util/PlayerHelper.kt b/app/src/main/java/com/github/libretube/util/PlayerHelper.kt
index 67d5ae2e5..6efdba774 100644
--- a/app/src/main/java/com/github/libretube/util/PlayerHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/PlayerHelper.kt
@@ -2,8 +2,8 @@ package com.github.libretube.util
 
 import android.content.Context
 import android.view.accessibility.CaptioningManager
-import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.api.obj.PipedStream
+import com.github.libretube.constants.PreferenceKeys
 import com.google.android.exoplayer2.ui.CaptionStyleCompat
 
 object PlayerHelper {