diff --git a/.editorconfig b/.editorconfig
index 7555f4db3..978f09ade 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,4 +7,5 @@ max_line_length=off
 ktlint_standard_property-naming=disabled
 ktlint_standard_filename=disabled
 ktlint_standard_package-name=disabled
-ktlint_code_style=android_studio
\ No newline at end of file
+ktlint_code_style=android_studio
+ktlint_function_naming_ignore_when_annotated_with = Composable
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 28422375b..a269cb1aa 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,12 +2,14 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 3c014cc40..84e6c09b2 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     id("dagger.hilt.android.plugin")
     id("com.google.firebase.crashlytics")
     id("com.google.devtools.ksp")
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -83,11 +84,37 @@ android {
         abortOnError = false
         checkReleaseBuilds = false
     }
+
+    buildFeatures {
+        compose = true
+    }
+
     namespace = "com.simplecityapps.shuttle"
 
     dependencies {
         implementation(fileTree("dir" to "libs", "include" to listOf("*.jar")))
 
+        val composeBom = platform(libs.androidx.compose.bom)
+        implementation(composeBom)
+        androidTestImplementation(composeBom)
+
+        // Choose one of the following:
+        // Material Design 3
+        implementation(libs.androidx.material3)
+        // or Material Design 2
+        implementation(libs.androidx.material)
+        // or skip Material Design and build directly on top of foundational components
+        implementation(libs.androidx.foundation)
+        // or only import the main APIs for the underlying toolkit systems,
+        // such as input and measurement/layout
+        implementation(libs.androidx.ui)
+
+        // Android Studio Preview support
+        implementation(libs.androidx.ui.tooling.preview)
+        debugImplementation(libs.androidx.ui.tooling)
+
+        implementation(libs.androidx.lifecycle.viewmodel.compose)
+
         // Shuttle Core
         implementation(project(":android:core"))
 
diff --git a/android/app/src/androidTest/java/com/simplecityapps/shuttle/CustomTestRunner.kt b/android/app/src/androidTest/java/com/simplecityapps/shuttle/CustomTestRunner.kt
index c41304b1c..9d573767a 100644
--- a/android/app/src/androidTest/java/com/simplecityapps/shuttle/CustomTestRunner.kt
+++ b/android/app/src/androidTest/java/com/simplecityapps/shuttle/CustomTestRunner.kt
@@ -10,7 +10,5 @@ class CustomTestRunner : AndroidJUnitRunner() {
         cl: ClassLoader?,
         name: String?,
         context: Context?
-    ): Application {
-        return super.newApplication(cl, HiltTestApplication::class.java.name, context)
-    }
+    ): Application = super.newApplication(cl, HiltTestApplication::class.java.name, context)
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ShuttleApplication.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ShuttleApplication.kt
index 7f2512af4..9a74b7ea3 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ShuttleApplication.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ShuttleApplication.kt
@@ -18,7 +18,10 @@ import kotlinx.coroutines.DEBUG_PROPERTY_VALUE_ON
 import timber.log.Timber
 
 @HiltAndroidApp
-class ShuttleApplication : Application(), ActivityIntentProvider, Configuration.Provider {
+class ShuttleApplication :
+    Application(),
+    ActivityIntentProvider,
+    Configuration.Provider {
     @Inject
     lateinit var workerFactory: HiltWorkerFactory
 
@@ -62,9 +65,7 @@ class ShuttleApplication : Application(), ActivityIntentProvider, Configuration.
 
     // ActivityIntentProvider Implementation
 
-    override fun provideMainActivityIntent(): Intent {
-        return Intent(this, MainActivity::class.java)
-    }
+    override fun provideMainActivityIntent(): Intent = Intent(this, MainActivity::class.java)
 
     // WorkManager
 
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/AppInitializer.kt b/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/AppInitializer.kt
index d6a28b004..e912a8270 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/AppInitializer.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/AppInitializer.kt
@@ -8,7 +8,5 @@ interface AppInitializer {
     /**
      * Optional priority. Higher priority intiializers will be initialized earlier
      */
-    fun priority(): Int {
-        return -1
-    }
+    fun priority(): Int = -1
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/CrashReportingInitializer.kt b/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/CrashReportingInitializer.kt
index d79bb634a..19bcd20ef 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/CrashReportingInitializer.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/CrashReportingInitializer.kt
@@ -63,9 +63,7 @@ constructor(
         }
     }
 
-    override fun priority(): Int {
-        return 1
-    }
+    override fun priority(): Int = 1
 }
 
 class CrashReportingTree : Timber.Tree() {
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/MediaStoreContentObserverInitializer.kt b/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/MediaStoreContentObserverInitializer.kt
index bf17edd4e..473603b03 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/MediaStoreContentObserverInitializer.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/MediaStoreContentObserverInitializer.kt
@@ -19,7 +19,8 @@ class MediaStoreContentObserverInitializer
 constructor(
     @AppCoroutineScope private val appCoroutineScope: CoroutineScope,
     private val mediaImporter: MediaImporter
-) : ContentObserver(null), AppInitializer {
+) : ContentObserver(null),
+    AppInitializer {
     override fun init(application: Application) {
         application.contentResolver.registerContentObserver(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, true, this)
     }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/RemoteConfigInitializer.kt b/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/RemoteConfigInitializer.kt
index c92f606cb..69667351f 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/RemoteConfigInitializer.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/RemoteConfigInitializer.kt
@@ -24,7 +24,5 @@ constructor(
         }
     }
 
-    override fun priority(): Int {
-        return 1
-    }
+    override fun priority(): Int = 1
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/TimberInitializer.kt b/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/TimberInitializer.kt
index 79d46a50c..6c783f3f9 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/TimberInitializer.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/TimberInitializer.kt
@@ -14,7 +14,5 @@ constructor(
         Timber.plant(debugLoggingTree)
     }
 
-    override fun priority(): Int {
-        return 2
-    }
+    override fun priority(): Int = 2
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/debug/LogMessage.kt b/android/app/src/main/java/com/simplecityapps/shuttle/debug/LogMessage.kt
index 228cea90b..9978ec088 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/debug/LogMessage.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/debug/LogMessage.kt
@@ -27,11 +27,9 @@ class LogMessage(val priority: Int, val tag: String?, val message: String, val t
         return result
     }
 
-    override fun toString(): String {
-        return "${dateFormat.format(date)}" +
-            "\n$priority/$tag" +
-            "\n$message"
-    }
+    override fun toString(): String = "${dateFormat.format(date)}" +
+        "\n$priority/$tag" +
+        "\n$message"
 
     companion object {
         @SuppressLint("SimpleDateFormat")
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/di/AppModule.kt b/android/app/src/main/java/com/simplecityapps/shuttle/di/AppModule.kt
index 6d1a5759e..faf7770a1 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/di/AppModule.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/di/AppModule.kt
@@ -25,39 +25,27 @@ class AppModule {
     fun provideDebugLoggingTree(
         @ApplicationContext context: Context,
         generalPreferenceManager: GeneralPreferenceManager
-    ): DebugLoggingTree {
-        return DebugLoggingTree(context, generalPreferenceManager)
-    }
+    ): DebugLoggingTree = DebugLoggingTree(context, generalPreferenceManager)
 
     @Singleton
     @Provides
-    fun provideArtworkCache(): LruCache<String, Bitmap> {
-        return object : LruCache<String, Bitmap>(10 * 1024 * 1024) {
-            override fun sizeOf(
-                key: String,
-                value: Bitmap
-            ): Int {
-                return value.allocationByteCount
-            }
-        }
+    fun provideArtworkCache(): LruCache<String, Bitmap> = object : LruCache<String, Bitmap>(10 * 1024 * 1024) {
+        override fun sizeOf(
+            key: String,
+            value: Bitmap
+        ): Int = value.allocationByteCount
     }
 
     @Singleton
     @Provides
-    fun provideSortPreferenceManager(preference: SharedPreferences): SortPreferenceManager {
-        return SortPreferenceManager(preference)
-    }
+    fun provideSortPreferenceManager(preference: SharedPreferences): SortPreferenceManager = SortPreferenceManager(preference)
 
     @Singleton
     @Provides
-    fun provideThemeManager(preferenceManager: GeneralPreferenceManager): ThemeManager {
-        return ThemeManager(preferenceManager)
-    }
+    fun provideThemeManager(preferenceManager: GeneralPreferenceManager): ThemeManager = ThemeManager(preferenceManager)
 
     @Singleton
     @Provides
     @Named("randomSeed")
-    fun provideRandomSeed(): Long {
-        return Random().nextLong()
-    }
+    fun provideRandomSeed(): Long = Random().nextLong()
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/di/ImageLoaderModule.kt b/android/app/src/main/java/com/simplecityapps/shuttle/di/ImageLoaderModule.kt
index e3abc0e0f..e991c606a 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/di/ImageLoaderModule.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/di/ImageLoaderModule.kt
@@ -20,21 +20,17 @@ class ImageLoaderModule {
     @Provides
     fun provideImageLoader(
         @ApplicationContext context: Context
-    ): ArtworkImageLoader {
-        return GlideImageLoader(context)
-    }
+    ): ArtworkImageLoader = GlideImageLoader(context)
 
     @Singleton
     @Provides
     fun provideAggregateRemoteArtworkProvider(
         embyRemoteArtworkProvider: EmbyRemoteArtworkProvider,
         jellyfinRemoteArtworkProvider: JellyfinRemoteArtworkProvider
-    ): AggregateRemoteArtworkProvider {
-        return AggregateRemoteArtworkProvider(
-            mutableSetOf(
-                embyRemoteArtworkProvider,
-                jellyfinRemoteArtworkProvider
-            )
+    ): AggregateRemoteArtworkProvider = AggregateRemoteArtworkProvider(
+        mutableSetOf(
+            embyRemoteArtworkProvider,
+            jellyfinRemoteArtworkProvider
         )
-    }
+    )
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/di/MediaProviderModule.kt b/android/app/src/main/java/com/simplecityapps/shuttle/di/MediaProviderModule.kt
index d1cc88283..239ab19a1 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/di/MediaProviderModule.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/di/MediaProviderModule.kt
@@ -17,15 +17,11 @@ import javax.inject.Singleton
 class MediaProviderModule {
     @Provides
     @Singleton
-    fun provideFileScanner(): FileScanner {
-        return FileScanner()
-    }
+    fun provideFileScanner(): FileScanner = FileScanner()
 
     @Provides
     @Singleton
-    fun provideKTagLib(): KTagLib {
-        return KTagLib()
-    }
+    fun provideKTagLib(): KTagLib = KTagLib()
 
     @Provides
     @Singleton
@@ -33,15 +29,11 @@ class MediaProviderModule {
         @ApplicationContext context: Context,
         kTagLib: KTagLib,
         fileScanner: FileScanner
-    ): TaglibMediaProvider {
-        return TaglibMediaProvider(context, kTagLib, fileScanner)
-    }
+    ): TaglibMediaProvider = TaglibMediaProvider(context, kTagLib, fileScanner)
 
     @Provides
     @Singleton
     fun provideMediaStoreSongProvider(
         @ApplicationContext context: Context
-    ): MediaStoreMediaProvider {
-        return MediaStoreMediaProvider(context)
-    }
+    ): MediaStoreMediaProvider = MediaStoreMediaProvider(context)
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/di/RepositoryModule.kt b/android/app/src/main/java/com/simplecityapps/shuttle/di/RepositoryModule.kt
index c268489ab..3ad54333e 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/di/RepositoryModule.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/di/RepositoryModule.kt
@@ -30,18 +30,14 @@ class RepositoryModule {
     @Singleton
     fun provideMediaDatabase(
         @ApplicationContext context: Context
-    ): MediaDatabase {
-        return DatabaseProvider(context).database
-    }
+    ): MediaDatabase = DatabaseProvider(context).database
 
     @Provides
     @Singleton
     fun provideSongRepository(
         database: MediaDatabase,
         @AppCoroutineScope appCoroutineScope: CoroutineScope
-    ): SongRepository {
-        return LocalSongRepository(appCoroutineScope, database.songDataDao())
-    }
+    ): SongRepository = LocalSongRepository(appCoroutineScope, database.songDataDao())
 
     @Provides
     @Singleton
@@ -50,27 +46,21 @@ class RepositoryModule {
         songRepository: SongRepository,
         playlistRepository: PlaylistRepository,
         preferenceManager: GeneralPreferenceManager
-    ): MediaImporter {
-        return MediaImporter(context, songRepository, playlistRepository, preferenceManager)
-    }
+    ): MediaImporter = MediaImporter(context, songRepository, playlistRepository, preferenceManager)
 
     @Provides
     @Singleton
     fun provideAlbumRepository(
         database: MediaDatabase,
         @AppCoroutineScope appCoroutineScope: CoroutineScope
-    ): AlbumRepository {
-        return LocalAlbumRepository(appCoroutineScope, database.songDataDao())
-    }
+    ): AlbumRepository = LocalAlbumRepository(appCoroutineScope, database.songDataDao())
 
     @Provides
     @Singleton
     fun provideAlbumArtistRepository(
         database: MediaDatabase,
         @AppCoroutineScope appCoroutineScope: CoroutineScope
-    ): AlbumArtistRepository {
-        return LocalAlbumArtistRepository(appCoroutineScope, database.songDataDao())
-    }
+    ): AlbumArtistRepository = LocalAlbumArtistRepository(appCoroutineScope, database.songDataDao())
 
     @Provides
     @Singleton
@@ -78,16 +68,12 @@ class RepositoryModule {
         @ApplicationContext context: Context,
         database: MediaDatabase,
         @AppCoroutineScope appCoroutineScope: CoroutineScope
-    ): PlaylistRepository {
-        return LocalPlaylistRepository(context, appCoroutineScope, database.playlistDataDao(), database.playlistSongJoinDataDao())
-    }
+    ): PlaylistRepository = LocalPlaylistRepository(context, appCoroutineScope, database.playlistDataDao(), database.playlistSongJoinDataDao())
 
     @Provides
     @Singleton
     fun provideGenreRepository(
         songRepository: SongRepository,
         @AppCoroutineScope appCoroutineScope: CoroutineScope
-    ): GenreRepository {
-        return LocalGenreRepository(appCoroutineScope, songRepository)
-    }
+    ): GenreRepository = LocalGenreRepository(appCoroutineScope, songRepository)
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/MainActivity.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/MainActivity.kt
index 6da224dd2..3e31c0d13 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/MainActivity.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/MainActivity.kt
@@ -24,8 +24,7 @@ import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withTimeout
 
 @AndroidEntryPoint
-class MainActivity :
-    AppCompatActivity() {
+class MainActivity : AppCompatActivity() {
     @Inject
     lateinit var preferenceManager: GeneralPreferenceManager
 
@@ -95,16 +94,12 @@ class MainActivity :
 
     // Private
 
-    private fun hasStoragePermission(): Boolean {
-        return (ContextCompat.checkSelfPermission(this, getStoragePermission()) == PackageManager.PERMISSION_GRANTED)
-    }
+    private fun hasStoragePermission(): Boolean = (ContextCompat.checkSelfPermission(this, getStoragePermission()) == PackageManager.PERMISSION_GRANTED)
 
-    private fun getStoragePermission(): String {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            Manifest.permission.READ_MEDIA_AUDIO
-        } else {
-            Manifest.permission.READ_EXTERNAL_STORAGE
-        }
+    private fun getStoragePermission(): String = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        Manifest.permission.READ_MEDIA_AUDIO
+    } else {
+        Manifest.permission.READ_EXTERNAL_STORAGE
     }
 
     private fun handleSearchQuery(intent: Intent?) {
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/ThemeManager.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/ThemeManager.kt
index 44d0f6420..425332e3e 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/ThemeManager.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/ThemeManager.kt
@@ -56,11 +56,9 @@ class ThemeManager(
         AppCompatDelegate.setDefaultNightMode(getDayNightMode())
     }
 
-    private fun getDayNightMode(): Int {
-        return when (preferenceManager.themeBase) {
-            GeneralPreferenceManager.Theme.DayNight -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-            GeneralPreferenceManager.Theme.Light -> AppCompatDelegate.MODE_NIGHT_NO
-            GeneralPreferenceManager.Theme.Dark -> AppCompatDelegate.MODE_NIGHT_YES
-        }
+    private fun getDayNightMode(): Int = when (preferenceManager.themeBase) {
+        GeneralPreferenceManager.Theme.DayNight -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+        GeneralPreferenceManager.Theme.Light -> AppCompatDelegate.MODE_NIGHT_NO
+        GeneralPreferenceManager.Theme.Dark -> AppCompatDelegate.MODE_NIGHT_YES
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/AutoClearedNullableValue.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/AutoClearedNullableValue.kt
index d9652e6a1..f36872cb9 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/AutoClearedNullableValue.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/AutoClearedNullableValue.kt
@@ -3,7 +3,6 @@ package com.simplecityapps.shuttle.ui.common
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.observe
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
@@ -11,7 +10,7 @@ import kotlin.reflect.KProperty
  * @see AutoClearedValue
  */
 class AutoClearedNullableValue<T : Any?>(val fragment: Fragment) : ReadWriteProperty<Fragment, T?> {
-    private var _value: T? = null
+    private var value: T? = null
 
     init {
         fragment.lifecycle.addObserver(
@@ -21,7 +20,7 @@ class AutoClearedNullableValue<T : Any?>(val fragment: Fragment) : ReadWriteProp
                         viewLifecycleOwner?.lifecycle?.addObserver(
                             object : DefaultLifecycleObserver {
                                 override fun onDestroy(owner: LifecycleOwner) {
-                                    _value = null
+                                    value = null
                                 }
                             }
                         )
@@ -34,16 +33,14 @@ class AutoClearedNullableValue<T : Any?>(val fragment: Fragment) : ReadWriteProp
     override fun getValue(
         thisRef: Fragment,
         property: KProperty<*>
-    ): T? {
-        return _value
-    }
+    ): T? = value
 
     override fun setValue(
         thisRef: Fragment,
         property: KProperty<*>,
         value: T?
     ) {
-        _value = value
+        this.value = value
     }
 }
 
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/AutoClearedValue.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/AutoClearedValue.kt
index 04ae9b9df..705e8fdc5 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/AutoClearedValue.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/AutoClearedValue.kt
@@ -3,7 +3,6 @@ package com.simplecityapps.shuttle.ui.common
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.observe
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
@@ -13,7 +12,7 @@ import kotlin.reflect.KProperty
  * Accessing this variable while the fragment's view is destroyed will throw NPE.
  */
 class AutoClearedValue<T : Any>(val fragment: Fragment) : ReadWriteProperty<Fragment, T> {
-    private var _value: T? = null
+    private var value: T? = null
 
     init {
         fragment.lifecycle.addObserver(
@@ -23,7 +22,7 @@ class AutoClearedValue<T : Any>(val fragment: Fragment) : ReadWriteProperty<Frag
                         viewLifecycleOwner?.lifecycle?.addObserver(
                             object : DefaultLifecycleObserver {
                                 override fun onDestroy(owner: LifecycleOwner) {
-                                    _value = null
+                                    value = null
                                 }
                             }
                         )
@@ -36,18 +35,16 @@ class AutoClearedValue<T : Any>(val fragment: Fragment) : ReadWriteProperty<Frag
     override fun getValue(
         thisRef: Fragment,
         property: KProperty<*>
-    ): T {
-        return _value ?: throw IllegalStateException(
-            "should never call auto-cleared-value get when it might not be available"
-        )
-    }
+    ): T = value ?: throw IllegalStateException(
+        "should never call auto-cleared-value get when it might not be available"
+    )
 
     override fun setValue(
         thisRef: Fragment,
         property: KProperty<*>,
         value: T
     ) {
-        _value = value
+        this.value = value
     }
 }
 
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/PagerAdapter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/PagerAdapter.kt
index 0c969f566..d5e389f67 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/PagerAdapter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/PagerAdapter.kt
@@ -14,15 +14,9 @@ class PagerAdapter(
     val fragmentFactory: (position: Int) -> Fragment,
     val titleFactory: (position: Int) -> String
 ) : FragmentStateAdapter(fragmentManager, lifecycle) {
-    fun getPageTitle(position: Int): CharSequence {
-        return titleFactory(position)
-    }
+    fun getPageTitle(position: Int): CharSequence = titleFactory(position)
 
-    override fun getItemCount(): Int {
-        return size
-    }
+    override fun getItemCount(): Int = size
 
-    override fun createFragment(position: Int): Fragment {
-        return fragmentFactory(position)
-    }
+    override fun createFragment(position: Int): Fragment = fragmentFactory(position)
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/DeleteDialog.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/DeleteDialog.kt
index 70f9ffa92..670dd4dc5 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/DeleteDialog.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/DeleteDialog.kt
@@ -10,17 +10,15 @@ fun showDeleteDialog(
     context: Context,
     itemName: String?,
     onDelete: () -> Unit
-): AlertDialog {
-    return MaterialAlertDialogBuilder(context)
-        .setTitle(context.getString(R.string.dialog_delete_title))
-        .setMessage(
-            Phrase.from(context, R.string.dialog_delete_message)
-                .put("item", itemName ?: context.getString(com.simplecityapps.core.R.string.unknown))
-                .format()
-        )
-        .setPositiveButton(context.getString(R.string.dialog_delete_button)) { _, _ ->
-            onDelete()
-        }
-        .setNegativeButton(context.getString(R.string.dialog_button_cancel), null)
-        .show()
-}
+): AlertDialog = MaterialAlertDialogBuilder(context)
+    .setTitle(context.getString(R.string.dialog_delete_title))
+    .setMessage(
+        Phrase.from(context, R.string.dialog_delete_message)
+            .put("item", itemName ?: context.getString(com.simplecityapps.core.R.string.unknown))
+            .format()
+    )
+    .setPositiveButton(context.getString(R.string.dialog_delete_button)) { _, _ ->
+        onDelete()
+    }
+    .setNegativeButton(context.getString(R.string.dialog_button_cancel), null)
+    .show()
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/EditTextAlertDialog.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/EditTextAlertDialog.kt
index 4aa8a650f..17734d254 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/EditTextAlertDialog.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/EditTextAlertDialog.kt
@@ -28,9 +28,7 @@ open class EditTextAlertDialog : DialogFragment() {
         fun validate(
             string: String?,
             extra: Parcelable? = null
-        ): Boolean {
-            return !string.isNullOrEmpty()
-        }
+        ): Boolean = !string.isNullOrEmpty()
     }
 
     private var editText: EditText? = null
@@ -121,9 +119,7 @@ open class EditTextAlertDialog : DialogFragment() {
         (dialog as? AlertDialog)?.getButton(AlertDialog.BUTTON_POSITIVE)?.isEnabled = isValid(editText?.text?.toString())
     }
 
-    open fun isValid(string: String?): Boolean {
-        return (parentFragment as? Listener)?.validate(string, extra) ?: !string.isNullOrEmpty()
-    }
+    open fun isValid(string: String?): Boolean = (parentFragment as? Listener)?.validate(string, extra) ?: !string.isNullOrEmpty()
 
     fun show(manager: FragmentManager) {
         super.show(manager, TAG)
@@ -144,13 +140,12 @@ open class EditTextAlertDialog : DialogFragment() {
             initialText: String? = null,
             extra: Parcelable? = null,
             inputType: Int = InputType.TYPE_TEXT_FLAG_CAP_WORDS
-        ): EditTextAlertDialog =
-            EditTextAlertDialog().withArgs {
-                putString(ARG_TITLE, title)
-                putString(ARG_HINT, hint)
-                putString(ARG_INITIAL_TEXT, initialText)
-                putParcelable(ARG_EXTRA, extra)
-                putInt(ARG_INPUT_TYPE, inputType)
-            }
+        ): EditTextAlertDialog = EditTextAlertDialog().withArgs {
+            putString(ARG_TITLE, title)
+            putString(ARG_HINT, hint)
+            putString(ARG_INITIAL_TEXT, initialText)
+            putParcelable(ARG_EXTRA, extra)
+            putInt(ARG_INPUT_TYPE, inputType)
+        }
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/ExcludeDialog.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/ExcludeDialog.kt
index 03b6672b4..8962d085d 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/ExcludeDialog.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/ExcludeDialog.kt
@@ -10,17 +10,15 @@ fun showExcludeDialog(
     context: Context,
     itemName: String?,
     onExclude: () -> Unit
-): AlertDialog {
-    return MaterialAlertDialogBuilder(context)
-        .setTitle(context.getString(R.string.dialog_exclude_title))
-        .setMessage(
-            Phrase.from(context, R.string.dialog_exclude_message)
-                .put("item", itemName ?: context.getString(com.simplecityapps.core.R.string.unknown))
-                .format()
-        )
-        .setPositiveButton(context.getString(R.string.dialog_exclude_button)) { _, _ ->
-            onExclude()
-        }
-        .setNegativeButton(context.getString(R.string.dialog_button_cancel), null)
-        .show()
-}
+): AlertDialog = MaterialAlertDialogBuilder(context)
+    .setTitle(context.getString(R.string.dialog_exclude_title))
+    .setMessage(
+        Phrase.from(context, R.string.dialog_exclude_message)
+            .put("item", itemName ?: context.getString(com.simplecityapps.core.R.string.unknown))
+            .format()
+    )
+    .setPositiveButton(context.getString(R.string.dialog_exclude_button)) { _, _ ->
+        onExclude()
+    }
+    .setNegativeButton(context.getString(R.string.dialog_button_cancel), null)
+    .show()
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/TagEditorAlertDialog.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/TagEditorAlertDialog.kt
index 63482fa06..986d694bf 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/TagEditorAlertDialog.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/TagEditorAlertDialog.kt
@@ -31,7 +31,7 @@ class TagEditorAlertDialog :
     TagEditorContract.View {
     private var songs: List<Song> = listOf()
 
-    private lateinit var _data: TagEditorContract.Data
+    private lateinit var data: TagEditorContract.Data
 
     @Inject
     lateinit var presenter: TagEditorPresenter
@@ -150,7 +150,7 @@ class TagEditorAlertDialog :
         dialog.setOnShowListener {
             dialog.getButton(AlertDialog.BUTTON_POSITIVE).apply {
                 setOnClickListener {
-                    presenter.save(_data)
+                    presenter.save(data)
                 }
             }
         }
@@ -203,7 +203,7 @@ class TagEditorAlertDialog :
     // TagEditorContract.View Implementation
 
     override fun setData(data: TagEditorContract.Data) {
-        _data = data
+        this.data = data
 
         updateSaveButton(data)
         val textChangeListener: () -> Unit = {
@@ -217,7 +217,7 @@ class TagEditorAlertDialog :
                 titleInputLayout.helperText = getString(R.string.edit_tags_multiple_values)
             }
         }
-        setupResetButton(titleInputLayout, titleEditText, _data.titleField, textChangeListener)
+        setupResetButton(titleInputLayout, titleEditText, this.data.titleField, textChangeListener)
 
         data.albumArtistField.apply {
             albumArtistEditText.setText(initialValue)
@@ -226,7 +226,7 @@ class TagEditorAlertDialog :
                 albumArtistInputLayout.helperText = getString(R.string.edit_tags_multiple_values)
             }
         }
-        setupResetButton(albumArtistInputLayout, albumArtistEditText, _data.albumArtistField, textChangeListener)
+        setupResetButton(albumArtistInputLayout, albumArtistEditText, this.data.albumArtistField, textChangeListener)
 
         data.artistField.apply {
             artistEditText.setText(initialValue)
@@ -235,7 +235,7 @@ class TagEditorAlertDialog :
                 artistInputLayout.helperText = getString(R.string.edit_tags_multiple_values)
             }
         }
-        setupResetButton(artistInputLayout, artistEditText, _data.artistField, textChangeListener)
+        setupResetButton(artistInputLayout, artistEditText, this.data.artistField, textChangeListener)
 
         data.albumField.apply {
             albumInputLayout.isVisible = visible
@@ -244,7 +244,7 @@ class TagEditorAlertDialog :
             }
             albumEditText.setText(initialValue)
         }
-        setupResetButton(albumInputLayout, albumEditText, _data.albumField, textChangeListener)
+        setupResetButton(albumInputLayout, albumEditText, this.data.albumField, textChangeListener)
 
         data.dateField.apply {
             yearEditText.setText(initialValue)
@@ -253,7 +253,7 @@ class TagEditorAlertDialog :
                 yearInputLayout.helperText = getString(R.string.edit_tags_multiple_values)
             }
         }
-        setupResetButton(yearInputLayout, yearEditText, _data.dateField, textChangeListener)
+        setupResetButton(yearInputLayout, yearEditText, this.data.dateField, textChangeListener)
 
         data.trackField.apply {
             trackEditText.setText(initialValue)
@@ -262,7 +262,7 @@ class TagEditorAlertDialog :
                 trackInputLayout.helperText = getString(R.string.edit_tags_multiple_values)
             }
         }
-        setupResetButton(trackInputLayout, trackEditText, _data.trackField, textChangeListener)
+        setupResetButton(trackInputLayout, trackEditText, this.data.trackField, textChangeListener)
 
         data.trackTotalField.apply {
             trackTotalEditText.setText(initialValue)
@@ -271,7 +271,7 @@ class TagEditorAlertDialog :
                 trackTotalInputLayout.helperText = getString(R.string.edit_tags_multiple_values)
             }
         }
-        setupResetButton(trackTotalInputLayout, trackTotalEditText, _data.trackTotalField, textChangeListener)
+        setupResetButton(trackTotalInputLayout, trackTotalEditText, this.data.trackTotalField, textChangeListener)
 
         data.discField.apply {
             discEditText.setText(initialValue)
@@ -280,7 +280,7 @@ class TagEditorAlertDialog :
                 discInputLayout.helperText = getString(R.string.edit_tags_multiple_values)
             }
         }
-        setupResetButton(discInputLayout, discEditText, _data.discField, textChangeListener)
+        setupResetButton(discInputLayout, discEditText, this.data.discField, textChangeListener)
 
         data.discTotalField.apply {
             discTotalEditText.setText(initialValue)
@@ -289,7 +289,7 @@ class TagEditorAlertDialog :
                 discTotalInputLayout.helperText = getString(R.string.edit_tags_multiple_values)
             }
         }
-        setupResetButton(discTotalInputLayout, discTotalEditText, _data.discTotalField, textChangeListener)
+        setupResetButton(discTotalInputLayout, discTotalEditText, this.data.discTotalField, textChangeListener)
 
         data.genreField.apply {
             genreEditText.setText(initialValue)
@@ -299,7 +299,7 @@ class TagEditorAlertDialog :
             }
         }
 
-        setupResetButton(genreInputLayout, genreEditText, _data.genreField, textChangeListener)
+        setupResetButton(genreInputLayout, genreEditText, this.data.genreField, textChangeListener)
 
         data.lyricsField.apply {
             lyricsEditText.setText(initialValue)
@@ -309,7 +309,7 @@ class TagEditorAlertDialog :
             }
         }
 
-        setupResetButton(lyricsInputLayout, lyricsEditText, _data.lyricsField, textChangeListener)
+        setupResetButton(lyricsInputLayout, lyricsEditText, this.data.lyricsField, textChangeListener)
     }
 
     override fun setLoading(loadingState: TagEditorContract.LoadingState) {
@@ -367,9 +367,8 @@ class TagEditorAlertDialog :
 
         fun newInstance(
             songs: List<Song>? = emptyList()
-        ): TagEditorAlertDialog =
-            TagEditorAlertDialog().withArgs {
-                putParcelableArrayList(ARG_SONGS, ArrayList(songs))
-            }
+        ): TagEditorAlertDialog = TagEditorAlertDialog().withArgs {
+            putParcelableArrayList(ARG_SONGS, ArrayList(songs))
+        }
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/TagEditorPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/TagEditorPresenter.kt
index 15214ac84..935d4aecd 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/TagEditorPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/dialog/TagEditorPresenter.kt
@@ -125,7 +125,8 @@ constructor(
     private val kTagLib: KTagLib,
     private val fileScanner: FileScanner,
     private val songRepository: SongRepository
-) : BasePresenter<TagEditorContract.View>(), TagEditorContract.Presenter {
+) : BasePresenter<TagEditorContract.View>(),
+    TagEditorContract.Presenter {
     private lateinit var uneditables: List<Pair<com.simplecityapps.shuttle.model.Song, AudioFile?>>
     private lateinit var editables: List<Pair<com.simplecityapps.shuttle.model.Song, AudioFile?>>
 
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/error/ErrorHelper.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/error/ErrorHelper.kt
index 59e41530d..9a5f04674 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/error/ErrorHelper.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/error/ErrorHelper.kt
@@ -3,10 +3,8 @@ package com.simplecityapps.shuttle.ui.common.error
 import android.content.res.Resources
 import com.simplecityapps.shuttle.R
 
-fun Error.userDescription(resources: Resources): String {
-    return when (this) {
-        is UserFriendlyError -> message
-        is UnexpectedError -> resources.getString(R.string.error_unexpected)
-        else -> resources.getString(R.string.error_unknown)
-    }
+fun Error.userDescription(resources: Resources): String = when (this) {
+    is UserFriendlyError -> message
+    is UnexpectedError -> resources.getString(R.string.error_unexpected)
+    else -> resources.getString(R.string.error_unknown)
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/error/UnexpectedError.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/error/UnexpectedError.kt
index 5614abfd7..48647f66e 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/error/UnexpectedError.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/error/UnexpectedError.kt
@@ -1,7 +1,5 @@
 package com.simplecityapps.shuttle.ui.common.error
 
 class UnexpectedError : Error() {
-    override fun toString(): String {
-        return "UnexpectedError"
-    }
+    override fun toString(): String = "UnexpectedError"
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/error/UserFriendlyError.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/error/UserFriendlyError.kt
index a8b560757..e712cdf32 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/error/UserFriendlyError.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/error/UserFriendlyError.kt
@@ -1,7 +1,5 @@
 package com.simplecityapps.shuttle.ui.common.error
 
 class UserFriendlyError(override var message: String) : Error(message) {
-    override fun toString(): String {
-        return "UserFriendlyError(message: $message)"
-    }
+    override fun toString(): String = "UserFriendlyError(message: $message)"
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/joinToSpannedString.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/joinToSpannedString.kt
index 4630ea52f..3a84b32b1 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/joinToSpannedString.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/joinToSpannedString.kt
@@ -10,6 +10,4 @@ fun <T> Iterable<T>.joinToSpannedString(
     limit: Int = -1,
     truncated: CharSequence = "...",
     transform: ((T) -> CharSequence)? = null
-): SpannedString {
-    return SpannedString(joinTo(SpannableStringBuilder(), separator, prefix, postfix, limit, truncated, transform))
-}
+): SpannedString = SpannedString(joinTo(SpannableStringBuilder(), separator, prefix, postfix, limit, truncated, transform))
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/mvp/BasePresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/mvp/BasePresenter.kt
index 61387aa09..15ff7738e 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/mvp/BasePresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/mvp/BasePresenter.kt
@@ -7,7 +7,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import timber.log.Timber
 
-abstract class BasePresenter<T : Any> : BaseContract.Presenter<T>, CoroutineScope {
+abstract class BasePresenter<T : Any> :
+    BaseContract.Presenter<T>,
+    CoroutineScope {
     var view: T? = null
 
     private var job = SupervisorJob()
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/GlidePreloadModelProvider.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/GlidePreloadModelProvider.kt
index 4ec376feb..ea0020d26 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/GlidePreloadModelProvider.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/GlidePreloadModelProvider.kt
@@ -18,7 +18,5 @@ class GlidePreloadModelProvider<T>(
         return listOf(items[position])
     }
 
-    override fun getPreloadRequestBuilder(item: T & Any): RequestBuilder<*>? {
-        return imageLoader.getRequestBuilder(options).load(item)
-    }
+    override fun getPreloadRequestBuilder(item: T & Any): RequestBuilder<*>? = imageLoader.getRequestBuilder(options).load(item)
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/ItemTouchHelperCallback.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/ItemTouchHelperCallback.kt
index ce6d7de9c..6c814738d 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/ItemTouchHelperCallback.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/ItemTouchHelperCallback.kt
@@ -25,9 +25,7 @@ open class ItemTouchHelperCallback(
     override fun getMovementFlags(
         recyclerView: RecyclerView,
         viewHolder: RecyclerView.ViewHolder
-    ): Int {
-        return makeMovementFlags(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0)
-    }
+    ): Int = makeMovementFlags(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0)
 
     override fun onMove(
         recyclerView: RecyclerView,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/NestedScrollFix.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/NestedScrollFix.kt
index 06237fc54..4218102d7 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/NestedScrollFix.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/NestedScrollFix.kt
@@ -18,7 +18,9 @@ fun RecyclerView.enforceSingleScrollDirection() {
     addOnScrollListener(enforcer)
 }
 
-private class SingleScrollDirectionEnforcer : RecyclerView.OnScrollListener(), OnItemTouchListener {
+private class SingleScrollDirectionEnforcer :
+    RecyclerView.OnScrollListener(),
+    OnItemTouchListener {
     private var scrollState = RecyclerView.SCROLL_STATE_IDLE
     private var scrollPointerId = -1
     private var initialTouchX = 0
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/SectionedAdapter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/SectionedAdapter.kt
index 37049faeb..86983e550 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/SectionedAdapter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/recyclerview/SectionedAdapter.kt
@@ -5,14 +5,12 @@ import com.simplecityapps.adapter.ViewBinder
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 import kotlinx.coroutines.CoroutineScope
 
-open class SectionedAdapter(scope: CoroutineScope) : RecyclerAdapter(scope), FastScrollRecyclerView.SectionedAdapter {
-    override fun getSectionName(position: Int): String {
-        return getSectionName(items.getOrNull(position)) ?: ""
-    }
+open class SectionedAdapter(scope: CoroutineScope) :
+    RecyclerAdapter(scope),
+    FastScrollRecyclerView.SectionedAdapter {
+    override fun getSectionName(position: Int): String = getSectionName(items.getOrNull(position)) ?: ""
 
-    open fun getSectionName(viewBinder: ViewBinder?): String? {
-        return (viewBinder as? SectionViewBinder)?.getSectionName()
-    }
+    open fun getSectionName(viewBinder: ViewBinder?): String? = (viewBinder as? SectionViewBinder)?.getSectionName()
 }
 
 interface SectionViewBinder : ViewBinder {
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/FavoriteButton.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/FavoriteButton.kt
index 1c942a0f7..bc53f348e 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/FavoriteButton.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/FavoriteButton.kt
@@ -13,7 +13,8 @@ constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-) : AppCompatImageButton(context, attrs, defStyleAttr), Checkable {
+) : AppCompatImageButton(context, attrs, defStyleAttr),
+    Checkable {
     private var heartDrawable = AnimatedVectorDrawableCompat.create(context, R.drawable.avd_heart)!!
     private var heartDrawableReverse = AnimatedVectorDrawableCompat.create(context, R.drawable.avd_heart_reverse)!!
 
@@ -27,9 +28,7 @@ constructor(
         }
     }
 
-    override fun isChecked(): Boolean {
-        return isChecked
-    }
+    override fun isChecked(): Boolean = isChecked
 
     override fun setChecked(isChecked: Boolean) {
         (drawable as AnimatedVectorDrawableCompat).stop()
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/HorizontalSeekbar.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/HorizontalSeekbar.kt
index be9a38208..ffb82665d 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/HorizontalSeekbar.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/HorizontalSeekbar.kt
@@ -136,9 +136,7 @@ constructor(
     private fun mRound(
         i: Float,
         n: Float
-    ): Float {
-        return if ((i % n) > n / 2) (i + n - i % n) else (i - i % n)
-    }
+    ): Float = if ((i % n) > n / 2) (i + n - i % n) else (i - i % n)
 
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/PlayPauseAnimationDrawable.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/PlayPauseAnimationDrawable.kt
index bf930c742..c95b57fd7 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/PlayPauseAnimationDrawable.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/PlayPauseAnimationDrawable.kt
@@ -137,16 +137,12 @@ class PlayPauseAnimationDrawable(context: Context) : Drawable() {
         invalidateSelf()
     }
 
-    override fun getOpacity(): Int {
-        return PixelFormat.TRANSLUCENT
-    }
+    override fun getOpacity(): Int = PixelFormat.TRANSLUCENT
 
     companion object {
         private val PROGRESS: Property<PlayPauseAnimationDrawable, Float> =
             object : Property<PlayPauseAnimationDrawable, Float>(Float::class.java, "progress") {
-                override fun get(d: PlayPauseAnimationDrawable): Float {
-                    return d.progress
-                }
+                override fun get(d: PlayPauseAnimationDrawable): Float = d.progress
 
                 override fun set(
                     d: PlayPauseAnimationDrawable,
@@ -163,8 +159,6 @@ class PlayPauseAnimationDrawable(context: Context) : Drawable() {
             a: Float,
             b: Float,
             t: Float
-        ): Float {
-            return a + (b - a) * t
-        }
+        ): Float = a + (b - a) * t
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/PlayPauseAnimationView.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/PlayPauseAnimationView.kt
index 4535102a3..7f4bf31e0 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/PlayPauseAnimationView.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/PlayPauseAnimationView.kt
@@ -109,9 +109,7 @@ constructor(
         clipToOutline = true
     }
 
-    override fun verifyDrawable(who: Drawable): Boolean {
-        return who === animationDrawable || super.verifyDrawable(who)
-    }
+    override fun verifyDrawable(who: Drawable): Boolean = who === animationDrawable || super.verifyDrawable(who)
 
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/SeekDirection.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/SeekDirection.kt
index 48a4606ee..007aa38a6 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/SeekDirection.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/SeekDirection.kt
@@ -6,12 +6,10 @@ enum class SeekDirection {
     ;
 
     companion object {
-        fun fromInt(value: Int): SeekDirection {
-            return when (value) {
-                0 -> Forward
-                1 -> Backward
-                else -> throw IllegalStateException("Invalid seek direction value")
-            }
+        fun fromInt(value: Int): SeekDirection = when (value) {
+            0 -> Forward
+            1 -> Backward
+            else -> throw IllegalStateException("Invalid seek direction value")
         }
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/SnowfallView.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/SnowfallView.kt
index 8aeefa6a4..f4ed7b94a 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/SnowfallView.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/SnowfallView.kt
@@ -173,18 +173,14 @@ class Snowflake(
     var snowY: Float = startY
     var shouldRemove = false
 
-    fun snowX(): Float {
-        return velX.let {
-            snowX += it
-            snowX
-        }
+    fun snowX(): Float = velX.let {
+        snowX += it
+        snowX
     }
 
-    fun snowY(): Float {
-        return velY.let {
-            snowY += it
-            snowY
-        }
+    fun snowY(): Float = velY.let {
+        snowY += it
+        snowY
     }
 
     fun reset() {
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/ToolbarHost.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/ToolbarHost.kt
index d527bd723..f3b520a6c 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/ToolbarHost.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/ToolbarHost.kt
@@ -8,6 +8,4 @@ interface ToolbarHost {
     val contextualToolbar: Toolbar?
 }
 
-fun Fragment.findToolbarHost(): ToolbarHost? {
-    return (this as? ToolbarHost) ?: parentFragment?.findToolbarHost()
-}
+fun Fragment.findToolbarHost(): ToolbarHost? = (this as? ToolbarHost) ?: parentFragment?.findToolbarHost()
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/VerticalSeekbar.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/VerticalSeekbar.kt
index 65159e13c..a732d3537 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/VerticalSeekbar.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/VerticalSeekbar.kt
@@ -134,9 +134,7 @@ constructor(
     private fun mRound(
         i: Float,
         n: Float
-    ): Float {
-        return if ((i % n) > n / 2) (i + n - i % n) else (i - i % n)
-    }
+    ): Float = if ((i % n) > n / 2) (i + n - i % n) else (i - i % n)
 
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/multisheet/MultiSheetView.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/multisheet/MultiSheetView.kt
index d975e1639..571f3fae1 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/multisheet/MultiSheetView.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/view/multisheet/MultiSheetView.kt
@@ -15,7 +15,11 @@ import com.simplecityapps.shuttle.ui.common.view.setMargins
 
 class MultiSheetView
 @JvmOverloads
-constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : CoordinatorLayout(context, attrs, defStyleAttr) {
+constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : CoordinatorLayout(context, attrs, defStyleAttr) {
     interface SheetStateChangeListener {
         fun onSheetStateChanged(
             @Sheet sheet: Int,
@@ -348,6 +352,4 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
  * @param v the view whose hierarchy will be traversed.
  * @return the first MultiSheetView of the passed in view, or null if none can be found.
  */
-fun View?.findParentMultiSheetView(): MultiSheetView? {
-    return (this as? MultiSheetView) ?: (this?.parent as? View)?.findParentMultiSheetView()
-}
+fun View?.findParentMultiSheetView(): MultiSheetView? = (this as? MultiSheetView) ?: (this?.parent as? View)?.findParentMultiSheetView()
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/viewbinders/DetailSongBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/viewbinders/DetailSongBinder.kt
index 3235307aa..4271c9bbc 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/viewbinders/DetailSongBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/viewbinders/DetailSongBinder.kt
@@ -29,21 +29,13 @@ class DetailSongBinder(
         ) {}
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_detail_song, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_detail_song, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.DetailSong
-    }
+    override fun viewType(): Int = ViewTypes.DetailSong
 
-    override fun getSectionName(): String? {
-        return song.name?.firstOrNull()?.toString()
-    }
+    override fun getSectionName(): String? = song.name?.firstOrNull()?.toString()
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return song.playbackPosition == (other as? Song)?.playbackPosition
-    }
+    override fun areContentsTheSame(other: Any): Boolean = song.playbackPosition == (other as? Song)?.playbackPosition
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -54,9 +46,7 @@ class DetailSongBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return song.id.hashCode()
-    }
+    override fun hashCode(): Int = song.id.hashCode()
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<DetailSongBinder>(itemView) {
         private val trackTextView: TextView = itemView.findViewById(R.id.trackTextView)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/viewbinders/DiscNumberBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/viewbinders/DiscNumberBinder.kt
index c11b47bf5..558ec26dc 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/viewbinders/DiscNumberBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/viewbinders/DiscNumberBinder.kt
@@ -11,13 +11,9 @@ import com.simplecityapps.shuttle.ui.common.recyclerview.ViewTypes
 class DiscNumberBinder(
     val label: String
 ) : ViewBinder {
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_disc_number, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_disc_number, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.DiscNumber
-    }
+    override fun viewType(): Int = ViewTypes.DiscNumber
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -30,9 +26,7 @@ class DiscNumberBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return label.hashCode()
-    }
+    override fun hashCode(): Int = label.hashCode()
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<DiscNumberBinder>(itemView) {
         override fun bind(
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/viewbinders/GroupingBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/viewbinders/GroupingBinder.kt
index 98bafb0d6..6fe1dbb68 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/viewbinders/GroupingBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/viewbinders/GroupingBinder.kt
@@ -11,13 +11,9 @@ import com.simplecityapps.shuttle.ui.common.recyclerview.ViewTypes
 class GroupingBinder(
     val label: String
 ) : ViewBinder {
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_grouping, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_grouping, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Grouping
-    }
+    override fun viewType(): Int = ViewTypes.Grouping
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -30,9 +26,7 @@ class GroupingBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return label.hashCode()
-    }
+    override fun hashCode(): Int = label.hashCode()
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<GroupingBinder>(itemView) {
         override fun bind(
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/lyrics/QuickLyricManager.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/lyrics/QuickLyricManager.kt
index a2d2649f0..e7038d5fc 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/lyrics/QuickLyricManager.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/lyrics/QuickLyricManager.kt
@@ -6,30 +6,24 @@ import android.content.pm.PackageManager
 import android.net.Uri
 
 object QuickLyricManager {
-    fun isQuickLyricInstalled(context: Context): Boolean {
-        return try {
-            context.packageManager.getPackageInfo("com.geecko.QuickLyric", PackageManager.GET_ACTIVITIES)
-            true
-        } catch (ignored: PackageManager.NameNotFoundException) {
-            false
-        }
+    fun isQuickLyricInstalled(context: Context): Boolean = try {
+        context.packageManager.getPackageInfo("com.geecko.QuickLyric", PackageManager.GET_ACTIVITIES)
+        true
+    } catch (ignored: PackageManager.NameNotFoundException) {
+        false
     }
 
     fun buildLyricsIntent(
         artistName: String,
         songName: String
-    ): Intent {
-        return Intent("com.geecko.QuickLyric.getLyrics").apply {
-            putExtra("TAGS", arrayOf(artistName, songName))
-        }
+    ): Intent = Intent("com.geecko.QuickLyric.getLyrics").apply {
+        putExtra("TAGS", arrayOf(artistName, songName))
     }
 
     /**
      * @return true if the Play Store is available, and QuickLyric can be downloaded
      */
-    fun canDownloadQuickLyric(context: Context): Boolean {
-        return quickLyricIntent.resolveActivity(context.packageManager) != null
-    }
+    fun canDownloadQuickLyric(context: Context): Boolean = quickLyricIntent.resolveActivity(context.packageManager) != null
 
     val quickLyricIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.geecko.QuickLyric"))
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/changelog/ChangelogDialogFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/changelog/ChangelogDialogFragment.kt
index 9ee67f0bf..d7c4ec944 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/changelog/ChangelogDialogFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/changelog/ChangelogDialogFragment.kt
@@ -83,16 +83,17 @@ class ChangelogDialogFragment : BottomSheetDialogFragment() {
             changelog?.mapIndexed { index, changeset ->
                 ChangesetBinder(
                     expanded =
-                    index == 0 || changeset.version > (
-                        preferenceManager.lastViewedChangelogVersion?.let { version ->
-                            try {
-                                Semver(version)
-                            } catch (e: Exception) {
-                                Timber.e(e)
-                                null
-                            }
-                        } ?: Semver("0.0.0")
-                        ),
+                    index == 0 ||
+                        changeset.version > (
+                            preferenceManager.lastViewedChangelogVersion?.let { version ->
+                                try {
+                                    Semver(version)
+                                } catch (e: Exception) {
+                                    Timber.e(e)
+                                    null
+                                }
+                            } ?: Semver("0.0.0")
+                            ),
                     changeset = changeset,
                     listener = listener
                 )
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/changelog/ChangesetBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/changelog/ChangesetBinder.kt
index 7a8770c6b..d187b4988 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/changelog/ChangesetBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/changelog/ChangesetBinder.kt
@@ -31,13 +31,9 @@ class ChangesetBinder(
         )
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_changeset, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_changeset, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Changelog
-    }
+    override fun viewType(): Int = ViewTypes.Changelog
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -50,13 +46,9 @@ class ChangesetBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return changeset.hashCode()
-    }
+    override fun hashCode(): Int = changeset.hashCode()
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return (other as? ChangesetBinder)?.expanded == expanded
-    }
+    override fun areContentsTheSame(other: Any): Boolean = (other as? ChangesetBinder)?.expanded == expanded
 
     fun getSpannableString(
         resources: Resources,
@@ -192,6 +184,4 @@ class ChangesetBinder(
     }
 }
 
-fun ChangesetBinder.clone(expanded: Boolean): ChangesetBinder {
-    return ChangesetBinder(expanded, changeset, listener)
-}
+fun ChangesetBinder.clone(expanded: Boolean): ChangesetBinder = ChangesetBinder(expanded, changeset, listener)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/changelog/NotesBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/changelog/NotesBinder.kt
index 79c9545e8..f2bf0207b 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/changelog/NotesBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/changelog/NotesBinder.kt
@@ -11,13 +11,9 @@ import com.simplecityapps.shuttle.R
 import com.simplecityapps.shuttle.ui.common.recyclerview.ViewTypes
 
 class NotesBinder(val note: String) : ViewBinder {
-    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_notes, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_notes, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Notes
-    }
+    override fun viewType(): Int = ViewTypes.Notes
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<NotesBinder>(itemView) {
         val subtitle: TextView = itemView.findViewById(R.id.subtitle)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/debug/DebugDrawerFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/debug/DebugDrawerFragment.kt
index 3f5a3a36c..328283068 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/debug/DebugDrawerFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/debug/DebugDrawerFragment.kt
@@ -21,9 +21,7 @@ class DebugDrawerFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_debug_drawer, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_debug_drawer, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/debug/LogMessageBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/debug/LogMessageBinder.kt
index a6facb20d..2f5ee398d 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/debug/LogMessageBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/debug/LogMessageBinder.kt
@@ -13,13 +13,9 @@ import com.simplecityapps.shuttle.ui.common.recyclerview.ViewTypes
 class LogMessageBinder(
     val logMessage: LogMessage
 ) : ViewBinder {
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_debug_log, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_debug_log, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Log
-    }
+    override fun viewType(): Int = ViewTypes.Log
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -32,9 +28,7 @@ class LogMessageBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return logMessage.hashCode()
-    }
+    override fun hashCode(): Int = logMessage.hashCode()
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<LogMessageBinder>(itemView) {
         private val timestampTextView: TextView = itemView.findViewById(R.id.timestampTextView)
@@ -52,15 +46,13 @@ class LogMessageBinder(
             messageTextViewBinder.text = viewBinder.logMessage.message
         }
 
-        private fun Int.getPriorityString(): String {
-            return when (this) {
-                Log.VERBOSE -> "V"
-                Log.DEBUG -> "D"
-                Log.INFO -> "I"
-                Log.WARN -> "W"
-                Log.ERROR -> "E"
-                else -> ""
-            }
+        private fun Int.getPriorityString(): String = when (this) {
+            Log.VERBOSE -> "V"
+            Log.DEBUG -> "D"
+            Log.INFO -> "I"
+            Log.WARN -> "W"
+            Log.ERROR -> "E"
+            else -> ""
         }
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/debug/LoggingFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/debug/LoggingFragment.kt
index 1ae3cffc8..37cea21eb 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/debug/LoggingFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/debug/LoggingFragment.kt
@@ -19,7 +19,9 @@ import javax.inject.Inject
 import kotlinx.parcelize.Parcelize
 
 @AndroidEntryPoint
-class LoggingFragment : Fragment(), DebugLoggingTree.Callback {
+class LoggingFragment :
+    Fragment(),
+    DebugLoggingTree.Callback {
     @Inject lateinit var debugLoggingTree: DebugLoggingTree
 
     private var adapter: RecyclerAdapter by autoCleared()
@@ -40,9 +42,7 @@ class LoggingFragment : Fragment(), DebugLoggingTree.Callback {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_debug_logging, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_debug_logging, container, false)
 
     override fun onViewCreated(
         view: View,
@@ -112,10 +112,9 @@ class LoggingFragment : Fragment(), DebugLoggingTree.Callback {
     companion object {
         private const val ARG_FILTER = "filter"
 
-        fun newInstance(filter: Filter? = null) =
-            LoggingFragment().withArgs {
-                putParcelable(ARG_FILTER, filter)
-            }
+        fun newInstance(filter: Filter? = null) = LoggingFragment().withArgs {
+            putParcelable(ARG_FILTER, filter)
+        }
     }
 
     @Parcelize
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/equalizer/DspFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/equalizer/DspFragment.kt
index a55936b70..812f72de3 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/equalizer/DspFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/equalizer/DspFragment.kt
@@ -22,7 +22,9 @@ import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class DspFragment : Fragment(), EqualizerContract.View {
+class DspFragment :
+    Fragment(),
+    EqualizerContract.View {
     @Inject
     lateinit var presenter: DspPresenter
 
@@ -40,9 +42,7 @@ class DspFragment : Fragment(), EqualizerContract.View {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_dsp, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_dsp, container, false)
 
     override fun onViewCreated(
         view: View,
@@ -105,12 +105,10 @@ class DspFragment : Fragment(), EqualizerContract.View {
 
     // Private
 
-    private fun ReplayGainMode.displayName(): String {
-        return when (this) {
-            ReplayGainMode.Track -> getString(R.string.dsp_replay_gain_track)
-            ReplayGainMode.Album -> getString(R.string.dsp_replay_gain_album)
-            ReplayGainMode.Off -> getString(R.string.dsp_replay_gain_off)
-        }
+    private fun ReplayGainMode.displayName(): String = when (this) {
+        ReplayGainMode.Track -> getString(R.string.dsp_replay_gain_track)
+        ReplayGainMode.Album -> getString(R.string.dsp_replay_gain_album)
+        ReplayGainMode.Off -> getString(R.string.dsp_replay_gain_off)
     }
 
     // EqualizerContract.View Implementation
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/equalizer/DspPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/equalizer/DspPresenter.kt
index d6b4d7333..f452bc752 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/equalizer/DspPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/equalizer/DspPresenter.kt
@@ -48,7 +48,8 @@ constructor(
     private val playbackPreferenceManager: PlaybackPreferenceManager,
     private val equalizerAudioProcessor: EqualizerAudioProcessor,
     private val replayGainAudioProcessor: ReplayGainAudioProcessor
-) : BasePresenter<EqualizerContract.View>(), EqualizerContract.Presenter {
+) : BasePresenter<EqualizerContract.View>(),
+    EqualizerContract.Presenter {
     override fun bindView(view: EqualizerContract.View) {
         super.bindView(view)
 
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/equalizer/FrequencyResponseDialogFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/equalizer/FrequencyResponseDialogFragment.kt
index 7a326efda..5e762093b 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/equalizer/FrequencyResponseDialogFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/equalizer/FrequencyResponseDialogFragment.kt
@@ -109,9 +109,7 @@ class FrequencyResponseDialogFragment : DialogFragment() {
         lineChart.axisLeft.labelCount = 10
         lineChart.axisLeft.valueFormatter =
             object : ValueFormatter() {
-                override fun getFormattedValue(value: Float): String {
-                    return "%.1f".format(value) + "dB"
-                }
+                override fun getFormattedValue(value: Float): String = "%.1f".format(value) + "dB"
             }
         lineChart.axisRight.isEnabled = false
 
@@ -144,46 +142,44 @@ class FrequencyResponseDialogFragment : DialogFragment() {
         lineChart.invalidate()
     }
 
-    private suspend fun calculateFft(): Map<Float, Float> {
-        return withContext(Dispatchers.IO) {
-            val audioProcessor = EqualizerAudioProcessor(true)
-            audioProcessor.configure(AudioProcessor.AudioFormat(44100, 1, C.ENCODING_PCM_16BIT))
-            audioProcessor.flush()
-            audioProcessor.preset = preset
+    private suspend fun calculateFft(): Map<Float, Float> = withContext(Dispatchers.IO) {
+        val audioProcessor = EqualizerAudioProcessor(true)
+        audioProcessor.configure(AudioProcessor.AudioFormat(44100, 1, C.ENCODING_PCM_16BIT))
+        audioProcessor.flush()
+        audioProcessor.preset = preset
 
-            val size = 2.0.pow(14).toInt()
+        val size = 2.0.pow(14).toInt()
 
-            val noise = Noise.real(size)
+        val noise = Noise.real(size)
 
-            var src = FloatArray(size)
-            src[0] = 1f
+        var src = FloatArray(size)
+        src[0] = 1f
 
-            val gain = playbackPreferenceManager.preAmpGain
-            val delta = gain.fromDb()
+        val gain = playbackPreferenceManager.preAmpGain
+        val delta = gain.fromDb()
 
-            src =
-                src.map { value ->
-                    var newValue = value
+        src =
+            src.map { value ->
+                var newValue = value
 
-                    if (gain != 0.0) {
-                        newValue = MathUtils.clamp((newValue * delta), Short.MIN_VALUE.toDouble(), Short.MAX_VALUE.toDouble()).toFloat()
-                    }
+                if (gain != 0.0) {
+                    newValue = MathUtils.clamp((newValue * delta), Short.MIN_VALUE.toDouble(), Short.MAX_VALUE.toDouble()).toFloat()
+                }
 
-                    for (band in audioProcessor.bandProcessors) {
-                        newValue = band.processSample(newValue, 0)
-                    }
-                    newValue
-                }.toFloatArray()
+                for (band in audioProcessor.bandProcessors) {
+                    newValue = band.processSample(newValue, 0)
+                }
+                newValue
+            }.toFloatArray()
 
-            val dst = FloatArray(size + 2)
+        val dst = FloatArray(size + 2)
 
-            noise.fft(src, dst)
+        noise.fft(src, dst)
 
-            (0 until size / 2).associateBy(
-                { index -> ((index / (size / 2f)) * (44100 / 2f)) },
-                { index -> (20f * log10(sqrt(((dst[index * 2]).pow(2)) + ((dst[index * 2 + 1]).pow(2))))) }
-            )
-        }
+        (0 until size / 2).associateBy(
+            { index -> ((index / (size / 2f)) * (44100 / 2f)) },
+            { index -> (20f * log10(sqrt(((dst[index * 2]).pow(2)) + ((dst[index * 2 + 1]).pow(2))))) }
+        )
     }
 
     fun show(fragmentManager: FragmentManager) {
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeFragment.kt
index 75871f810..e5ec19c95 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeFragment.kt
@@ -85,9 +85,7 @@ class HomeFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_home, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_home, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomePresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomePresenter.kt
index c48ddde0e..be73d8a0e 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomePresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomePresenter.kt
@@ -80,7 +80,8 @@ constructor(
     private val playbackManager: PlaybackManager,
     private val queueManager: QueueManager,
     @Named("randomSeed") private val seed: Long
-) : HomeContract.Presenter, BasePresenter<HomeContract.View>() {
+) : BasePresenter<HomeContract.View>(),
+    HomeContract.Presenter {
     override fun shuffleAll() {
         launch {
             val songs = songRepository.getSongs(SongQuery.All()).firstOrNull().orEmpty()
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HorizontalAlbumArtistListBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HorizontalAlbumArtistListBinder.kt
index 33980456d..650087838 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HorizontalAlbumArtistListBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HorizontalAlbumArtistListBinder.kt
@@ -21,17 +21,11 @@ class HorizontalAlbumArtistListBinder(
     val scope: CoroutineScope,
     val listener: AlbumArtistBinder.Listener
 ) : ViewBinder {
-    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_horizontal_list, parent, false), scope)
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_horizontal_list, parent, false), scope)
 
-    override fun viewType(): Int {
-        return ViewTypes.HorizontalAlbumArtistSection
-    }
+    override fun viewType(): Int = ViewTypes.HorizontalAlbumArtistSection
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return albumArtists == (other as? HorizontalAlbumArtistListBinder)?.albumArtists
-    }
+    override fun areContentsTheSame(other: Any): Boolean = albumArtists == (other as? HorizontalAlbumArtistListBinder)?.albumArtists
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -44,9 +38,7 @@ class HorizontalAlbumArtistListBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return albumArtists.hashCode()
-    }
+    override fun hashCode(): Int = albumArtists.hashCode()
 
     class ViewHolder(itemView: View, scope: CoroutineScope) : ViewBinder.ViewHolder<HorizontalAlbumArtistListBinder>(itemView) {
         private val recyclerView: RecyclerView = itemView.findViewById(R.id.recyclerView)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HorizontalAlbumListBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HorizontalAlbumListBinder.kt
index 536dcf005..e4c9ae1ac 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HorizontalAlbumListBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HorizontalAlbumListBinder.kt
@@ -22,17 +22,11 @@ class HorizontalAlbumListBinder(
     val scope: CoroutineScope,
     val listener: AlbumBinder.Listener
 ) : ViewBinder {
-    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_horizontal_list, parent, false), scope)
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_horizontal_list, parent, false), scope)
 
-    override fun viewType(): Int {
-        return ViewTypes.HorizontalAlbumSection
-    }
+    override fun viewType(): Int = ViewTypes.HorizontalAlbumSection
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return albums == (other as? HorizontalAlbumListBinder)?.albums
-    }
+    override fun areContentsTheSame(other: Any): Boolean = albums == (other as? HorizontalAlbumListBinder)?.albums
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -43,9 +37,7 @@ class HorizontalAlbumListBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return albums.hashCode()
-    }
+    override fun hashCode(): Int = albums.hashCode()
 
     class ViewHolder(itemView: View, scope: CoroutineScope) : ViewBinder.ViewHolder<HorizontalAlbumListBinder>(itemView) {
         private val recyclerView: RecyclerView = itemView.findViewById(R.id.recyclerView)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HorizontalSongListBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HorizontalSongListBinder.kt
index 0beb1f016..92aaebb54 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HorizontalSongListBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HorizontalSongListBinder.kt
@@ -22,17 +22,11 @@ class HorizontalSongListBinder(
     val imageLoader: ArtworkImageLoader,
     val scope: CoroutineScope
 ) : ViewBinder {
-    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_horizontal_list, parent, false), scope)
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_horizontal_list, parent, false), scope)
 
-    override fun viewType(): Int {
-        return ViewTypes.HorizontalSongSection
-    }
+    override fun viewType(): Int = ViewTypes.HorizontalSongSection
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return songs == (other as? HorizontalSongListBinder)?.songs
-    }
+    override fun areContentsTheSame(other: Any): Boolean = songs == (other as? HorizontalSongListBinder)?.songs
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/HeaderBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/HeaderBinder.kt
index d3e769eeb..25acaa8bb 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/HeaderBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/HeaderBinder.kt
@@ -13,13 +13,9 @@ class HeaderBinder(
     val title: String,
     val subtitle: String? = null
 ) : ViewBinder {
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_header, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_header, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Header
-    }
+    override fun viewType(): Int = ViewTypes.Header
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchAlbumArtistBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchAlbumArtistBinder.kt
index 0b0550e40..1902cda93 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchAlbumArtistBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchAlbumArtistBinder.kt
@@ -29,13 +29,9 @@ class SearchAlbumArtistBinder(
     listener: Listener,
     private val jaroSimilarity: ArtistJaroSimilarity
 ) : AlbumArtistBinder(albumArtist, imageLoader, listener) {
-    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_album_artist, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_album_artist, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.AlbumArtistList
-    }
+    override fun viewType(): Int = ViewTypes.AlbumArtistList
 
     override fun areContentsTheSame(other: Any): Boolean {
         if (other !is SearchAlbumArtistBinder) return false
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchAlbumBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchAlbumBinder.kt
index 4391cfc3c..361a703d1 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchAlbumBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchAlbumBinder.kt
@@ -33,13 +33,9 @@ class SearchAlbumBinder(
     private val jaroSimilarity: AlbumJaroSimilarity
 ) : AlbumBinder(album, imageLoader, listener),
     SectionViewBinder {
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_album, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_album, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.AlbumList
-    }
+    override fun viewType(): Int = ViewTypes.AlbumList
 
     override fun areContentsTheSame(other: Any): Boolean {
         if (other !is SearchAlbumBinder) return false
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchFragment.kt
index 820c73238..d9210fba1 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchFragment.kt
@@ -88,9 +88,7 @@ class SearchFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_search, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_search, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchPresenter.kt
index 785563301..25938bd7c 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchPresenter.kt
@@ -110,8 +110,7 @@ constructor(
     private val playbackManager: PlaybackManager,
     private val queueManager: QueueManager,
     private val preferenceManager: GeneralPreferenceManager
-) :
-    BasePresenter<SearchContract.View>(),
+) : BasePresenter<SearchContract.View>(),
     SearchContract.Presenter {
     private var query: String? = null
 
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchSongBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchSongBinder.kt
index 2476fd024..5f01426a3 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchSongBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/search/SearchSongBinder.kt
@@ -47,17 +47,11 @@ open class SearchSongBinder(
         fun onViewHolderCreated(holder: ViewHolder) {}
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_song, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_song, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Song
-    }
+    override fun viewType(): Int = ViewTypes.Song
 
-    override fun getSectionName(): String? {
-        return song.name?.firstOrNull()?.toString()
-    }
+    override fun getSectionName(): String? = song.name?.firstOrNull()?.toString()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -68,23 +62,19 @@ open class SearchSongBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return song.id.hashCode()
-    }
-
-    override fun areContentsTheSame(other: Any): Boolean {
-        return other is SearchSongBinder &&
-            song.name == other.song.name &&
-            song.albumArtist == other.song.albumArtist &&
-            song.artists == other.song.artists &&
-            song.album == other.song.album &&
-            song.date == other.song.date &&
-            song.track == other.song.track &&
-            song.disc == other.song.disc &&
-            song.playCount == other.song.playCount &&
-            selected == other.selected &&
-            jaroSimilarity == other.jaroSimilarity
-    }
+    override fun hashCode(): Int = song.id.hashCode()
+
+    override fun areContentsTheSame(other: Any): Boolean = other is SearchSongBinder &&
+        song.name == other.song.name &&
+        song.albumArtist == other.song.albumArtist &&
+        song.artists == other.song.artists &&
+        song.album == other.song.album &&
+        song.date == other.song.date &&
+        song.track == other.song.track &&
+        song.disc == other.song.disc &&
+        song.playCount == other.song.playCount &&
+        selected == other.selected &&
+        jaroSimilarity == other.jaroSimilarity
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<SearchSongBinder>(itemView) {
         private val title: TextView = itemView.findViewById(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryFragment.kt
index f604b4f3e..7acd299f8 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryFragment.kt
@@ -82,9 +82,7 @@ class LibraryFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_library, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_library, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPagerAdapter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPagerAdapter.kt
index 6d51b2f95..9ad8f634c 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPagerAdapter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPagerAdapter.kt
@@ -28,35 +28,25 @@ class LibraryPagerAdapter(
             }
         }
 
-    fun getPageTitle(position: Int): CharSequence {
-        return when (items[position]) {
-            LibraryTab.Genres -> context.getString(R.string.genres)
-            LibraryTab.Playlists -> context.getString(R.string.library_playlists)
-            LibraryTab.Artists -> context.getString(R.string.artists)
-            LibraryTab.Albums -> context.getString(R.string.albums)
-            LibraryTab.Songs -> context.getString(R.string.songs)
-        }
+    fun getPageTitle(position: Int): CharSequence = when (items[position]) {
+        LibraryTab.Genres -> context.getString(R.string.genres)
+        LibraryTab.Playlists -> context.getString(R.string.library_playlists)
+        LibraryTab.Artists -> context.getString(R.string.artists)
+        LibraryTab.Albums -> context.getString(R.string.albums)
+        LibraryTab.Songs -> context.getString(R.string.songs)
     }
 
-    override fun getItemCount(): Int {
-        return items.size
-    }
+    override fun getItemCount(): Int = items.size
 
-    override fun createFragment(position: Int): Fragment {
-        return when (items[position]) {
-            LibraryTab.Genres -> GenreListFragment.newInstance()
-            LibraryTab.Playlists -> PlaylistListFragment.newInstance()
-            LibraryTab.Artists -> AlbumArtistListFragment.newInstance()
-            LibraryTab.Albums -> AlbumListFragment.newInstance()
-            LibraryTab.Songs -> SongListFragment.newInstance()
-        }
+    override fun createFragment(position: Int): Fragment = when (items[position]) {
+        LibraryTab.Genres -> GenreListFragment.newInstance()
+        LibraryTab.Playlists -> PlaylistListFragment.newInstance()
+        LibraryTab.Artists -> AlbumArtistListFragment.newInstance()
+        LibraryTab.Albums -> AlbumListFragment.newInstance()
+        LibraryTab.Songs -> SongListFragment.newInstance()
     }
 
-    override fun containsItem(itemId: Long): Boolean {
-        return items.map { it.ordinal.toLong() }.contains(itemId)
-    }
+    override fun containsItem(itemId: Long): Boolean = items.map { it.ordinal.toLong() }.contains(itemId)
 
-    override fun getItemId(position: Int): Long {
-        return items[position].ordinal.toLong()
-    }
+    override fun getItemId(position: Int): Long = items[position].ordinal.toLong()
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/ViewMode.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/ViewMode.kt
index ae0d4420c..7939aed3a 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/ViewMode.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/ViewMode.kt
@@ -5,6 +5,4 @@ enum class ViewMode {
     Grid
 }
 
-fun String?.toViewMode(): ViewMode {
-    return ViewMode.valueOf(this ?: ViewMode.List.name)
-}
+fun String?.toViewMode(): ViewMode = ViewMode.valueOf(this ?: ViewMode.List.name)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/AlbumArtistBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/AlbumArtistBinder.kt
index e4b981088..c4d487bc2 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/AlbumArtistBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/AlbumArtistBinder.kt
@@ -34,9 +34,7 @@ abstract class AlbumArtistBinder(
         fun onViewHolderCreated(holder: ViewHolder) {}
     }
 
-    override fun getSectionName(): String? {
-        return albumArtist.groupKey.key?.firstOrNull()?.uppercaseChar()?.toString()
-    }
+    override fun getSectionName(): String? = albumArtist.groupKey.key?.firstOrNull()?.uppercaseChar()?.toString()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -47,9 +45,7 @@ abstract class AlbumArtistBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return albumArtist.hashCode()
-    }
+    override fun hashCode(): Int = albumArtist.hashCode()
 
     override fun areContentsTheSame(other: Any): Boolean {
         if (other !is AlbumArtistBinder) return false
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/AlbumArtistListFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/AlbumArtistListFragment.kt
index 33b0d70cc..034b78d40 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/AlbumArtistListFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/AlbumArtistListFragment.kt
@@ -93,9 +93,7 @@ class AlbumArtistListFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_album_artists, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_album_artists, container, false)
 
     override fun onViewCreated(
         view: View,
@@ -177,20 +175,18 @@ class AlbumArtistListFragment :
 
     // Toolbar item selection
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.gridViewMode -> {
-                adapter.clear()
-                presenter.setViewMode(ViewMode.Grid)
-                true
-            }
-            R.id.listViewMode -> {
-                adapter.clear()
-                presenter.setViewMode(ViewMode.List)
-                true
-            }
-            else -> false
+    override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
+        R.id.gridViewMode -> {
+            adapter.clear()
+            presenter.setViewMode(ViewMode.Grid)
+            true
+        }
+        R.id.listViewMode -> {
+            adapter.clear()
+            presenter.setViewMode(ViewMode.List)
+            true
         }
+        else -> false
     }
 
     // Private
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/AlbumArtistListPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/AlbumArtistListPresenter.kt
index f5dbb167a..40d65b8ee 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/AlbumArtistListPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/AlbumArtistListPresenter.kt
@@ -81,8 +81,8 @@ constructor(
     private val mediaImporter: MediaImporter,
     private val preferenceManager: GeneralPreferenceManager,
     private val queueManager: QueueManager
-) : AlbumArtistListContract.Presenter,
-    BasePresenter<AlbumArtistListContract.View>() {
+) : BasePresenter<AlbumArtistListContract.View>(),
+    AlbumArtistListContract.Presenter {
     private var albumArtists: List<com.simplecityapps.shuttle.model.AlbumArtist> = emptyList()
 
     private val mediaImporterListener =
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/GridAlbumArtistBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/GridAlbumArtistBinder.kt
index 9d067f1e0..512ef1eb1 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/GridAlbumArtistBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/GridAlbumArtistBinder.kt
@@ -20,15 +20,11 @@ class GridAlbumArtistBinder(
     val coloredBackground: Boolean = false,
     val fixedWidthDp: Int? = null
 ) : AlbumArtistBinder(albumArtist, imageLoader, listener) {
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(
-            LayoutInflater.from(parent.context).inflate(R.layout.grid_item_album_artist, parent, false)
-        )
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(
+        LayoutInflater.from(parent.context).inflate(R.layout.grid_item_album_artist, parent, false)
+    )
 
-    override fun viewType(): Int {
-        return ViewTypes.AlbumArtistGrid
-    }
+    override fun viewType(): Int = ViewTypes.AlbumArtistGrid
 
     class ViewHolder(itemView: View) : AlbumArtistBinder.ViewHolder(itemView) {
         private val title: TextView = itemView.findViewById(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/ListAlbumArtistBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/ListAlbumArtistBinder.kt
index b129f8547..f626a72e1 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/ListAlbumArtistBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/ListAlbumArtistBinder.kt
@@ -21,13 +21,9 @@ class ListAlbumArtistBinder(
     imageLoader: ArtworkImageLoader,
     listener: Listener
 ) : AlbumArtistBinder(albumArtist, imageLoader, listener) {
-    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_album_artist, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_album_artist, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.AlbumArtistList
-    }
+    override fun viewType(): Int = ViewTypes.AlbumArtistList
 
     class ViewHolder(itemView: View) : AlbumArtistBinder.ViewHolder(itemView) {
         private val title = itemView.findViewById<TextView>(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/detail/ExpandableAlbumBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/detail/ExpandableAlbumBinder.kt
index 20b290af7..6293ae830 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/detail/ExpandableAlbumBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albumartists/detail/ExpandableAlbumBinder.kt
@@ -61,17 +61,11 @@ class ExpandableAlbumBinder(
         ) {}
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_album_expandable, parent, false), scope)
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_album_expandable, parent, false), scope)
 
-    override fun viewType(): Int {
-        return ViewTypes.ExpandableAlbum
-    }
+    override fun viewType(): Int = ViewTypes.ExpandableAlbum
 
-    override fun getSectionName(): String? {
-        return album.groupKey?.key?.firstOrNull()?.toString()?.uppercase(Locale.getDefault())
-    }
+    override fun getSectionName(): String? = album.groupKey?.key?.firstOrNull()?.toString()?.uppercase(Locale.getDefault())
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -82,20 +76,16 @@ class ExpandableAlbumBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return album.groupKey.hashCode()
-    }
+    override fun hashCode(): Int = album.groupKey.hashCode()
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return (other as? ExpandableAlbumBinder)?.let {
-            album.name == other.album.name &&
-                album.albumArtist == other.album.albumArtist &&
-                expanded == other.expanded &&
-                album.songCount == other.album.songCount &&
-                album.year == other.album.year &&
-                songs.map { it.id } == other.songs.map { it.id }
-        } ?: false
-    }
+    override fun areContentsTheSame(other: Any): Boolean = (other as? ExpandableAlbumBinder)?.let {
+        album.name == other.album.name &&
+            album.albumArtist == other.album.albumArtist &&
+            expanded == other.expanded &&
+            album.songCount == other.album.songCount &&
+            album.year == other.album.year &&
+            songs.map { it.id } == other.songs.map { it.id }
+    } ?: false
 
     class ViewHolder(itemView: View, scope: CoroutineScope) : ViewBinder.ViewHolder<ExpandableAlbumBinder>(itemView) {
         private val title: TextView = itemView.findViewById(R.id.title)
@@ -210,6 +200,4 @@ class ExpandableAlbumBinder(
     }
 }
 
-fun ExpandableAlbumBinder.clone(expanded: Boolean): ExpandableAlbumBinder {
-    return ExpandableAlbumBinder(album, songs, imageLoader, expanded, scope, listener)
-}
+fun ExpandableAlbumBinder.clone(expanded: Boolean): ExpandableAlbumBinder = ExpandableAlbumBinder(album, songs, imageLoader, expanded, scope, listener)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/AlbumBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/AlbumBinder.kt
index edc60d761..5e330c39a 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/AlbumBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/AlbumBinder.kt
@@ -35,9 +35,7 @@ abstract class AlbumBinder(
         fun onViewHolderCreated(holder: ViewHolder) {}
     }
 
-    override fun getSectionName(): String? {
-        return album.groupKey?.key?.firstOrNull()?.toString()?.uppercase(Locale.getDefault())
-    }
+    override fun getSectionName(): String? = album.groupKey?.key?.firstOrNull()?.toString()?.uppercase(Locale.getDefault())
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -48,9 +46,7 @@ abstract class AlbumBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return album.hashCode()
-    }
+    override fun hashCode(): Int = album.hashCode()
 
     override fun areContentsTheSame(other: Any): Boolean {
         if (other !is AlbumBinder) return false
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/AlbumListFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/AlbumListFragment.kt
index 34656ed15..c7632d039 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/AlbumListFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/AlbumListFragment.kt
@@ -96,9 +96,7 @@ class AlbumListFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_albums, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_albums, container, false)
 
     override fun onViewCreated(
         view: View,
@@ -112,10 +110,8 @@ class AlbumListFragment :
 
         adapter =
             object : SectionedAdapter(viewLifecycleOwner.lifecycleScope) {
-                override fun getSectionName(viewBinder: ViewBinder?): String? {
-                    return (viewBinder as? AlbumBinder)?.album?.let { album ->
-                        presenter.getFastscrollPrefix(album)
-                    }
+                override fun getSectionName(viewBinder: ViewBinder?): String? = (viewBinder as? AlbumBinder)?.album?.let { album ->
+                    presenter.getFastscrollPrefix(album)
                 }
             }
         recyclerView = view.findViewById(R.id.recyclerView)
@@ -199,32 +195,30 @@ class AlbumListFragment :
 
     // Toolbar item selection
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.listViewMode -> {
-                adapter.clear()
-                presenter.setViewMode(ViewMode.List)
-                true
-            }
-            R.id.gridViewMode -> {
-                adapter.clear()
-                presenter.setViewMode(ViewMode.Grid)
-                true
-            }
-            R.id.sortAlbumName -> {
-                presenter.setSortOrder(AlbumSortOrder.AlbumName)
-                true
-            }
-            R.id.sortArtistName -> {
-                presenter.setSortOrder(AlbumSortOrder.ArtistGroupKey)
-                true
-            }
-            R.id.sortAlbumYear -> {
-                presenter.setSortOrder(AlbumSortOrder.Year)
-                true
-            }
-            else -> false
+    override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
+        R.id.listViewMode -> {
+            adapter.clear()
+            presenter.setViewMode(ViewMode.List)
+            true
+        }
+        R.id.gridViewMode -> {
+            adapter.clear()
+            presenter.setViewMode(ViewMode.Grid)
+            true
+        }
+        R.id.sortAlbumName -> {
+            presenter.setSortOrder(AlbumSortOrder.AlbumName)
+            true
+        }
+        R.id.sortArtistName -> {
+            presenter.setSortOrder(AlbumSortOrder.ArtistGroupKey)
+            true
+        }
+        R.id.sortAlbumYear -> {
+            presenter.setSortOrder(AlbumSortOrder.Year)
+            true
         }
+        else -> false
     }
 
     // Private
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/AlbumListPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/AlbumListPresenter.kt
index 74d2589a3..4674ed091 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/AlbumListPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/AlbumListPresenter.kt
@@ -99,8 +99,8 @@ constructor(
     private val preferenceManager: GeneralPreferenceManager,
     private val sortPreferenceManager: SortPreferenceManager,
     private val queueManager: QueueManager
-) : AlbumListContract.Presenter,
-    BasePresenter<AlbumListContract.View>() {
+) : BasePresenter<AlbumListContract.View>(),
+    AlbumListContract.Presenter {
     private var albums: List<Album> = emptyList()
 
     private val mediaImporterListener =
@@ -273,12 +273,10 @@ constructor(
         view?.updateToolbarMenuViewMode(preferenceManager.albumListViewMode.toViewMode())
     }
 
-    override fun getFastscrollPrefix(album: Album): String? {
-        return when (sortPreferenceManager.sortOrderAlbumList) {
-            AlbumSortOrder.AlbumName -> album.groupKey?.key?.firstOrNull()?.toString()?.uppercase(Locale.getDefault())
-            AlbumSortOrder.ArtistGroupKey -> album.groupKey?.albumArtistGroupKey?.key?.firstOrNull()?.toString()?.uppercase(Locale.getDefault())
-            AlbumSortOrder.Year -> album.year.toString()
-            else -> null
-        }
+    override fun getFastscrollPrefix(album: Album): String? = when (sortPreferenceManager.sortOrderAlbumList) {
+        AlbumSortOrder.AlbumName -> album.groupKey?.key?.firstOrNull()?.toString()?.uppercase(Locale.getDefault())
+        AlbumSortOrder.ArtistGroupKey -> album.groupKey?.albumArtistGroupKey?.key?.firstOrNull()?.toString()?.uppercase(Locale.getDefault())
+        AlbumSortOrder.Year -> album.year.toString()
+        else -> null
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/GridAlbumBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/GridAlbumBinder.kt
index 2bf8dc61e..8661d99b2 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/GridAlbumBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/GridAlbumBinder.kt
@@ -25,17 +25,11 @@ class GridAlbumBinder(
     val fixedWidthDp: Int? = null
 ) : AlbumBinder(album, imageLoader, listener),
     SectionViewBinder {
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.grid_item_album, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.grid_item_album, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.AlbumGrid
-    }
+    override fun viewType(): Int = ViewTypes.AlbumGrid
 
-    override fun spanSize(spanCount: Int): Int {
-        return 1
-    }
+    override fun spanSize(spanCount: Int): Int = 1
 
     class ViewHolder(itemView: View) : AlbumBinder.ViewHolder(itemView) {
         private val title: TextView = itemView.findViewById(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/ListAlbumBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/ListAlbumBinder.kt
index 37b823132..e6af31cd8 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/ListAlbumBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/ListAlbumBinder.kt
@@ -23,13 +23,9 @@ class ListAlbumBinder(
     listener: Listener
 ) : AlbumBinder(album, imageLoader, listener),
     SectionViewBinder {
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_album, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_album, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.AlbumList
-    }
+    override fun viewType(): Int = ViewTypes.AlbumList
 
     class ViewHolder(itemView: View) : AlbumBinder.ViewHolder(itemView) {
         private val title: TextView = itemView.findViewById(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/ShuffleBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/ShuffleBinder.kt
index 56a803287..88b68aa09 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/ShuffleBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/ShuffleBinder.kt
@@ -17,17 +17,11 @@ class ShuffleBinder(
         fun onClicked()
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_shuffle, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_shuffle, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.AlbumShuffle
-    }
+    override fun viewType(): Int = ViewTypes.AlbumShuffle
 
-    override fun spanSize(spanCount: Int): Int {
-        return spanCount
-    }
+    override fun spanSize(spanCount: Int): Int = spanCount
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<ShuffleBinder>(itemView) {
         val titleText: TextView = itemView.findViewById(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/detail/AlbumDetailPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/detail/AlbumDetailPresenter.kt
index a332d62aa..1aa46e540 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/detail/AlbumDetailPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/detail/AlbumDetailPresenter.kt
@@ -175,9 +175,7 @@ constructor(
         }
     }
 
-    override fun getCurrentSong(): Song? {
-        return queueManager.getCurrentItem()?.song
-    }
+    override fun getCurrentSong(): Song? = queueManager.getCurrentItem()?.song
 
     override fun exclude(song: Song) {
         launch {
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreBinder.kt
index 699d7ae3c..9a7ef6d6c 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreBinder.kt
@@ -24,13 +24,9 @@ class GenreBinder(val genre: com.simplecityapps.shuttle.model.Genre, private val
         ) {}
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_genre, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_genre, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Genre
-    }
+    override fun viewType(): Int = ViewTypes.Genre
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -43,14 +39,10 @@ class GenreBinder(val genre: com.simplecityapps.shuttle.model.Genre, private val
         return true
     }
 
-    override fun hashCode(): Int {
-        return genre.hashCode()
-    }
+    override fun hashCode(): Int = genre.hashCode()
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return genre.name == (other as? GenreBinder)?.genre?.name &&
-            genre.songCount == (other as? GenreBinder)?.genre?.songCount
-    }
+    override fun areContentsTheSame(other: Any): Boolean = genre.name == (other as? GenreBinder)?.genre?.name &&
+        genre.songCount == (other as? GenreBinder)?.genre?.songCount
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<GenreBinder>(itemView) {
         private val titleTextView: TextView = itemView.findViewById(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreListFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreListFragment.kt
index c8bc2aa96..4622f18f7 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreListFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreListFragment.kt
@@ -61,9 +61,7 @@ class GenreListFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_genres, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_genres, container, false)
 
     override fun onViewCreated(
         view: View,
@@ -75,10 +73,8 @@ class GenreListFragment :
 
         adapter =
             object : SectionedAdapter(viewLifecycleOwner.lifecycleScope) {
-                override fun getSectionName(viewBinder: ViewBinder?): String? {
-                    return (viewBinder as? GenreBinder)?.genre?.let { genre ->
-                        presenter.getFastscrollPrefix(genre)
-                    }
+                override fun getSectionName(viewBinder: ViewBinder?): String? = (viewBinder as? GenreBinder)?.genre?.let { genre ->
+                    presenter.getFastscrollPrefix(genre)
                 }
             }
         recyclerView = view.findViewById(R.id.recyclerView)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreListPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreListPresenter.kt
index 988c22243..78dc0fb81 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreListPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreListPresenter.kt
@@ -72,8 +72,8 @@ constructor(
     private val playbackManager: PlaybackManager,
     private val mediaImporter: MediaImporter,
     private val queueManager: QueueManager
-) : GenreListContract.Presenter,
-    BasePresenter<GenreListContract.View>() {
+) : BasePresenter<GenreListContract.View>(),
+    GenreListContract.Presenter {
     private var genres: List<Genre>? = null
 
     private val mediaImporterListener =
@@ -182,7 +182,5 @@ constructor(
         }
     }
 
-    override fun getFastscrollPrefix(genre: Genre): String? {
-        return genre.name.first().toString()
-    }
+    override fun getFastscrollPrefix(genre: Genre): String? = genre.name.first().toString()
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/detail/GenreDetailFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/detail/GenreDetailFragment.kt
index e4e4d1a7e..2fa938322 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/detail/GenreDetailFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/detail/GenreDetailFragment.kt
@@ -76,9 +76,7 @@ class GenreDetailFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_genre_detail, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_genre_detail, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/PlaylistBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/PlaylistBinder.kt
index 8940a2b20..c5e161361 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/PlaylistBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/PlaylistBinder.kt
@@ -25,13 +25,9 @@ class PlaylistBinder(val playlist: com.simplecityapps.shuttle.model.Playlist, pr
         ) {}
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_playlist, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_playlist, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Playlist
-    }
+    override fun viewType(): Int = ViewTypes.Playlist
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -44,16 +40,12 @@ class PlaylistBinder(val playlist: com.simplecityapps.shuttle.model.Playlist, pr
         return true
     }
 
-    override fun hashCode(): Int {
-        return playlist.hashCode()
-    }
+    override fun hashCode(): Int = playlist.hashCode()
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return playlist.name == (other as? PlaylistBinder)?.playlist?.name &&
-            playlist.songCount == (other as? PlaylistBinder)?.playlist?.songCount &&
-            playlist.externalId == other.playlist.externalId &&
-            playlist.mediaProvider == other.playlist.mediaProvider
-    }
+    override fun areContentsTheSame(other: Any): Boolean = playlist.name == (other as? PlaylistBinder)?.playlist?.name &&
+        playlist.songCount == (other as? PlaylistBinder)?.playlist?.songCount &&
+        playlist.externalId == other.playlist.externalId &&
+        playlist.mediaProvider == other.playlist.mediaProvider
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<PlaylistBinder>(itemView) {
         private val imageView: ImageView = itemView.findViewById(R.id.imageView)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/PlaylistListFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/PlaylistListFragment.kt
index 6695e7194..3e538ad53 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/PlaylistListFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/PlaylistListFragment.kt
@@ -55,9 +55,7 @@ class PlaylistListFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_playlists, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_playlists, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/PlaylistListPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/PlaylistListPresenter.kt
index d26506e66..13f0177ff 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/PlaylistListPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/PlaylistListPresenter.kt
@@ -66,8 +66,8 @@ constructor(
     private val playlistRepository: PlaylistRepository,
     private val playbackManager: PlaybackManager,
     private val queueManager: QueueManager
-) : PlaylistListContract.Presenter,
-    BasePresenter<PlaylistListContract.View>() {
+) : BasePresenter<PlaylistListContract.View>(),
+    PlaylistListContract.Presenter {
     override fun loadPlaylists() {
         view?.setLoadingState(PlaylistListContract.LoadingState.Loading)
 
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/SmartPlaylistBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/SmartPlaylistBinder.kt
index a06b9ec19..411f5b746 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/SmartPlaylistBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/SmartPlaylistBinder.kt
@@ -24,13 +24,9 @@ class SmartPlaylistBinder(val playlist: SmartPlaylist, private val listener: Lis
         ) {}
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_smart_playlist, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_smart_playlist, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.SmartPlaylist
-    }
+    override fun viewType(): Int = ViewTypes.SmartPlaylist
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -43,13 +39,9 @@ class SmartPlaylistBinder(val playlist: SmartPlaylist, private val listener: Lis
         return true
     }
 
-    override fun hashCode(): Int {
-        return playlist.hashCode()
-    }
+    override fun hashCode(): Int = playlist.hashCode()
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return playlist.nameResId == (other as? SmartPlaylistBinder)?.playlist?.nameResId
-    }
+    override fun areContentsTheSame(other: Any): Boolean = playlist.nameResId == (other as? SmartPlaylistBinder)?.playlist?.nameResId
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<SmartPlaylistBinder>(itemView) {
         private val titleTextView: TextView = itemView.findViewById(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/detail/PlaylistDetailFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/detail/PlaylistDetailFragment.kt
index 706a98973..505032dd7 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/detail/PlaylistDetailFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/detail/PlaylistDetailFragment.kt
@@ -84,9 +84,7 @@ class PlaylistDetailFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_playlist_detail, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_playlist_detail, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/detail/PlaylistSongBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/detail/PlaylistSongBinder.kt
index 5a00ea396..df09f7f66 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/detail/PlaylistSongBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/detail/PlaylistSongBinder.kt
@@ -42,17 +42,11 @@ open class PlaylistSongBinder(
         fun onStartDrag(viewHolder: ViewHolder) {}
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_playlist_song, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_playlist_song, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Song
-    }
+    override fun viewType(): Int = ViewTypes.Song
 
-    override fun getSectionName(): String? {
-        return playlistSong.song.name?.firstOrNull()?.toString()
-    }
+    override fun getSectionName(): String? = playlistSong.song.name?.firstOrNull()?.toString()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -63,24 +57,20 @@ open class PlaylistSongBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return playlistSong.id.hashCode()
-    }
-
-    override fun areContentsTheSame(other: Any): Boolean {
-        return other is PlaylistSongBinder &&
-            playlistSong.song.name == other.playlistSong.song.name &&
-            playlistSong.song.albumArtist == other.playlistSong.song.albumArtist &&
-            playlistSong.song.artists == other.playlistSong.song.artists &&
-            playlistSong.song.album == other.playlistSong.song.album &&
-            playlistSong.song.date == other.playlistSong.song.date &&
-            playlistSong.song.track == other.playlistSong.song.track &&
-            playlistSong.song.disc == other.playlistSong.song.disc &&
-            playlistSong.song.playCount == other.playlistSong.song.playCount &&
-            selected == other.selected &&
-            showDragHandle == other.showDragHandle &&
-            jaroSimilarity == other.jaroSimilarity
-    }
+    override fun hashCode(): Int = playlistSong.id.hashCode()
+
+    override fun areContentsTheSame(other: Any): Boolean = other is PlaylistSongBinder &&
+        playlistSong.song.name == other.playlistSong.song.name &&
+        playlistSong.song.albumArtist == other.playlistSong.song.albumArtist &&
+        playlistSong.song.artists == other.playlistSong.song.artists &&
+        playlistSong.song.album == other.playlistSong.song.album &&
+        playlistSong.song.date == other.playlistSong.song.date &&
+        playlistSong.song.track == other.playlistSong.song.track &&
+        playlistSong.song.disc == other.playlistSong.song.disc &&
+        playlistSong.song.playCount == other.playlistSong.song.playCount &&
+        selected == other.selected &&
+        showDragHandle == other.showDragHandle &&
+        jaroSimilarity == other.jaroSimilarity
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<PlaylistSongBinder>(itemView) {
         private val title: TextView = itemView.findViewById(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/smart/SmartPlaylistDetailFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/smart/SmartPlaylistDetailFragment.kt
index 2af5f3711..07e7d3b8e 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/smart/SmartPlaylistDetailFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/smart/SmartPlaylistDetailFragment.kt
@@ -74,9 +74,7 @@ class SmartPlaylistDetailFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_smart_playlist_detail, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_smart_playlist_detail, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/GridSongBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/GridSongBinder.kt
index 15de53055..7dc9b73a9 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/GridSongBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/GridSongBinder.kt
@@ -26,17 +26,11 @@ class GridSongBinder(
         fun onSongClicked(song: com.simplecityapps.shuttle.model.Song)
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.grid_item_song, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.grid_item_song, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Song
-    }
+    override fun viewType(): Int = ViewTypes.Song
 
-    override fun getSectionName(): String? {
-        return song.name?.firstOrNull()?.toString()
-    }
+    override fun getSectionName(): String? = song.name?.firstOrNull()?.toString()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -47,13 +41,9 @@ class GridSongBinder(
         return true
     }
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return song.playCount == (other as? GridSongBinder)?.song?.playCount
-    }
+    override fun areContentsTheSame(other: Any): Boolean = song.playCount == (other as? GridSongBinder)?.song?.playCount
 
-    override fun hashCode(): Int {
-        return song.hashCode()
-    }
+    override fun hashCode(): Int = song.hashCode()
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<GridSongBinder>(itemView) {
         private val title: TextView = itemView.findViewById(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongBinder.kt
index 338805e5b..7844f2b93 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongBinder.kt
@@ -40,17 +40,11 @@ open class SongBinder(
         fun onViewHolderCreated(holder: ViewHolder) {}
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_song, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_song, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Song
-    }
+    override fun viewType(): Int = ViewTypes.Song
 
-    override fun getSectionName(): String? {
-        return song.name?.firstOrNull()?.toString()
-    }
+    override fun getSectionName(): String? = song.name?.firstOrNull()?.toString()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -61,23 +55,19 @@ open class SongBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return song.id.hashCode()
-    }
-
-    override fun areContentsTheSame(other: Any): Boolean {
-        return other is SongBinder &&
-            song.name == other.song.name &&
-            song.albumArtist == other.song.albumArtist &&
-            song.artists == other.song.artists &&
-            song.album == other.song.album &&
-            song.date == other.song.date &&
-            song.track == other.song.track &&
-            song.disc == other.song.disc &&
-            song.playCount == other.song.playCount &&
-            selected == other.selected &&
-            showPlayCountBadge == other.showPlayCountBadge
-    }
+    override fun hashCode(): Int = song.id.hashCode()
+
+    override fun areContentsTheSame(other: Any): Boolean = other is SongBinder &&
+        song.name == other.song.name &&
+        song.albumArtist == other.song.albumArtist &&
+        song.artists == other.song.artists &&
+        song.album == other.song.album &&
+        song.date == other.song.date &&
+        song.track == other.song.track &&
+        song.disc == other.song.disc &&
+        song.playCount == other.song.playCount &&
+        selected == other.selected &&
+        showPlayCountBadge == other.showPlayCountBadge
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<SongBinder>(itemView) {
         private val title: TextView = itemView.findViewById(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongListFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongListFragment.kt
index aa5343890..2801d0dc4 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongListFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongListFragment.kt
@@ -93,9 +93,7 @@ class SongListFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_songs, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_songs, container, false)
 
     override fun onViewCreated(
         view: View,
@@ -111,11 +109,9 @@ class SongListFragment :
 
         adapter =
             object : SectionedAdapter(viewLifecycleOwner.lifecycleScope) {
-                override fun getSectionName(viewBinder: ViewBinder?): String {
-                    return (viewBinder as? SongBinder)?.song?.let { song ->
-                        presenter.getFastscrollPrefix(song)
-                    } ?: ""
-                }
+                override fun getSectionName(viewBinder: ViewBinder?): String = (viewBinder as? SongBinder)?.song?.let { song ->
+                    presenter.getFastscrollPrefix(song)
+                } ?: ""
             }
         recyclerView = view.findViewById(R.id.recyclerView)
         recyclerView.adapter = adapter
@@ -195,34 +191,32 @@ class SongListFragment :
 
     // Toolbar item selection
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.sortSongName -> {
-                presenter.setSortOrder(SongSortOrder.SongName)
-                true
-            }
-            R.id.sortArtistName -> {
-                presenter.setSortOrder(SongSortOrder.ArtistGroupKey)
-                true
-            }
-            R.id.sortAlbumName -> {
-                presenter.setSortOrder(SongSortOrder.AlbumGroupKey)
-                true
-            }
-            R.id.sortSongYear -> {
-                presenter.setSortOrder(SongSortOrder.Year)
-                true
-            }
-            R.id.sortSongDuration -> {
-                presenter.setSortOrder(SongSortOrder.Duration)
-                true
-            }
-            R.id.sortSongDateModified -> {
-                presenter.setSortOrder(SongSortOrder.LastModified)
-                true
-            }
-            else -> false
+    override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
+        R.id.sortSongName -> {
+            presenter.setSortOrder(SongSortOrder.SongName)
+            true
+        }
+        R.id.sortArtistName -> {
+            presenter.setSortOrder(SongSortOrder.ArtistGroupKey)
+            true
+        }
+        R.id.sortAlbumName -> {
+            presenter.setSortOrder(SongSortOrder.AlbumGroupKey)
+            true
+        }
+        R.id.sortSongYear -> {
+            presenter.setSortOrder(SongSortOrder.Year)
+            true
+        }
+        R.id.sortSongDuration -> {
+            presenter.setSortOrder(SongSortOrder.Duration)
+            true
+        }
+        R.id.sortSongDateModified -> {
+            presenter.setSortOrder(SongSortOrder.LastModified)
+            true
         }
+        else -> false
     }
 
     // Private
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongListPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongListPresenter.kt
index 2e1633456..454a02725 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongListPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongListPresenter.kt
@@ -216,14 +216,12 @@ constructor(
         }
     }
 
-    override fun getFastscrollPrefix(song: Song): String? {
-        return when (sortPreferenceManager.sortOrderSongList) {
-            SongSortOrder.SongName -> song.name?.firstOrNull()?.toString()
-            SongSortOrder.ArtistGroupKey -> song.albumArtistGroupKey.key?.firstOrNull()?.toString()?.uppercase(Locale.getDefault())
-            SongSortOrder.AlbumGroupKey -> song.albumGroupKey.key?.firstOrNull()?.toString()?.uppercase(Locale.getDefault())
-            SongSortOrder.Year -> song.date?.year?.toString()
-            else -> null
-        }
+    override fun getFastscrollPrefix(song: Song): String? = when (sortPreferenceManager.sortOrderSongList) {
+        SongSortOrder.SongName -> song.name?.firstOrNull()?.toString()
+        SongSortOrder.ArtistGroupKey -> song.albumArtistGroupKey.key?.firstOrNull()?.toString()?.uppercase(Locale.getDefault())
+        SongSortOrder.AlbumGroupKey -> song.albumGroupKey.key?.firstOrNull()?.toString()?.uppercase(Locale.getDefault())
+        SongSortOrder.Year -> song.date?.year?.toString()
+        else -> null
     }
 
     override fun shuffle() {
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/main/MainFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/main/MainFragment.kt
index 35440544c..0bef23a44 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/main/MainFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/main/MainFragment.kt
@@ -57,9 +57,7 @@ class MainFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_main, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_main, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/main/MainPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/main/MainPresenter.kt
index 0aac6853d..a50f6b871 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/main/MainPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/main/MainPresenter.kt
@@ -43,8 +43,8 @@ constructor(
     private val queueWatcher: QueueWatcher,
     private val preferenceManager: GeneralPreferenceManager,
     private val trialManager: TrialManager
-) : MainContract.Presenter,
-    BasePresenter<MainContract.View>(),
+) : BasePresenter<MainContract.View>(),
+    MainContract.Presenter,
     QueueChangeCallback {
     override fun bindView(view: MainContract.View) {
         super.bindView(view)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/OnboardingParentFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/OnboardingParentFragment.kt
index a19a7550f..01a236454 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/OnboardingParentFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/OnboardingParentFragment.kt
@@ -104,9 +104,7 @@ class OnboardingParentFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_onboarding, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_onboarding, container, false)
 
     override fun onViewCreated(
         view: View,
@@ -149,9 +147,7 @@ class OnboardingParentFragment :
 
     // PageCompletionListener Implementation
 
-    override fun getPages(): List<OnboardingPage> {
-        return adapter.data
-    }
+    override fun getPages(): List<OnboardingPage> = adapter.data
 
     override fun setPages(pages: List<OnboardingPage>) {
         adapter.data = pages
@@ -208,16 +204,12 @@ class OnboardingParentFragment :
 
     // Private
 
-    private fun hasStoragePermission(): Boolean {
-        return (checkSelfPermission(requireContext(), getStoragePermission()) == PackageManager.PERMISSION_GRANTED)
-    }
+    private fun hasStoragePermission(): Boolean = (checkSelfPermission(requireContext(), getStoragePermission()) == PackageManager.PERMISSION_GRANTED)
 
-    private fun getStoragePermission(): String {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            Manifest.permission.READ_MEDIA_AUDIO
-        } else {
-            Manifest.permission.READ_EXTERNAL_STORAGE
-        }
+    private fun getStoragePermission(): String = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        Manifest.permission.READ_MEDIA_AUDIO
+    } else {
+        Manifest.permission.READ_EXTERNAL_STORAGE
     }
 
     // Static
@@ -227,10 +219,9 @@ class OnboardingParentFragment :
 
         const val TAG = "OnboardingParentFragment"
 
-        fun newInstance(args: OnboardingParentFragmentArgs) =
-            OnboardingParentFragment().apply {
-                arguments = args.toBundle()
-            }
+        fun newInstance(args: OnboardingParentFragmentArgs) = OnboardingParentFragment().apply {
+            arguments = args.toBundle()
+        }
     }
 
     class OnboardingAdapter(fragment: Fragment, private val isOnboarding: Boolean) : FragmentStateAdapter(fragment) {
@@ -244,22 +235,16 @@ class OnboardingParentFragment :
 
         override fun getItemCount() = data.size
 
-        override fun getItemId(position: Int): Long {
-            return data[position].hashCode().toLong()
-        }
+        override fun getItemId(position: Int): Long = data[position].hashCode().toLong()
 
-        override fun containsItem(itemId: Long): Boolean {
-            return data.any { it.hashCode().toLong() == itemId }
-        }
+        override fun containsItem(itemId: Long): Boolean = data.any { it.hashCode().toLong() == itemId }
 
-        override fun createFragment(position: Int): Fragment {
-            return when (data[position]) {
-                OnboardingPage.StoragePermission -> StoragePermissionFragment()
-                OnboardingPage.AnalyticsPermission -> AnalyticsPermissionFragment()
-                OnboardingPage.MediaProviderSelector -> MediaProviderSelectionFragment.newInstance(isOnboarding)
-                OnboardingPage.MusicDirectories -> DirectorySelectionFragment()
-                OnboardingPage.Scanner -> MediaScannerFragment.newInstance(scanAutomatically = true, showRescanButton = false, dismissOnScanComplete = isOnboarding, showToolbar = true)
-            }
+        override fun createFragment(position: Int): Fragment = when (data[position]) {
+            OnboardingPage.StoragePermission -> StoragePermissionFragment()
+            OnboardingPage.AnalyticsPermission -> AnalyticsPermissionFragment()
+            OnboardingPage.MediaProviderSelector -> MediaProviderSelectionFragment.newInstance(isOnboarding)
+            OnboardingPage.MusicDirectories -> DirectorySelectionFragment()
+            OnboardingPage.Scanner -> MediaScannerFragment.newInstance(scanAutomatically = true, showRescanButton = false, dismissOnScanComplete = isOnboarding, showToolbar = true)
         }
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderBinder.kt
index 61aa0a92b..f69824c34 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderBinder.kt
@@ -31,13 +31,9 @@ class MediaProviderBinder(
         ) {}
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_media_provider, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_media_provider, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.MediaProvider
-    }
+    override fun viewType(): Int = ViewTypes.MediaProvider
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -50,9 +46,7 @@ class MediaProviderBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return providerType.hashCode()
-    }
+    override fun hashCode(): Int = providerType.hashCode()
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<MediaProviderBinder>(itemView) {
         val icon: ImageView = itemView.findViewById(R.id.icon)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderOptionsFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderOptionsFragment.kt
index cd5acc230..6490448f1 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderOptionsFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderOptionsFragment.kt
@@ -78,9 +78,8 @@ class MediaProviderOptionsFragment : DialogFragment() {
     companion object {
         const val ARG_PROVIDER_TYPES = "provider_types"
 
-        fun newInstance(providerTypes: List<MediaProviderType>) =
-            MediaProviderOptionsFragment().withArgs {
-                putSerializable(ARG_PROVIDER_TYPES, providerTypes as Serializable)
-            }
+        fun newInstance(providerTypes: List<MediaProviderType>) = MediaProviderOptionsFragment().withArgs {
+            putSerializable(ARG_PROVIDER_TYPES, providerTypes as Serializable)
+        }
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderSelectionFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderSelectionFragment.kt
index 32bb5df05..0b590368b 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderSelectionFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderSelectionFragment.kt
@@ -76,9 +76,7 @@ class MediaProviderSelectionFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_media_provider_selector, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_media_provider_selector, container, false)
 
     override fun onViewCreated(
         view: View,
@@ -261,9 +259,7 @@ class MediaProviderSelectionFragment :
 
     override val page = OnboardingPage.MediaProviderSelector
 
-    override fun getParent(): OnboardingParent? {
-        return parentFragment as? OnboardingParent
-    }
+    override fun getParent(): OnboardingParent? = parentFragment as? OnboardingParent
 
     override fun handleNextButtonClick() {
         getParent()?.goToNext() ?: Timber.e("Failed to goToNext() - getParent() returned null")
@@ -274,8 +270,6 @@ class MediaProviderSelectionFragment :
     companion object {
         const val ARG_ONBOARDING = "is_onboarding"
 
-        fun newInstance(isOnboarding: Boolean = true): MediaProviderSelectionFragment {
-            return MediaProviderSelectionFragment().withArgs { putBoolean(ARG_ONBOARDING, isOnboarding) }
-        }
+        fun newInstance(isOnboarding: Boolean = true): MediaProviderSelectionFragment = MediaProviderSelectionFragment().withArgs { putBoolean(ARG_ONBOARDING, isOnboarding) }
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderSelectionPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderSelectionPresenter.kt
index 787c406d8..5a1e944dd 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderSelectionPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderSelectionPresenter.kt
@@ -109,13 +109,11 @@ constructor(
         }
     }
 
-    private fun MediaProviderType.toMediaProvider(): MediaProvider {
-        return when (this) {
-            MediaProviderType.MediaStore -> mediaStoreMediaProvider
-            MediaProviderType.Shuttle -> taglibMediaProvider
-            MediaProviderType.Emby -> embyMediaProvider
-            MediaProviderType.Jellyfin -> jellyfinMediaProvider
-            MediaProviderType.Plex -> plexMediaProvider
-        }
+    private fun MediaProviderType.toMediaProvider(): MediaProvider = when (this) {
+        MediaProviderType.MediaStore -> mediaStoreMediaProvider
+        MediaProviderType.Shuttle -> taglibMediaProvider
+        MediaProviderType.Emby -> embyMediaProvider
+        MediaProviderType.Jellyfin -> jellyfinMediaProvider
+        MediaProviderType.Plex -> plexMediaProvider
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/permissions/StoragePermissionFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/permissions/StoragePermissionFragment.kt
index cc74cebf0..07ba781f9 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/permissions/StoragePermissionFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/permissions/StoragePermissionFragment.kt
@@ -16,16 +16,16 @@ import com.simplecityapps.shuttle.ui.screens.onboarding.OnboardingPage
 import com.simplecityapps.shuttle.ui.screens.onboarding.OnboardingParent
 import com.simplecityapps.shuttle.ui.screens.onboarding.OnboardingParentFragment
 
-class StoragePermissionFragment : Fragment(), OnboardingChild {
+class StoragePermissionFragment :
+    Fragment(),
+    OnboardingChild {
     // Lifecycle
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_onboarding_permissions, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_onboarding_permissions, container, false)
 
     override fun onViewCreated(
         view: View,
@@ -66,12 +66,10 @@ class StoragePermissionFragment : Fragment(), OnboardingChild {
         requestPermissions(arrayOf(getStoragePermission()), OnboardingParentFragment.REQUEST_CODE_READ_STORAGE)
     }
 
-    private fun getStoragePermission(): String {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            Manifest.permission.READ_MEDIA_AUDIO
-        } else {
-            Manifest.permission.READ_EXTERNAL_STORAGE
-        }
+    private fun getStoragePermission(): String = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        Manifest.permission.READ_MEDIA_AUDIO
+    } else {
+        Manifest.permission.READ_EXTERNAL_STORAGE
     }
 
     // OnboardingChild Implementation
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/privacy/AnalyticsPermissionFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/privacy/AnalyticsPermissionFragment.kt
index bdf4a6660..b8071732e 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/privacy/AnalyticsPermissionFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/privacy/AnalyticsPermissionFragment.kt
@@ -17,7 +17,9 @@ import javax.inject.Inject
 import timber.log.Timber
 
 @AndroidEntryPoint
-class AnalyticsPermissionFragment : Fragment(), OnboardingChild {
+class AnalyticsPermissionFragment :
+    Fragment(),
+    OnboardingChild {
     @Inject
     lateinit var preferenceManager: GeneralPreferenceManager
 
@@ -30,9 +32,7 @@ class AnalyticsPermissionFragment : Fragment(), OnboardingChild {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_onboarding_privacy, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_onboarding_privacy, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/scanner/MediaScannerFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/scanner/MediaScannerFragment.kt
index b1713a4de..a53c55a6c 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/scanner/MediaScannerFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/scanner/MediaScannerFragment.kt
@@ -72,9 +72,7 @@ class MediaScannerFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_scanner, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_scanner, container, false)
 
     override fun onViewCreated(
         view: View,
@@ -196,9 +194,7 @@ class MediaScannerFragment :
 
     override val page: OnboardingPage = OnboardingPage.Scanner
 
-    override fun getParent(): OnboardingParent? {
-        return parentFragment as? OnboardingParent
-    }
+    override fun getParent(): OnboardingParent? = parentFragment as? OnboardingParent
 
     override fun handleNextButtonClick() {
         getParent()?.exit()
@@ -222,12 +218,11 @@ class MediaScannerFragment :
             showRescanButton: Boolean,
             dismissOnScanComplete: Boolean,
             showToolbar: Boolean
-        ) =
-            MediaScannerFragment().withArgs {
-                putBoolean(ARG_SCAN_AUTOMATICALLY, scanAutomatically)
-                putBoolean(ARG_SHOW_RESCAN_BUTTON, showRescanButton)
-                putBoolean(ARG_DISMISS_ON_SCAN_COMPLETE, dismissOnScanComplete)
-                putBoolean(ARG_SHOW_TOOLBAR, showToolbar)
-            }
+        ) = MediaScannerFragment().withArgs {
+            putBoolean(ARG_SCAN_AUTOMATICALLY, scanAutomatically)
+            putBoolean(ARG_SHOW_RESCAN_BUTTON, showRescanButton)
+            putBoolean(ARG_DISMISS_ON_SCAN_COMPLETE, dismissOnScanComplete)
+            putBoolean(ARG_SHOW_TOOLBAR, showToolbar)
+        }
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/scanner/MediaScannerPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/scanner/MediaScannerPresenter.kt
index 4ead6843f..c17e96055 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/scanner/MediaScannerPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/scanner/MediaScannerPresenter.kt
@@ -63,8 +63,8 @@ constructor(
     @AppCoroutineScope private val appCoroutineScope: CoroutineScope,
     private val mediaImporter: MediaImporter,
     @Assisted private val shouldDismissOnScanComplete: Boolean
-) : ScannerContract.Presenter,
-    BasePresenter<ScannerContract.View>() {
+) : BasePresenter<ScannerContract.View>(),
+    ScannerContract.Presenter {
     @AssistedFactory
     interface Factory {
         fun create(shouldDismissOnScanComplete: Boolean): ScannerPresenter
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/scanner/ScanProgressBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/scanner/ScanProgressBinder.kt
index d1fde2d00..222032298 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/scanner/ScanProgressBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/scanner/ScanProgressBinder.kt
@@ -20,13 +20,9 @@ class ScanProgressBinder(
     val songImportProgressState: ImportProgressState,
     val playlistImportProgressState: ImportProgressState
 ) : ViewBinder {
-    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_scan_progress, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewBinder.ViewHolder<out ViewBinder> = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_scan_progress, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.ScanProgress
-    }
+    override fun viewType(): Int = ViewTypes.ScanProgress
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -36,16 +32,12 @@ class ScanProgressBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return mediaProviderType.hashCode()
-    }
+    override fun hashCode(): Int = mediaProviderType.hashCode()
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return other is ScanProgressBinder &&
-            mediaProviderType == other.mediaProviderType &&
-            songImportProgressState == other.songImportProgressState &&
-            playlistImportProgressState == other.playlistImportProgressState
-    }
+    override fun areContentsTheSame(other: Any): Boolean = other is ScanProgressBinder &&
+        mediaProviderType == other.mediaProviderType &&
+        songImportProgressState == other.songImportProgressState &&
+        playlistImportProgressState == other.playlistImportProgressState
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<ScanProgressBinder>(itemView) {
         val icon: ImageView = itemView.findViewById(R.id.icon)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/taglib/DirectoryBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/taglib/DirectoryBinder.kt
index 14046bb1b..e5424989f 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/taglib/DirectoryBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/taglib/DirectoryBinder.kt
@@ -19,17 +19,11 @@ class DirectoryBinder(
         fun onRemoveClicked(directory: DirectorySelectionContract.Directory)
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(parent.inflateView(R.layout.list_item_onboaring_directory))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(parent.inflateView(R.layout.list_item_onboaring_directory))
 
-    override fun viewType(): Int {
-        return ViewTypes.OnboardingDirectory
-    }
+    override fun viewType(): Int = ViewTypes.OnboardingDirectory
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return directory.traversalComplete == (other as? DirectoryBinder)?.directory?.traversalComplete
-    }
+    override fun areContentsTheSame(other: Any): Boolean = directory.traversalComplete == (other as? DirectoryBinder)?.directory?.traversalComplete
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -42,9 +36,7 @@ class DirectoryBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return directory.hashCode()
-    }
+    override fun hashCode(): Int = directory.hashCode()
 
     class ViewHolder(val itemView: View) : ViewBinder.ViewHolder<DirectoryBinder>(itemView) {
         private val title: TextView = itemView.findViewById(R.id.titleLabel)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/taglib/DirectorySelectionPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/taglib/DirectorySelectionPresenter.kt
index feb8785c4..664fa528f 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/taglib/DirectorySelectionPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/taglib/DirectorySelectionPresenter.kt
@@ -49,7 +49,8 @@ class DirectorySelectionPresenter
 constructor(
     @ApplicationContext private val context: Context,
     @AppCoroutineScope private val appCoroutineScope: CoroutineScope
-) : DirectorySelectionContract.Presenter, BasePresenter<DirectorySelectionContract.View>() {
+) : BasePresenter<DirectorySelectionContract.View>(),
+    DirectorySelectionContract.Presenter {
     private var data: MutableList<DirectorySelectionContract.Directory> = mutableListOf()
 
     override fun loadData(contentResolver: ContentResolver) {
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/opensource/LibraryBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/opensource/LibraryBinder.kt
index cd1eb454f..703fdee56 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/opensource/LibraryBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/opensource/LibraryBinder.kt
@@ -15,13 +15,9 @@ class LibraryBinder(val library: Library, val listener: Listener) : ViewBinder {
         fun onItemClick(library: Library)
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_license, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_license, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.License
-    }
+    override fun viewType(): Int = ViewTypes.License
 
     class ViewHolder(val itemView: View) : ViewBinder.ViewHolder<LibraryBinder>(itemView) {
         val title: TextView = itemView.findViewById(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playback/ArtworkBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playback/ArtworkBinder.kt
index eccb5fea5..1b351f8bf 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playback/ArtworkBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playback/ArtworkBinder.kt
@@ -16,13 +16,9 @@ class ArtworkBinder(
     val queueItem: QueueItem,
     val imageLoader: ArtworkImageLoader
 ) : ViewBinder {
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_artwork, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_artwork, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Artwork
-    }
+    override fun viewType(): Int = ViewTypes.Artwork
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -35,9 +31,7 @@ class ArtworkBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return queueItem.hashCode()
-    }
+    override fun hashCode(): Int = queueItem.hashCode()
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<ArtworkBinder>(itemView) {
         val imageView: ImageView = itemView.findViewById(R.id.imageView)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playback/PlaybackFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playback/PlaybackFragment.kt
index 6a2c82860..2fef7beef 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playback/PlaybackFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playback/PlaybackFragment.kt
@@ -103,9 +103,7 @@ class PlaybackFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_playback, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_playback, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playback/mini/MiniPlaybackFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playback/mini/MiniPlaybackFragment.kt
index 6e99b6522..fc7da9659 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playback/mini/MiniPlaybackFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playback/mini/MiniPlaybackFragment.kt
@@ -22,7 +22,9 @@ import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class MiniPlaybackFragment : Fragment(), MiniPlayerContract.View {
+class MiniPlaybackFragment :
+    Fragment(),
+    MiniPlayerContract.View {
     @Inject
     lateinit var presenter: MiniPlayerPresenter
 
@@ -40,9 +42,7 @@ class MiniPlaybackFragment : Fragment(), MiniPlayerContract.View {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_mini_playback, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_mini_playback, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/CreatePlaylistDialogFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/CreatePlaylistDialogFragment.kt
index af9778066..1052a23ac 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/CreatePlaylistDialogFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/CreatePlaylistDialogFragment.kt
@@ -24,9 +24,7 @@ class CreatePlaylistDialogFragment : EditTextAlertDialog() {
         (parentFragment as? Listener)?.onSave(string, playlistData)
     }
 
-    override fun isValid(string: String?): Boolean {
-        return string?.isNotEmpty() ?: false
-    }
+    override fun isValid(string: String?): Boolean = string?.isNotEmpty() ?: false
 
     companion object {
         const val ARG_DATA = "data"
@@ -34,10 +32,9 @@ class CreatePlaylistDialogFragment : EditTextAlertDialog() {
         fun newInstance(
             playlistData: PlaylistData,
             hint: String?
-        ) =
-            CreatePlaylistDialogFragment().withArgs {
-                putParcelable(ARG_DATA, playlistData)
-                putString(ARG_HINT, hint)
-            }
+        ) = CreatePlaylistDialogFragment().withArgs {
+            putParcelable(ARG_DATA, playlistData)
+            putString(ARG_HINT, hint)
+        }
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/PlaylistData.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/PlaylistData.kt
index 69dca3773..e27504da5 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/PlaylistData.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/PlaylistData.kt
@@ -23,13 +23,11 @@ sealed class PlaylistData : Parcelable {
         override fun getPlaylistSavedMessage(
             resources: Resources,
             playlistName: String
-        ): String {
-            return Phrase.fromPlural(resources, R.plurals.playlist_songs_added, data.size)
-                .put("count", data.size)
-                .put("playlist_name", playlistName)
-                .format()
-                .toString()
-        }
+        ): String = Phrase.fromPlural(resources, R.plurals.playlist_songs_added, data.size)
+            .put("count", data.size)
+            .put("playlist_name", playlistName)
+            .format()
+            .toString()
     }
 
     @Parcelize
@@ -39,13 +37,11 @@ sealed class PlaylistData : Parcelable {
         override fun getPlaylistSavedMessage(
             resources: Resources,
             playlistName: String
-        ): String {
-            return Phrase.fromPlural(resources, R.plurals.playlist_albums_added, data.size)
-                .put("count", data.size)
-                .put("playlist_name", playlistName)
-                .format()
-                .toString()
-        }
+        ): String = Phrase.fromPlural(resources, R.plurals.playlist_albums_added, data.size)
+            .put("count", data.size)
+            .put("playlist_name", playlistName)
+            .format()
+            .toString()
     }
 
     @Parcelize
@@ -55,13 +51,11 @@ sealed class PlaylistData : Parcelable {
         override fun getPlaylistSavedMessage(
             resources: Resources,
             playlistName: String
-        ): String {
-            return Phrase.fromPlural(resources, R.plurals.playlist_artists_added, data.size)
-                .put("count", data.size)
-                .put("playlist_name", playlistName)
-                .format()
-                .toString()
-        }
+        ): String = Phrase.fromPlural(resources, R.plurals.playlist_artists_added, data.size)
+            .put("count", data.size)
+            .put("playlist_name", playlistName)
+            .format()
+            .toString()
     }
 
     @Parcelize
@@ -71,13 +65,11 @@ sealed class PlaylistData : Parcelable {
         override fun getPlaylistSavedMessage(
             resources: Resources,
             playlistName: String
-        ): String {
-            return Phrase.fromPlural(resources, R.plurals.playlist_genres_added, data.size)
-                .put("count", data.size)
-                .put("playlist_name", playlistName)
-                .format()
-                .toString()
-        }
+        ): String = Phrase.fromPlural(resources, R.plurals.playlist_genres_added, data.size)
+            .put("count", data.size)
+            .put("playlist_name", playlistName)
+            .format()
+            .toString()
     }
 
     @Parcelize
@@ -85,11 +77,9 @@ sealed class PlaylistData : Parcelable {
         override fun getPlaylistSavedMessage(
             resources: Resources,
             playlistName: String
-        ): String {
-            return Phrase.from(resources, R.string.playlist_queue_added)
-                .put("playlist_name", playlistName)
-                .format()
-                .toString()
-        }
+        ): String = Phrase.from(resources, R.string.playlist_queue_added)
+            .put("playlist_name", playlistName)
+            .format()
+            .toString()
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/PlaylistMenuPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/PlaylistMenuPresenter.kt
index a05eb9282..df0585e2b 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/PlaylistMenuPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/PlaylistMenuPresenter.kt
@@ -73,8 +73,8 @@ constructor(
     private val genreRepository: GenreRepository,
     private val queueManager: QueueManager,
     private val preferenceManager: GeneralPreferenceManager
-) : PlaylistMenuContract.Presenter,
-    BasePresenter<PlaylistMenuContract.View>() {
+) : BasePresenter<PlaylistMenuContract.View>(),
+    PlaylistMenuContract.Presenter {
     override var playlists: List<Playlist> = emptyList()
 
     override fun bindView(view: PlaylistMenuContract.View) {
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/PlaylistMenuView.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/PlaylistMenuView.kt
index 2dcd8452d..d81808725 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/PlaylistMenuView.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/playlistmenu/PlaylistMenuView.kt
@@ -135,9 +135,7 @@ class PlaylistMenuView(
      *
      * Typically used in association with [createPlaylistMenu]
      */
-    private fun isCreatePlaylistMenuItem(item: MenuItem): Boolean {
-        return item.itemId == playlistCreateId
-    }
+    private fun isCreatePlaylistMenuItem(item: MenuItem): Boolean = item.itemId == playlistCreateId
 
     private fun showPlaylistCreatedToast(
         context: Context,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/queue/QueueBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/queue/QueueBinder.kt
index 3f75d1b57..e49f62cae 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/queue/QueueBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/queue/QueueBinder.kt
@@ -47,17 +47,11 @@ class QueueBinder(
         fun onLongPress(viewHolder: ViewHolder)
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_queue, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_queue, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Queue
-    }
+    override fun viewType(): Int = ViewTypes.Queue
 
-    override fun getSectionName(): String? {
-        return queueItem.song.name?.firstOrNull()?.toString()
-    }
+    override fun getSectionName(): String? = queueItem.song.name?.firstOrNull()?.toString()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -68,9 +62,7 @@ class QueueBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return queueItem.hashCode()
-    }
+    override fun hashCode(): Int = queueItem.hashCode()
 
     override fun areContentsTheSame(other: Any): Boolean {
         (other as? QueueBinder)?.let {
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/queue/QueueFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/queue/QueueFragment.kt
index a8218966a..2f5f1f328 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/queue/QueueFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/queue/QueueFragment.kt
@@ -101,9 +101,7 @@ class QueueFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_queue, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_queue, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/BottomDrawerSettingsFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/BottomDrawerSettingsFragment.kt
index e932d6c8b..8b03eee41 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/BottomDrawerSettingsFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/BottomDrawerSettingsFragment.kt
@@ -34,9 +34,7 @@ class BottomDrawerSettingsFragment :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_bottom_drawer, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_bottom_drawer, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/BottomDrawerSettingsPresenter.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/BottomDrawerSettingsPresenter.kt
index 8ab0ae298..715a153f7 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/BottomDrawerSettingsPresenter.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/BottomDrawerSettingsPresenter.kt
@@ -37,8 +37,7 @@ constructor(
     private val songRepository: SongRepository,
     private val playbackManager: PlaybackManager,
     @AppCoroutineScope private val appCoroutineScope: CoroutineScope
-) :
-    BasePresenter<BottomDrawerSettingsContract.View>(),
+) : BasePresenter<BottomDrawerSettingsContract.View>(),
     BottomDrawerSettingsContract.Presenter {
     @NavigationRes
     var currentDestinationIdRes: Int? = null
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/ExcludeBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/ExcludeBinder.kt
index 89be8d90f..24105ac24 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/ExcludeBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/ExcludeBinder.kt
@@ -26,17 +26,11 @@ class ExcludeBinder(
         fun onRemoveClicked(song: com.simplecityapps.shuttle.model.Song)
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_exclude, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_exclude, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.ExcludeList
-    }
+    override fun viewType(): Int = ViewTypes.ExcludeList
 
-    override fun getSectionName(): String? {
-        return song.name?.firstOrNull()?.toString()
-    }
+    override fun getSectionName(): String? = song.name?.firstOrNull()?.toString()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -47,9 +41,7 @@ class ExcludeBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return song.hashCode()
-    }
+    override fun hashCode(): Int = song.hashCode()
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<ExcludeBinder>(itemView) {
         private val title: TextView = itemView.findViewById(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewBinder.kt
index 16a5deabc..f3ce3da38 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewBinder.kt
@@ -17,13 +17,9 @@ class SettingsViewBinder(
         fun onMenuItemClicked(settingsItem: SettingsMenuItem)
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(parent.inflateView(R.layout.list_item_settings))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(parent.inflateView(R.layout.list_item_settings))
 
-    override fun viewType(): Int {
-        return ViewTypes.Settings
-    }
+    override fun viewType(): Int = ViewTypes.Settings
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -36,13 +32,9 @@ class SettingsViewBinder(
         return true
     }
 
-    override fun hashCode(): Int {
-        return settingsItem.hashCode()
-    }
+    override fun hashCode(): Int = settingsItem.hashCode()
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return isSelected == (other as? SettingsViewBinder)?.isSelected
-    }
+    override fun areContentsTheSame(other: Any): Boolean = isSelected == (other as? SettingsViewBinder)?.isSelected
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<SettingsViewBinder>(itemView) {
         private val icon: ImageView = itemView.findViewById(R.id.icon)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/screens/appearance/AppearancePreferenceFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/screens/appearance/AppearancePreferenceFragment.kt
index 751cbeceb..d01aedb23 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/screens/appearance/AppearancePreferenceFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/screens/appearance/AppearancePreferenceFragment.kt
@@ -60,9 +60,7 @@ class AppearancePreferenceFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_preferences_appearance, container, false)
-    }
+    ): View? = inflater.inflate(R.layout.fragment_preferences_appearance, container, false)
 
     override fun onViewCreated(
         view: View,
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/screens/appearance/LibraryTabBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/screens/appearance/LibraryTabBinder.kt
index c03118ee1..af135526a 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/screens/appearance/LibraryTabBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/screens/appearance/LibraryTabBinder.kt
@@ -23,13 +23,9 @@ class LibraryTabBinder(val tab: LibraryTab, val selected: Boolean, val listener:
         )
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_library_tab, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_library_tab, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.LibraryTab
-    }
+    override fun viewType(): Int = ViewTypes.LibraryTab
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -42,13 +38,9 @@ class LibraryTabBinder(val tab: LibraryTab, val selected: Boolean, val listener:
         return true
     }
 
-    override fun hashCode(): Int {
-        return tab.hashCode()
-    }
+    override fun hashCode(): Int = tab.hashCode()
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return (other as? LibraryTabBinder)?.selected == selected
-    }
+    override fun areContentsTheSame(other: Any): Boolean = (other as? LibraryTabBinder)?.selected == selected
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<LibraryTabBinder>(itemView) {
         private val title: TextView = itemView.findViewById(R.id.title)
@@ -80,12 +72,10 @@ class LibraryTabBinder(val tab: LibraryTab, val selected: Boolean, val listener:
     }
 }
 
-private fun LibraryTab.name(resources: Resources): String {
-    return when (this) {
-        LibraryTab.Genres -> resources.getString(R.string.genres)
-        LibraryTab.Playlists -> resources.getString(R.string.library_playlists)
-        LibraryTab.Artists -> resources.getString(R.string.artists)
-        LibraryTab.Albums -> resources.getString(R.string.albums)
-        LibraryTab.Songs -> resources.getString(R.string.songs)
-    }
+private fun LibraryTab.name(resources: Resources): String = when (this) {
+    LibraryTab.Genres -> resources.getString(R.string.genres)
+    LibraryTab.Playlists -> resources.getString(R.string.library_playlists)
+    LibraryTab.Artists -> resources.getString(R.string.artists)
+    LibraryTab.Albums -> resources.getString(R.string.albums)
+    LibraryTab.Songs -> resources.getString(R.string.songs)
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sleeptimer/SleepTimerBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sleeptimer/SleepTimerBinder.kt
index 0d4ff63b5..0e0201efb 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sleeptimer/SleepTimerBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sleeptimer/SleepTimerBinder.kt
@@ -13,13 +13,9 @@ class SleepTimerBinder(val duration: SleepTimerDuration, val listener: Listener)
         fun onClick(duration: SleepTimerDuration)
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_sleep_timer, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_sleep_timer, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.SleepTimer
-    }
+    override fun viewType(): Int = ViewTypes.SleepTimer
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<SleepTimerBinder>(itemView) {
         val label: TextView = itemView.findViewById(R.id.label)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/songinfo/SongInfoDialogFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/songinfo/SongInfoDialogFragment.kt
index ec76f3a02..21c53d800 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/songinfo/SongInfoDialogFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/songinfo/SongInfoDialogFragment.kt
@@ -119,9 +119,8 @@ class SongInfoDialogFragment : BottomSheetDialogFragment() {
 
         private const val TAG = "SongInfoDialogFragment"
 
-        fun newInstance(song: com.simplecityapps.shuttle.model.Song): SongInfoDialogFragment =
-            SongInfoDialogFragment().withArgs {
-                putParcelable(ARG_SONG, song)
-            }
+        fun newInstance(song: com.simplecityapps.shuttle.model.Song): SongInfoDialogFragment = SongInfoDialogFragment().withArgs {
+            putParcelable(ARG_SONG, song)
+        }
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/trial/PromoCodeDialogFragment.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/trial/PromoCodeDialogFragment.kt
index ccd3dee62..eaf570bac 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/trial/PromoCodeDialogFragment.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/trial/PromoCodeDialogFragment.kt
@@ -48,9 +48,8 @@ class PromoCodeDialogFragment : DialogFragment() {
         private const val TAG = "PromoCodeDialog"
         const val ARG_PROMO_CODE = "promo_code"
 
-        fun newInstance(promoCode: String): PromoCodeDialogFragment =
-            PromoCodeDialogFragment().withArgs {
-                putString(ARG_PROMO_CODE, promoCode)
-            }
+        fun newInstance(promoCode: String): PromoCodeDialogFragment = PromoCodeDialogFragment().withArgs {
+            putString(ARG_PROMO_CODE, promoCode)
+        }
     }
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/trial/SkuBinder.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/trial/SkuBinder.kt
index 95691efa0..4dfeeb34a 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/trial/SkuBinder.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/trial/SkuBinder.kt
@@ -17,13 +17,9 @@ class SkuBinder(val skuDetails: SkuDetails, val litener: Listener) : ViewBinder
         fun onClick(skuDetails: SkuDetails)
     }
 
-    override fun createViewHolder(parent: ViewGroup): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_sku, parent, false))
-    }
+    override fun createViewHolder(parent: ViewGroup): ViewHolder = ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.list_item_sku, parent, false))
 
-    override fun viewType(): Int {
-        return ViewTypes.Sku
-    }
+    override fun viewType(): Int = ViewTypes.Sku
 
     class ViewHolder(itemView: View) : ViewBinder.ViewHolder<SkuBinder>(itemView) {
         val title: TextView = itemView.findViewById(R.id.title)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/Color.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/Color.kt
new file mode 100644
index 000000000..0d4c48e10
--- /dev/null
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/Color.kt
@@ -0,0 +1,486 @@
+package com.simplecityapps.shuttle.ui.theme
+
+import androidx.compose.material3.ColorScheme
+import androidx.compose.ui.graphics.Color
+
+data class Theme(
+    val light: ColorScheme,
+    val dark: ColorScheme
+)
+
+fun Theme.getColorScheme(useDark: Boolean = false): ColorScheme = if (useDark) dark else light
+
+val ShuttleTheme = Theme(
+    light = ColorScheme(
+        primary = Color(0xFF005389),
+        onPrimary = Color(0xFFFFFFFF),
+        primaryContainer = Color(0xFF0079C3),
+        onPrimaryContainer = Color(0xFFFFFFFF),
+        secondary = Color(0xFF406183),
+        onSecondary = Color(0xFFFFFFFF),
+        secondaryContainer = Color(0xFFC0DCFF),
+        onSecondaryContainer = Color(0xFF224565),
+        tertiary = Color(0xFF762F95),
+        onTertiary = Color(0xFFFFFFFF),
+        tertiaryContainer = Color(0xFF9E56BD),
+        onTertiaryContainer = Color(0xFFFFFFFF),
+        error = Color(0xFFBA1A1A),
+        onError = Color(0xFFFFFFFF),
+        errorContainer = Color(0xFFFFDAD6),
+        onErrorContainer = Color(0xFF410002),
+        background = Color(0xFFF8F9FF),
+        onBackground = Color(0xFF181C21),
+        surface = Color(0xFFF8F9FF),
+        onSurface = Color(0xFF181C21),
+        surfaceVariant = Color(0xFFDBE3F0),
+        onSurfaceVariant = Color(0xFF3F4752),
+        outline = Color(0xFF707883),
+        outlineVariant = Color(0xFFBFC7D4),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFF2C3137),
+        inverseOnSurface = Color(0xFFEDF1F8),
+        inversePrimary = Color(0xFF9BCBFF),
+        surfaceDim = Color(0xFFD7DAE2),
+        surfaceBright = Color(0xFFF8F9FF),
+        surfaceContainerLowest = Color(0xFFFFFFFF),
+        surfaceContainerLow = Color(0xFFF0F4FB),
+        surfaceContainer = Color(0xFFEBEEF6),
+        surfaceContainerHigh = Color(0xFFE5E8F0),
+        surfaceContainerHighest = Color(0xFFDFE2EA),
+        surfaceTint = Color(0xFF005389)
+    ),
+    dark = ColorScheme(
+        primary = Color(0xFF9BCBFF),
+        onPrimary = Color(0xFF003256),
+        primaryContainer = Color(0xFF0079C3),
+        onPrimaryContainer = Color(0xFFFFFFFF),
+        secondary = Color(0xFFA8C9F0),
+        onSecondary = Color(0xFF0B3252),
+        secondaryContainer = Color(0xFF1C3F60),
+        onSecondaryContainer = Color(0xFFB2D4FB),
+        tertiary = Color(0xFFEBB2FF),
+        onTertiary = Color(0xFF520072),
+        tertiaryContainer = Color(0xFF9E56BD),
+        onTertiaryContainer = Color(0xFFFFFFFF),
+        error = Color(0xFFFFB4AB),
+        onError = Color(0xFF690005),
+        errorContainer = Color(0xFF93000A),
+        onErrorContainer = Color(0xFFFFDAD6),
+        background = Color(0xFF0F1419),
+        onBackground = Color(0xFFDFE2EA),
+        surface = Color(0xFF0F1419),
+        onSurface = Color(0xFFDFE2EA),
+        surfaceVariant = Color(0xFF3F4752),
+        onSurfaceVariant = Color(0xFFBFC7D4),
+        outline = Color(0xFF89919D),
+        outlineVariant = Color(0xFF3F4752),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFFDFE2EA),
+        inverseOnSurface = Color(0xFF2C3137),
+        inversePrimary = Color(0xFF0062A0),
+        surfaceDim = Color(0xFF0F1419),
+        surfaceBright = Color(0xFF35393F),
+        surfaceContainerLowest = Color(0xFF0A0F14),
+        surfaceContainerLow = Color(0xFF181C21),
+        surfaceContainer = Color(0xFF1C2025),
+        surfaceContainerHigh = Color(0xFF262A30),
+        surfaceContainerHighest = Color(0xFF31353B),
+        surfaceTint = Color(0xFF9BCBFF)
+    )
+)
+
+val OrangeTheme = Theme(
+    light = ColorScheme(
+        primary = Color(0xFF904A42),
+        onPrimary = Color(0xFFFFFFFF),
+        primaryContainer = Color(0xFFFFDAD5),
+        onPrimaryContainer = Color(0xFF3B0906),
+        secondary = Color(0xFF775652),
+        onSecondary = Color(0xFFFFFFFF),
+        secondaryContainer = Color(0xFFFFDAD5),
+        onSecondaryContainer = Color(0xFF2C1512),
+        tertiary = Color(0xFF705C2E),
+        onTertiary = Color(0xFFFFFFFF),
+        tertiaryContainer = Color(0xFFFCDFA6),
+        onTertiaryContainer = Color(0xFF261A00),
+        error = Color(0xFFBA1A1A),
+        onError = Color(0xFFFFFFFF),
+        errorContainer = Color(0xFFFFDAD6),
+        onErrorContainer = Color(0xFF410002),
+        background = Color(0xFFFFF8F7),
+        onBackground = Color(0xFF231918),
+        surface = Color(0xFFFFF8F7),
+        onSurface = Color(0xFF231918),
+        surfaceVariant = Color(0xFFF5DDDA),
+        onSurfaceVariant = Color(0xFF534341),
+        outline = Color(0xFF857370),
+        outlineVariant = Color(0xFFD8C2BE),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFF392E2C),
+        inverseOnSurface = Color(0xFFFFEDEA),
+        inversePrimary = Color(0xFFFFB4A9),
+        surfaceDim = Color(0xFFE8D6D3),
+        surfaceBright = Color(0xFFFFF8F7),
+        surfaceContainerLowest = Color(0xFFFFFFFF),
+        surfaceContainerLow = Color(0xFFFFF0EE),
+        surfaceContainer = Color(0xFFFCEAE7),
+        surfaceContainerHigh = Color(0xFFF7E4E1),
+        surfaceContainerHighest = Color(0xFFF1DEDC),
+        surfaceTint = Color(0xFF904A42)
+
+    ),
+    dark = ColorScheme(
+        primary = Color(0xFFFFB4A9),
+        onPrimary = Color(0xFF561E18),
+        primaryContainer = Color(0xFF73342C),
+        onPrimaryContainer = Color(0xFFFFDAD5),
+        secondary = Color(0xFFE7BDB7),
+        onSecondary = Color(0xFF442926),
+        secondaryContainer = Color(0xFF5D3F3B),
+        onSecondaryContainer = Color(0xFFFFDAD5),
+        tertiary = Color(0xFFDFC38C),
+        onTertiary = Color(0xFF3E2E04),
+        tertiaryContainer = Color(0xFF574419),
+        onTertiaryContainer = Color(0xFFFCDFA6),
+        error = Color(0xFFFFB4AB),
+        onError = Color(0xFF690005),
+        errorContainer = Color(0xFF93000A),
+        onErrorContainer = Color(0xFFFFDAD6),
+        background = Color(0xFF1A1110),
+        onBackground = Color(0xFFF1DEDC),
+        surface = Color(0xFF1A1110),
+        onSurface = Color(0xFFF1DEDC),
+        surfaceVariant = Color(0xFF534341),
+        onSurfaceVariant = Color(0xFFD8C2BE),
+        outline = Color(0xFFA08C89),
+        outlineVariant = Color(0xFF534341),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFFF1DEDC),
+        inverseOnSurface = Color(0xFF392E2C),
+        inversePrimary = Color(0xFF904A42),
+        surfaceDim = Color(0xFF1A1110),
+        surfaceBright = Color(0xFF423735),
+        surfaceContainerLowest = Color(0xFF140C0B),
+        surfaceContainerLow = Color(0xFF231918),
+        surfaceContainer = Color(0xFF271D1C),
+        surfaceContainerHigh = Color(0xFF322826),
+        surfaceContainerHighest = Color(0xFF3D3231),
+        surfaceTint = Color(0xFFFFB4A9)
+    )
+)
+
+val CyanTheme = Theme(
+    light = ColorScheme(
+        primary = Color(0xFF006A6A),
+        onPrimary = Color(0xFFFFFFFF),
+        primaryContainer = Color(0xFF9CF1F0),
+        onPrimaryContainer = Color(0xFF002020),
+        secondary = Color(0xFF4A6363),
+        onSecondary = Color(0xFFFFFFFF),
+        secondaryContainer = Color(0xFFCCE8E7),
+        onSecondaryContainer = Color(0xFF051F1F),
+        tertiary = Color(0xFF4B607C),
+        onTertiary = Color(0xFFFFFFFF),
+        tertiaryContainer = Color(0xFFD3E4FF),
+        onTertiaryContainer = Color(0xFF041C35),
+        error = Color(0xFFBA1A1A),
+        onError = Color(0xFFFFFFFF),
+        errorContainer = Color(0xFFFFDAD6),
+        onErrorContainer = Color(0xFF410002),
+        background = Color(0xFFF4FBFA),
+        onBackground = Color(0xFF161D1D),
+        surface = Color(0xFFF4FBFA),
+        onSurface = Color(0xFF161D1D),
+        surfaceVariant = Color(0xFFDAE5E4),
+        onSurfaceVariant = Color(0xFF3F4948),
+        outline = Color(0xFF6F7979),
+        outlineVariant = Color(0xFFBEC9C8),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFF2B3231),
+        inverseOnSurface = Color(0xFFECF2F1),
+        inversePrimary = Color(0xFF80D5D4),
+        surfaceDim = Color(0xFFD5DBDA),
+        surfaceBright = Color(0xFFF4FBFA),
+        surfaceContainerLowest = Color(0xFFFFFFFF),
+        surfaceContainerLow = Color(0xFFEFF5F4),
+        surfaceContainer = Color(0xFFE9EFEE),
+        surfaceContainerHigh = Color(0xFFE3E9E9),
+        surfaceContainerHighest = Color(0xFFDDE4E3),
+        surfaceTint = Color(0xFF006A6A)
+    ),
+    dark = ColorScheme(
+        primary = Color(0xFF80D5D4),
+        onPrimary = Color(0xFF003737),
+        primaryContainer = Color(0xFF004F4F),
+        onPrimaryContainer = Color(0xFF9CF1F0),
+        secondary = Color(0xFFB0CCCB),
+        onSecondary = Color(0xFF1B3534),
+        secondaryContainer = Color(0xFF324B4B),
+        onSecondaryContainer = Color(0xFFCCE8E7),
+        tertiary = Color(0xFFB3C8E8),
+        onTertiary = Color(0xFF1C314B),
+        tertiaryContainer = Color(0xFF334863),
+        onTertiaryContainer = Color(0xFFD3E4FF),
+        error = Color(0xFFFFB4AB),
+        onError = Color(0xFF690005),
+        errorContainer = Color(0xFF93000A),
+        onErrorContainer = Color(0xFFFFDAD6),
+        background = Color(0xFF0E1514),
+        onBackground = Color(0xFFDDE4E3),
+        surface = Color(0xFF0E1514),
+        onSurface = Color(0xFFDDE4E3),
+        surfaceVariant = Color(0xFF3F4948),
+        onSurfaceVariant = Color(0xFFBEC9C8),
+        outline = Color(0xFF889392),
+        outlineVariant = Color(0xFF3F4948),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFFDDE4E3),
+        inverseOnSurface = Color(0xFF2B3231),
+        inversePrimary = Color(0xFF006A6A),
+        surfaceDim = Color(0xFF0E1514),
+        surfaceBright = Color(0xFF343A3A),
+        surfaceContainerLowest = Color(0xFF090F0F),
+        surfaceContainerLow = Color(0xFF161D1D),
+        surfaceContainer = Color(0xFF1A2121),
+        surfaceContainerHigh = Color(0xFF252B2B),
+        surfaceContainerHighest = Color(0xFF2F3636),
+        surfaceTint = Color(0xFF003737)
+    )
+)
+
+val PurpleTheme = Theme(
+    light = ColorScheme(
+        primary = Color(0xFF7F4D7A),
+        onPrimary = Color(0xFFFFFFFF),
+        primaryContainer = Color(0xFFFFD7F6),
+        onPrimaryContainer = Color(0xFF330833),
+        secondary = Color(0xFF6D5869),
+        onSecondary = Color(0xFFFFFFFF),
+        secondaryContainer = Color(0xFFF7DAEF),
+        onSecondaryContainer = Color(0xFF261625),
+        tertiary = Color(0xFF825246),
+        onTertiary = Color(0xFFFFFFFF),
+        tertiaryContainer = Color(0xFFFFDBD1),
+        onTertiaryContainer = Color(0xFF321209),
+        error = Color(0xFFBA1A1A),
+        onError = Color(0xFFFFFFFF),
+        errorContainer = Color(0xFFFFDAD6),
+        onErrorContainer = Color(0xFF410002),
+        background = Color(0xFFFFF7F9),
+        onBackground = Color(0xFF201A1E),
+        surface = Color(0xFFFFF7F9),
+        onSurface = Color(0xFF201A1E),
+        surfaceVariant = Color(0xFFEEDEE7),
+        onSurfaceVariant = Color(0xFF4E444B),
+        outline = Color(0xFF7F747C),
+        outlineVariant = Color(0xFFD1C3CB),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFF352E33),
+        inverseOnSurface = Color(0xFFFAEDF4),
+        inversePrimary = Color(0xFFF0B3E7),
+        surfaceDim = Color(0xFFE3D7DD),
+        surfaceBright = Color(0xFFFFF7F9),
+        surfaceContainerLowest = Color(0xFFFFFFFF),
+        surfaceContainerLow = Color(0xFFFDF0F7),
+        surfaceContainer = Color(0xFFF7EBF1),
+        surfaceContainerHigh = Color(0xFFF1E5EB),
+        surfaceContainerHighest = Color(0xFFEBDFE6),
+        surfaceTint = Color(0xFF7F4D7A)
+    ),
+    dark = ColorScheme(
+        primary = Color(0xFFF0B3E7),
+        onPrimary = Color(0xFF4B1F4A),
+        primaryContainer = Color(0xFF653661),
+        onPrimaryContainer = Color(0xFFFFD7F6),
+        secondary = Color(0xFFDABFD3),
+        onSecondary = Color(0xFF3D2B3A),
+        secondaryContainer = Color(0xFF544151),
+        onSecondaryContainer = Color(0xFFF7DAEF),
+        tertiary = Color(0xFFF6B8A8),
+        onTertiary = Color(0xFF4C261B),
+        tertiaryContainer = Color(0xFF663B30),
+        onTertiaryContainer = Color(0xFFFFDBD1),
+        error = Color(0xFFFFB4AB),
+        onError = Color(0xFF690005),
+        errorContainer = Color(0xFF93000A),
+        onErrorContainer = Color(0xFFFFDAD6),
+        background = Color(0xFF171216),
+        onBackground = Color(0xFFEBDFE6),
+        surface = Color(0xFF171216),
+        onSurface = Color(0xFFEBDFE6),
+        surfaceVariant = Color(0xFF4E444B),
+        onSurfaceVariant = Color(0xFFD1C3CB),
+        outline = Color(0xFF9A8D95),
+        outlineVariant = Color(0xFF4E444B),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFFEBDFE6),
+        inverseOnSurface = Color(0xFF352E33),
+        inversePrimary = Color(0xFF7F4D7A),
+        surfaceDim = Color(0xFF171216),
+        surfaceBright = Color(0xFF3E373C),
+        surfaceContainerLowest = Color(0xFF120D11),
+        surfaceContainerLow = Color(0xFF201A1E),
+        surfaceContainer = Color(0xFF241E22),
+        surfaceContainerHigh = Color(0xFF2F282D),
+        surfaceContainerHighest = Color(0xFF3A3338),
+        surfaceTint = Color(0xFFF0B3E7)
+    )
+)
+
+val GreenTheme = Theme(
+    light = ColorScheme(
+        primary = Color(0xFF3B6939),
+        onPrimary = Color(0xFFFFFFFF),
+        primaryContainer = Color(0xFFBCF0B4),
+        onPrimaryContainer = Color(0xFF002204),
+        secondary = Color(0xFF52634F),
+        onSecondary = Color(0xFFFFFFFF),
+        secondaryContainer = Color(0xFFD5E8CF),
+        onSecondaryContainer = Color(0xFF111F0F),
+        tertiary = Color(0xFF38656A),
+        onTertiary = Color(0xFFFFFFFF),
+        tertiaryContainer = Color(0xFFBCEBF0),
+        onTertiaryContainer = Color(0xFF002023),
+        error = Color(0xFFBA1A1A),
+        onError = Color(0xFFFFFFFF),
+        errorContainer = Color(0xFFFFDAD6),
+        onErrorContainer = Color(0xFF410002),
+        background = Color(0xFFF7FBF1),
+        onBackground = Color(0xFF191D17),
+        surface = Color(0xFFF7FBF1),
+        onSurface = Color(0xFF191D17),
+        surfaceVariant = Color(0xFFDEE5D8),
+        onSurfaceVariant = Color(0xFF424940),
+        outline = Color(0xFF72796F),
+        outlineVariant = Color(0xFFC2C9BD),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFF2D322C),
+        inverseOnSurface = Color(0xFFEFF2E9),
+        inversePrimary = Color(0xFFA1D39A),
+        surfaceDim = Color(0xFFD8DBD2),
+        surfaceBright = Color(0xFFF7FBF1),
+        surfaceContainerLowest = Color(0xFFFFFFFF),
+        surfaceContainerLow = Color(0xFFF1F5EC),
+        surfaceContainer = Color(0xFFECEFE6),
+        surfaceContainerHigh = Color(0xFFE6E9E0),
+        surfaceContainerHighest = Color(0xFFE0E4DB),
+        surfaceTint = Color(0xFF3B6939)
+    ),
+    dark = ColorScheme(
+        primary = Color(0xFFA1D39A),
+        onPrimary = Color(0xFF0A390F),
+        primaryContainer = Color(0xFF235024),
+        onPrimaryContainer = Color(0xFFBCF0B4),
+        secondary = Color(0xFFBACCB3),
+        onSecondary = Color(0xFF253423),
+        secondaryContainer = Color(0xFF3B4B38),
+        onSecondaryContainer = Color(0xFFD5E8CF),
+        tertiary = Color(0xFFA0CFD4),
+        onTertiary = Color(0xFF00363B),
+        tertiaryContainer = Color(0xFF1F4D52),
+        onTertiaryContainer = Color(0xFFBCEBF0),
+        error = Color(0xFFFFB4AB),
+        onError = Color(0xFF690005),
+        errorContainer = Color(0xFF93000A),
+        onErrorContainer = Color(0xFFFFDAD6),
+        background = Color(0xFF10140F),
+        onBackground = Color(0xFFE0E4DB),
+        surface = Color(0xFF10140F),
+        onSurface = Color(0xFFE0E4DB),
+        surfaceVariant = Color(0xFF424940),
+        onSurfaceVariant = Color(0xFFC2C9BD),
+        outline = Color(0xFF8C9388),
+        outlineVariant = Color(0xFF424940),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFFE0E4DB),
+        inverseOnSurface = Color(0xFF2D322C),
+        inversePrimary = Color(0xFF3B6939),
+        surfaceDim = Color(0xFF10140F),
+        surfaceBright = Color(0xFF363A34),
+        surfaceContainerLowest = Color(0xFF0B0F0A),
+        surfaceContainerLow = Color(0xFF191D17),
+        surfaceContainer = Color(0xFF1D211B),
+        surfaceContainerHigh = Color(0xFF272B25),
+        surfaceContainerHighest = Color(0xFF323630),
+        surfaceTint = Color(0xFFA1D39A)
+    )
+)
+
+val AmberTheme = Theme(
+    light = ColorScheme(
+        primary = Color(0xFF855318),
+        onPrimary = Color(0xFFFFFFFF),
+        primaryContainer = Color(0xFFFFDCBE),
+        onPrimaryContainer = Color(0xFF2C1600),
+        secondary = Color(0xFF725A42),
+        onSecondary = Color(0xFFFFFFFF),
+        secondaryContainer = Color(0xFFFFDCBE),
+        onSecondaryContainer = Color(0xFF291806),
+        tertiary = Color(0xFF58633A),
+        onTertiary = Color(0xFFFFFFFF),
+        tertiaryContainer = Color(0xFFDCE8B4),
+        onTertiaryContainer = Color(0xFF161E01),
+        error = Color(0xFFBA1A1A),
+        onError = Color(0xFFFFFFFF),
+        errorContainer = Color(0xFFFFDAD6),
+        onErrorContainer = Color(0xFF410002),
+        background = Color(0xFFFFF8F5),
+        onBackground = Color(0xFF211A14),
+        surface = Color(0xFFFFF8F5),
+        onSurface = Color(0xFF211A14),
+        surfaceVariant = Color(0xFFF2DFD1),
+        onSurfaceVariant = Color(0xFF51453A),
+        outline = Color(0xFF837468),
+        outlineVariant = Color(0xFFD5C3B5),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFF372F28),
+        inverseOnSurface = Color(0xFFFDEEE3),
+        inversePrimary = Color(0xFFFDB975),
+        surfaceDim = Color(0xFFE6D7CD),
+        surfaceBright = Color(0xFFFFF8F5),
+        surfaceContainerLowest = Color(0xFFFFFFFF),
+        surfaceContainerLow = Color(0xFFFFF1E7),
+        surfaceContainer = Color(0xFFFAEBE0),
+        surfaceContainerHigh = Color(0xFFF4E5DB),
+        surfaceContainerHighest = Color(0xFFEFE0D5),
+        surfaceTint = Color(0xFF855318)
+    ),
+    dark = ColorScheme(
+        primary = Color(0xFFFDB975),
+        onPrimary = Color(0xFF4A2800),
+        primaryContainer = Color(0xFF693C00),
+        onPrimaryContainer = Color(0xFFFFDCBE),
+        secondary = Color(0xFFE1C1A4),
+        onSecondary = Color(0xFF402C18),
+        secondaryContainer = Color(0xFF59422C),
+        onSecondaryContainer = Color(0xFFFFDCBE),
+        tertiary = Color(0xFFC0CC9A),
+        onTertiary = Color(0xFF2B3410),
+        tertiaryContainer = Color(0xFF414B24),
+        onTertiaryContainer = Color(0xFFDCE8B4),
+        error = Color(0xFFFFB4AB),
+        onError = Color(0xFF690005),
+        errorContainer = Color(0xFF93000A),
+        onErrorContainer = Color(0xFFFFDAD6),
+        background = Color(0xFF19120C),
+        onBackground = Color(0xFFEFE0D5),
+        surface = Color(0xFF19120C),
+        onSurface = Color(0xFFEFE0D5),
+        surfaceVariant = Color(0xFF51453A),
+        onSurfaceVariant = Color(0xFFD5C3B5),
+        outline = Color(0xFF9D8E81),
+        outlineVariant = Color(0xFF51453A),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFFEFE0D5),
+        inverseOnSurface = Color(0xFF372F28),
+        inversePrimary = Color(0xFF855318),
+        surfaceDim = Color(0xFF19120C),
+        surfaceBright = Color(0xFF403830),
+        surfaceContainerLowest = Color(0xFF130D07),
+        surfaceContainerLow = Color(0xFF211A14),
+        surfaceContainer = Color(0xFF261E18),
+        surfaceContainerHigh = Color(0xFF302822),
+        surfaceContainerHighest = Color(0xFF3C332C),
+        surfaceTint = Color(0xFFFDB975)
+    )
+)
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/Theme.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/Theme.kt
new file mode 100644
index 000000000..6daff1ab6
--- /dev/null
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/Theme.kt
@@ -0,0 +1,54 @@
+package com.simplecityapps.shuttle.ui.theme
+
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import com.simplecityapps.shuttle.persistence.GeneralPreferenceManager
+
+@Immutable
+data class ColorFamily(
+    val color: Color,
+    val onColor: Color,
+    val colorContainer: Color,
+    val onColorContainer: Color
+)
+
+@Composable
+fun AppTheme(
+    dynamicColor: Boolean = false,
+    theme: GeneralPreferenceManager.Theme = GeneralPreferenceManager.Theme.DayNight,
+    accent: GeneralPreferenceManager.Accent = GeneralPreferenceManager.Accent.Default,
+    extraDark: Boolean = false,
+    content: @Composable () -> Unit
+) {
+    val isDark = when (theme) {
+        GeneralPreferenceManager.Theme.DayNight -> isSystemInDarkTheme()
+        GeneralPreferenceManager.Theme.Light -> false
+        GeneralPreferenceManager.Theme.Dark -> true
+    }
+
+    val colorScheme = if (dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+        val context = LocalContext.current
+        if (isDark) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+    } else {
+        when (accent) {
+            GeneralPreferenceManager.Accent.Default -> ShuttleTheme.getColorScheme(isDark)
+            GeneralPreferenceManager.Accent.Orange -> OrangeTheme.getColorScheme(isDark)
+            GeneralPreferenceManager.Accent.Cyan -> CyanTheme.getColorScheme(isDark)
+            GeneralPreferenceManager.Accent.Purple -> PurpleTheme.getColorScheme(isDark)
+            GeneralPreferenceManager.Accent.Green -> GreenTheme.getColorScheme(isDark)
+            GeneralPreferenceManager.Accent.Amber -> AmberTheme.getColorScheme(isDark)
+        }
+    }
+    MaterialTheme(
+        colorScheme = colorScheme,
+        typography = AppTypography,
+        content = content
+    )
+}
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/Type.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/Type.kt
new file mode 100644
index 000000000..e55bd0679
--- /dev/null
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/Type.kt
@@ -0,0 +1,5 @@
+package com.simplecityapps.shuttle.ui.theme
+
+import androidx.compose.material3.Typography
+
+val AppTypography = Typography()
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/widgets/ShuttleAppWidgetProvider.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/widgets/ShuttleAppWidgetProvider.kt
index 330abdb0d..703648d0a 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/widgets/ShuttleAppWidgetProvider.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/widgets/ShuttleAppWidgetProvider.kt
@@ -50,9 +50,7 @@ abstract class ShuttleAppWidgetProvider : AppWidgetProvider() {
     val isDarkMode: Boolean
         get() = preferenceManager.widgetDarkMode
 
-    private fun getLayoutResId(): Int {
-        return if (isDarkMode) layoutResIdDark else layoutResIdLight
-    }
+    private fun getLayoutResId(): Int = if (isDarkMode) layoutResIdDark else layoutResIdLight
 
     override fun onReceive(
         context: Context?,
@@ -119,26 +117,20 @@ abstract class ShuttleAppWidgetProvider : AppWidgetProvider() {
     private fun getPendingIntent(
         context: Context,
         intent: Intent
-    ): PendingIntent {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            PendingIntent.getForegroundService(context, 1, intent, PendingIntentCompat.FLAG_IMMUTABLE)
-        } else {
-            PendingIntent.getService(context, 1, intent, PendingIntentCompat.FLAG_IMMUTABLE)
-        }
+    ): PendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        PendingIntent.getForegroundService(context, 1, intent, PendingIntentCompat.FLAG_IMMUTABLE)
+    } else {
+        PendingIntent.getService(context, 1, intent, PendingIntentCompat.FLAG_IMMUTABLE)
     }
 
-    fun getPlaybackDrawable(): Int {
-        return when (playbackManager.playbackState()) {
-            is PlaybackState.Loading, PlaybackState.Playing -> {
-                if (isDarkMode) R.drawable.ic_pause_white_24dp else com.simplecityapps.playback.R.drawable.ic_pause_black_24dp
-            }
-            else -> {
-                if (isDarkMode) R.drawable.ic_play_arrow_white_24dp else com.simplecityapps.playback.R.drawable.ic_play_arrow_black_24dp
-            }
+    fun getPlaybackDrawable(): Int = when (playbackManager.playbackState()) {
+        is PlaybackState.Loading, PlaybackState.Playing -> {
+            if (isDarkMode) R.drawable.ic_pause_white_24dp else com.simplecityapps.playback.R.drawable.ic_pause_black_24dp
+        }
+        else -> {
+            if (isDarkMode) R.drawable.ic_play_arrow_white_24dp else com.simplecityapps.playback.R.drawable.ic_play_arrow_black_24dp
         }
     }
 
-    fun getPlaceholderDrawable(): Int {
-        return if (isDarkMode) R.drawable.ic_music_note_white_24dp else com.simplecityapps.playback.R.drawable.ic_music_note_black_24dp
-    }
+    fun getPlaceholderDrawable(): Int = if (isDarkMode) R.drawable.ic_music_note_white_24dp else com.simplecityapps.playback.R.drawable.ic_music_note_black_24dp
 }
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/widgets/WidgetManager.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/widgets/WidgetManager.kt
index 9efb7cc9b..1beb2ed6b 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/widgets/WidgetManager.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/widgets/WidgetManager.kt
@@ -17,7 +17,8 @@ constructor(
     @ApplicationContext private val context: Context,
     private val playbackWatcher: PlaybackWatcher,
     private val queueWatcher: QueueWatcher
-) : PlaybackWatcherCallback, QueueChangeCallback {
+) : PlaybackWatcherCallback,
+    QueueChangeCallback {
     enum class UpdateReason {
         PlaystateChanged,
         QueueChanged,
diff --git a/android/core/src/main/java/com/simplecityapps/shuttle/coroutines/concurrentMap.kt b/android/core/src/main/java/com/simplecityapps/shuttle/coroutines/concurrentMap.kt
index 7e2eaa19a..a5d53381b 100644
--- a/android/core/src/main/java/com/simplecityapps/shuttle/coroutines/concurrentMap.kt
+++ b/android/core/src/main/java/com/simplecityapps/shuttle/coroutines/concurrentMap.kt
@@ -9,8 +9,6 @@ import kotlinx.coroutines.flow.flow
 fun <T, R> Flow<T>.concurrentMap(
     concurrencyLevel: Int,
     transform: suspend (T) -> R
-): Flow<R> {
-    return flatMapMerge(concurrencyLevel) { value ->
-        flow { emit(transform(value)) }
-    }
+): Flow<R> = flatMapMerge(concurrencyLevel) { value ->
+    flow { emit(transform(value)) }
 }
diff --git a/android/core/src/main/java/com/simplecityapps/shuttle/di/CoroutineModule.kt b/android/core/src/main/java/com/simplecityapps/shuttle/di/CoroutineModule.kt
index 60e134a69..1b55d2c62 100644
--- a/android/core/src/main/java/com/simplecityapps/shuttle/di/CoroutineModule.kt
+++ b/android/core/src/main/java/com/simplecityapps/shuttle/di/CoroutineModule.kt
@@ -18,18 +18,14 @@ import timber.log.Timber
 class CoroutineModule {
     @Singleton
     @Provides
-    fun coroutineExceptionHandler(): CoroutineExceptionHandler {
-        return CoroutineExceptionHandler { _, throwable ->
-            Timber.e(throwable)
-        }
+    fun coroutineExceptionHandler(): CoroutineExceptionHandler = CoroutineExceptionHandler { _, throwable ->
+        Timber.e(throwable)
     }
 
     @Singleton
     @Provides
     @AppSupervisorJob
-    fun appSupervisorJob(): Job {
-        return SupervisorJob()
-    }
+    fun appSupervisorJob(): Job = SupervisorJob()
 
     @Singleton
     @Provides
@@ -37,9 +33,7 @@ class CoroutineModule {
     fun provideAppCoroutineScope(
         @AppSupervisorJob job: Job,
         coroutineExceptionHandler: CoroutineExceptionHandler
-    ): CoroutineScope {
-        return CoroutineScope(Dispatchers.Main + job + coroutineExceptionHandler)
-    }
+    ): CoroutineScope = CoroutineScope(Dispatchers.Main + job + coroutineExceptionHandler)
 }
 
 @Retention(AnnotationRetention.BINARY)
diff --git a/android/core/src/main/java/com/simplecityapps/shuttle/di/NetworkingModule.kt b/android/core/src/main/java/com/simplecityapps/shuttle/di/NetworkingModule.kt
index 1a1dc097e..bfd41bb12 100644
--- a/android/core/src/main/java/com/simplecityapps/shuttle/di/NetworkingModule.kt
+++ b/android/core/src/main/java/com/simplecityapps/shuttle/di/NetworkingModule.kt
@@ -21,35 +21,29 @@ import timber.log.Timber
 open class NetworkingModule {
     @Singleton
     @Provides
-    fun provideLoggingInterceptor(): HttpLoggingInterceptor {
-        return HttpLoggingInterceptor { message ->
-            Timber.tag(NETWORK_LOG_TAG).v(message)
-        }.apply {
-            level = HttpLoggingInterceptor.Level.NONE
-        }
+    fun provideLoggingInterceptor(): HttpLoggingInterceptor = HttpLoggingInterceptor { message ->
+        Timber.tag(NETWORK_LOG_TAG).v(message)
+    }.apply {
+        level = HttpLoggingInterceptor.Level.NONE
     }
 
     @Singleton
     @Provides
-    fun provideOkHttpClient(loggingInterceptor: HttpLoggingInterceptor): OkHttpClient {
-        return OkHttpClient.Builder()
-            .apply {
-                if (BuildConfig.PROXY_ENABLED) {
-                    this.proxy(Proxy(Proxy.Type.HTTP, InetSocketAddress(BuildConfig.PROXY_ADDR, BuildConfig.PROXY_PORT)))
-                }
+    fun provideOkHttpClient(loggingInterceptor: HttpLoggingInterceptor): OkHttpClient = OkHttpClient.Builder()
+        .apply {
+            if (BuildConfig.PROXY_ENABLED) {
+                this.proxy(Proxy(Proxy.Type.HTTP, InetSocketAddress(BuildConfig.PROXY_ADDR, BuildConfig.PROXY_PORT)))
             }
-            .addInterceptor(loggingInterceptor)
-            .build()
-    }
+        }
+        .addInterceptor(loggingInterceptor)
+        .build()
 
     @Singleton
     @Provides
-    fun provideMoshi(): Moshi {
-        return Moshi.Builder()
-            .addLast(KotlinJsonAdapterFactory())
-            .add(Date::class.java, Rfc3339DateJsonAdapter())
-            .build()
-    }
+    fun provideMoshi(): Moshi = Moshi.Builder()
+        .addLast(KotlinJsonAdapterFactory())
+        .add(Date::class.java, Rfc3339DateJsonAdapter())
+        .build()
 
     companion object {
         const val NETWORK_LOG_TAG = "OkHttp"
diff --git a/android/core/src/main/java/com/simplecityapps/shuttle/di/PersistenceModule.kt b/android/core/src/main/java/com/simplecityapps/shuttle/di/PersistenceModule.kt
index e52cfa990..fd0404726 100644
--- a/android/core/src/main/java/com/simplecityapps/shuttle/di/PersistenceModule.kt
+++ b/android/core/src/main/java/com/simplecityapps/shuttle/di/PersistenceModule.kt
@@ -23,15 +23,11 @@ class PersistenceModule {
     @Provides
     fun provideSharedPrefs(
         @ApplicationContext context: Context
-    ): SharedPreferences {
-        return PreferenceManager.getDefaultSharedPreferences(context)
-    }
+    ): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
 
     @Singleton
     @Provides
-    fun provideGeneralPreferenceManager(preference: SharedPreferences): GeneralPreferenceManager {
-        return GeneralPreferenceManager(preference)
-    }
+    fun provideGeneralPreferenceManager(preference: SharedPreferences): GeneralPreferenceManager = GeneralPreferenceManager(preference)
 
     @SuppressLint("ApplySharedPref")
     @Singleton
diff --git a/android/data/src/main/kotlin/com/simplecityapps/shuttle/model/MediaProviderType.kt b/android/data/src/main/kotlin/com/simplecityapps/shuttle/model/MediaProviderType.kt
index e183bd24d..a2cff5a3b 100644
--- a/android/data/src/main/kotlin/com/simplecityapps/shuttle/model/MediaProviderType.kt
+++ b/android/data/src/main/kotlin/com/simplecityapps/shuttle/model/MediaProviderType.kt
@@ -9,15 +9,13 @@ enum class MediaProviderType(val remote: Boolean, val supportsTagEditing: Boolea
     ;
 
     companion object {
-        fun init(ordinal: Int): MediaProviderType {
-            return when (ordinal) {
-                Shuttle.ordinal -> Shuttle
-                MediaStore.ordinal -> MediaStore
-                Emby.ordinal -> Emby
-                Jellyfin.ordinal -> Jellyfin
-                Plex.ordinal -> Plex
-                else -> Shuttle
-            }
+        fun init(ordinal: Int): MediaProviderType = when (ordinal) {
+            Shuttle.ordinal -> Shuttle
+            MediaStore.ordinal -> MediaStore
+            Emby.ordinal -> Emby
+            Jellyfin.ordinal -> Jellyfin
+            Plex.ordinal -> Plex
+            else -> Shuttle
         }
     }
 }
diff --git a/android/data/src/main/kotlin/com/simplecityapps/shuttle/model/Regex.kt b/android/data/src/main/kotlin/com/simplecityapps/shuttle/model/Regex.kt
index efb510cac..d2f6a600e 100644
--- a/android/data/src/main/kotlin/com/simplecityapps/shuttle/model/Regex.kt
+++ b/android/data/src/main/kotlin/com/simplecityapps/shuttle/model/Regex.kt
@@ -4,6 +4,4 @@ object Regex {
     val articlePattern = Regex("^(?i)\\s*(?:the |an |a )|(?:, the|, an|, a)\\s*$|[\\[\\]()!?.,']")
 }
 
-fun String.removeArticles(): String {
-    return Regex.articlePattern.replace(this, "")
-}
+fun String.removeArticles(): String = Regex.articlePattern.replace(this, "")
diff --git a/android/data/src/main/kotlin/com/simplecityapps/shuttle/query/SongQuery.kt b/android/data/src/main/kotlin/com/simplecityapps/shuttle/query/SongQuery.kt
index ded6f9149..84cc025dc 100644
--- a/android/data/src/main/kotlin/com/simplecityapps/shuttle/query/SongQuery.kt
+++ b/android/data/src/main/kotlin/com/simplecityapps/shuttle/query/SongQuery.kt
@@ -24,93 +24,83 @@ sealed class SongQuery(
         override val includeExcluded: Boolean = false,
         override val sortOrder: SongSortOrder = SongSortOrder.Default,
         override val providerType: MediaProviderType? = null
-    ) :
-        SongQuery(
-            predicate = { true },
-            sortOrder = sortOrder,
-            includeExcluded = includeExcluded,
-            providerType = providerType
-        )
+    ) : SongQuery(
+        predicate = { true },
+        sortOrder = sortOrder,
+        includeExcluded = includeExcluded,
+        providerType = providerType
+    )
 
     @Parcelize
     data class ArtistGroupKey(
         val key: AlbumArtistGroupKey?
-    ) :
-        SongQuery(
-            predicate = { song -> song.albumArtistGroupKey == key }
-        )
+    ) : SongQuery(
+        predicate = { song -> song.albumArtistGroupKey == key }
+    )
 
     @Parcelize
     data class ArtistGroupKeys(
         private val artistGroupKeys: List<ArtistGroupKey>
-    ) :
-        SongQuery(
-            predicate = { song -> artistGroupKeys.any { albumArtist -> albumArtist.predicate(song) } },
-            sortOrder = SongSortOrder.Track
-        )
+    ) : SongQuery(
+        predicate = { song -> artistGroupKeys.any { albumArtist -> albumArtist.predicate(song) } },
+        sortOrder = SongSortOrder.Track
+    )
 
     @Parcelize
     data class AlbumGroupKey(
         val key: com.simplecityapps.shuttle.model.AlbumGroupKey?
-    ) :
-        SongQuery(
-            predicate = { song -> song.albumGroupKey == key }
-        )
+    ) : SongQuery(
+        predicate = { song -> song.albumGroupKey == key }
+    )
 
     @Parcelize
     data class AlbumGroupKeys(
         val albumGroupKeys: List<AlbumGroupKey>
-    ) :
-        SongQuery(
-            predicate = { song -> albumGroupKeys.any { it.predicate(song) } },
-            sortOrder = SongSortOrder.Track
-        )
+    ) : SongQuery(
+        predicate = { song -> albumGroupKeys.any { it.predicate(song) } },
+        sortOrder = SongSortOrder.Track
+    )
 
     @Parcelize
     data class SongIds(
         val songIds: List<Long>
-    ) :
-        SongQuery(
-            predicate = { song -> songIds.contains(song.id) }
-        )
+    ) : SongQuery(
+        predicate = { song -> songIds.contains(song.id) }
+    )
 
     @Parcelize
     @TypeParceler<Instant, InstantParceler>
     data class LastPlayed(
         val after: Instant
-    ) :
-        SongQuery(
-            predicate = { song -> song.lastPlayed?.let { it > after } ?: false },
-            sortOrder = SongSortOrder.LastCompleted
-        )
+    ) : SongQuery(
+        predicate = { song -> song.lastPlayed?.let { it > after } ?: false },
+        sortOrder = SongSortOrder.LastCompleted
+    )
 
     @Parcelize
     @TypeParceler<Instant, InstantParceler>
     data class LastCompleted(
         val after: Instant
-    ) :
-        SongQuery(
-            predicate = { song -> song.lastCompleted?.let { it > after } ?: false },
-            sortOrder = SongSortOrder.LastCompleted
-        )
+    ) : SongQuery(
+        predicate = { song -> song.lastCompleted?.let { it > after } ?: false },
+        sortOrder = SongSortOrder.LastCompleted
+    )
 
     @Parcelize
     data class Search(
         val query: String
-    ) :
-        SongQuery(
-            predicate = { song -> song.name?.contains(query, true) ?: false || song.album?.contains(query, true) ?: false || song.albumArtist?.contains(query, true) ?: false }
-        )
+    ) : SongQuery(
+        predicate = { song -> song.name?.contains(query, true) ?: false || song.album?.contains(query, true) ?: false || song.albumArtist?.contains(query, true) ?: false }
+    )
 
     @Parcelize
     data class PlayCount(
         val count: Int,
         override val sortOrder: SongSortOrder
-    ) :
-        SongQuery(
-            predicate = { song -> song.playCount >= count },
-            sortOrder = sortOrder
-        )
+    ) : SongQuery(
+        predicate = { song -> song.playCount >= count },
+        sortOrder = sortOrder
+    )
 
     // Todo: This isn't really 'recently added', any songs which have had their contents modified will show up here.
     //   Best to add a 'dateAdded' column.
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/ArtworkDownloadService.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/ArtworkDownloadService.kt
index e45cd15fe..3adb3a649 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/ArtworkDownloadService.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/ArtworkDownloadService.kt
@@ -39,7 +39,9 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 
 @AndroidEntryPoint
-class ArtworkDownloadService : Service(), CoroutineScope {
+class ArtworkDownloadService :
+    Service(),
+    CoroutineScope {
     private val notificationManager: NotificationManager? by lazy {
         getSystemService()
     }
@@ -68,9 +70,7 @@ class ArtworkDownloadService : Service(), CoroutineScope {
 
     // Lifecycle
 
-    override fun onBind(intent: Intent?): IBinder? {
-        return null
-    }
+    override fun onBind(intent: Intent?): IBinder? = null
 
     override fun onCreate() {
         super.onCreate()
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/encode.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/encode.kt
index cbbe07bf9..7fb80f31b 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/encode.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/encode.kt
@@ -2,6 +2,4 @@ package au.com.simplecityapps.shuttle.imageloading
 
 import java.net.URLEncoder
 
-fun String.urlEncode(): String {
-    return URLEncoder.encode(this, Charsets.UTF_8.name())
-}
+fun String.urlEncode(): String = URLEncoder.encode(this, Charsets.UTF_8.name())
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/fetcher/remote/RemoteArtworkAlbumArtistFetcher.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/fetcher/remote/RemoteArtworkAlbumArtistFetcher.kt
index b10749a93..d2008caa2 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/fetcher/remote/RemoteArtworkAlbumArtistFetcher.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/fetcher/remote/RemoteArtworkAlbumArtistFetcher.kt
@@ -61,11 +61,7 @@ class RemoteArtworkAlbumArtistFetcher(
         httpUrlFetcher?.cancel()
     }
 
-    override fun getDataClass(): Class<InputStream> {
-        return InputStream::class.java
-    }
+    override fun getDataClass(): Class<InputStream> = InputStream::class.java
 
-    override fun getDataSource(): DataSource {
-        return DataSource.REMOTE
-    }
+    override fun getDataSource(): DataSource = DataSource.REMOTE
 }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/fetcher/remote/RemoteArtworkAlbumFetcher.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/fetcher/remote/RemoteArtworkAlbumFetcher.kt
index 2b4b017b6..53802a9db 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/fetcher/remote/RemoteArtworkAlbumFetcher.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/fetcher/remote/RemoteArtworkAlbumFetcher.kt
@@ -54,11 +54,7 @@ class RemoteArtworkAlbumFetcher(
         job?.cancel()
     }
 
-    override fun getDataClass(): Class<InputStream> {
-        return InputStream::class.java
-    }
+    override fun getDataClass(): Class<InputStream> = InputStream::class.java
 
-    override fun getDataSource(): DataSource {
-        return DataSource.REMOTE
-    }
+    override fun getDataSource(): DataSource = DataSource.REMOTE
 }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/fetcher/remote/RemoteArtworkSongFetcher.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/fetcher/remote/RemoteArtworkSongFetcher.kt
index 1eeb664e4..30c655b9b 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/fetcher/remote/RemoteArtworkSongFetcher.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/fetcher/remote/RemoteArtworkSongFetcher.kt
@@ -50,11 +50,7 @@ class RemoteArtworkSongFetcher(
         httpUrlFetcher?.cancel()
     }
 
-    override fun getDataClass(): Class<InputStream> {
-        return InputStream::class.java
-    }
+    override fun getDataClass(): Class<InputStream> = InputStream::class.java
 
-    override fun getDataSource(): DataSource {
-        return DataSource.REMOTE
-    }
+    override fun getDataSource(): DataSource = DataSource.REMOTE
 }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/common/AlbumArtistArtworkProvider.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/common/AlbumArtistArtworkProvider.kt
index 6d2278967..e48156eae 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/common/AlbumArtistArtworkProvider.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/common/AlbumArtistArtworkProvider.kt
@@ -3,7 +3,5 @@ package au.com.simplecityapps.shuttle.imageloading.glide.loader.common
 import com.simplecityapps.shuttle.model.AlbumArtist
 
 open class AlbumArtistArtworkProvider(private val albumArtist: AlbumArtist) : ArtworkProvider {
-    override fun getCacheKey(): String {
-        return albumArtist.name ?: albumArtist.friendlyArtistName ?: "Unknown"
-    }
+    override fun getCacheKey(): String = albumArtist.name ?: albumArtist.friendlyArtistName ?: "Unknown"
 }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/common/AlbumArtworkProvider.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/common/AlbumArtworkProvider.kt
index 8921ada6e..61b3cea24 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/common/AlbumArtworkProvider.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/common/AlbumArtworkProvider.kt
@@ -3,7 +3,5 @@ package au.com.simplecityapps.shuttle.imageloading.glide.loader.common
 import com.simplecityapps.shuttle.model.Album
 
 open class AlbumArtworkProvider(private val album: Album) : ArtworkProvider {
-    override fun getCacheKey(): String {
-        return "${album.albumArtist ?: album.friendlyArtistName}_${album.name}"
-    }
+    override fun getCacheKey(): String = "${album.albumArtist ?: album.friendlyArtistName}_${album.name}"
 }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/common/SongArtworkProvider.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/common/SongArtworkProvider.kt
index ddca496f7..1dd0458ad 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/common/SongArtworkProvider.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/common/SongArtworkProvider.kt
@@ -3,7 +3,5 @@ package au.com.simplecityapps.shuttle.imageloading.glide.loader.common
 import com.simplecityapps.shuttle.model.Song
 
 open class SongArtworkProvider(val song: Song) : ArtworkProvider {
-    override fun getCacheKey(): String {
-        return "${song.albumArtist ?: song.friendlyArtistName}_${song.album}_${song.name}"
-    }
+    override fun getCacheKey(): String = "${song.albumArtist ?: song.friendlyArtistName}_${song.album}_${song.name}"
 }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/DirectoryAlbumArtistLocalArtworkModelLoader.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/DirectoryAlbumArtistLocalArtworkModelLoader.kt
index f479cd665..2853a3f69 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/DirectoryAlbumArtistLocalArtworkModelLoader.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/DirectoryAlbumArtistLocalArtworkModelLoader.kt
@@ -28,21 +28,15 @@ class DirectoryAlbumArtistLocalArtworkModelLoader(
         width: Int,
         height: Int,
         options: Options
-    ): ModelLoader.LoadData<InputStream>? {
-        return localArtworkModelLoader.buildLoadData(DirectoryAlbumArtistLocalArtworkProvider(context, model, songRepository), width, height, options)
-    }
+    ): ModelLoader.LoadData<InputStream>? = localArtworkModelLoader.buildLoadData(DirectoryAlbumArtistLocalArtworkProvider(context, model, songRepository), width, height, options)
 
-    override fun handles(model: AlbumArtist): Boolean {
-        return true
-    }
+    override fun handles(model: AlbumArtist): Boolean = true
 
     class Factory(
         private val context: Context,
         private val songRepository: SongRepository
     ) : ModelLoaderFactory<AlbumArtist, InputStream> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<AlbumArtist, InputStream> {
-            return DirectoryAlbumArtistLocalArtworkModelLoader(context, multiFactory.build(LocalArtworkProvider::class.java, InputStream::class.java) as LocalArtworkModelLoader, songRepository)
-        }
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<AlbumArtist, InputStream> = DirectoryAlbumArtistLocalArtworkModelLoader(context, multiFactory.build(LocalArtworkProvider::class.java, InputStream::class.java) as LocalArtworkModelLoader, songRepository)
 
         override fun teardown() {
         }
@@ -54,46 +48,44 @@ class DirectoryAlbumArtistLocalArtworkModelLoader(
         private val songRepository: SongRepository
     ) : AlbumArtistArtworkProvider(albumArtist),
         LocalArtworkProvider {
-        override fun getInputStream(): InputStream? {
-            return runBlocking {
-                songRepository.getSongs(SongQuery.ArtistGroupKeys(listOf(SongQuery.ArtistGroupKey(albumArtist.groupKey))))
-                    .firstOrNull()
-                    ?.firstOrNull()
-                    ?.let { song ->
+        override fun getInputStream(): InputStream? = runBlocking {
+            songRepository.getSongs(SongQuery.ArtistGroupKeys(listOf(SongQuery.ArtistGroupKey(albumArtist.groupKey))))
+                .firstOrNull()
+                ?.firstOrNull()
+                ?.let { song ->
 
-                        val documentFiles = mutableListOf<DocumentFile>()
+                    val documentFiles = mutableListOf<DocumentFile>()
 
-                        if (DocumentsContract.isDocumentUri(context, song.path.toUri())) {
-                            val parent = song.path.substringBeforeLast("%2F", "")
-                            if (parent.isNotEmpty()) {
-                                DocumentFile.fromTreeUri(context, parent.toUri())?.let {
-                                    documentFiles.add(it)
-                                }
-                            }
-                            val grandParent = parent.substringBeforeLast("%2F", "")
-                            if (grandParent.isNotEmpty()) {
-                                DocumentFile.fromTreeUri(context, grandParent.toUri())?.let {
-                                    documentFiles.add(it)
-                                }
-                            }
-                        } else {
-                            File(song.path).parentFile?.let { parent ->
-                                documentFiles.add(DocumentFile.fromFile(parent))
-                            }
-                            File(song.path).parentFile?.parentFile?.let { grandParent ->
-                                documentFiles.add(DocumentFile.fromFile(grandParent))
+                    if (DocumentsContract.isDocumentUri(context, song.path.toUri())) {
+                        val parent = song.path.substringBeforeLast("%2F", "")
+                        if (parent.isNotEmpty()) {
+                            DocumentFile.fromTreeUri(context, parent.toUri())?.let {
+                                documentFiles.add(it)
                             }
                         }
-                        documentFiles.flatMap { it.listFiles().toList() }.filter {
-                            it.type?.startsWith("image") == true &&
-                                it.length() > 1024 &&
-                                (pattern.matcher(it.name ?: "").matches() || (albumArtist.friendlyArtistName ?: albumArtist.name ?: "").contains(it.name ?: "", true))
-                        }.maxByOrNull { it.length() }
-                            ?.let { documentFile ->
-                                context.contentResolver.openInputStream(documentFile.uri)
+                        val grandParent = parent.substringBeforeLast("%2F", "")
+                        if (grandParent.isNotEmpty()) {
+                            DocumentFile.fromTreeUri(context, grandParent.toUri())?.let {
+                                documentFiles.add(it)
                             }
+                        }
+                    } else {
+                        File(song.path).parentFile?.let { parent ->
+                            documentFiles.add(DocumentFile.fromFile(parent))
+                        }
+                        File(song.path).parentFile?.parentFile?.let { grandParent ->
+                            documentFiles.add(DocumentFile.fromFile(grandParent))
+                        }
                     }
-            }
+                    documentFiles.flatMap { it.listFiles().toList() }.filter {
+                        it.type?.startsWith("image") == true &&
+                            it.length() > 1024 &&
+                            (pattern.matcher(it.name ?: "").matches() || (albumArtist.friendlyArtistName ?: albumArtist.name ?: "").contains(it.name ?: "", true))
+                    }.maxByOrNull { it.length() }
+                        ?.let { documentFile ->
+                            context.contentResolver.openInputStream(documentFile.uri)
+                        }
+                }
         }
 
         companion object {
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/DirectoryAlbumLocalArtworkModelLoader.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/DirectoryAlbumLocalArtworkModelLoader.kt
index 3fce0954d..367ebaad5 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/DirectoryAlbumLocalArtworkModelLoader.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/DirectoryAlbumLocalArtworkModelLoader.kt
@@ -28,21 +28,15 @@ class DirectoryAlbumLocalArtworkModelLoader(
         width: Int,
         height: Int,
         options: Options
-    ): ModelLoader.LoadData<InputStream> {
-        return localArtworkModelLoader.buildLoadData(DirectoryAlbumLocalArtworkProvider(context, model, songRepository), width, height, options)
-    }
+    ): ModelLoader.LoadData<InputStream> = localArtworkModelLoader.buildLoadData(DirectoryAlbumLocalArtworkProvider(context, model, songRepository), width, height, options)
 
-    override fun handles(model: Album): Boolean {
-        return true
-    }
+    override fun handles(model: Album): Boolean = true
 
     class Factory(
         private val context: Context,
         private val songRepository: SongRepository
     ) : ModelLoaderFactory<Album, InputStream> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Album, InputStream> {
-            return DirectoryAlbumLocalArtworkModelLoader(context, multiFactory.build(LocalArtworkProvider::class.java, InputStream::class.java) as LocalArtworkModelLoader, songRepository)
-        }
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Album, InputStream> = DirectoryAlbumLocalArtworkModelLoader(context, multiFactory.build(LocalArtworkProvider::class.java, InputStream::class.java) as LocalArtworkModelLoader, songRepository)
 
         override fun teardown() {
         }
@@ -54,38 +48,36 @@ class DirectoryAlbumLocalArtworkModelLoader(
         private val songRepository: SongRepository
     ) : AlbumArtworkProvider(album),
         LocalArtworkProvider {
-        override fun getInputStream(): InputStream? {
-            return runBlocking {
-                songRepository.getSongs(SongQuery.AlbumGroupKeys(listOf(SongQuery.AlbumGroupKey(album.groupKey))))
-                    .firstOrNull()
-                    ?.firstOrNull()
-                    ?.let { song ->
-                        val parentDocumentFile =
-                            if (DocumentsContract.isDocumentUri(context, song.path.toUri())) {
-                                val parent = song.path.substringBeforeLast("%2F", "")
-                                if (parent.isNotEmpty()) {
-                                    DocumentFile.fromTreeUri(context, parent.toUri())
-                                } else {
-                                    null
-                                }
+        override fun getInputStream(): InputStream? = runBlocking {
+            songRepository.getSongs(SongQuery.AlbumGroupKeys(listOf(SongQuery.AlbumGroupKey(album.groupKey))))
+                .firstOrNull()
+                ?.firstOrNull()
+                ?.let { song ->
+                    val parentDocumentFile =
+                        if (DocumentsContract.isDocumentUri(context, song.path.toUri())) {
+                            val parent = song.path.substringBeforeLast("%2F", "")
+                            if (parent.isNotEmpty()) {
+                                DocumentFile.fromTreeUri(context, parent.toUri())
                             } else {
-                                File(song.path).parentFile?.let { parent ->
-                                    DocumentFile.fromFile(parent)
-                                }
+                                null
                             }
-
-                        parentDocumentFile?.listFiles()
-                            ?.filter {
-                                it.type?.startsWith("image") == true &&
-                                    it.length() > 1024 &&
-                                    pattern.matcher(it.name ?: "").matches()
-                            }
-                            ?.maxByOrNull { it.length() }
-                            ?.let { documentFile ->
-                                context.contentResolver.openInputStream(documentFile.uri)
+                        } else {
+                            File(song.path).parentFile?.let { parent ->
+                                DocumentFile.fromFile(parent)
                             }
-                    }
-            }
+                        }
+
+                    parentDocumentFile?.listFiles()
+                        ?.filter {
+                            it.type?.startsWith("image") == true &&
+                                it.length() > 1024 &&
+                                pattern.matcher(it.name ?: "").matches()
+                        }
+                        ?.maxByOrNull { it.length() }
+                        ?.let { documentFile ->
+                            context.contentResolver.openInputStream(documentFile.uri)
+                        }
+                }
         }
 
         companion object {
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/DirectorySongLocalArtworkModelLoader.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/DirectorySongLocalArtworkModelLoader.kt
index 7f9bd0395..f3caf862b 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/DirectorySongLocalArtworkModelLoader.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/DirectorySongLocalArtworkModelLoader.kt
@@ -23,18 +23,12 @@ class DirectorySongLocalArtworkModelLoader(
         width: Int,
         height: Int,
         options: Options
-    ): ModelLoader.LoadData<InputStream>? {
-        return localArtworkModelLoader.buildLoadData(DirectorySongLocalArtworkProvider(context, model), width, height, options)
-    }
+    ): ModelLoader.LoadData<InputStream>? = localArtworkModelLoader.buildLoadData(DirectorySongLocalArtworkProvider(context, model), width, height, options)
 
-    override fun handles(model: Song): Boolean {
-        return true
-    }
+    override fun handles(model: Song): Boolean = true
 
     class Factory(val context: Context) : ModelLoaderFactory<Song, InputStream> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Song, InputStream> {
-            return DirectorySongLocalArtworkModelLoader(context, multiFactory.build(LocalArtworkProvider::class.java, InputStream::class.java) as LocalArtworkModelLoader)
-        }
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Song, InputStream> = DirectorySongLocalArtworkModelLoader(context, multiFactory.build(LocalArtworkProvider::class.java, InputStream::class.java) as LocalArtworkModelLoader)
 
         override fun teardown() {
         }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/LocalArtworkModelLoader.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/LocalArtworkModelLoader.kt
index 23b8712e4..c38772d29 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/LocalArtworkModelLoader.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/LocalArtworkModelLoader.kt
@@ -22,18 +22,12 @@ class LocalArtworkModelLoader : ModelLoader<LocalArtworkProvider, InputStream> {
         width: Int,
         height: Int,
         options: Options
-    ): ModelLoader.LoadData<InputStream> {
-        return ModelLoader.LoadData(ObjectKey(model.getCacheKey()), LocalArtworkDataFetcher(model))
-    }
+    ): ModelLoader.LoadData<InputStream> = ModelLoader.LoadData(ObjectKey(model.getCacheKey()), LocalArtworkDataFetcher(model))
 
-    override fun handles(model: LocalArtworkProvider): Boolean {
-        return true
-    }
+    override fun handles(model: LocalArtworkProvider): Boolean = true
 
     class Factory : ModelLoaderFactory<LocalArtworkProvider, InputStream> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<LocalArtworkProvider, InputStream> {
-            return LocalArtworkModelLoader()
-        }
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<LocalArtworkProvider, InputStream> = LocalArtworkModelLoader()
 
         override fun teardown() {
         }
@@ -42,16 +36,12 @@ class LocalArtworkModelLoader : ModelLoader<LocalArtworkProvider, InputStream> {
     class LocalArtworkDataFetcher(
         private val localArtworkProvider: LocalArtworkProvider
     ) : DataFetcher<InputStream> {
-        override fun getDataClass(): Class<InputStream> {
-            return InputStream::class.java
-        }
+        override fun getDataClass(): Class<InputStream> = InputStream::class.java
 
         override fun cleanup() {
         }
 
-        override fun getDataSource(): DataSource {
-            return DataSource.REMOTE
-        }
+        override fun getDataSource(): DataSource = DataSource.REMOTE
 
         override fun cancel() {
         }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/TagLibAlbumLocalArtworkModelLoader.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/TagLibAlbumLocalArtworkModelLoader.kt
index 91287df76..46196abdb 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/TagLibAlbumLocalArtworkModelLoader.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/TagLibAlbumLocalArtworkModelLoader.kt
@@ -29,22 +29,16 @@ class TagLibAlbumLocalArtworkModelLoader(
         width: Int,
         height: Int,
         options: Options
-    ): ModelLoader.LoadData<InputStream>? {
-        return localArtworkModelLoader.buildLoadData(TagLibAlbumLocalArtworkProvider(context, kTagLib, model, songRepository), width, height, options)
-    }
+    ): ModelLoader.LoadData<InputStream>? = localArtworkModelLoader.buildLoadData(TagLibAlbumLocalArtworkProvider(context, kTagLib, model, songRepository), width, height, options)
 
-    override fun handles(model: Album): Boolean {
-        return true
-    }
+    override fun handles(model: Album): Boolean = true
 
     class Factory(
         private val context: Context,
         private val kTagLib: KTagLib,
         private val songRepository: SongRepository
     ) : ModelLoaderFactory<Album, InputStream> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Album, InputStream> {
-            return TagLibAlbumLocalArtworkModelLoader(context, kTagLib, multiFactory.build(LocalArtworkProvider::class.java, InputStream::class.java) as LocalArtworkModelLoader, songRepository)
-        }
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Album, InputStream> = TagLibAlbumLocalArtworkModelLoader(context, kTagLib, multiFactory.build(LocalArtworkProvider::class.java, InputStream::class.java) as LocalArtworkModelLoader, songRepository)
 
         override fun teardown() {
         }
@@ -57,37 +51,35 @@ class TagLibAlbumLocalArtworkModelLoader(
         private val songRepository: SongRepository
     ) : AlbumArtworkProvider(album),
         LocalArtworkProvider {
-        override fun getInputStream(): InputStream? {
-            return runBlocking {
-                songRepository.getSongs(SongQuery.AlbumGroupKeys(listOf(SongQuery.AlbumGroupKey(album.groupKey))))
-                    .firstOrNull()
-                    ?.firstOrNull()
-                    ?.let { song ->
-                        val uri: Uri =
-                            if (song.path.startsWith("content://")) {
-                                Uri.parse(song.path)
-                            } else {
-                                Uri.fromFile(File(song.path))
-                            }
-                        try {
-                            context.contentResolver.openFileDescriptor(uri, "r")?.use { pfd ->
-                                kTagLib.getArtwork(pfd.detachFd())?.inputStream()
-                            }
-                        } catch (e: SecurityException) {
-                            Timber.v("Failed to retrieve artwork (permission denial)")
-                            null
-                        } catch (e: IllegalStateException) {
-                            Timber.v("Failed to retrieve artwork (fd problem)")
-                            null
-                        } catch (e: SecurityException) {
-                            Timber.v("Failed to retrieve artwork (security problem)")
-                            null
-                        } catch (e: FileNotFoundException) {
-                            Timber.v("Failed to retrieve artwork (file not found)")
-                            null
+        override fun getInputStream(): InputStream? = runBlocking {
+            songRepository.getSongs(SongQuery.AlbumGroupKeys(listOf(SongQuery.AlbumGroupKey(album.groupKey))))
+                .firstOrNull()
+                ?.firstOrNull()
+                ?.let { song ->
+                    val uri: Uri =
+                        if (song.path.startsWith("content://")) {
+                            Uri.parse(song.path)
+                        } else {
+                            Uri.fromFile(File(song.path))
+                        }
+                    try {
+                        context.contentResolver.openFileDescriptor(uri, "r")?.use { pfd ->
+                            kTagLib.getArtwork(pfd.detachFd())?.inputStream()
                         }
+                    } catch (e: SecurityException) {
+                        Timber.v("Failed to retrieve artwork (permission denial)")
+                        null
+                    } catch (e: IllegalStateException) {
+                        Timber.v("Failed to retrieve artwork (fd problem)")
+                        null
+                    } catch (e: SecurityException) {
+                        Timber.v("Failed to retrieve artwork (security problem)")
+                        null
+                    } catch (e: FileNotFoundException) {
+                        Timber.v("Failed to retrieve artwork (file not found)")
+                        null
                     }
-            }
+                }
         }
     }
 }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/TagLibSongLocalArtworkModelLoader.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/TagLibSongLocalArtworkModelLoader.kt
index 539fba765..6d9808e02 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/TagLibSongLocalArtworkModelLoader.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/local/TagLibSongLocalArtworkModelLoader.kt
@@ -24,35 +24,29 @@ class TagLibSongLocalArtworkModelLoader(
         width: Int,
         height: Int,
         options: Options
-    ): ModelLoader.LoadData<InputStream>? {
-        return localArtworkModelLoader.buildLoadData(
-            model =
-            TagLibSongLocalArtworkProvider(
-                context = context,
-                kTagLib = kTagLib,
-                song = model
-            ),
-            width = width,
-            height = height,
-            options = options
-        )
-    }
+    ): ModelLoader.LoadData<InputStream>? = localArtworkModelLoader.buildLoadData(
+        model =
+        TagLibSongLocalArtworkProvider(
+            context = context,
+            kTagLib = kTagLib,
+            song = model
+        ),
+        width = width,
+        height = height,
+        options = options
+    )
 
-    override fun handles(model: Song): Boolean {
-        return true
-    }
+    override fun handles(model: Song): Boolean = true
 
     class Factory(
         private val context: Context,
         private val kTagLib: KTagLib
     ) : ModelLoaderFactory<Song, InputStream> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Song, InputStream> {
-            return TagLibSongLocalArtworkModelLoader(
-                context = context,
-                kTagLib = kTagLib,
-                localArtworkModelLoader = multiFactory.build(LocalArtworkProvider::class.java, InputStream::class.java) as LocalArtworkModelLoader
-            )
-        }
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Song, InputStream> = TagLibSongLocalArtworkModelLoader(
+            context = context,
+            kTagLib = kTagLib,
+            localArtworkModelLoader = multiFactory.build(LocalArtworkProvider::class.java, InputStream::class.java) as LocalArtworkModelLoader
+        )
 
         override fun teardown() {
         }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/provider/RemoteArtworkAlbumArtistModelLoader.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/provider/RemoteArtworkAlbumArtistModelLoader.kt
index bbcaf1d98..a4b95516a 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/provider/RemoteArtworkAlbumArtistModelLoader.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/provider/RemoteArtworkAlbumArtistModelLoader.kt
@@ -20,9 +20,7 @@ class RemoteArtworkAlbumArtistModelLoader(
     private val remoteArtworkProvider: RemoteArtworkProvider,
     private val coroutineScope: CoroutineScope
 ) : ModelLoader<AlbumArtist, InputStream> {
-    override fun handles(model: AlbumArtist): Boolean {
-        return true
-    }
+    override fun handles(model: AlbumArtist): Boolean = true
 
     override fun buildLoadData(
         model: AlbumArtist,
@@ -43,9 +41,7 @@ class RemoteArtworkAlbumArtistModelLoader(
         private val remoteArtworkProvider: RemoteArtworkProvider,
         private val coroutineScope: CoroutineScope
     ) : ModelLoaderFactory<AlbumArtist, InputStream> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<AlbumArtist, InputStream> {
-            return RemoteArtworkAlbumArtistModelLoader(preferenceManager, songRepository, remoteArtworkProvider, coroutineScope)
-        }
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<AlbumArtist, InputStream> = RemoteArtworkAlbumArtistModelLoader(preferenceManager, songRepository, remoteArtworkProvider, coroutineScope)
 
         override fun teardown() {}
     }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/provider/RemoteArtworkAlbumModelLoader.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/provider/RemoteArtworkAlbumModelLoader.kt
index 7defcf746..2231bc708 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/provider/RemoteArtworkAlbumModelLoader.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/provider/RemoteArtworkAlbumModelLoader.kt
@@ -20,9 +20,7 @@ class RemoteArtworkAlbumModelLoader(
     private val remoteArtworkProvider: RemoteArtworkProvider,
     private val coroutineScope: CoroutineScope
 ) : ModelLoader<Album, InputStream> {
-    override fun handles(model: Album): Boolean {
-        return true
-    }
+    override fun handles(model: Album): Boolean = true
 
     override fun buildLoadData(
         model: Album,
@@ -43,9 +41,7 @@ class RemoteArtworkAlbumModelLoader(
         private val remoteArtworkProvider: RemoteArtworkProvider,
         private val coroutineScope: CoroutineScope
     ) : ModelLoaderFactory<Album, InputStream> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Album, InputStream> {
-            return RemoteArtworkAlbumModelLoader(preferenceManager, songRepository, remoteArtworkProvider, coroutineScope)
-        }
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Album, InputStream> = RemoteArtworkAlbumModelLoader(preferenceManager, songRepository, remoteArtworkProvider, coroutineScope)
 
         override fun teardown() {}
     }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/provider/RemoteArtworkSongModelLoader.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/provider/RemoteArtworkSongModelLoader.kt
index 072d3e49e..5f9e95130 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/provider/RemoteArtworkSongModelLoader.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/provider/RemoteArtworkSongModelLoader.kt
@@ -18,9 +18,7 @@ class RemoteArtworkSongModelLoader(
     private val remoteArtworkProvider: RemoteArtworkProvider,
     private val coroutineScope: CoroutineScope
 ) : ModelLoader<Song, InputStream> {
-    override fun handles(model: Song): Boolean {
-        return true
-    }
+    override fun handles(model: Song): Boolean = true
 
     override fun buildLoadData(
         model: Song,
@@ -40,9 +38,7 @@ class RemoteArtworkSongModelLoader(
         private val remoteArtworkProvider: RemoteArtworkProvider,
         private val coroutineScope: CoroutineScope
     ) : ModelLoaderFactory<Song, InputStream> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Song, InputStream> {
-            return RemoteArtworkSongModelLoader(preferenceManager, remoteArtworkProvider, coroutineScope)
-        }
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Song, InputStream> = RemoteArtworkSongModelLoader(preferenceManager, remoteArtworkProvider, coroutineScope)
 
         override fun teardown() {}
     }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/s2/S2AlbumArtistArtworkModelLoader.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/s2/S2AlbumArtistArtworkModelLoader.kt
index 0b8281744..1055f8018 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/s2/S2AlbumArtistArtworkModelLoader.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/s2/S2AlbumArtistArtworkModelLoader.kt
@@ -20,13 +20,9 @@ class S2AlbumArtistArtworkModelLoader(
         width: Int,
         height: Int,
         options: Options?
-    ): String {
-        return "https://api.shuttlemusicplayer.app/v1/artwork?artist=${(model.name ?: model.friendlyArtistName)!!.urlEncode()}"
-    }
+    ): String = "https://api.shuttlemusicplayer.app/v1/artwork?artist=${(model.name ?: model.friendlyArtistName)!!.urlEncode()}"
 
-    override fun handles(model: AlbumArtist): Boolean {
-        return (model.name ?: model.friendlyArtistName) != null
-    }
+    override fun handles(model: AlbumArtist): Boolean = (model.name ?: model.friendlyArtistName) != null
 
     override fun buildLoadData(
         model: AlbumArtist,
@@ -43,9 +39,7 @@ class S2AlbumArtistArtworkModelLoader(
     class Factory(
         private val preferenceManager: GeneralPreferenceManager
     ) : ModelLoaderFactory<AlbumArtist, InputStream> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<AlbumArtist, InputStream> {
-            return S2AlbumArtistArtworkModelLoader(multiFactory.build(GlideUrl::class.java, InputStream::class.java), preferenceManager)
-        }
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<AlbumArtist, InputStream> = S2AlbumArtistArtworkModelLoader(multiFactory.build(GlideUrl::class.java, InputStream::class.java), preferenceManager)
 
         override fun teardown() {}
     }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/s2/S2AlbumArtworkModelLoader.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/s2/S2AlbumArtworkModelLoader.kt
index 3cb8e72c8..7f295b3c4 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/s2/S2AlbumArtworkModelLoader.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/s2/S2AlbumArtworkModelLoader.kt
@@ -20,13 +20,9 @@ class S2AlbumArtworkModelLoader(
         width: Int,
         height: Int,
         options: Options?
-    ): String {
-        return "https://api.shuttlemusicplayer.app/v1/artwork?artist=${(model.albumArtist ?: model.friendlyArtistName)!!.urlEncode()}&album=${model.name!!.urlEncode()}"
-    }
+    ): String = "https://api.shuttlemusicplayer.app/v1/artwork?artist=${(model.albumArtist ?: model.friendlyArtistName)!!.urlEncode()}&album=${model.name!!.urlEncode()}"
 
-    override fun handles(model: Album): Boolean {
-        return model.name != null && (model.albumArtist ?: model.friendlyArtistName) != null
-    }
+    override fun handles(model: Album): Boolean = model.name != null && (model.albumArtist ?: model.friendlyArtistName) != null
 
     override fun buildLoadData(
         model: Album,
@@ -43,9 +39,7 @@ class S2AlbumArtworkModelLoader(
     class Factory(
         private val preferenceManager: GeneralPreferenceManager
     ) : ModelLoaderFactory<Album, InputStream> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Album, InputStream> {
-            return S2AlbumArtworkModelLoader(multiFactory.build(GlideUrl::class.java, InputStream::class.java), preferenceManager)
-        }
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Album, InputStream> = S2AlbumArtworkModelLoader(multiFactory.build(GlideUrl::class.java, InputStream::class.java), preferenceManager)
 
         override fun teardown() {}
     }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/s2/S2SongArtworkModelLoader.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/s2/S2SongArtworkModelLoader.kt
index 770c0dc81..316b89d19 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/s2/S2SongArtworkModelLoader.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/loader/remote/s2/S2SongArtworkModelLoader.kt
@@ -20,13 +20,9 @@ class S2SongArtworkModelLoader(
         width: Int,
         height: Int,
         options: Options?
-    ): String {
-        return "https://api.shuttlemusicplayer.app/v1/artwork?artist=${(model.albumArtist ?: model.friendlyArtistName)!!.urlEncode()}&album=${model.album!!.urlEncode()}"
-    }
+    ): String = "https://api.shuttlemusicplayer.app/v1/artwork?artist=${(model.albumArtist ?: model.friendlyArtistName)!!.urlEncode()}&album=${model.album!!.urlEncode()}"
 
-    override fun handles(model: Song): Boolean {
-        return model.album != null && (model.albumArtist ?: model.friendlyArtistName) != null
-    }
+    override fun handles(model: Song): Boolean = model.album != null && (model.albumArtist ?: model.friendlyArtistName) != null
 
     override fun buildLoadData(
         model: Song,
@@ -43,9 +39,7 @@ class S2SongArtworkModelLoader(
     class Factory(
         private val preferenceManager: GeneralPreferenceManager
     ) : ModelLoaderFactory<Song, InputStream> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Song, InputStream> {
-            return S2SongArtworkModelLoader(multiFactory.build(GlideUrl::class.java, InputStream::class.java), preferenceManager)
-        }
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Song, InputStream> = S2SongArtworkModelLoader(multiFactory.build(GlideUrl::class.java, InputStream::class.java), preferenceManager)
 
         override fun teardown() {}
     }
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/module/ImageLoaderGlideModule.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/module/ImageLoaderGlideModule.kt
index a96dd9b46..dd8fabdd0 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/module/ImageLoaderGlideModule.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/glide/module/ImageLoaderGlideModule.kt
@@ -218,9 +218,7 @@ class ImageLoaderGlideModule : AppGlideModule() {
         )
     }
 
-    override fun isManifestParsingEnabled(): Boolean {
-        return false
-    }
+    override fun isManifestParsingEnabled(): Boolean = false
 
     override fun applyOptions(
         context: Context,
diff --git a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/palette/ColorSet.kt b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/palette/ColorSet.kt
index 5d0313481..3694fd334 100644
--- a/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/palette/ColorSet.kt
+++ b/android/imageloader/src/main/java/au/com/simplecityapps/shuttle/imageloading/palette/ColorSet.kt
@@ -46,16 +46,12 @@ class ColorSet(
             return ColorSet(primaryColor, accentColor, tintedTextColor.first!!, tintedTextColor.second!!, primaryTextColor, secondaryTextColor)
         }
 
-        fun empty(): ColorSet {
-            return ColorSet(Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT)
-        }
+        fun empty(): ColorSet = ColorSet(Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT)
 
         /**
          * @return an approximate byte size for this object. Currently based on 6 integers @ 4 bytes each and a safety factor of 3
          */
-        fun estimatedSize(): Int {
-            return 6 * 4 * 3
-        }
+        fun estimatedSize(): Int = 6 * 4 * 3
     }
 
     override fun equals(other: Any?): Boolean {
@@ -92,14 +88,12 @@ class ColorSetEvaluator : TypeEvaluator<ColorSet> {
         p0: Float,
         p1: ColorSet,
         p2: ColorSet
-    ): ColorSet {
-        return ColorSet(
-            argbEvaluator.evaluate(p0, p1.primaryColor, p2.primaryColor) as Int,
-            argbEvaluator.evaluate(p0, p1.accentColor, p2.accentColor) as Int,
-            argbEvaluator.evaluate(p0, p1.primaryTextColorTinted, p2.primaryTextColor) as Int,
-            argbEvaluator.evaluate(p0, p1.secondaryTextColorTinted, p2.secondaryTextColorTinted) as Int,
-            argbEvaluator.evaluate(p0, p1.primaryTextColor, p2.primaryTextColor) as Int,
-            argbEvaluator.evaluate(p0, p1.secondaryTextColor, p2.secondaryTextColor) as Int
-        )
-    }
+    ): ColorSet = ColorSet(
+        argbEvaluator.evaluate(p0, p1.primaryColor, p2.primaryColor) as Int,
+        argbEvaluator.evaluate(p0, p1.accentColor, p2.accentColor) as Int,
+        argbEvaluator.evaluate(p0, p1.primaryTextColorTinted, p2.primaryTextColor) as Int,
+        argbEvaluator.evaluate(p0, p1.secondaryTextColorTinted, p2.secondaryTextColorTinted) as Int,
+        argbEvaluator.evaluate(p0, p1.primaryTextColor, p2.primaryTextColor) as Int,
+        argbEvaluator.evaluate(p0, p1.secondaryTextColor, p2.secondaryTextColor) as Int
+    )
 }
diff --git a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/Diff.kt b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/Diff.kt
index 40d584876..d04c79848 100644
--- a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/Diff.kt
+++ b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/Diff.kt
@@ -9,9 +9,7 @@ abstract class Diff<T>(private val existingData: List<T>, private val newData: L
         val updates: List<T>,
         val deletes: List<T>
     ) {
-        override fun toString(): String {
-            return "${inserts.count()} inserts, ${updates.count()} updates, ${deletes.count()} deletes"
-        }
+        override fun toString(): String = "${inserts.count()} inserts, ${updates.count()} updates, ${deletes.count()} deletes"
     }
 
     /**
diff --git a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/M3uParser.kt b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/M3uParser.kt
index 8d2328243..71e6a096a 100644
--- a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/M3uParser.kt
+++ b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/M3uParser.kt
@@ -47,7 +47,5 @@ class M3uParser {
     /**
      * Sanitises paths, converting windows file separators to unix, and removing any leading windows directory qualifiers (e.g. c:\)
      */
-    fun String.sanitise(): String {
-        return substringAfter(":\\").replace('\\', '/')
-    }
+    fun String.sanitise(): String = substringAfter(":\\").replace('\\', '/')
 }
diff --git a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/MediaImporter.kt b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/MediaImporter.kt
index d92314248..13338cf06 100644
--- a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/MediaImporter.kt
+++ b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/MediaImporter.kt
@@ -183,114 +183,110 @@ class MediaImporter(
         val deletes: Int
     )
 
-    private fun importSongs(mediaProvider: MediaProvider): Flow<FlowEvent<SongImportResult, MessageProgress>> {
-        return flow {
-            emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_import_retrieving_songs), null)))
-
-            val existingSongs =
-                songRepository.getSongs(
-                    SongQuery.All(
-                        includeExcluded = true,
-                        providerType = mediaProvider.type
-                    )
+    private fun importSongs(mediaProvider: MediaProvider): Flow<FlowEvent<SongImportResult, MessageProgress>> = flow {
+        emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_import_retrieving_songs), null)))
+
+        val existingSongs =
+            songRepository.getSongs(
+                SongQuery.All(
+                    includeExcluded = true,
+                    providerType = mediaProvider.type
                 )
-                    .filterNotNull()
-                    .firstOrNull()
-                    .orEmpty()
-
-            mediaProvider.findSongs().collect { event ->
-                when (event) {
-                    is FlowEvent.Progress -> {
-                        emit(
-                            FlowEvent.Progress<SongImportResult, MessageProgress>(
-                                MessageProgress(
-                                    message = event.data.message,
-                                    progress = event.data.progress
-                                )
+            )
+                .filterNotNull()
+                .firstOrNull()
+                .orEmpty()
+
+        mediaProvider.findSongs().collect { event ->
+            when (event) {
+                is FlowEvent.Progress -> {
+                    emit(
+                        FlowEvent.Progress<SongImportResult, MessageProgress>(
+                            MessageProgress(
+                                message = event.data.message,
+                                progress = event.data.progress
                             )
                         )
-                    }
+                    )
+                }
 
-                    is FlowEvent.Success -> {
-                        try {
-                            emit(FlowEvent.Progress<SongImportResult, MessageProgress>(MessageProgress(context.getString(R.string.media_import_updating_database), null)))
-                            val songDiff = SongDiff(existingSongs, event.result).apply()
-                            val result =
-                                songRepository.insertUpdateAndDelete(
-                                    inserts = songDiff.inserts,
-                                    updates = songDiff.updates,
-                                    deletes = songDiff.deletes,
+                is FlowEvent.Success -> {
+                    try {
+                        emit(FlowEvent.Progress<SongImportResult, MessageProgress>(MessageProgress(context.getString(R.string.media_import_updating_database), null)))
+                        val songDiff = SongDiff(existingSongs, event.result).apply()
+                        val result =
+                            songRepository.insertUpdateAndDelete(
+                                inserts = songDiff.inserts,
+                                updates = songDiff.updates,
+                                deletes = songDiff.deletes,
+                                mediaProviderType = mediaProvider.type
+                            )
+                        emit(
+                            FlowEvent.Success(
+                                SongImportResult(
+                                    inserts = result.first,
+                                    updates = result.second,
+                                    deletes = result.third,
                                     mediaProviderType = mediaProvider.type
                                 )
-                            emit(
-                                FlowEvent.Success(
-                                    SongImportResult(
-                                        inserts = result.first,
-                                        updates = result.second,
-                                        deletes = result.third,
-                                        mediaProviderType = mediaProvider.type
-                                    )
-                                )
                             )
-                        } catch (e: Exception) {
-                            Timber.e(e, "Failed to update song repository")
-                            emit(FlowEvent.Failure(context.getString(R.string.media_import_error)))
-                        }
+                        )
+                    } catch (e: Exception) {
+                        Timber.e(e, "Failed to update song repository")
+                        emit(FlowEvent.Failure(context.getString(R.string.media_import_error)))
                     }
+                }
 
-                    is FlowEvent.Failure -> {
-                        emit(event)
-                    }
+                is FlowEvent.Failure -> {
+                    emit(event)
                 }
             }
-        }.flowOn(Dispatchers.IO)
-    }
+        }
+    }.flowOn(Dispatchers.IO)
 
     data class PlaylistImportResult(
         val mediaProviderType: MediaProviderType
     )
 
-    private fun importPlaylists(mediaProvider: MediaProvider): Flow<FlowEvent<PlaylistImportResult, MessageProgress>> {
-        return flow {
-            emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_import_retrieving_playlists), null)))
-
-            val existingPlaylists =
-                playlistRepository.getPlaylists(query = PlaylistQuery.All(mediaProviderType = mediaProvider.type))
-                    .filterNotNull()
-                    .firstOrNull()
-                    .orEmpty()
-
-            val existingSongs =
-                songRepository.getSongs(
-                    SongQuery.All(
-                        includeExcluded = true,
-                        providerType = mediaProvider.type
-                    )
+    private fun importPlaylists(mediaProvider: MediaProvider): Flow<FlowEvent<PlaylistImportResult, MessageProgress>> = flow {
+        emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_import_retrieving_playlists), null)))
+
+        val existingPlaylists =
+            playlistRepository.getPlaylists(query = PlaylistQuery.All(mediaProviderType = mediaProvider.type))
+                .filterNotNull()
+                .firstOrNull()
+                .orEmpty()
+
+        val existingSongs =
+            songRepository.getSongs(
+                SongQuery.All(
+                    includeExcluded = true,
+                    providerType = mediaProvider.type
                 )
-                    .filterNotNull()
-                    .firstOrNull()
-                    .orEmpty()
-
-            mediaProvider.findPlaylists(existingPlaylists, existingSongs).collect { event ->
-                when (event) {
-                    is FlowEvent.Progress -> {
-                        emit(FlowEvent.Progress<PlaylistImportResult, MessageProgress>(event.data))
-                    }
+            )
+                .filterNotNull()
+                .firstOrNull()
+                .orEmpty()
+
+        mediaProvider.findPlaylists(existingPlaylists, existingSongs).collect { event ->
+            when (event) {
+                is FlowEvent.Progress -> {
+                    emit(FlowEvent.Progress<PlaylistImportResult, MessageProgress>(event.data))
+                }
 
-                    is FlowEvent.Success -> {
-                        event.result.forEachIndexed { i, playlistUpdateData ->
-                            emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_import_updating_database), Progress(i, event.result.size))))
-                            createOrUpdatePlaylist(playlistUpdateData, existingPlaylists)
-                        }
+                is FlowEvent.Success -> {
+                    event.result.forEachIndexed { i, playlistUpdateData ->
+                        emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_import_updating_database), Progress(i, event.result.size))))
+                        createOrUpdatePlaylist(playlistUpdateData, existingPlaylists)
                     }
+                }
 
-                    is FlowEvent.Failure -> {
-                        emit(event)
-                    }
+                is FlowEvent.Failure -> {
+                    emit(event)
                 }
             }
-            emit(FlowEvent.Success(PlaylistImportResult(mediaProvider.type)))
         }
+        emit(FlowEvent.Success(PlaylistImportResult(mediaProvider.type)))
     }
 
     data class PlaylistUpdateData(
diff --git a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/MediaInfoProvider.kt b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/MediaInfoProvider.kt
index 2d4cac418..55bf97921 100644
--- a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/MediaInfoProvider.kt
+++ b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/MediaInfoProvider.kt
@@ -24,9 +24,7 @@ class AggregateMediaInfoProvider(val providers: MutableSet<MediaInfoProvider> =
         providers.remove(provider)
     }
 
-    override fun handles(uri: Uri): Boolean {
-        return true
-    }
+    override fun handles(uri: Uri): Boolean = true
 
     override suspend fun getMediaInfo(
         song: Song,
diff --git a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/MediaProvider.kt b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/MediaProvider.kt
index fe5607b8e..f3e206d71 100644
--- a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/MediaProvider.kt
+++ b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/MediaProvider.kt
@@ -18,33 +18,27 @@ interface MediaProvider {
     ): Flow<FlowEvent<List<MediaImporter.PlaylistUpdateData>, MessageProgress>>
 }
 
-fun MediaProviderType.title(context: Context): String {
-    return when (this) {
-        MediaProviderType.Shuttle -> context.getString(R.string.media_provider_title_s2)
-        MediaProviderType.MediaStore -> context.getString(R.string.media_provider_title_media_store)
-        MediaProviderType.Jellyfin -> context.getString(R.string.media_provider_title_jellyfin)
-        MediaProviderType.Emby -> context.getString(R.string.media_provider_title_emby)
-        MediaProviderType.Plex -> context.getString(R.string.media_provider_title_plex)
-    }
+fun MediaProviderType.title(context: Context): String = when (this) {
+    MediaProviderType.Shuttle -> context.getString(R.string.media_provider_title_s2)
+    MediaProviderType.MediaStore -> context.getString(R.string.media_provider_title_media_store)
+    MediaProviderType.Jellyfin -> context.getString(R.string.media_provider_title_jellyfin)
+    MediaProviderType.Emby -> context.getString(R.string.media_provider_title_emby)
+    MediaProviderType.Plex -> context.getString(R.string.media_provider_title_plex)
 }
 
-fun MediaProviderType.description(context: Context): String {
-    return when (this) {
-        MediaProviderType.Shuttle -> context.getString(R.string.media_provider_description_s2)
-        MediaProviderType.MediaStore -> context.getString(R.string.media_provider_description_media_store)
-        MediaProviderType.Jellyfin -> context.getString(R.string.media_provider_description_jellyfin)
-        MediaProviderType.Emby -> context.getString(R.string.media_provider_description_emby)
-        MediaProviderType.Plex -> context.getString(R.string.media_provider_description_plex)
-    }
+fun MediaProviderType.description(context: Context): String = when (this) {
+    MediaProviderType.Shuttle -> context.getString(R.string.media_provider_description_s2)
+    MediaProviderType.MediaStore -> context.getString(R.string.media_provider_description_media_store)
+    MediaProviderType.Jellyfin -> context.getString(R.string.media_provider_description_jellyfin)
+    MediaProviderType.Emby -> context.getString(R.string.media_provider_description_emby)
+    MediaProviderType.Plex -> context.getString(R.string.media_provider_description_plex)
 }
 
 @DrawableRes
-fun MediaProviderType.iconResId(): Int {
-    return when (this) {
-        MediaProviderType.Shuttle -> R.drawable.ic_s2
-        MediaProviderType.MediaStore -> R.drawable.ic_baseline_android_24
-        MediaProviderType.Jellyfin -> R.drawable.ic_jellyfin
-        MediaProviderType.Emby -> R.drawable.ic_emby
-        MediaProviderType.Plex -> R.drawable.ic_plex
-    }
+fun MediaProviderType.iconResId(): Int = when (this) {
+    MediaProviderType.Shuttle -> R.drawable.ic_s2
+    MediaProviderType.MediaStore -> R.drawable.ic_baseline_android_24
+    MediaProviderType.Jellyfin -> R.drawable.ic_jellyfin
+    MediaProviderType.Emby -> R.drawable.ic_emby
+    MediaProviderType.Plex -> R.drawable.ic_plex
 }
diff --git a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/Progress.kt b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/Progress.kt
index ff2e2dcd8..154c3010b 100644
--- a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/Progress.kt
+++ b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/Progress.kt
@@ -1,7 +1,5 @@
 package com.simplecityapps.mediaprovider
 
 data class Progress(val progress: Int, val total: Int) {
-    fun asFloat(): Float {
-        return progress / total.toFloat()
-    }
+    fun asFloat(): Float = progress / total.toFloat()
 }
diff --git a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/RemoteArtworkProvider.kt b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/RemoteArtworkProvider.kt
index 3d68cc9cd..ebd4800c6 100644
--- a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/RemoteArtworkProvider.kt
+++ b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/RemoteArtworkProvider.kt
@@ -12,9 +12,7 @@ interface RemoteArtworkProvider {
 }
 
 class AggregateRemoteArtworkProvider(val providers: MutableSet<RemoteArtworkProvider>) : RemoteArtworkProvider {
-    override fun handles(uri: Uri): Boolean {
-        return providers.any { it.handles(uri) }
-    }
+    override fun handles(uri: Uri): Boolean = providers.any { it.handles(uri) }
 
     override suspend fun getAlbumArtworkUrl(song: Song): String? {
         val uri = Uri.parse(song.path)
diff --git a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/SongDiff.kt b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/SongDiff.kt
index fada1cd47..5e843979c 100644
--- a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/SongDiff.kt
+++ b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/SongDiff.kt
@@ -6,14 +6,10 @@ class SongDiff(existingData: List<Song>, newData: List<Song>) : Diff<Song>(exist
     override fun isEqual(
         a: Song,
         b: Song
-    ): Boolean {
-        return a.path == b.path
-    }
+    ): Boolean = a.path == b.path
 
     override fun update(
         oldData: Song,
         newData: Song
-    ): Song {
-        return newData.copy(id = oldData.id)
-    }
+    ): Song = newData.copy(id = oldData.id)
 }
diff --git a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/genres/GenreQuery.kt b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/genres/GenreQuery.kt
index 39c5affb7..68e5c57f0 100644
--- a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/genres/GenreQuery.kt
+++ b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/genres/GenreQuery.kt
@@ -7,16 +7,19 @@ sealed class GenreQuery(
     val predicate: (Genre) -> Boolean,
     val sortOrder: GenreSortOrder = GenreSortOrder.Default
 ) {
-    class All(sortOrder: GenreSortOrder = GenreSortOrder.Default) : GenreQuery(
-        predicate = { true },
-        sortOrder = sortOrder
-    )
+    class All(sortOrder: GenreSortOrder = GenreSortOrder.Default) :
+        GenreQuery(
+            predicate = { true },
+            sortOrder = sortOrder
+        )
 
-    class GenreName(val genreName: String) : GenreQuery(
-        predicate = { genre -> genre.name == genreName }
-    )
+    class GenreName(val genreName: String) :
+        GenreQuery(
+            predicate = { genre -> genre.name == genreName }
+        )
 
-    class Search(val query: String) : GenreQuery(
-        predicate = { genre -> genre.name.contains(query, true) }
-    )
+    class Search(val query: String) :
+        GenreQuery(
+            predicate = { genre -> genre.name.contains(query, true) }
+        )
 }
diff --git a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/genres/GenreRepository.kt b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/genres/GenreRepository.kt
index cf62e99e9..f3860e595 100644
--- a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/genres/GenreRepository.kt
+++ b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/genres/GenreRepository.kt
@@ -16,7 +16,5 @@ interface GenreRepository {
     fun getSongsForGenre(
         genre: String,
         songQuery: SongQuery
-    ): Flow<List<Song>> {
-        return getSongsForGenres(listOf(genre), songQuery)
-    }
+    ): Flow<List<Song>> = getSongsForGenres(listOf(genre), songQuery)
 }
diff --git a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/playlists/PlaylistQuery.kt b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/playlists/PlaylistQuery.kt
index d11f858b1..d052ee3f7 100644
--- a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/playlists/PlaylistQuery.kt
+++ b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/playlists/PlaylistQuery.kt
@@ -7,13 +7,15 @@ sealed class PlaylistQuery(
     val predicate: (Playlist) -> Boolean,
     val sortOrder: PlaylistSortOrder = PlaylistSortOrder.Default
 ) {
-    class All(mediaProviderType: MediaProviderType?, sortOrder: PlaylistSortOrder = PlaylistSortOrder.Default) : PlaylistQuery(
-        predicate = { mediaProviderType == null || it.mediaProvider == mediaProviderType },
-        sortOrder = sortOrder
-    )
+    class All(mediaProviderType: MediaProviderType?, sortOrder: PlaylistSortOrder = PlaylistSortOrder.Default) :
+        PlaylistQuery(
+            predicate = { mediaProviderType == null || it.mediaProvider == mediaProviderType },
+            sortOrder = sortOrder
+        )
 
-    class PlaylistId(val playlistId: Long) : PlaylistQuery(
-        predicate = { playlist -> playlist.id == playlistId },
-        sortOrder = PlaylistSortOrder.Default
-    )
+    class PlaylistId(val playlistId: Long) :
+        PlaylistQuery(
+            predicate = { playlist -> playlist.id == playlistId },
+            sortOrder = PlaylistSortOrder.Default
+        )
 }
diff --git a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/playlists/PlaylistSongComparator.kt b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/playlists/PlaylistSongComparator.kt
index 8dca3b163..15610a958 100644
--- a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/playlists/PlaylistSongComparator.kt
+++ b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/repository/playlists/PlaylistSongComparator.kt
@@ -31,7 +31,5 @@ class DelegatingComparator(private val songComparator: Comparator<Song>) : Compa
     override fun compare(
         o1: PlaylistSong,
         o2: PlaylistSong
-    ): Int {
-        return songComparator.compare(o1.song, o2.song)
-    }
+    ): Int = songComparator.compare(o1.song, o2.song)
 }
diff --git a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/worker/MediaImportWorker.kt b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/worker/MediaImportWorker.kt
index 9a9ada79a..20b1669ea 100644
--- a/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/worker/MediaImportWorker.kt
+++ b/android/mediaprovider/core/src/main/java/com/simplecityapps/mediaprovider/worker/MediaImportWorker.kt
@@ -71,11 +71,9 @@ enum class ImportFrequency(val value: Int) {
     Weekly(2)
     ;
 
-    fun intervalInDays(): Long {
-        return when (this) {
-            Never -> 0L
-            Daily -> 1L
-            Weekly -> 7L
-        }
+    fun intervalInDays(): Long = when (this) {
+        Never -> 0L
+        Daily -> 1L
+        Weekly -> 7L
     }
 }
diff --git a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyAuthenticationManager.kt b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyAuthenticationManager.kt
index 2aa145ad8..46b14cadb 100644
--- a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyAuthenticationManager.kt
+++ b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyAuthenticationManager.kt
@@ -17,25 +17,19 @@ class EmbyAuthenticationManager(
 ) {
     private val deviceId = UUID.randomUUID().toString()
 
-    fun getLoginCredentials(): LoginCredentials? {
-        return credentialStore.loginCredentials
-    }
+    fun getLoginCredentials(): LoginCredentials? = credentialStore.loginCredentials
 
     fun setLoginCredentials(loginCredentials: LoginCredentials?) {
         credentialStore.loginCredentials = loginCredentials
     }
 
-    fun getAuthenticatedCredentials(): AuthenticatedCredentials? {
-        return credentialStore.authenticatedCredentials
-    }
+    fun getAuthenticatedCredentials(): AuthenticatedCredentials? = credentialStore.authenticatedCredentials
 
     fun setAddress(address: String) {
         credentialStore.address = address
     }
 
-    fun getAddress(): String? {
-        return credentialStore.address
-    }
+    fun getAddress(): String? = credentialStore.address
 
     suspend fun authenticate(
         address: String,
diff --git a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyMediaInfoProvider.kt b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyMediaInfoProvider.kt
index ccb8529c2..9bf155859 100644
--- a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyMediaInfoProvider.kt
+++ b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyMediaInfoProvider.kt
@@ -14,9 +14,7 @@ constructor(
     private val embyAuthenticationManager: EmbyAuthenticationManager,
     private val embyTranscodeService: EmbyTranscodeService
 ) : MediaInfoProvider {
-    override fun handles(uri: Uri): Boolean {
-        return uri.scheme == "emby"
-    }
+    override fun handles(uri: Uri): Boolean = uri.scheme == "emby"
 
     @Throws(IllegalStateException::class)
     override suspend fun getMediaInfo(
diff --git a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyMediaProvider.kt b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyMediaProvider.kt
index b2c2a92b7..a2a84aaee 100644
--- a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyMediaProvider.kt
+++ b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyMediaProvider.kt
@@ -111,18 +111,16 @@ class EmbyMediaProvider(
         }
     }
 
-    private suspend fun authenticate(address: String): AuthenticatedCredentials? {
-        return (
-            authenticationManager.getAuthenticatedCredentials()
-                ?: authenticationManager.getLoginCredentials()
-                    ?.let { loginCredentials ->
-                        authenticationManager.authenticate(
-                            address,
-                            loginCredentials
-                        ).getOrNull()
-                    }
-            )
-    }
+    private suspend fun authenticate(address: String): AuthenticatedCredentials? = (
+        authenticationManager.getAuthenticatedCredentials()
+            ?: authenticationManager.getLoginCredentials()
+                ?.let { loginCredentials ->
+                    authenticationManager.authenticate(
+                        address,
+                        loginCredentials
+                    ).getOrNull()
+                }
+        )
 
     private fun queryItems(
         address: String,
@@ -130,45 +128,43 @@ class EmbyMediaProvider(
         startIndex: Int = 0,
         pageSize: Int = 500,
         items: MutableList<Item> = mutableListOf()
-    ): Flow<FlowEvent<List<Item>, MessageProgress>> {
-        return flow {
-            when (
-                val queryResult =
-                    itemsService.audioItems(
-                        url = address,
-                        token = credentials.accessToken,
-                        userId = credentials.userId,
-                        limit = pageSize,
-                        startIndex = startIndex
-                    )
-            ) {
-                is NetworkResult.Success<QueryResult> -> {
-                    val totalRecordCount = queryResult.body.totalRecordCount
-                    val lastIndex = startIndex + pageSize
+    ): Flow<FlowEvent<List<Item>, MessageProgress>> = flow {
+        when (
+            val queryResult =
+                itemsService.audioItems(
+                    url = address,
+                    token = credentials.accessToken,
+                    userId = credentials.userId,
+                    limit = pageSize,
+                    startIndex = startIndex
+                )
+        ) {
+            is NetworkResult.Success<QueryResult> -> {
+                val totalRecordCount = queryResult.body.totalRecordCount
+                val lastIndex = startIndex + pageSize
 
-                    emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_provider_querying_api), Progress(lastIndex, totalRecordCount))))
+                emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_provider_querying_api), Progress(lastIndex, totalRecordCount))))
 
-                    items.addAll(queryResult.body.items)
+                items.addAll(queryResult.body.items)
 
-                    if (lastIndex < totalRecordCount) {
-                        emitAll(
-                            queryItems(
-                                address = address,
-                                credentials = credentials,
-                                startIndex = lastIndex,
-                                pageSize = min(pageSize, totalRecordCount - lastIndex),
-                                items = items
-                            )
+                if (lastIndex < totalRecordCount) {
+                    emitAll(
+                        queryItems(
+                            address = address,
+                            credentials = credentials,
+                            startIndex = lastIndex,
+                            pageSize = min(pageSize, totalRecordCount - lastIndex),
+                            items = items
                         )
-                    } else {
-                        emit(FlowEvent.Success(items))
-                    }
+                    )
+                } else {
+                    emit(FlowEvent.Success(items))
                 }
+            }
 
-                is NetworkResult.Failure -> {
-                    Timber.e(queryResult.error, queryResult.error.userDescription())
-                    emit(FlowEvent.Failure(queryResult.error.userDescription()))
-                }
+            is NetworkResult.Failure -> {
+                Timber.e(queryResult.error, queryResult.error.userDescription())
+                emit(FlowEvent.Failure(queryResult.error.userDescription()))
             }
         }
     }
@@ -179,30 +175,28 @@ class EmbyMediaProvider(
         credentials: AuthenticatedCredentials,
         playlistItems: List<Item>,
         existingSongs: List<Song>
-    ): Flow<MediaImporter.PlaylistUpdateData> {
-        return playlistItems
-            .asFlow()
-            .flatMapConcat { playlistItem ->
-                queryPlaylistItems(address, credentials, playlistItem.id)
-                    .map { event ->
-                        when (event) {
-                            is FlowEvent.Success -> {
-                                val matchingSongs = event.result.mapNotNull { item -> existingSongs.firstOrNull { item.id == it.externalId } }
-                                MediaImporter.PlaylistUpdateData(
-                                    mediaProviderType = type,
-                                    name = playlistItem.name ?: context.getString(com.simplecityapps.core.R.string.unknown),
-                                    songs = matchingSongs,
-                                    externalId = playlistItem.id
-                                )
-                            }
-
-                            is FlowEvent.Failure -> null
-                            is FlowEvent.Progress -> null
+    ): Flow<MediaImporter.PlaylistUpdateData> = playlistItems
+        .asFlow()
+        .flatMapConcat { playlistItem ->
+            queryPlaylistItems(address, credentials, playlistItem.id)
+                .map { event ->
+                    when (event) {
+                        is FlowEvent.Success -> {
+                            val matchingSongs = event.result.mapNotNull { item -> existingSongs.firstOrNull { item.id == it.externalId } }
+                            MediaImporter.PlaylistUpdateData(
+                                mediaProviderType = type,
+                                name = playlistItem.name ?: context.getString(com.simplecityapps.core.R.string.unknown),
+                                songs = matchingSongs,
+                                externalId = playlistItem.id
+                            )
                         }
+
+                        is FlowEvent.Failure -> null
+                        is FlowEvent.Progress -> null
                     }
-            }
-            .filterNotNull()
-    }
+                }
+        }
+        .filterNotNull()
 
     private fun queryPlaylistItems(
         address: String,
@@ -211,79 +205,75 @@ class EmbyMediaProvider(
         startIndex: Int = 0,
         pageSize: Int = 500,
         items: MutableList<Item> = mutableListOf()
-    ): Flow<FlowEvent<List<Item>, MessageProgress>> {
-        return flow {
-            when (
-                val queryResult =
-                    itemsService.playlistItems(
-                        url = address,
-                        token = credentials.accessToken,
-                        playlistId = playlistId,
-                        limit = pageSize,
-                        startIndex = startIndex,
-                        userId = credentials.userId
-                    )
-            ) {
-                is NetworkResult.Success<QueryResult> -> {
-                    val totalRecordCount = queryResult.body.totalRecordCount
-                    val lastIndex = startIndex + pageSize
+    ): Flow<FlowEvent<List<Item>, MessageProgress>> = flow {
+        when (
+            val queryResult =
+                itemsService.playlistItems(
+                    url = address,
+                    token = credentials.accessToken,
+                    playlistId = playlistId,
+                    limit = pageSize,
+                    startIndex = startIndex,
+                    userId = credentials.userId
+                )
+        ) {
+            is NetworkResult.Success<QueryResult> -> {
+                val totalRecordCount = queryResult.body.totalRecordCount
+                val lastIndex = startIndex + pageSize
 
-                    emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_provider_querying_api), Progress(lastIndex, totalRecordCount))))
+                emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_provider_querying_api), Progress(lastIndex, totalRecordCount))))
 
-                    items.addAll(queryResult.body.items)
+                items.addAll(queryResult.body.items)
 
-                    if (lastIndex < totalRecordCount) {
-                        emitAll(
-                            queryItems(
-                                address = address,
-                                credentials = credentials,
-                                startIndex = lastIndex,
-                                pageSize = min(pageSize, totalRecordCount - lastIndex),
-                                items = items
-                            )
+                if (lastIndex < totalRecordCount) {
+                    emitAll(
+                        queryItems(
+                            address = address,
+                            credentials = credentials,
+                            startIndex = lastIndex,
+                            pageSize = min(pageSize, totalRecordCount - lastIndex),
+                            items = items
                         )
-                    } else {
-                        emit(FlowEvent.Success(items))
-                    }
+                    )
+                } else {
+                    emit(FlowEvent.Success(items))
                 }
+            }
 
-                is NetworkResult.Failure -> {
-                    Timber.e(queryResult.error, queryResult.error.userDescription())
-                    emit(FlowEvent.Failure(queryResult.error.userDescription()))
-                }
+            is NetworkResult.Failure -> {
+                Timber.e(queryResult.error, queryResult.error.userDescription())
+                emit(FlowEvent.Failure(queryResult.error.userDescription()))
             }
         }
     }
 
-    private fun Item.toSong(): Song {
-        return Song(
-            id = 0,
-            name = name,
-            albumArtist = albumArtist,
-            artists = artists.filter { it.isNotEmpty() },
-            album = album,
-            track = indexNumber,
-            disc = parentIndexNumber,
-            duration = ((runTime ?: 0) / (10 * 1000)).toInt(),
-            date = productionYear?.let { year -> LocalDate(year, 1, 1) },
-            genres = genres,
-            path = "emby://item/$id",
-            size = 0,
-            mimeType = "Audio/*",
-            lastModified = Clock.System.now(),
-            lastPlayed = null,
-            lastCompleted = null,
-            playCount = 0,
-            playbackPosition = 0,
-            blacklisted = false,
-            externalId = id,
-            mediaProvider = MediaProviderType.Emby,
-            lyrics = null,
-            grouping = null,
-            bitRate = null,
-            bitDepth = null,
-            sampleRate = null,
-            channelCount = null
-        )
-    }
+    private fun Item.toSong(): Song = Song(
+        id = 0,
+        name = name,
+        albumArtist = albumArtist,
+        artists = artists.filter { it.isNotEmpty() },
+        album = album,
+        track = indexNumber,
+        disc = parentIndexNumber,
+        duration = ((runTime ?: 0) / (10 * 1000)).toInt(),
+        date = productionYear?.let { year -> LocalDate(year, 1, 1) },
+        genres = genres,
+        path = "emby://item/$id",
+        size = 0,
+        mimeType = "Audio/*",
+        lastModified = Clock.System.now(),
+        lastPlayed = null,
+        lastCompleted = null,
+        playCount = 0,
+        playbackPosition = 0,
+        blacklisted = false,
+        externalId = id,
+        mediaProvider = MediaProviderType.Emby,
+        lyrics = null,
+        grouping = null,
+        bitRate = null,
+        bitDepth = null,
+        sampleRate = null,
+        channelCount = null
+    )
 }
diff --git a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyRemoteArtworkProvider.kt b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyRemoteArtworkProvider.kt
index d1cf4f154..62cb97c62 100644
--- a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyRemoteArtworkProvider.kt
+++ b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/EmbyRemoteArtworkProvider.kt
@@ -16,9 +16,7 @@ constructor(
     private val credentialStore: CredentialStore,
     private val itemsService: ItemsService
 ) : RemoteArtworkProvider {
-    override fun handles(uri: Uri): Boolean {
-        return uri.scheme == "emby"
-    }
+    override fun handles(uri: Uri): Boolean = uri.scheme == "emby"
 
     override suspend fun getAlbumArtworkUrl(song: Song): String? {
         val itemId = Uri.parse(song.path).pathSegments.last() ?: return null
diff --git a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/di/EmbyMediaProviderModule.kt b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/di/EmbyMediaProviderModule.kt
index d8c8e92dd..522745116 100644
--- a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/di/EmbyMediaProviderModule.kt
+++ b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/di/EmbyMediaProviderModule.kt
@@ -37,53 +37,43 @@ open class EmbyMediaProviderModule {
         @ApplicationContext context: Context,
         okHttpClient: OkHttpClient,
         moshi: Moshi
-    ): Retrofit {
-        return Retrofit.Builder()
-            .baseUrl("http://localhost/") // unused
-            .addCallAdapterFactory(NetworkResultAdapterFactory(context.getSystemService()))
-            .addConverterFactory(MoshiConverterFactory.create(moshi))
-            .client(
-                okHttpClient
-                    .newBuilder()
-                    .readTimeout(90, TimeUnit.SECONDS)
-                    .build()
-            )
-            .build()
-    }
+    ): Retrofit = Retrofit.Builder()
+        .baseUrl("http://localhost/") // unused
+        .addCallAdapterFactory(NetworkResultAdapterFactory(context.getSystemService()))
+        .addConverterFactory(MoshiConverterFactory.create(moshi))
+        .client(
+            okHttpClient
+                .newBuilder()
+                .readTimeout(90, TimeUnit.SECONDS)
+                .build()
+        )
+        .build()
 
     @Provides
     @Singleton
     fun provideUserService(
         @Named("EmbyRetrofit") retrofit: Retrofit
-    ): UserService {
-        return retrofit.create()
-    }
+    ): UserService = retrofit.create()
 
     @Provides
     @Singleton
     fun provideItemsService(
         @Named("EmbyRetrofit") retrofit: Retrofit
-    ): ItemsService {
-        return retrofit.create()
-    }
+    ): ItemsService = retrofit.create()
 
     @Provides
     @Singleton
     fun provideTranscodeService(
         @Named("EmbyRetrofit") retrofit: Retrofit
-    ): EmbyTranscodeService {
-        return retrofit.create()
-    }
+    ): EmbyTranscodeService = retrofit.create()
 
     @Provides
     @Singleton
-    fun provideCredentialStore(securePreferenceManager: SecurePreferenceManager): CredentialStore {
-        return CredentialStore(securePreferenceManager).apply {
-            if (BuildConfig.DEBUG) {
-                if (loginCredentials == null) {
-                    loginCredentials = LoginCredentials("tim", "")
-                    address = "https://emby.mediaserver.timmalseed.dev"
-                }
+    fun provideCredentialStore(securePreferenceManager: SecurePreferenceManager): CredentialStore = CredentialStore(securePreferenceManager).apply {
+        if (BuildConfig.DEBUG) {
+            if (loginCredentials == null) {
+                loginCredentials = LoginCredentials("tim", "")
+                address = "https://emby.mediaserver.timmalseed.dev"
             }
         }
     }
@@ -93,9 +83,7 @@ open class EmbyMediaProviderModule {
     fun provideEmbyAuthenticationManager(
         userService: UserService,
         credentialStore: CredentialStore
-    ): EmbyAuthenticationManager {
-        return EmbyAuthenticationManager(userService, credentialStore)
-    }
+    ): EmbyAuthenticationManager = EmbyAuthenticationManager(userService, credentialStore)
 
     @Provides
     @Singleton
@@ -103,16 +91,12 @@ open class EmbyMediaProviderModule {
         @ApplicationContext context: Context,
         authenticationManager: EmbyAuthenticationManager,
         itemsService: ItemsService
-    ): EmbyMediaProvider {
-        return EmbyMediaProvider(context, authenticationManager, itemsService)
-    }
+    ): EmbyMediaProvider = EmbyMediaProvider(context, authenticationManager, itemsService)
 
     @Provides
     @Singleton
     fun provideEmbyMediaPathProvider(
         authenticationManager: EmbyAuthenticationManager,
         embyTranscodeService: EmbyTranscodeService
-    ): EmbyMediaInfoProvider {
-        return EmbyMediaInfoProvider(authenticationManager, embyTranscodeService)
-    }
+    ): EmbyMediaInfoProvider = EmbyMediaInfoProvider(authenticationManager, embyTranscodeService)
 }
diff --git a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/http/ItemsService.kt b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/http/ItemsService.kt
index 2c766160f..9b973249a 100644
--- a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/http/ItemsService.kt
+++ b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/http/ItemsService.kt
@@ -44,9 +44,7 @@ suspend fun ItemsService.audioItems(
     fields: String? = "Genres,ProductionYear",
     limit: Int = 2500,
     startIndex: Int = 0
-): NetworkResult<QueryResult> {
-    return itemsImpl("$url/Users/$userId/Items", token, recursive, itemTypes, fields, limit, startIndex)
-}
+): NetworkResult<QueryResult> = itemsImpl("$url/Users/$userId/Items", token, recursive, itemTypes, fields, limit, startIndex)
 
 suspend fun ItemsService.playlists(
     url: String,
@@ -57,9 +55,7 @@ suspend fun ItemsService.playlists(
     fields: String? = null,
     limit: Int = 2500,
     startIndex: Int = 0
-): NetworkResult<QueryResult> {
-    return itemsImpl("$url/Users/$userId/Items", token, recursive, itemTypes, fields, limit, startIndex)
-}
+): NetworkResult<QueryResult> = itemsImpl("$url/Users/$userId/Items", token, recursive, itemTypes, fields, limit, startIndex)
 
 suspend fun ItemsService.playlistItems(
     url: String,
@@ -71,15 +67,11 @@ suspend fun ItemsService.playlistItems(
     limit: Int = 2500,
     startIndex: Int = 0,
     userId: String
-): NetworkResult<QueryResult> {
-    return itemsImpl("$url/Playlists/$playlistId/Items", token, recursive, itemTypes, fields, limit, startIndex, userId)
-}
+): NetworkResult<QueryResult> = itemsImpl("$url/Playlists/$playlistId/Items", token, recursive, itemTypes, fields, limit, startIndex, userId)
 
 suspend fun ItemsService.item(
     url: String,
     token: String,
     userId: String,
     itemId: String
-): NetworkResult<Item> {
-    return itemImpl("$url/Users/$userId/Items/$itemId", token)
-}
+): NetworkResult<Item> = itemImpl("$url/Users/$userId/Items/$itemId", token)
diff --git a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/http/UserService.kt b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/http/UserService.kt
index d8edf44e8..f3770ec02 100644
--- a/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/http/UserService.kt
+++ b/android/mediaprovider/emby/src/main/java/com/simplecityapps/provider/emby/http/UserService.kt
@@ -33,13 +33,11 @@ suspend fun UserService.authenticate(
             "Unknown"
         },
     version: String = "1.0"
-): NetworkResult<AuthenticationResult> {
-    return authenticateImpl(
-        "$url/Users/AuthenticateByName",
-        mapOf(
-            "username" to username,
-            "pw" to password
-        ),
-        "MediaBrowser Client=\"Shuttle2.0\", Device=\"$deviceName\", DeviceId=\"$deviceId\", Version=\"$version\""
-    )
-}
+): NetworkResult<AuthenticationResult> = authenticateImpl(
+    "$url/Users/AuthenticateByName",
+    mapOf(
+        "username" to username,
+        "pw" to password
+    ),
+    "MediaBrowser Client=\"Shuttle2.0\", Device=\"$deviceName\", DeviceId=\"$deviceId\", Version=\"$version\""
+)
diff --git a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinAuthenticationManager.kt b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinAuthenticationManager.kt
index 4b78f7a22..2c3d86841 100644
--- a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinAuthenticationManager.kt
+++ b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinAuthenticationManager.kt
@@ -17,25 +17,19 @@ class JellyfinAuthenticationManager(
 ) {
     private val deviceId = UUID.randomUUID().toString()
 
-    fun getLoginCredentials(): LoginCredentials? {
-        return credentialStore.loginCredentials
-    }
+    fun getLoginCredentials(): LoginCredentials? = credentialStore.loginCredentials
 
     fun setLoginCredentials(loginCredentials: LoginCredentials?) {
         credentialStore.loginCredentials = loginCredentials
     }
 
-    fun getAuthenticatedCredentials(): AuthenticatedCredentials? {
-        return credentialStore.authenticatedCredentials
-    }
+    fun getAuthenticatedCredentials(): AuthenticatedCredentials? = credentialStore.authenticatedCredentials
 
     fun setAddress(address: String) {
         credentialStore.address = address
     }
 
-    fun getAddress(): String? {
-        return credentialStore.address
-    }
+    fun getAddress(): String? = credentialStore.address
 
     suspend fun authenticate(
         address: String,
diff --git a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinMediaInfoProvider.kt b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinMediaInfoProvider.kt
index 7d6ca6f8d..0d5822955 100644
--- a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinMediaInfoProvider.kt
+++ b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinMediaInfoProvider.kt
@@ -14,9 +14,7 @@ constructor(
     private val jellyfinAuthenticationManager: JellyfinAuthenticationManager,
     private val jellyfinTranscodeService: JellyfinTranscodeService
 ) : MediaInfoProvider {
-    override fun handles(uri: Uri): Boolean {
-        return uri.scheme == "jellyfin"
-    }
+    override fun handles(uri: Uri): Boolean = uri.scheme == "jellyfin"
 
     @Throws(IllegalStateException::class)
     override suspend fun getMediaInfo(
diff --git a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinMediaProvider.kt b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinMediaProvider.kt
index 9e9ba944b..e66991be0 100644
--- a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinMediaProvider.kt
+++ b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinMediaProvider.kt
@@ -111,18 +111,16 @@ class JellyfinMediaProvider(
         }
     }
 
-    private suspend fun authenticate(address: String): AuthenticatedCredentials? {
-        return (
-            authenticationManager.getAuthenticatedCredentials()
-                ?: authenticationManager.getLoginCredentials()
-                    ?.let { loginCredentials ->
-                        authenticationManager.authenticate(
-                            address,
-                            loginCredentials
-                        ).getOrNull()
-                    }
-            )
-    }
+    private suspend fun authenticate(address: String): AuthenticatedCredentials? = (
+        authenticationManager.getAuthenticatedCredentials()
+            ?: authenticationManager.getLoginCredentials()
+                ?.let { loginCredentials ->
+                    authenticationManager.authenticate(
+                        address,
+                        loginCredentials
+                    ).getOrNull()
+                }
+        )
 
     private fun queryItems(
         address: String,
@@ -130,45 +128,43 @@ class JellyfinMediaProvider(
         startIndex: Int = 0,
         pageSize: Int = 500,
         items: MutableList<Item> = mutableListOf()
-    ): Flow<FlowEvent<List<Item>, MessageProgress>> {
-        return flow {
-            when (
-                val queryResult =
-                    itemsService.audioItems(
-                        url = address,
-                        token = credentials.accessToken,
-                        userId = credentials.userId,
-                        limit = pageSize,
-                        startIndex = startIndex
-                    )
-            ) {
-                is NetworkResult.Success<QueryResult> -> {
-                    val totalRecordCount = queryResult.body.totalRecordCount
-                    val lastIndex = startIndex + pageSize
+    ): Flow<FlowEvent<List<Item>, MessageProgress>> = flow {
+        when (
+            val queryResult =
+                itemsService.audioItems(
+                    url = address,
+                    token = credentials.accessToken,
+                    userId = credentials.userId,
+                    limit = pageSize,
+                    startIndex = startIndex
+                )
+        ) {
+            is NetworkResult.Success<QueryResult> -> {
+                val totalRecordCount = queryResult.body.totalRecordCount
+                val lastIndex = startIndex + pageSize
 
-                    emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_provider_querying_api), Progress(lastIndex, totalRecordCount))))
+                emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_provider_querying_api), Progress(lastIndex, totalRecordCount))))
 
-                    items.addAll(queryResult.body.items)
+                items.addAll(queryResult.body.items)
 
-                    if (lastIndex < totalRecordCount) {
-                        emitAll(
-                            queryItems(
-                                address = address,
-                                credentials = credentials,
-                                startIndex = lastIndex,
-                                pageSize = min(pageSize, totalRecordCount - lastIndex),
-                                items = items
-                            )
+                if (lastIndex < totalRecordCount) {
+                    emitAll(
+                        queryItems(
+                            address = address,
+                            credentials = credentials,
+                            startIndex = lastIndex,
+                            pageSize = min(pageSize, totalRecordCount - lastIndex),
+                            items = items
                         )
-                    } else {
-                        emit(FlowEvent.Success(items))
-                    }
+                    )
+                } else {
+                    emit(FlowEvent.Success(items))
                 }
+            }
 
-                is NetworkResult.Failure -> {
-                    Timber.e(queryResult.error, queryResult.error.userDescription())
-                    emit(FlowEvent.Failure(queryResult.error.userDescription()))
-                }
+            is NetworkResult.Failure -> {
+                Timber.e(queryResult.error, queryResult.error.userDescription())
+                emit(FlowEvent.Failure(queryResult.error.userDescription()))
             }
         }
     }
@@ -179,29 +175,27 @@ class JellyfinMediaProvider(
         credentials: AuthenticatedCredentials,
         playlistItems: List<Item>,
         existingSongs: List<Song>
-    ): Flow<MediaImporter.PlaylistUpdateData> {
-        return playlistItems
-            .asFlow()
-            .flatMapConcat { playlistItem ->
-                queryPlaylistItems(address, credentials, playlistItem.id)
-                    .map { event ->
-                        when (event) {
-                            is FlowEvent.Success -> {
-                                MediaImporter.PlaylistUpdateData(
-                                    mediaProviderType = type,
-                                    name = playlistItem.name ?: context.getString(com.simplecityapps.core.R.string.unknown),
-                                    songs = event.result.mapNotNull { item -> existingSongs.firstOrNull { it.externalId == item.id } },
-                                    externalId = playlistItem.id
-                                )
-                            }
-
-                            is FlowEvent.Failure -> null
-                            is FlowEvent.Progress -> null
+    ): Flow<MediaImporter.PlaylistUpdateData> = playlistItems
+        .asFlow()
+        .flatMapConcat { playlistItem ->
+            queryPlaylistItems(address, credentials, playlistItem.id)
+                .map { event ->
+                    when (event) {
+                        is FlowEvent.Success -> {
+                            MediaImporter.PlaylistUpdateData(
+                                mediaProviderType = type,
+                                name = playlistItem.name ?: context.getString(com.simplecityapps.core.R.string.unknown),
+                                songs = event.result.mapNotNull { item -> existingSongs.firstOrNull { it.externalId == item.id } },
+                                externalId = playlistItem.id
+                            )
                         }
+
+                        is FlowEvent.Failure -> null
+                        is FlowEvent.Progress -> null
                     }
-            }
-            .filterNotNull()
-    }
+                }
+        }
+        .filterNotNull()
 
     private fun queryPlaylistItems(
         address: String,
@@ -210,79 +204,75 @@ class JellyfinMediaProvider(
         startIndex: Int = 0,
         pageSize: Int = 500,
         items: MutableList<Item> = mutableListOf()
-    ): Flow<FlowEvent<List<Item>, MessageProgress>> {
-        return flow {
-            when (
-                val queryResult =
-                    itemsService.playlistItems(
-                        url = address,
-                        token = credentials.accessToken,
-                        playlistId = playlistId,
-                        limit = pageSize,
-                        startIndex = startIndex,
-                        userId = credentials.userId
-                    )
-            ) {
-                is NetworkResult.Success<QueryResult> -> {
-                    val totalRecordCount = queryResult.body.totalRecordCount
-                    val lastIndex = startIndex + pageSize
+    ): Flow<FlowEvent<List<Item>, MessageProgress>> = flow {
+        when (
+            val queryResult =
+                itemsService.playlistItems(
+                    url = address,
+                    token = credentials.accessToken,
+                    playlistId = playlistId,
+                    limit = pageSize,
+                    startIndex = startIndex,
+                    userId = credentials.userId
+                )
+        ) {
+            is NetworkResult.Success<QueryResult> -> {
+                val totalRecordCount = queryResult.body.totalRecordCount
+                val lastIndex = startIndex + pageSize
 
-                    emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_provider_querying_api), Progress(lastIndex, totalRecordCount))))
+                emit(FlowEvent.Progress(MessageProgress(context.getString(R.string.media_provider_querying_api), Progress(lastIndex, totalRecordCount))))
 
-                    items.addAll(queryResult.body.items)
+                items.addAll(queryResult.body.items)
 
-                    if (lastIndex < totalRecordCount) {
-                        emitAll(
-                            queryItems(
-                                address = address,
-                                credentials = credentials,
-                                startIndex = lastIndex,
-                                pageSize = min(pageSize, totalRecordCount - lastIndex),
-                                items = items
-                            )
+                if (lastIndex < totalRecordCount) {
+                    emitAll(
+                        queryItems(
+                            address = address,
+                            credentials = credentials,
+                            startIndex = lastIndex,
+                            pageSize = min(pageSize, totalRecordCount - lastIndex),
+                            items = items
                         )
-                    } else {
-                        emit(FlowEvent.Success(items))
-                    }
+                    )
+                } else {
+                    emit(FlowEvent.Success(items))
                 }
+            }
 
-                is NetworkResult.Failure -> {
-                    Timber.e(queryResult.error, queryResult.error.userDescription())
-                    emit(FlowEvent.Failure(queryResult.error.userDescription()))
-                }
+            is NetworkResult.Failure -> {
+                Timber.e(queryResult.error, queryResult.error.userDescription())
+                emit(FlowEvent.Failure(queryResult.error.userDescription()))
             }
         }
     }
 
-    private fun Item.toSong(): Song {
-        return Song(
-            id = 0,
-            name = name,
-            albumArtist = albumArtist,
-            artists = artists.filter { it.isNotEmpty() },
-            album = album,
-            track = indexNumber,
-            disc = parentIndexNumber,
-            duration = ((runTime ?: 0) / (10 * 1000)).toInt(),
-            date = productionYear?.let { year -> LocalDate(year, 1, 1) },
-            genres = genres,
-            path = "jellyfin://item/$id",
-            size = 0,
-            mimeType = "Audio/*",
-            lastModified = Clock.System.now(),
-            lastPlayed = null,
-            lastCompleted = null,
-            playCount = 0,
-            playbackPosition = 0,
-            blacklisted = false,
-            externalId = id,
-            mediaProvider = MediaProviderType.Jellyfin,
-            lyrics = null,
-            grouping = null,
-            bitRate = null,
-            bitDepth = null,
-            sampleRate = null,
-            channelCount = null
-        )
-    }
+    private fun Item.toSong(): Song = Song(
+        id = 0,
+        name = name,
+        albumArtist = albumArtist,
+        artists = artists.filter { it.isNotEmpty() },
+        album = album,
+        track = indexNumber,
+        disc = parentIndexNumber,
+        duration = ((runTime ?: 0) / (10 * 1000)).toInt(),
+        date = productionYear?.let { year -> LocalDate(year, 1, 1) },
+        genres = genres,
+        path = "jellyfin://item/$id",
+        size = 0,
+        mimeType = "Audio/*",
+        lastModified = Clock.System.now(),
+        lastPlayed = null,
+        lastCompleted = null,
+        playCount = 0,
+        playbackPosition = 0,
+        blacklisted = false,
+        externalId = id,
+        mediaProvider = MediaProviderType.Jellyfin,
+        lyrics = null,
+        grouping = null,
+        bitRate = null,
+        bitDepth = null,
+        sampleRate = null,
+        channelCount = null
+    )
 }
diff --git a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinRemoteArtworkProvider.kt b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinRemoteArtworkProvider.kt
index 139dfb48f..5a88313bb 100644
--- a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinRemoteArtworkProvider.kt
+++ b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/JellyfinRemoteArtworkProvider.kt
@@ -16,9 +16,7 @@ constructor(
     private val itemsService: ItemsService,
     private val credentialStore: CredentialStore
 ) : RemoteArtworkProvider {
-    override fun handles(uri: Uri): Boolean {
-        return uri.scheme == "jellyfin"
-    }
+    override fun handles(uri: Uri): Boolean = uri.scheme == "jellyfin"
 
     override suspend fun getAlbumArtworkUrl(song: Song): String? {
         val itemId = Uri.parse(song.path).pathSegments.last() ?: return null
diff --git a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/di/JellyfinMediaProviderModule.kt b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/di/JellyfinMediaProviderModule.kt
index c3ad4c926..572722cf7 100644
--- a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/di/JellyfinMediaProviderModule.kt
+++ b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/di/JellyfinMediaProviderModule.kt
@@ -37,53 +37,43 @@ open class JellyfinMediaProviderModule {
         @ApplicationContext context: Context,
         okHttpClient: OkHttpClient,
         moshi: Moshi
-    ): Retrofit {
-        return Retrofit.Builder()
-            .baseUrl("http://localhost/") // unused
-            .addCallAdapterFactory(NetworkResultAdapterFactory(context.getSystemService()))
-            .addConverterFactory(MoshiConverterFactory.create(moshi))
-            .client(
-                okHttpClient
-                    .newBuilder()
-                    .readTimeout(90, TimeUnit.SECONDS)
-                    .build()
-            )
-            .build()
-    }
+    ): Retrofit = Retrofit.Builder()
+        .baseUrl("http://localhost/") // unused
+        .addCallAdapterFactory(NetworkResultAdapterFactory(context.getSystemService()))
+        .addConverterFactory(MoshiConverterFactory.create(moshi))
+        .client(
+            okHttpClient
+                .newBuilder()
+                .readTimeout(90, TimeUnit.SECONDS)
+                .build()
+        )
+        .build()
 
     @Provides
     @Singleton
     fun provideUserService(
         @Named("JellyfinRetrofit") retrofit: Retrofit
-    ): UserService {
-        return retrofit.create()
-    }
+    ): UserService = retrofit.create()
 
     @Provides
     @Singleton
     fun provideItemsService(
         @Named("JellyfinRetrofit") retrofit: Retrofit
-    ): ItemsService {
-        return retrofit.create()
-    }
+    ): ItemsService = retrofit.create()
 
     @Provides
     @Singleton
     fun provideTranscodeService(
         @Named("JellyfinRetrofit") retrofit: Retrofit
-    ): JellyfinTranscodeService {
-        return retrofit.create()
-    }
+    ): JellyfinTranscodeService = retrofit.create()
 
     @Provides
     @Singleton
-    fun provideCredentialStore(securePreferenceManager: SecurePreferenceManager): CredentialStore {
-        return CredentialStore(securePreferenceManager).apply {
-            if (BuildConfig.DEBUG) {
-                if (loginCredentials == null) {
-                    loginCredentials = LoginCredentials("tim", "")
-                    address = "https://jellyfin.mediaserver.timmalseed.dev"
-                }
+    fun provideCredentialStore(securePreferenceManager: SecurePreferenceManager): CredentialStore = CredentialStore(securePreferenceManager).apply {
+        if (BuildConfig.DEBUG) {
+            if (loginCredentials == null) {
+                loginCredentials = LoginCredentials("tim", "")
+                address = "https://jellyfin.mediaserver.timmalseed.dev"
             }
         }
     }
@@ -93,9 +83,7 @@ open class JellyfinMediaProviderModule {
     fun provideJellyfinAuthenticationManager(
         userService: UserService,
         credentialStore: CredentialStore
-    ): JellyfinAuthenticationManager {
-        return JellyfinAuthenticationManager(userService, credentialStore)
-    }
+    ): JellyfinAuthenticationManager = JellyfinAuthenticationManager(userService, credentialStore)
 
     @Provides
     @Singleton
@@ -103,16 +91,12 @@ open class JellyfinMediaProviderModule {
         @ApplicationContext context: Context,
         authenticationManager: JellyfinAuthenticationManager,
         itemsService: ItemsService
-    ): JellyfinMediaProvider {
-        return JellyfinMediaProvider(context, authenticationManager, itemsService)
-    }
+    ): JellyfinMediaProvider = JellyfinMediaProvider(context, authenticationManager, itemsService)
 
     @Provides
     @Singleton
     fun provideJellyfinMediaPathProvider(
         authenticationManager: JellyfinAuthenticationManager,
         transcodeService: JellyfinTranscodeService
-    ): JellyfinMediaInfoProvider {
-        return JellyfinMediaInfoProvider(authenticationManager, transcodeService)
-    }
+    ): JellyfinMediaInfoProvider = JellyfinMediaInfoProvider(authenticationManager, transcodeService)
 }
diff --git a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/http/ItemsService.kt b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/http/ItemsService.kt
index 8af839ade..be03ee369 100644
--- a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/http/ItemsService.kt
+++ b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/http/ItemsService.kt
@@ -44,9 +44,7 @@ suspend fun ItemsService.audioItems(
     fields: String? = "Genres",
     limit: Int = 2500,
     startIndex: Int = 0
-): NetworkResult<QueryResult> {
-    return itemsImpl("$url/Users/$userId/Items", token, recursive, itemTypes, fields, limit, startIndex)
-}
+): NetworkResult<QueryResult> = itemsImpl("$url/Users/$userId/Items", token, recursive, itemTypes, fields, limit, startIndex)
 
 suspend fun ItemsService.playlists(
     url: String,
@@ -57,9 +55,7 @@ suspend fun ItemsService.playlists(
     fields: String? = null,
     limit: Int = 2500,
     startIndex: Int = 0
-): NetworkResult<QueryResult> {
-    return itemsImpl("$url/Users/$userId/Items", token, recursive, itemTypes, fields, limit, startIndex)
-}
+): NetworkResult<QueryResult> = itemsImpl("$url/Users/$userId/Items", token, recursive, itemTypes, fields, limit, startIndex)
 
 suspend fun ItemsService.playlistItems(
     url: String,
@@ -71,15 +67,11 @@ suspend fun ItemsService.playlistItems(
     limit: Int = 2500,
     startIndex: Int = 0,
     userId: String
-): NetworkResult<QueryResult> {
-    return itemsImpl("$url/Playlists/$playlistId/Items", token, recursive, itemTypes, fields, limit, startIndex, userId)
-}
+): NetworkResult<QueryResult> = itemsImpl("$url/Playlists/$playlistId/Items", token, recursive, itemTypes, fields, limit, startIndex, userId)
 
 suspend fun ItemsService.item(
     url: String,
     token: String,
     userId: String,
     itemId: String
-): NetworkResult<Item> {
-    return itemImpl("$url/Users/$userId/Items/$itemId", token)
-}
+): NetworkResult<Item> = itemImpl("$url/Users/$userId/Items/$itemId", token)
diff --git a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/http/UserService.kt b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/http/UserService.kt
index a1ef1470d..c79ac8e23 100644
--- a/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/http/UserService.kt
+++ b/android/mediaprovider/jellyfin/src/main/java/com/simplecityapps/provider/jellyfin/http/UserService.kt
@@ -33,13 +33,11 @@ suspend fun UserService.authenticate(
             "Unknown"
         },
     version: String = "1.0"
-): NetworkResult<AuthenticationResult> {
-    return authenticateImpl(
-        "$url/Users/AuthenticateByName",
-        mapOf(
-            "username" to username,
-            "pw" to password
-        ),
-        "MediaBrowser Client=\"Shuttle2.0\", Device=\"$deviceName\", DeviceId=\"$deviceId\", Version=\"$version\""
-    )
-}
+): NetworkResult<AuthenticationResult> = authenticateImpl(
+    "$url/Users/AuthenticateByName",
+    mapOf(
+        "username" to username,
+        "pw" to password
+    ),
+    "MediaBrowser Client=\"Shuttle2.0\", Device=\"$deviceName\", DeviceId=\"$deviceId\", Version=\"$version\""
+)
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/Converters.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/Converters.kt
index fe2df66d5..98337b7ba 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/Converters.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/Converters.kt
@@ -7,46 +7,30 @@ import java.util.Date
 
 class Converters {
     @TypeConverter
-    fun fromTimestamp(value: Long?): Date? {
-        return value?.let { Date(it) }
-    }
+    fun fromTimestamp(value: Long?): Date? = value?.let { Date(it) }
 
     @TypeConverter
-    fun dateToTimestamp(date: Date?): Long? {
-        return date?.time
-    }
+    fun dateToTimestamp(date: Date?): Long? = date?.time
 
     @TypeConverter
-    fun fromString(string: String): List<String> {
-        return string.split(";").filter { it.isNotEmpty() }.map { it }
-    }
+    fun fromString(string: String): List<String> = string.split(";").filter { it.isNotEmpty() }.map { it }
 
     @TypeConverter
-    fun toString(stringList: List<String>): String {
-        return stringList.joinToString(separator = ";")
-    }
+    fun toString(stringList: List<String>): String = stringList.joinToString(separator = ";")
 
     @TypeConverter
-    fun fromMediaProvider(mediaProviderType: MediaProviderType): String {
-        return mediaProviderType.name
-    }
+    fun fromMediaProvider(mediaProviderType: MediaProviderType): String = mediaProviderType.name
 
     @TypeConverter
-    fun toMediaProvider(string: String): MediaProviderType {
-        return MediaProviderType.valueOf(string)
-    }
+    fun toMediaProvider(string: String): MediaProviderType = MediaProviderType.valueOf(string)
 
     @TypeConverter
-    fun fromSortOrder(songSortOrder: SongSortOrder): String {
-        return songSortOrder.name
-    }
+    fun fromSortOrder(songSortOrder: SongSortOrder): String = songSortOrder.name
 
     @TypeConverter
-    fun toSortOrder(string: String): SongSortOrder {
-        return try {
-            SongSortOrder.valueOf(string)
-        } catch (e: IllegalArgumentException) {
-            SongSortOrder.Default
-        }
+    fun toSortOrder(string: String): SongSortOrder = try {
+        SongSortOrder.valueOf(string)
+    } catch (e: IllegalArgumentException) {
+        SongSortOrder.Default
     }
 }
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/dao/PlaylistDataDao.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/dao/PlaylistDataDao.kt
index 1f64aa6b0..5c266263f 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/dao/PlaylistDataDao.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/dao/PlaylistDataDao.kt
@@ -31,11 +31,9 @@ abstract class PlaylistDataDao {
     )
     abstract fun getAllPlaylistData(): Flow<List<PlaylistEntity>>
 
-    fun getAll(): Flow<List<Playlist>> {
-        return getAllPlaylistData().map { list ->
-            list.map { playlistData ->
-                playlistData.toPlaylist()
-            }
+    fun getAll(): Flow<List<Playlist>> = getAllPlaylistData().map { list ->
+        list.map { playlistData ->
+            playlistData.toPlaylist()
         }
     }
 
@@ -52,9 +50,7 @@ abstract class PlaylistDataDao {
     )
     abstract suspend fun getPlaylistData(playlistId: Long): PlaylistEntity
 
-    suspend fun getPlaylist(playlistId: Long): Playlist {
-        return getPlaylistData(playlistId).toPlaylist()
-    }
+    suspend fun getPlaylist(playlistId: Long): Playlist = getPlaylistData(playlistId).toPlaylist()
 
     @Query("DELETE FROM playlist_song_join WHERE playlistId = :playlistId")
     abstract suspend fun clear(playlistId: Long)
@@ -76,14 +72,12 @@ data class PlaylistEntity(
     val externalId: String?
 )
 
-fun PlaylistEntity.toPlaylist(): Playlist {
-    return Playlist(
-        id = id,
-        name = name,
-        songCount = songCount,
-        duration = duration,
-        sortOrder = sortOrder,
-        mediaProvider = mediaProvider,
-        externalId = externalId
-    )
-}
+fun PlaylistEntity.toPlaylist(): Playlist = Playlist(
+    id = id,
+    name = name,
+    songCount = songCount,
+    duration = duration,
+    sortOrder = sortOrder,
+    mediaProvider = mediaProvider,
+    externalId = externalId
+)
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/dao/PlaylistSongJoinDao.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/dao/PlaylistSongJoinDao.kt
index a99d4b5b4..0fb97ab63 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/dao/PlaylistSongJoinDao.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/dao/PlaylistSongJoinDao.kt
@@ -28,15 +28,13 @@ abstract class PlaylistSongJoinDao {
     )
     abstract fun getSongDataForPlaylist(playlistId: Long): Flow<List<PlaylistSongData>>
 
-    fun getSongsForPlaylist(playlistId: Long): Flow<List<PlaylistSong>> {
-        return getSongDataForPlaylist(playlistId).map { list ->
-            list.map { playlistSongData ->
-                PlaylistSong(
-                    playlistSongData.playlistSongId,
-                    playlistSongData.sortOrder,
-                    playlistSongData.songData.toSong()
-                )
-            }
+    fun getSongsForPlaylist(playlistId: Long): Flow<List<PlaylistSong>> = getSongDataForPlaylist(playlistId).map { list ->
+        list.map { playlistSongData ->
+            PlaylistSong(
+                playlistSongData.playlistSongId,
+                playlistSongData.sortOrder,
+                playlistSongData.songData.toSong()
+            )
         }
     }
 
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt
index 778950304..ec56d1adf 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt
@@ -28,11 +28,9 @@ abstract class SongDataDao {
     @Query("SELECT * FROM songs ORDER BY albumArtist, album, track")
     abstract fun getAllSongData(): Flow<List<SongData>>
 
-    fun getAll(): Flow<List<Song>> {
-        return getAllSongData().map { list ->
-            list.map { songData ->
-                songData.toSong()
-            }
+    fun getAll(): Flow<List<Song>> = getAllSongData().map { list ->
+        list.map { songData ->
+            songData.toSong()
         }
     }
 
@@ -95,36 +93,34 @@ abstract class SongDataDao {
     abstract suspend fun delete(id: Long)
 }
 
-fun SongData.toSong(): Song {
-    return Song(
-        id = id,
-        name = name,
-        albumArtist = albumArtist,
-        artists = artists,
-        album = album,
-        track = track,
-        disc = disc,
-        duration = duration,
-        date = year?.let { LocalDate(it, 1, 1) },
-        genres = genres,
-        path = path,
-        size = size,
-        mimeType = mimeType,
-        lastModified = Instant.fromEpochMilliseconds(lastModified.time),
-        lastPlayed = lastPlayed?.let { Instant.fromEpochMilliseconds(it.time) },
-        lastCompleted = lastCompleted?.let { Instant.fromEpochMilliseconds(it.time) },
-        playCount = playCount,
-        playbackPosition = playbackPosition,
-        blacklisted = excluded,
-        externalId = externalId,
-        mediaProvider = mediaProvider,
-        replayGainTrack = replayGainTrack,
-        replayGainAlbum = replayGainAlbum,
-        lyrics = lyrics,
-        grouping = grouping,
-        bitRate = bitRate,
-        bitDepth = bitDepth,
-        sampleRate = sampleRate,
-        channelCount = channelCount
-    )
-}
+fun SongData.toSong(): Song = Song(
+    id = id,
+    name = name,
+    albumArtist = albumArtist,
+    artists = artists,
+    album = album,
+    track = track,
+    disc = disc,
+    duration = duration,
+    date = year?.let { LocalDate(it, 1, 1) },
+    genres = genres,
+    path = path,
+    size = size,
+    mimeType = mimeType,
+    lastModified = Instant.fromEpochMilliseconds(lastModified.time),
+    lastPlayed = lastPlayed?.let { Instant.fromEpochMilliseconds(it.time) },
+    lastCompleted = lastCompleted?.let { Instant.fromEpochMilliseconds(it.time) },
+    playCount = playCount,
+    playbackPosition = playbackPosition,
+    blacklisted = excluded,
+    externalId = externalId,
+    mediaProvider = mediaProvider,
+    replayGainTrack = replayGainTrack,
+    replayGainAlbum = replayGainAlbum,
+    lyrics = lyrics,
+    grouping = grouping,
+    bitRate = bitRate,
+    bitDepth = bitDepth,
+    sampleRate = sampleRate,
+    channelCount = channelCount
+)
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/entity/SongData.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/entity/SongData.kt
index 101fc3e63..10e819fdf 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/entity/SongData.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/entity/SongData.kt
@@ -48,41 +48,37 @@ data class SongData(
     var id: Long = 0
 }
 
-fun Song.toSongData(mediaProviderType: MediaProviderType): SongData {
-    return SongData(
-        name = name,
-        track = track,
-        disc = disc,
-        duration = duration,
-        year = date?.year,
-        genres = genres,
-        path = path,
-        albumArtist = albumArtist,
-        artists = artists,
-        album = album,
-        size = size,
-        mimeType = mimeType,
-        lastModified = lastModified?.let { Date(it.toEpochMilliseconds()) } ?: Date(),
-        playbackPosition = playbackPosition,
-        playCount = playCount,
-        lastPlayed = lastPlayed?.let { Date(it.toEpochMilliseconds()) },
-        lastCompleted = lastCompleted?.let { Date(it.toEpochMilliseconds()) },
-        excluded = false,
-        externalId = externalId,
-        mediaProvider = mediaProviderType,
-        replayGainTrack = replayGainTrack,
-        replayGainAlbum = replayGainAlbum,
-        lyrics = lyrics,
-        grouping = grouping,
-        bitRate = bitRate,
-        bitDepth = bitDepth,
-        sampleRate = sampleRate,
-        channelCount = channelCount
-    ).apply {
-        id = this@toSongData.id
-    }
+fun Song.toSongData(mediaProviderType: MediaProviderType): SongData = SongData(
+    name = name,
+    track = track,
+    disc = disc,
+    duration = duration,
+    year = date?.year,
+    genres = genres,
+    path = path,
+    albumArtist = albumArtist,
+    artists = artists,
+    album = album,
+    size = size,
+    mimeType = mimeType,
+    lastModified = lastModified?.let { Date(it.toEpochMilliseconds()) } ?: Date(),
+    playbackPosition = playbackPosition,
+    playCount = playCount,
+    lastPlayed = lastPlayed?.let { Date(it.toEpochMilliseconds()) },
+    lastCompleted = lastCompleted?.let { Date(it.toEpochMilliseconds()) },
+    excluded = false,
+    externalId = externalId,
+    mediaProvider = mediaProviderType,
+    replayGainTrack = replayGainTrack,
+    replayGainAlbum = replayGainAlbum,
+    lyrics = lyrics,
+    grouping = grouping,
+    bitRate = bitRate,
+    bitDepth = bitDepth,
+    sampleRate = sampleRate,
+    channelCount = channelCount
+).apply {
+    id = this@toSongData.id
 }
 
-fun List<Song>.toSongData(mediaProviderType: MediaProviderType): List<SongData> {
-    return map { song -> song.toSongData(mediaProviderType) }
-}
+fun List<Song>.toSongData(mediaProviderType: MediaProviderType): List<SongData> = map { song -> song.toSongData(mediaProviderType) }
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/entity/SongDataUpdate.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/entity/SongDataUpdate.kt
index a214dec10..bb027f6d0 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/entity/SongDataUpdate.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/entity/SongDataUpdate.kt
@@ -27,33 +27,27 @@ data class SongDataUpdate(
     @ColumnInfo(name = "grouping") var grouping: String? = null
 )
 
-fun SongData.toSongDataUpdate(): SongDataUpdate {
-    return SongDataUpdate(
-        id = id,
-        name = name,
-        track = track,
-        disc = disc,
-        duration = duration,
-        year = year,
-        genres = genres,
-        albumArtist = albumArtist,
-        artists = artists,
-        album = album,
-        size = size,
-        mimeType = mimeType,
-        lastModified = lastModified,
-        externalId = externalId,
-        replayGainTrack = replayGainTrack,
-        replayGainAlbum = replayGainAlbum,
-        lyrics = lyrics,
-        grouping = grouping
-    )
-}
+fun SongData.toSongDataUpdate(): SongDataUpdate = SongDataUpdate(
+    id = id,
+    name = name,
+    track = track,
+    disc = disc,
+    duration = duration,
+    year = year,
+    genres = genres,
+    albumArtist = albumArtist,
+    artists = artists,
+    album = album,
+    size = size,
+    mimeType = mimeType,
+    lastModified = lastModified,
+    externalId = externalId,
+    replayGainTrack = replayGainTrack,
+    replayGainAlbum = replayGainAlbum,
+    lyrics = lyrics,
+    grouping = grouping
+)
 
-fun Song.toSongDataUpdate(): SongDataUpdate {
-    return toSongData(MediaProviderType.Shuttle).toSongDataUpdate()
-}
+fun Song.toSongDataUpdate(): SongDataUpdate = toSongData(MediaProviderType.Shuttle).toSongDataUpdate()
 
-fun List<Song>.toSongDataUpdate(): List<SongDataUpdate> {
-    return map { song -> song.toSongDataUpdate() }
-}
+fun List<Song>.toSongDataUpdate(): List<SongDataUpdate> = map { song -> song.toSongDataUpdate() }
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/provider/AudioFileExt.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/provider/AudioFileExt.kt
index 984142977..28942704b 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/provider/AudioFileExt.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/provider/AudioFileExt.kt
@@ -8,38 +8,36 @@ import java.util.Locale
 import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDate
 
-fun AudioFile.toSong(providerType: MediaProviderType): Song {
-    return Song(
-        id = 0,
-        name = title,
-        artists = artists,
-        albumArtist = albumArtist,
-        album = album,
-        track = track,
-        disc = disc,
-        duration = duration ?: 0,
-        date = year?.toIntOrNull()?.let { LocalDate(it, 1, 1) },
-        genres = genres,
-        path = path,
-        size = size,
-        mimeType = mimeType,
-        lastModified = Instant.fromEpochMilliseconds(lastModified),
-        lastPlayed = null,
-        lastCompleted = null,
-        playCount = 0,
-        playbackPosition = 0,
-        blacklisted = false,
-        mediaProvider = providerType,
-        replayGainTrack = replayGainTrack,
-        replayGainAlbum = replayGainAlbum,
-        lyrics = lyrics,
-        grouping = grouping,
-        bitRate = bitRate,
-        bitDepth = bitDepth,
-        sampleRate = sampleRate,
-        channelCount = channelCount
-    )
-}
+fun AudioFile.toSong(providerType: MediaProviderType): Song = Song(
+    id = 0,
+    name = title,
+    artists = artists,
+    albumArtist = albumArtist,
+    album = album,
+    track = track,
+    disc = disc,
+    duration = duration ?: 0,
+    date = year?.toIntOrNull()?.let { LocalDate(it, 1, 1) },
+    genres = genres,
+    path = path,
+    size = size,
+    mimeType = mimeType,
+    lastModified = Instant.fromEpochMilliseconds(lastModified),
+    lastPlayed = null,
+    lastCompleted = null,
+    playCount = 0,
+    playbackPosition = 0,
+    blacklisted = false,
+    mediaProvider = providerType,
+    replayGainTrack = replayGainTrack,
+    replayGainAlbum = replayGainAlbum,
+    lyrics = lyrics,
+    grouping = grouping,
+    bitRate = bitRate,
+    bitDepth = bitDepth,
+    sampleRate = sampleRate,
+    channelCount = channelCount
+)
 
 enum class TagLibProperty(val key: String) {
     Title("TITLE"),
@@ -124,6 +122,4 @@ fun String.parseDate(): String? {
     return this
 }
 
-fun <V> Map<String, V>.getCaseInsensitive(key: String): V? {
-    return get(key) ?: get(key.lowercase(Locale.US))
-}
+fun <V> Map<String, V>.getCaseInsensitive(key: String): V? = get(key) ?: get(key.lowercase(Locale.US))
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/provider/mediastore/MediaStoreMediaProvider.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/provider/mediastore/MediaStoreMediaProvider.kt
index 2bd2eb5e7..c6db348a5 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/provider/mediastore/MediaStoreMediaProvider.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/provider/mediastore/MediaStoreMediaProvider.kt
@@ -30,163 +30,161 @@ class MediaStoreMediaProvider(
 
     // Songs
 
-    override fun findSongs(): Flow<FlowEvent<List<Song>, MessageProgress>> {
-        return flow {
-            var songs = mutableListOf<Song>()
-            val songCursor =
-                context.contentResolver.query(
-                    MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-                    arrayOf(
-                        MediaStore.Audio.Media._ID,
-                        MediaStore.Audio.Media.DATA,
-                        MediaStore.Audio.Media.TITLE,
-                        MediaStore.Audio.Media.ARTIST_ID,
-                        MediaStore.Audio.Media.ARTIST,
-                        MediaStore.Audio.Media.ALBUM_ID,
-                        MediaStore.Audio.Media.ALBUM,
-                        MediaStore.Audio.Media.DURATION,
-                        MediaStore.Audio.Media.SIZE,
-                        MediaStore.Audio.Media.YEAR,
-                        MediaStore.Audio.Media.TRACK,
-                        MediaStore.Audio.Media.DATE_MODIFIED,
-                        MediaStore.Audio.Media.IS_PODCAST,
-                        MediaStore.Audio.Media.BOOKMARK,
-                        MediaStore.Audio.Media.MIME_TYPE,
-                        "album_artist"
-                    ),
-                    "${MediaStore.Audio.Media.IS_MUSIC}=1 OR ${MediaStore.Audio.Media.IS_PODCAST}=1",
-                    null,
-                    null
-                )
+    override fun findSongs(): Flow<FlowEvent<List<Song>, MessageProgress>> = flow {
+        var songs = mutableListOf<Song>()
+        val songCursor =
+            context.contentResolver.query(
+                MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                arrayOf(
+                    MediaStore.Audio.Media._ID,
+                    MediaStore.Audio.Media.DATA,
+                    MediaStore.Audio.Media.TITLE,
+                    MediaStore.Audio.Media.ARTIST_ID,
+                    MediaStore.Audio.Media.ARTIST,
+                    MediaStore.Audio.Media.ALBUM_ID,
+                    MediaStore.Audio.Media.ALBUM,
+                    MediaStore.Audio.Media.DURATION,
+                    MediaStore.Audio.Media.SIZE,
+                    MediaStore.Audio.Media.YEAR,
+                    MediaStore.Audio.Media.TRACK,
+                    MediaStore.Audio.Media.DATE_MODIFIED,
+                    MediaStore.Audio.Media.IS_PODCAST,
+                    MediaStore.Audio.Media.BOOKMARK,
+                    MediaStore.Audio.Media.MIME_TYPE,
+                    "album_artist"
+                ),
+                "${MediaStore.Audio.Media.IS_MUSIC}=1 OR ${MediaStore.Audio.Media.IS_PODCAST}=1",
+                null,
+                null
+            )
 
-            songCursor?.use {
-                val size = songCursor.count
-                var progress = 0
-                while (currentCoroutineContext().isActive && songCursor.moveToNext()) {
-                    var track =
-                        songCursor.getInt(songCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.TRACK))
-                    var disc = 1
-                    if (track >= 1000) {
-                        track %= 1000
+        songCursor?.use {
+            val size = songCursor.count
+            var progress = 0
+            while (currentCoroutineContext().isActive && songCursor.moveToNext()) {
+                var track =
+                    songCursor.getInt(songCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.TRACK))
+                var disc = 1
+                if (track >= 1000) {
+                    track %= 1000
 
-                        disc = track / 1000
-                        if (disc == 0) {
-                            disc = 1
-                        }
+                    disc = track / 1000
+                    if (disc == 0) {
+                        disc = 1
                     }
+                }
 
-                    val song =
-                        Song(
-                            id = 0,
-                            name =
-                            songCursor.getStringOrNull(
-                                songCursor.getColumnIndexOrThrow(
-                                    MediaStore.Audio.Media.TITLE
-                                )
-                            ),
-                            artists =
-                            songCursor.getStringOrNull(
-                                songCursor.getColumnIndexOrThrow(
-                                    MediaStore.Audio.Media.ARTIST
-                                )
-                            )?.let { listOf(it) } ?: emptyList(),
-                            albumArtist = songCursor.getStringOrNull(songCursor.getColumnIndex("album_artist")),
-                            album =
-                            songCursor.getStringOrNull(
-                                songCursor.getColumnIndexOrThrow(
-                                    MediaStore.Audio.Media.ALBUM
-                                )
-                            ),
-                            track = track,
-                            disc = disc,
-                            duration = songCursor.getInt(songCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.DURATION)),
-                            date = songCursor.getIntOrNull(songCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.YEAR))?.let { LocalDate(it, 1, 1) },
-                            genres = emptyList(),
-                            path = songCursor.getString(songCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.DATA)),
-                            size = songCursor.getLong(songCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.SIZE)),
-                            mimeType = songCursor.getString(songCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.MIME_TYPE)),
-                            lastModified =
-                            Instant.fromEpochMilliseconds(
-                                songCursor.getLong(
-                                    songCursor.getColumnIndexOrThrow(
-                                        MediaStore.Audio.Media.DATE_MODIFIED
-                                    )
-                                ) * 1000
-                            ),
-                            lastPlayed = null,
-                            lastCompleted = null,
-                            playCount = 0,
-                            playbackPosition = 0,
-                            blacklisted = false,
-                            externalId =
+                val song =
+                    Song(
+                        id = 0,
+                        name =
+                        songCursor.getStringOrNull(
+                            songCursor.getColumnIndexOrThrow(
+                                MediaStore.Audio.Media.TITLE
+                            )
+                        ),
+                        artists =
+                        songCursor.getStringOrNull(
+                            songCursor.getColumnIndexOrThrow(
+                                MediaStore.Audio.Media.ARTIST
+                            )
+                        )?.let { listOf(it) } ?: emptyList(),
+                        albumArtist = songCursor.getStringOrNull(songCursor.getColumnIndex("album_artist")),
+                        album =
+                        songCursor.getStringOrNull(
+                            songCursor.getColumnIndexOrThrow(
+                                MediaStore.Audio.Media.ALBUM
+                            )
+                        ),
+                        track = track,
+                        disc = disc,
+                        duration = songCursor.getInt(songCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.DURATION)),
+                        date = songCursor.getIntOrNull(songCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.YEAR))?.let { LocalDate(it, 1, 1) },
+                        genres = emptyList(),
+                        path = songCursor.getString(songCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.DATA)),
+                        size = songCursor.getLong(songCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.SIZE)),
+                        mimeType = songCursor.getString(songCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.MIME_TYPE)),
+                        lastModified =
+                        Instant.fromEpochMilliseconds(
                             songCursor.getLong(
                                 songCursor.getColumnIndexOrThrow(
-                                    MediaStore.Audio.Media._ID
+                                    MediaStore.Audio.Media.DATE_MODIFIED
                                 )
-                            ).toString(),
-                            mediaProvider = type,
-                            lyrics = null,
-                            grouping = null,
-                            bitRate = null,
-                            bitDepth = null,
-                            sampleRate = null,
-                            channelCount = null
-                        )
-                    songs.add(song)
-                    progress++
-                    emit(
-                        FlowEvent.Progress(
-                            MessageProgress(
-                                message =
-                                listOf(
-                                    song.friendlyArtistName ?: song.albumArtist,
-                                    song.name
-                                ).joinToString(" • "),
-                                progress = Progress(progress, size)
+                            ) * 1000
+                        ),
+                        lastPlayed = null,
+                        lastCompleted = null,
+                        playCount = 0,
+                        playbackPosition = 0,
+                        blacklisted = false,
+                        externalId =
+                        songCursor.getLong(
+                            songCursor.getColumnIndexOrThrow(
+                                MediaStore.Audio.Media._ID
                             )
+                        ).toString(),
+                        mediaProvider = type,
+                        lyrics = null,
+                        grouping = null,
+                        bitRate = null,
+                        bitDepth = null,
+                        sampleRate = null,
+                        channelCount = null
+                    )
+                songs.add(song)
+                progress++
+                emit(
+                    FlowEvent.Progress(
+                        MessageProgress(
+                            message =
+                            listOf(
+                                song.friendlyArtistName ?: song.albumArtist,
+                                song.name
+                            ).joinToString(" • "),
+                            progress = Progress(progress, size)
                         )
                     )
-                }
+                )
             }
+        }
 
-            context.contentResolver.query(
-                MediaStore.Audio.Genres.EXTERNAL_CONTENT_URI,
-                arrayOf(MediaStore.Audio.Genres._ID, MediaStore.Audio.Genres.NAME),
-                null,
-                null,
-                null
-            )?.use { genreCursor ->
-                while (currentCoroutineContext().isActive && genreCursor.moveToNext()) {
-                    val id =
-                        genreCursor.getLong(genreCursor.getColumnIndexOrThrow(MediaStore.Audio.Genres._ID))
-                    val genre =
-                        genreCursor.getString(genreCursor.getColumnIndexOrThrow(MediaStore.Audio.Genres.NAME))
-                    context.contentResolver.query(
-                        MediaStore.Audio.Genres.Members.getContentUri("external", id),
-                        arrayOf(MediaStore.Audio.Media._ID),
-                        null,
-                        null,
-                        null
-                    )?.use { genreSongCursor ->
-                        while (currentCoroutineContext().isActive && genreSongCursor.moveToNext()) {
-                            val songId =
-                                genreSongCursor.getLong(
-                                    genreSongCursor.getColumnIndexOrThrow(MediaStore.Audio.Media._ID)
-                                ).toString()
-                            songs =
-                                songs.map { song ->
-                                    if (song.externalId == songId) {
-                                        song.copy(genres = song.genres + genre)
-                                    } else {
-                                        song
-                                    }
-                                }.toMutableList()
-                        }
+        context.contentResolver.query(
+            MediaStore.Audio.Genres.EXTERNAL_CONTENT_URI,
+            arrayOf(MediaStore.Audio.Genres._ID, MediaStore.Audio.Genres.NAME),
+            null,
+            null,
+            null
+        )?.use { genreCursor ->
+            while (currentCoroutineContext().isActive && genreCursor.moveToNext()) {
+                val id =
+                    genreCursor.getLong(genreCursor.getColumnIndexOrThrow(MediaStore.Audio.Genres._ID))
+                val genre =
+                    genreCursor.getString(genreCursor.getColumnIndexOrThrow(MediaStore.Audio.Genres.NAME))
+                context.contentResolver.query(
+                    MediaStore.Audio.Genres.Members.getContentUri("external", id),
+                    arrayOf(MediaStore.Audio.Media._ID),
+                    null,
+                    null,
+                    null
+                )?.use { genreSongCursor ->
+                    while (currentCoroutineContext().isActive && genreSongCursor.moveToNext()) {
+                        val songId =
+                            genreSongCursor.getLong(
+                                genreSongCursor.getColumnIndexOrThrow(MediaStore.Audio.Media._ID)
+                            ).toString()
+                        songs =
+                            songs.map { song ->
+                                if (song.externalId == songId) {
+                                    song.copy(genres = song.genres + genre)
+                                } else {
+                                    song
+                                }
+                            }.toMutableList()
                     }
                 }
             }
-            emit(FlowEvent.Success(songs))
         }
+        emit(FlowEvent.Success(songs))
     }
 
     data class MediaStoreSong(
@@ -207,39 +205,37 @@ class MediaStoreMediaProvider(
     override fun findPlaylists(
         existingPlaylists: List<Playlist>,
         existingSongs: List<Song>
-    ): Flow<FlowEvent<List<MediaImporter.PlaylistUpdateData>, MessageProgress>> {
-        return flow {
-            val mediaStorePlaylists = findMediaStorePlaylists().toList()
-            val updates =
-                mediaStorePlaylists.mapIndexed { i, mediaStorePlaylist ->
-                    val mediaStoreSongs = findSongsForMediaStorePlaylist(mediaStorePlaylist.id)
+    ): Flow<FlowEvent<List<MediaImporter.PlaylistUpdateData>, MessageProgress>> = flow {
+        val mediaStorePlaylists = findMediaStorePlaylists().toList()
+        val updates =
+            mediaStorePlaylists.mapIndexed { i, mediaStorePlaylist ->
+                val mediaStoreSongs = findSongsForMediaStorePlaylist(mediaStorePlaylist.id)
 
-                    // Associate Media Store songs with Shuttle's songs
-                    val matchingSongs =
-                        mediaStoreSongs.mapNotNull { mediaStoreSong ->
-                            existingSongs.firstOrNull { existingSong ->
-                                // We assume two songs are equal, if they have the same title, album, artist & duration. We can't be too specific, as the
-                                // MediaStore scanner may have interpreted some fields differently to Shuttle's built in scanner.
-                                existingSong.name.equals(mediaStoreSong.title, ignoreCase = true) &&
-                                    existingSong.album.equals(mediaStoreSong.album, ignoreCase = true) &&
-                                    (existingSong.artists.any { it.equals(mediaStoreSong.artist, true) } || existingSong.albumArtist.equals(mediaStoreSong.albumArtist, ignoreCase = true)) &&
-                                    abs(existingSong.duration - mediaStoreSong.duration) <= 1000 // song duration is within 1 second
-                            }
+                // Associate Media Store songs with Shuttle's songs
+                val matchingSongs =
+                    mediaStoreSongs.mapNotNull { mediaStoreSong ->
+                        existingSongs.firstOrNull { existingSong ->
+                            // We assume two songs are equal, if they have the same title, album, artist & duration. We can't be too specific, as the
+                            // MediaStore scanner may have interpreted some fields differently to Shuttle's built in scanner.
+                            existingSong.name.equals(mediaStoreSong.title, ignoreCase = true) &&
+                                existingSong.album.equals(mediaStoreSong.album, ignoreCase = true) &&
+                                (existingSong.artists.any { it.equals(mediaStoreSong.artist, true) } || existingSong.albumArtist.equals(mediaStoreSong.albumArtist, ignoreCase = true)) &&
+                                abs(existingSong.duration - mediaStoreSong.duration) <= 1000 // song duration is within 1 second
                         }
+                    }
 
-                    val updateData =
-                        MediaImporter.PlaylistUpdateData(
-                            type,
-                            mediaStorePlaylist.name,
-                            matchingSongs,
-                            mediaStorePlaylist.id.toString()
-                        )
-                    emit(FlowEvent.Progress(MessageProgress("Found playlist", Progress(i, mediaStorePlaylists.size))))
-                    updateData
-                }
+                val updateData =
+                    MediaImporter.PlaylistUpdateData(
+                        type,
+                        mediaStorePlaylist.name,
+                        matchingSongs,
+                        mediaStorePlaylist.id.toString()
+                    )
+                emit(FlowEvent.Progress(MessageProgress("Found playlist", Progress(i, mediaStorePlaylists.size))))
+                updateData
+            }
 
-            emit(FlowEvent.Success(updates.toList()))
-        }
+        emit(FlowEvent.Success(updates.toList()))
     }
 
     private suspend fun findSongsForMediaStorePlaylist(mediaStorePlaylistId: Long): List<MediaStoreSong> {
@@ -301,29 +297,27 @@ class MediaStoreMediaProvider(
 
     data class MediaStorePlaylist(val id: Long, val name: String)
 
-    private fun findMediaStorePlaylists(): Flow<MediaStorePlaylist> {
-        return flow {
-            val cursor =
-                context.contentResolver.query(
-                    MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI,
-                    arrayOf(
-                        MediaStore.Audio.Playlists._ID,
-                        MediaStore.Audio.Playlists.NAME
-                    ),
-                    null,
-                    null,
-                    MediaStore.Audio.Playlists.DEFAULT_SORT_ORDER
-                )
+    private fun findMediaStorePlaylists(): Flow<MediaStorePlaylist> = flow {
+        val cursor =
+            context.contentResolver.query(
+                MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI,
+                arrayOf(
+                    MediaStore.Audio.Playlists._ID,
+                    MediaStore.Audio.Playlists.NAME
+                ),
+                null,
+                null,
+                MediaStore.Audio.Playlists.DEFAULT_SORT_ORDER
+            )
 
-            cursor?.use {
-                while (cursor.moveToNext()) {
-                    emit(
-                        MediaStorePlaylist(
-                            cursor.getLong(cursor.getColumnIndexOrThrow(MediaStore.Audio.Playlists._ID)),
-                            cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Audio.Playlists.NAME))
-                        )
+        cursor?.use {
+            while (cursor.moveToNext()) {
+                emit(
+                    MediaStorePlaylist(
+                        cursor.getLong(cursor.getColumnIndexOrThrow(MediaStore.Audio.Playlists._ID)),
+                        cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Audio.Playlists.NAME))
                     )
-                }
+                )
             }
         }
     }
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt
index 43c9457a4..f4ea48e74 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt
@@ -38,137 +38,129 @@ class TaglibMediaProvider(
 ) : MediaProvider {
     override val type = MediaProviderType.Shuttle
 
-    override fun findSongs(): Flow<FlowEvent<List<Song>, MessageProgress>> {
-        return flow {
-            getDocumentNodes()?.let { nodes ->
-                val songs = mutableListOf<Song>()
-                getAudioFiles(nodes.filter { it.ext != "m3u" && it.ext != "m3u8" })
-                    .collectIndexed { index, audioFile ->
-                        val song = audioFile.toSong(type)
-                        emit(
-                            FlowEvent.Progress(
-                                MessageProgress(
-                                    message =
-                                    listOf(
-                                        song.friendlyArtistName ?: song.albumArtist,
-                                        song.name
-                                    ).joinToString(" • "),
-                                    progress = Progress(index, nodes.size)
-                                )
+    override fun findSongs(): Flow<FlowEvent<List<Song>, MessageProgress>> = flow {
+        getDocumentNodes()?.let { nodes ->
+            val songs = mutableListOf<Song>()
+            getAudioFiles(nodes.filter { it.ext != "m3u" && it.ext != "m3u8" })
+                .collectIndexed { index, audioFile ->
+                    val song = audioFile.toSong(type)
+                    emit(
+                        FlowEvent.Progress(
+                            MessageProgress(
+                                message =
+                                listOf(
+                                    song.friendlyArtistName ?: song.albumArtist,
+                                    song.name
+                                ).joinToString(" • "),
+                                progress = Progress(index, nodes.size)
                             )
                         )
-                        songs.add(song)
-                    }
-                emit(FlowEvent.Success(songs))
-            } ?: run {
-                Timber.e("No document nodes to scan")
-                emit(FlowEvent.Failure(context.getString(com.simplecityapps.mediaprovider.R.string.media_import_directories_empty)))
-            }
-        }
-    }
-
-    private suspend fun getDocumentNodes(): List<DocumentNode>? {
-        return withContext(Dispatchers.IO) {
-            context.contentResolver?.persistedUriPermissions
-                ?.filter { uriPermission -> uriPermission.isReadPermission || uriPermission.isWritePermission }
-                ?.map { uriPermission ->
-                    SafDirectoryHelper.buildFolderNodeTree(
-                        context.contentResolver,
-                        uriPermission.uri
                     )
-                        .filterIsInstance<SafDirectoryHelper.TreeStatus.Complete>()
-                        .map { it.tree }
+                    songs.add(song)
                 }
+            emit(FlowEvent.Success(songs))
+        } ?: run {
+            Timber.e("No document nodes to scan")
+            emit(FlowEvent.Failure(context.getString(com.simplecityapps.mediaprovider.R.string.media_import_directories_empty)))
         }
-            ?.merge()
-            ?.toList()
-            ?.let { status ->
-                status.flatMap { it.getLeaves() }
-            }
     }
 
-    private fun getAudioFiles(documentNodes: List<DocumentNode>): Flow<AudioFile> {
-        return documentNodes
-            .asFlow()
-            .concurrentMap((Runtime.getRuntime().availableProcessors() - 1).coerceAtLeast(1)) {
-                fileScanner.getAudioFile(context, kTagLib, it.uri)
-            }.mapNotNull { it }
+    private suspend fun getDocumentNodes(): List<DocumentNode>? = withContext(Dispatchers.IO) {
+        context.contentResolver?.persistedUriPermissions
+            ?.filter { uriPermission -> uriPermission.isReadPermission || uriPermission.isWritePermission }
+            ?.map { uriPermission ->
+                SafDirectoryHelper.buildFolderNodeTree(
+                    context.contentResolver,
+                    uriPermission.uri
+                )
+                    .filterIsInstance<SafDirectoryHelper.TreeStatus.Complete>()
+                    .map { it.tree }
+            }
     }
+        ?.merge()
+        ?.toList()
+        ?.let { status ->
+            status.flatMap { it.getLeaves() }
+        }
+
+    private fun getAudioFiles(documentNodes: List<DocumentNode>): Flow<AudioFile> = documentNodes
+        .asFlow()
+        .concurrentMap((Runtime.getRuntime().availableProcessors() - 1).coerceAtLeast(1)) {
+            fileScanner.getAudioFile(context, kTagLib, it.uri)
+        }.mapNotNull { it }
 
     override fun findPlaylists(
         existingPlaylists: List<Playlist>,
         existingSongs: List<Song>
-    ): Flow<FlowEvent<List<MediaImporter.PlaylistUpdateData>, MessageProgress>> {
-        return flow {
-            val sanitisedSongPaths = existingSongs.associateBy { Uri.decode(it.path.substringAfterLast('/')).substringAfterLast(':') }
+    ): Flow<FlowEvent<List<MediaImporter.PlaylistUpdateData>, MessageProgress>> = flow {
+        val sanitisedSongPaths = existingSongs.associateBy { Uri.decode(it.path.substringAfterLast('/')).substringAfterLast(':') }
 
-            getDocumentNodes()?.let { nodes ->
-                val m3uPlaylists =
-                    nodes
-                        .filter { it.ext == "m3u" || it.ext == "m3u8" }
-                        .mapNotNull { documentNode ->
-                            context.contentResolver.openInputStream(documentNode.uri)
-                                .use { inputStream ->
-                                    inputStream?.let {
-                                        M3uParser().parse(
-                                            path = documentNode.uri.toString(),
-                                            fileName = documentNode.displayName,
-                                            inputStream = inputStream
-                                        )
-                                    }
+        getDocumentNodes()?.let { nodes ->
+            val m3uPlaylists =
+                nodes
+                    .filter { it.ext == "m3u" || it.ext == "m3u8" }
+                    .mapNotNull { documentNode ->
+                        context.contentResolver.openInputStream(documentNode.uri)
+                            .use { inputStream ->
+                                inputStream?.let {
+                                    M3uParser().parse(
+                                        path = documentNode.uri.toString(),
+                                        fileName = documentNode.displayName,
+                                        inputStream = inputStream
+                                    )
                                 }
-                        }
+                            }
+                    }
 
-                val updates =
-                    m3uPlaylists.mapNotNull { m3uPlaylist ->
-                        Timber.i("Importing playlist ${m3uPlaylist.name}...")
-                        val songs =
-                            m3uPlaylist.entries.mapIndexedNotNull { index, entry ->
-                                emit(
-                                    FlowEvent.Progress(
-                                        MessageProgress(
-                                            Phrase.from(context, com.simplecityapps.mediaprovider.R.string.media_import_m3u_scan).put("playlist_name", m3uPlaylist.name).format().toString(),
-                                            Progress(index, m3uPlaylist.entries.size)
-                                        )
+            val updates =
+                m3uPlaylists.mapNotNull { m3uPlaylist ->
+                    Timber.i("Importing playlist ${m3uPlaylist.name}...")
+                    val songs =
+                        m3uPlaylist.entries.mapIndexedNotNull { index, entry ->
+                            emit(
+                                FlowEvent.Progress(
+                                    MessageProgress(
+                                        Phrase.from(context, com.simplecityapps.mediaprovider.R.string.media_import_m3u_scan).put("playlist_name", m3uPlaylist.name).format().toString(),
+                                        Progress(index, m3uPlaylist.entries.size)
                                     )
                                 )
+                            )
 
-                                sanitisedSongPaths.keys.firstOrNull { songPath ->
-                                    when {
-                                        songPath.equals(entry.location, ignoreCase = true) -> {
-                                            true
-                                        }
+                            sanitisedSongPaths.keys.firstOrNull { songPath ->
+                                when {
+                                    songPath.equals(entry.location, ignoreCase = true) -> {
+                                        true
+                                    }
 
-                                        songPath.length > entry.location.length -> {
-                                            songPath.contains(other = entry.location, ignoreCase = true)
-                                        }
+                                    songPath.length > entry.location.length -> {
+                                        songPath.contains(other = entry.location, ignoreCase = true)
+                                    }
 
-                                        else -> {
-                                            entry.location.contains(other = songPath, ignoreCase = true)
-                                        }
+                                    else -> {
+                                        entry.location.contains(other = songPath, ignoreCase = true)
                                     }
-                                }?.let { matchingPath ->
-                                    sanitisedSongPaths[matchingPath]
                                 }
+                            }?.let { matchingPath ->
+                                sanitisedSongPaths[matchingPath]
                             }
-                        if (songs.isNotEmpty()) {
-                            val updateData =
-                                MediaImporter.PlaylistUpdateData(
-                                    mediaProviderType = type,
-                                    name = m3uPlaylist.name,
-                                    songs = songs,
-                                    externalId = m3uPlaylist.name
-                                )
-                            updateData
-                        } else {
-                            null
                         }
+                    if (songs.isNotEmpty()) {
+                        val updateData =
+                            MediaImporter.PlaylistUpdateData(
+                                mediaProviderType = type,
+                                name = m3uPlaylist.name,
+                                songs = songs,
+                                externalId = m3uPlaylist.name
+                            )
+                        updateData
+                    } else {
+                        null
                     }
-                emit(FlowEvent.Success(updates.toList()))
-            } ?: run {
-                Timber.e("No document nodes to scan")
-                emit(FlowEvent.Failure(context.getString(com.simplecityapps.mediaprovider.R.string.media_import_directories_empty)))
-            }
+                }
+            emit(FlowEvent.Success(updates.toList()))
+        } ?: run {
+            Timber.e("No document nodes to scan")
+            emit(FlowEvent.Failure(context.getString(com.simplecityapps.mediaprovider.R.string.media_import_directories_empty)))
         }
     }
 }
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalAlbumArtistRepository.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalAlbumArtistRepository.kt
index 0fe296c74..7cc518ff1 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalAlbumArtistRepository.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalAlbumArtistRepository.kt
@@ -38,15 +38,13 @@ class LocalAlbumArtistRepository(val scope: CoroutineScope, private val songData
             .stateIn(scope, SharingStarted.Lazily, null)
     }
 
-    override fun getAlbumArtists(query: AlbumArtistQuery): Flow<List<AlbumArtist>> {
-        return albumArtistsRelay
-            .filterNotNull()
-            .map { albumArtists ->
-                albumArtists
-                    .filter(query.predicate)
-                    .toMutableList()
-                    .sortedWith(query.sortOrder.comparator)
-            }
-            .flowOn(Dispatchers.IO)
-    }
+    override fun getAlbumArtists(query: AlbumArtistQuery): Flow<List<AlbumArtist>> = albumArtistsRelay
+        .filterNotNull()
+        .map { albumArtists ->
+            albumArtists
+                .filter(query.predicate)
+                .toMutableList()
+                .sortedWith(query.sortOrder.comparator)
+        }
+        .flowOn(Dispatchers.IO)
 }
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalAlbumRepository.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalAlbumRepository.kt
index 7e473c575..1f73221f3 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalAlbumRepository.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalAlbumRepository.kt
@@ -45,13 +45,11 @@ class LocalAlbumRepository(
             .stateIn(scope, SharingStarted.Lazily, null)
     }
 
-    override fun getAlbums(query: AlbumQuery): Flow<List<Album>> {
-        return albumsRelay
-            .filterNotNull()
-            .map { albums ->
-                albums
-                    .filter(query.predicate)
-                    .sortedWith(query.sortOrder.comparator)
-            }
-    }
+    override fun getAlbums(query: AlbumQuery): Flow<List<Album>> = albumsRelay
+        .filterNotNull()
+        .map { albums ->
+            albums
+                .filter(query.predicate)
+                .sortedWith(query.sortOrder.comparator)
+        }
 }
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalGenreRepository.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalGenreRepository.kt
index c19a9a017..efa002d62 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalGenreRepository.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalGenreRepository.kt
@@ -38,46 +38,42 @@ class LocalGenreRepository(
             .stateIn(scope, SharingStarted.Lazily, null)
     }
 
-    override fun getGenres(query: GenreQuery): Flow<List<Genre>> {
-        return genreRelay
-            .filterNotNull()
-            .map { genres ->
-                genres
-                    .map { entry ->
-                        com.simplecityapps.shuttle.model.Genre(
-                            entry.key,
-                            entry.value.size,
-                            entry.value.sumBy { song -> song.duration },
-                            entry.value.map { song -> song.mediaProvider }.distinct()
-                        )
-                    }
-                    .filter(query.predicate)
-                    .toMutableList()
-                    .sortedWith(query.sortOrder.comparator)
-            }
-    }
+    override fun getGenres(query: GenreQuery): Flow<List<Genre>> = genreRelay
+        .filterNotNull()
+        .map { genres ->
+            genres
+                .map { entry ->
+                    com.simplecityapps.shuttle.model.Genre(
+                        entry.key,
+                        entry.value.size,
+                        entry.value.sumBy { song -> song.duration },
+                        entry.value.map { song -> song.mediaProvider }.distinct()
+                    )
+                }
+                .filter(query.predicate)
+                .toMutableList()
+                .sortedWith(query.sortOrder.comparator)
+        }
 
     override fun getSongsForGenres(
         genres: List<String>,
         songQuery: SongQuery
-    ): Flow<List<Song>> {
-        return genreRelay
-            .filterNotNull()
-            .map {
-                genres.flatMap { genre ->
-                    it[genre].orEmpty()
-                }
+    ): Flow<List<Song>> = genreRelay
+        .filterNotNull()
+        .map {
+            genres.flatMap { genre ->
+                it[genre].orEmpty()
             }
-            .map { songs ->
-                var result = songs
-
-                if (!songQuery.includeExcluded) {
-                    result = songs.filterNot { it.blacklisted }
-                }
+        }
+        .map { songs ->
+            var result = songs
 
-                result
-                    .filter(songQuery.predicate)
-                    .sortedWith(songQuery.sortOrder.comparator)
+            if (!songQuery.includeExcluded) {
+                result = songs.filterNot { it.blacklisted }
             }
-    }
+
+            result
+                .filter(songQuery.predicate)
+                .sortedWith(songQuery.sortOrder.comparator)
+        }
 }
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalPlaylistRepository.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalPlaylistRepository.kt
index 664cbbacf..ca848e738 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalPlaylistRepository.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalPlaylistRepository.kt
@@ -43,26 +43,22 @@ class LocalPlaylistRepository(
             .stateIn(scope, SharingStarted.Lazily, null)
     }
 
-    override fun getPlaylists(query: PlaylistQuery): Flow<List<Playlist>> {
-        return playlistsRelay
-            .filterNotNull()
-            .map { playlists ->
-                playlists
-                    .filter(query.predicate)
-                    .toMutableList()
-                    .sortedWith(query.sortOrder.comparator)
-            }
-    }
+    override fun getPlaylists(query: PlaylistQuery): Flow<List<Playlist>> = playlistsRelay
+        .filterNotNull()
+        .map { playlists ->
+            playlists
+                .filter(query.predicate)
+                .toMutableList()
+                .sortedWith(query.sortOrder.comparator)
+        }
 
-    override fun getSmartPlaylists(): Flow<List<SmartPlaylist>> {
-        return flow {
-            emit(
-                listOf(
-                    SmartPlaylist(com.simplecityapps.mediaprovider.R.string.playlist_title_recently_added, SongQuery.RecentlyAdded()),
-                    SmartPlaylist(com.simplecityapps.mediaprovider.R.string.playlist_title_most_played, SongQuery.PlayCount(2, SongSortOrder.PlayCount))
-                )
+    override fun getSmartPlaylists(): Flow<List<SmartPlaylist>> = flow {
+        emit(
+            listOf(
+                SmartPlaylist(com.simplecityapps.mediaprovider.R.string.playlist_title_recently_added, SongQuery.RecentlyAdded()),
+                SmartPlaylist(com.simplecityapps.mediaprovider.R.string.playlist_title_most_played, SongQuery.PlayCount(2, SongSortOrder.PlayCount))
             )
-        }
+        )
     }
 
     override suspend fun getFavoritesPlaylist(): Playlist {
@@ -113,71 +109,55 @@ class LocalPlaylistRepository(
     override suspend fun addToPlaylist(
         playlist: Playlist,
         songs: List<Song>
-    ) {
-        return playlistSongJoinDao.insert(
-            songs.mapIndexed { i, song ->
-                PlaylistSongJoin(
-                    playlistId = playlist.id,
-                    songId = song.id,
-                    sortOrder = (playlist.songCount + i).toLong()
-                )
-            }
-        )
-    }
+    ) = playlistSongJoinDao.insert(
+        songs.mapIndexed { i, song ->
+            PlaylistSongJoin(
+                playlistId = playlist.id,
+                songId = song.id,
+                sortOrder = (playlist.songCount + i).toLong()
+            )
+        }
+    )
 
     override suspend fun removeFromPlaylist(
         playlist: Playlist,
         playlistSongs: List<PlaylistSong>
-    ) {
-        return playlistSongJoinDao.delete(
-            playlistId = playlist.id,
-            playlistSongIds = playlistSongs.map { playlistSong -> playlistSong.id }.toTypedArray()
-        )
-    }
+    ) = playlistSongJoinDao.delete(
+        playlistId = playlist.id,
+        playlistSongIds = playlistSongs.map { playlistSong -> playlistSong.id }.toTypedArray()
+    )
 
     override suspend fun removeSongsFromPlaylist(
         playlist: Playlist,
         songs: List<Song>
-    ) {
-        return playlistSongJoinDao.deleteSongs(
-            playlistId = playlist.id,
-            songIds = songs.map { it.id }.toTypedArray()
-        )
-    }
-
-    override fun getSongsForPlaylist(playlist: Playlist): Flow<List<PlaylistSong>> {
-        return playlistSongJoinDao.getSongsForPlaylist(playlist.id)
-            .map { playlistSong ->
-                playlistSong.sortedWith(playlist.sortOrder.comparator)
-            }
-    }
+    ) = playlistSongJoinDao.deleteSongs(
+        playlistId = playlist.id,
+        songIds = songs.map { it.id }.toTypedArray()
+    )
+
+    override fun getSongsForPlaylist(playlist: Playlist): Flow<List<PlaylistSong>> = playlistSongJoinDao.getSongsForPlaylist(playlist.id)
+        .map { playlistSong ->
+            playlistSong.sortedWith(playlist.sortOrder.comparator)
+        }
 
-    override suspend fun deletePlaylist(playlist: Playlist) {
-        return playlistDataDao.delete(playlist.id)
-    }
+    override suspend fun deletePlaylist(playlist: Playlist) = playlistDataDao.delete(playlist.id)
 
-    override suspend fun deleteAll(mediaProviderType: MediaProviderType) {
-        return playlistDataDao.deleteAll(mediaProviderType)
-    }
+    override suspend fun deleteAll(mediaProviderType: MediaProviderType) = playlistDataDao.deleteAll(mediaProviderType)
 
-    override suspend fun clearPlaylist(playlist: Playlist) {
-        return playlistDataDao.clear(playlist.id)
-    }
+    override suspend fun clearPlaylist(playlist: Playlist) = playlistDataDao.clear(playlist.id)
 
     override suspend fun renamePlaylist(
         playlist: Playlist,
         name: String
-    ) {
-        return playlistDataDao.update(
-            PlaylistData(
-                id = playlist.id,
-                name = name,
-                externalId = playlist.externalId,
-                mediaProviderType = playlist.mediaProvider,
-                sortOrder = playlist.sortOrder
-            )
+    ) = playlistDataDao.update(
+        PlaylistData(
+            id = playlist.id,
+            name = name,
+            externalId = playlist.externalId,
+            mediaProviderType = playlist.mediaProvider,
+            sortOrder = playlist.sortOrder
         )
-    }
+    )
 
     override suspend fun updatePlaylistSortOder(
         playlist: Playlist,
diff --git a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalSongRepository.kt b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalSongRepository.kt
index d74871548..7cd318d29 100644
--- a/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalSongRepository.kt
+++ b/android/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalSongRepository.kt
@@ -29,24 +29,22 @@ class LocalSongRepository(
             .stateIn(scope, SharingStarted.Lazily, null)
     }
 
-    override fun getSongs(query: SongQuery): Flow<List<Song>?> {
-        return songsRelay
-            .map { songs ->
-                var result = songs
-
-                if (!query.includeExcluded) {
-                    result = songs?.filterNot { it.blacklisted }
-                }
-
-                query.providerType?.let { providerType ->
-                    result = songs?.filter { song -> song.mediaProvider == providerType }
-                }
-
-                result
-                    ?.filter(query.predicate)
-                    ?.sortedWith(query.sortOrder.comparator)
+    override fun getSongs(query: SongQuery): Flow<List<Song>?> = songsRelay
+        .map { songs ->
+            var result = songs
+
+            if (!query.includeExcluded) {
+                result = songs?.filterNot { it.blacklisted }
+            }
+
+            query.providerType?.let { providerType ->
+                result = songs?.filter { song -> song.mediaProvider == providerType }
             }
-    }
+
+            result
+                ?.filter(query.predicate)
+                ?.sortedWith(query.sortOrder.comparator)
+        }
 
     override suspend fun insert(
         songs: List<Song>,
@@ -59,9 +57,7 @@ class LocalSongRepository(
         songDataDao.update(songs.toSongDataUpdate())
     }
 
-    override suspend fun update(song: Song): Int {
-        return songDataDao.update(song.toSongDataUpdate())
-    }
+    override suspend fun update(song: Song): Int = songDataDao.update(song.toSongDataUpdate())
 
     override suspend fun remove(song: Song) {
         Timber.v("Deleting song")
@@ -77,9 +73,7 @@ class LocalSongRepository(
         updates: List<Song>,
         deletes: List<Song>,
         mediaProviderType: MediaProviderType
-    ): Triple<Int, Int, Int> {
-        return songDataDao.insertUpdateAndDelete(inserts.toSongData(mediaProviderType), updates.toSongDataUpdate(), deletes.toSongData(mediaProviderType))
-    }
+    ): Triple<Int, Int, Int> = songDataDao.insertUpdateAndDelete(inserts.toSongData(mediaProviderType), updates.toSongDataUpdate(), deletes.toSongData(mediaProviderType))
 
     override suspend fun incrementPlayCount(song: Song) {
         Timber.v("Incrementing play count for song: ${song.name}")
diff --git a/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/PlexAuthenticationManager.kt b/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/PlexAuthenticationManager.kt
index 212fed8bc..814a84751 100644
--- a/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/PlexAuthenticationManager.kt
+++ b/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/PlexAuthenticationManager.kt
@@ -15,25 +15,19 @@ class PlexAuthenticationManager(
     private val userService: UserService,
     private val credentialStore: CredentialStore
 ) {
-    fun getLoginCredentials(): LoginCredentials? {
-        return credentialStore.loginCredentials
-    }
+    fun getLoginCredentials(): LoginCredentials? = credentialStore.loginCredentials
 
     fun setLoginCredentials(loginCredentials: LoginCredentials?) {
         credentialStore.loginCredentials = loginCredentials
     }
 
-    fun getAuthenticatedCredentials(): AuthenticatedCredentials? {
-        return credentialStore.authenticatedCredentials
-    }
+    fun getAuthenticatedCredentials(): AuthenticatedCredentials? = credentialStore.authenticatedCredentials
 
     fun setAddress(address: String) {
         credentialStore.address = address
     }
 
-    fun getAddress(): String? {
-        return credentialStore.address
-    }
+    fun getAddress(): String? = credentialStore.address
 
     suspend fun authenticate(
         address: String,
diff --git a/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/PlexMediaInfoProvider.kt b/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/PlexMediaInfoProvider.kt
index 675fbe2d9..1596d05ca 100644
--- a/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/PlexMediaInfoProvider.kt
+++ b/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/PlexMediaInfoProvider.kt
@@ -12,9 +12,7 @@ class PlexMediaInfoProvider
 constructor(
     private val plexAuthenticationManager: PlexAuthenticationManager
 ) : MediaInfoProvider {
-    override fun handles(uri: Uri): Boolean {
-        return uri.scheme == "plex"
-    }
+    override fun handles(uri: Uri): Boolean = uri.scheme == "plex"
 
     @Throws(IllegalStateException::class)
     override suspend fun getMediaInfo(
diff --git a/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/PlexMediaProvider.kt b/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/PlexMediaProvider.kt
index 172c83698..2ff4ae0d3 100644
--- a/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/PlexMediaProvider.kt
+++ b/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/PlexMediaProvider.kt
@@ -104,7 +104,5 @@ class PlexMediaProvider(
     override fun findPlaylists(
         existingPlaylists: List<Playlist>,
         existingSongs: List<Song>
-    ): Flow<FlowEvent<List<MediaImporter.PlaylistUpdateData>, MessageProgress>> {
-        return flowOf(FlowEvent.Success(emptyList()))
-    }
+    ): Flow<FlowEvent<List<MediaImporter.PlaylistUpdateData>, MessageProgress>> = flowOf(FlowEvent.Success(emptyList()))
 }
diff --git a/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/di/PlexMediaProviderModule.kt b/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/di/PlexMediaProviderModule.kt
index 640f67beb..433bbda91 100644
--- a/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/di/PlexMediaProviderModule.kt
+++ b/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/di/PlexMediaProviderModule.kt
@@ -34,63 +34,49 @@ open class PlexMediaProviderModule {
         @ApplicationContext context: Context,
         okHttpClient: OkHttpClient,
         moshi: Moshi
-    ): Retrofit {
-        return Retrofit.Builder()
-            .baseUrl("http://localhost/") // unused
-            .addCallAdapterFactory(NetworkResultAdapterFactory(context.getSystemService()))
-            .addConverterFactory(MoshiConverterFactory.create(moshi))
-            .client(
-                okHttpClient
-                    .newBuilder()
-                    .readTimeout(90, TimeUnit.SECONDS)
-                    .build()
-            )
-            .build()
-    }
+    ): Retrofit = Retrofit.Builder()
+        .baseUrl("http://localhost/") // unused
+        .addCallAdapterFactory(NetworkResultAdapterFactory(context.getSystemService()))
+        .addConverterFactory(MoshiConverterFactory.create(moshi))
+        .client(
+            okHttpClient
+                .newBuilder()
+                .readTimeout(90, TimeUnit.SECONDS)
+                .build()
+        )
+        .build()
 
     @Provides
     @Singleton
     fun provideUserService(
         @Named("PlexRetrofit") retrofit: Retrofit
-    ): UserService {
-        return retrofit.create()
-    }
+    ): UserService = retrofit.create()
 
     @Provides
     @Singleton
     fun provideItemsService(
         @Named("PlexRetrofit") retrofit: Retrofit
-    ): ItemsService {
-        return retrofit.create()
-    }
+    ): ItemsService = retrofit.create()
 
     @Provides
     @Singleton
-    fun provideCredentialStore(securePreferenceManager: SecurePreferenceManager): CredentialStore {
-        return CredentialStore(securePreferenceManager)
-    }
+    fun provideCredentialStore(securePreferenceManager: SecurePreferenceManager): CredentialStore = CredentialStore(securePreferenceManager)
 
     @Provides
     @Singleton
     fun providePlexAuthenticationManager(
         userService: UserService,
         credentialStore: CredentialStore
-    ): PlexAuthenticationManager {
-        return PlexAuthenticationManager(userService, credentialStore)
-    }
+    ): PlexAuthenticationManager = PlexAuthenticationManager(userService, credentialStore)
 
     @Provides
     @Singleton
     fun providePlexMediaProvider(
         authenticationManager: PlexAuthenticationManager,
         itemsService: ItemsService
-    ): PlexMediaProvider {
-        return PlexMediaProvider(authenticationManager, itemsService)
-    }
+    ): PlexMediaProvider = PlexMediaProvider(authenticationManager, itemsService)
 
     @Provides
     @Singleton
-    fun providePlexMediaPathProvider(authenticationManager: PlexAuthenticationManager): PlexMediaInfoProvider {
-        return PlexMediaInfoProvider(authenticationManager)
-    }
+    fun providePlexMediaPathProvider(authenticationManager: PlexAuthenticationManager): PlexMediaInfoProvider = PlexMediaInfoProvider(authenticationManager)
 }
diff --git a/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/http/ItemsService.kt b/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/http/ItemsService.kt
index e72c2085a..51b068b03 100644
--- a/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/http/ItemsService.kt
+++ b/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/http/ItemsService.kt
@@ -22,24 +22,20 @@ suspend fun ItemsService.items(
     url: String,
     token: String,
     section: String
-): NetworkResult<QueryResult> {
-    return itemsImpl(
-        url =
-        "$url/library/sections/$section/all" +
-            "?type=10" +
-            "&includeCollections=1" +
-            "&includeAdvanced=1" +
-            "&includeMeta=1",
-        token = token
-    )
-}
+): NetworkResult<QueryResult> = itemsImpl(
+    url =
+    "$url/library/sections/$section/all" +
+        "?type=10" +
+        "&includeCollections=1" +
+        "&includeAdvanced=1" +
+        "&includeMeta=1",
+    token = token
+)
 
 suspend fun ItemsService.sections(
     url: String,
     token: String
-): NetworkResult<QueryResult> {
-    return itemsImpl(
-        url = "$url/library/sections",
-        token = token
-    )
-}
+): NetworkResult<QueryResult> = itemsImpl(
+    url = "$url/library/sections",
+    token = token
+)
diff --git a/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/http/UserService.kt b/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/http/UserService.kt
index 072a70d81..3170d2f90 100644
--- a/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/http/UserService.kt
+++ b/android/mediaprovider/plex/src/main/java/com/simplecityapps/provider/plex/http/UserService.kt
@@ -24,10 +24,8 @@ suspend fun UserService.authenticate(
     username: String,
     password: String,
     authCode: String?
-): NetworkResult<AuthenticationResult> {
-    return authenticateImpl(
-        "https://plex.tv/users/sign_in",
-        username,
-        password + (authCode ?: "")
-    )
-}
+): NetworkResult<AuthenticationResult> = authenticateImpl(
+    "https://plex.tv/users/sign_in",
+    username,
+    password + (authCode ?: "")
+)
diff --git a/android/networking/src/main/java/com/simplecityapps/networking/ErrorHelper.kt b/android/networking/src/main/java/com/simplecityapps/networking/ErrorHelper.kt
index cc020c2a5..1041673ae 100644
--- a/android/networking/src/main/java/com/simplecityapps/networking/ErrorHelper.kt
+++ b/android/networking/src/main/java/com/simplecityapps/networking/ErrorHelper.kt
@@ -6,52 +6,40 @@ import com.simplecityapps.networking.retrofit.error.RemoteServiceHttpError
 import com.simplecityapps.networking.retrofit.error.UnexpectedError
 import com.simplecityapps.networking.retrofit.error.UserFriendlyError
 
-fun Throwable.userDescription(): String {
-    return (this as? Error)?.userDescription() ?: "An unknown error occurred."
-}
+fun Throwable.userDescription(): String = (this as? Error)?.userDescription() ?: "An unknown error occurred."
 
-fun Error.userDescription(): String {
-    return when (this) {
-        is RemoteServiceHttpError -> {
-            when {
-                isServerError -> "A server error occurred. (${httpStatusCode.code})"
-                else -> "An error occurred. (${httpStatusCode.code})"
-            }
-        }
-        is RemoteServiceError -> {
-            "An unknown service error occurred."
-        }
-        is NetworkError -> {
-            if (hasInternetConnectivity) {
-                "The server could not be reached."
-            } else {
-                "You are not connected to the internet."
-            }
-        }
-        is UnexpectedError -> {
-            "An unexpected error occurred."
+fun Error.userDescription(): String = when (this) {
+    is RemoteServiceHttpError -> {
+        when {
+            isServerError -> "A server error occurred. (${httpStatusCode.code})"
+            else -> "An error occurred. (${httpStatusCode.code})"
         }
-        is UserFriendlyError -> {
-            message
-        }
-        else -> {
-            "An unknown error occurred."
+    }
+    is RemoteServiceError -> {
+        "An unknown service error occurred."
+    }
+    is NetworkError -> {
+        if (hasInternetConnectivity) {
+            "The server could not be reached."
+        } else {
+            "You are not connected to the internet."
         }
     }
+    is UnexpectedError -> {
+        "An unexpected error occurred."
+    }
+    is UserFriendlyError -> {
+        message
+    }
+    else -> {
+        "An unknown error occurred."
+    }
 }
 
-fun Error.isHttpError(): Boolean {
-    return this is RemoteServiceHttpError
-}
+fun Error.isHttpError(): Boolean = this is RemoteServiceHttpError
 
-fun Error.isHttpServerError(): Boolean {
-    return (this as? RemoteServiceHttpError)?.isServerError ?: false
-}
+fun Error.isHttpServerError(): Boolean = (this as? RemoteServiceHttpError)?.isServerError ?: false
 
-fun Error.isHttpClientError(): Boolean {
-    return (this as? RemoteServiceHttpError)?.isClientError ?: false
-}
+fun Error.isHttpClientError(): Boolean = (this as? RemoteServiceHttpError)?.isClientError ?: false
 
-fun Error.isNetworkError(): Boolean {
-    return this is NetworkError
-}
+fun Error.isNetworkError(): Boolean = this is NetworkError
diff --git a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/NetworkResultCall.kt b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/NetworkResultCall.kt
index 7f96479a7..edd007613 100644
--- a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/NetworkResultCall.kt
+++ b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/NetworkResultCall.kt
@@ -88,31 +88,19 @@ class NetworkResultCall<S : Any>(
         )
     }
 
-    override fun execute(): Response<NetworkResult<S>> {
-        throw(IllegalStateException("execute() not supported"))
-    }
+    override fun execute(): Response<NetworkResult<S>> = throw(IllegalStateException("execute() not supported"))
 
-    override fun isExecuted(): Boolean {
-        return call.isExecuted
-    }
+    override fun isExecuted(): Boolean = call.isExecuted
 
-    override fun clone(): Call<NetworkResult<S>> {
-        return NetworkResultCall(call.clone(), errorBodyConverter, connectivityManager = connectivityManager)
-    }
+    override fun clone(): Call<NetworkResult<S>> = NetworkResultCall(call.clone(), errorBodyConverter, connectivityManager = connectivityManager)
 
     override fun cancel() {
         call.cancel()
     }
 
-    override fun isCanceled(): Boolean {
-        return call.isCanceled
-    }
+    override fun isCanceled(): Boolean = call.isCanceled
 
-    override fun request(): Request {
-        return call.request()
-    }
+    override fun request(): Request = call.request()
 
-    override fun timeout(): Timeout {
-        return call.timeout()
-    }
+    override fun timeout(): Timeout = call.timeout()
 }
diff --git a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/NetworkResultCallAdapter.kt b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/NetworkResultCallAdapter.kt
index ed617237b..bd04b6d61 100644
--- a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/NetworkResultCallAdapter.kt
+++ b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/NetworkResultCallAdapter.kt
@@ -12,11 +12,7 @@ class NetworkResultCallAdapter<S : Any>(
     private val errorBodyConverter: Converter<ResponseBody, Throwable>?,
     private val connectivityManager: ConnectivityManager?
 ) : CallAdapter<S, Call<NetworkResult<S>>> {
-    override fun responseType(): Type {
-        return responseType
-    }
+    override fun responseType(): Type = responseType
 
-    override fun adapt(call: Call<S>): Call<NetworkResult<S>> {
-        return NetworkResultCall(call, errorBodyConverter, connectivityManager)
-    }
+    override fun adapt(call: Call<S>): Call<NetworkResult<S>> = NetworkResultCall(call, errorBodyConverter, connectivityManager)
 }
diff --git a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/NetworkError.kt b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/NetworkError.kt
index 27f8f12a7..613e41513 100644
--- a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/NetworkError.kt
+++ b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/NetworkError.kt
@@ -4,7 +4,5 @@ package com.simplecityapps.networking.retrofit.error
  * Represents an error in which the server could not be reached.
  */
 class NetworkError(val hasInternetConnectivity: Boolean, val t: Throwable) : Error() {
-    override fun toString(): String {
-        return "NetworkError (hasInternetConnectivity: $hasInternetConnectivity, error: ${t.localizedMessage})"
-    }
+    override fun toString(): String = "NetworkError (hasInternetConnectivity: $hasInternetConnectivity, error: ${t.localizedMessage})"
 }
diff --git a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/RemoteServiceError.kt b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/RemoteServiceError.kt
index 3f241142d..cf2167cad 100644
--- a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/RemoteServiceError.kt
+++ b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/RemoteServiceError.kt
@@ -4,7 +4,5 @@ package com.simplecityapps.networking.retrofit.error
  * An error response from the server.
  */
 open class RemoteServiceError : Error() {
-    override fun toString(): String {
-        return "RemoteServiceError(message: $message)"
-    }
+    override fun toString(): String = "RemoteServiceError(message: $message)"
 }
diff --git a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/RemoteServiceHttpError.kt b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/RemoteServiceHttpError.kt
index 9ca14d21a..5ed486d1c 100644
--- a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/RemoteServiceHttpError.kt
+++ b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/RemoteServiceHttpError.kt
@@ -15,11 +15,9 @@ open class RemoteServiceHttpError(val response: Response<*>) : RemoteServiceErro
     val isServerError: Boolean
         get() = response.code() in 500..599
 
-    override fun toString(): String {
-        return "RemoteServiceHttpError" +
-            "\n\t- code: ${response.code()} (${httpStatusCode.name})" +
-            "\n\t- message: ${super.message}"
-    }
+    override fun toString(): String = "RemoteServiceHttpError" +
+        "\n\t- code: ${response.code()} (${httpStatusCode.name})" +
+        "\n\t- message: ${super.message}"
 }
 
 enum class HttpStatusCode(val code: Int) {
diff --git a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/UnexpectedError.kt b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/UnexpectedError.kt
index 3e6758d6a..fcc3c8e80 100644
--- a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/UnexpectedError.kt
+++ b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/UnexpectedError.kt
@@ -1,7 +1,5 @@
 package com.simplecityapps.networking.retrofit.error
 
 class UnexpectedError(val t: Throwable) : Error() {
-    override fun toString(): String {
-        return "UnexpectedError (${t.localizedMessage})"
-    }
+    override fun toString(): String = "UnexpectedError (${t.localizedMessage})"
 }
diff --git a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/UserFriendlyError.kt b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/UserFriendlyError.kt
index e2835e4e8..29dacccc7 100644
--- a/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/UserFriendlyError.kt
+++ b/android/networking/src/main/java/com/simplecityapps/networking/retrofit/error/UserFriendlyError.kt
@@ -1,7 +1,5 @@
 package com.simplecityapps.networking.retrofit.error
 
 class UserFriendlyError(override var message: String) : Error(message) {
-    override fun toString(): String {
-        return "UserFriendlyError(message: $message)"
-    }
+    override fun toString(): String = "UserFriendlyError(message: $message)"
 }
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/ArtworkCacheUtil.kt b/android/playback/src/main/java/com/simplecityapps/playback/ArtworkCacheUtil.kt
index a538e6d6f..8fac2f981 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/ArtworkCacheUtil.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/ArtworkCacheUtil.kt
@@ -5,6 +5,4 @@ import com.simplecityapps.shuttle.model.Song
 fun Song.getArtworkCacheKey(
     width: Int,
     height: Int
-): String {
-    return "${albumGroupKey}_${name}_${width}_$height"
-}
+): String = "${albumGroupKey}_${name}_${width}_$height"
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/Playback.kt b/android/playback/src/main/java/com/simplecityapps/playback/Playback.kt
index f4918e07c..ec11d7222 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/Playback.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/Playback.kt
@@ -44,9 +44,7 @@ interface Playback {
 
     fun updateLastKnownStreamPosition() {}
 
-    fun getResumeWhenSwitched(oldPlayback: Playback): Boolean {
-        return false
-    }
+    fun getResumeWhenSwitched(oldPlayback: Playback): Boolean = false
 
     fun setRepeatMode(repeatMode: QueueManager.RepeatMode)
 
@@ -63,9 +61,7 @@ interface Playback {
 
     fun getPlaybackSpeed(): Float
 
-    fun respondsToAudioFocus(): Boolean {
-        return true
-    }
+    fun respondsToAudioFocus(): Boolean = true
 
     interface Callback {
         fun onPlaybackStateChanged(playbackState: PlaybackState)
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/PlaybackManager.kt b/android/playback/src/main/java/com/simplecityapps/playback/PlaybackManager.kt
index 986d8b3b2..b03ccfc31 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/PlaybackManager.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/PlaybackManager.kt
@@ -218,23 +218,17 @@ class PlaybackManager(
         }
     }
 
-    fun playbackState(): PlaybackState {
-        return playback.playBackState()
-    }
+    fun playbackState(): PlaybackState = playback.playBackState()
 
     /**
      * @return the current seek position, in milliseconds
      */
-    fun getProgress(): Int? {
-        return playback.getProgress()
-    }
+    fun getProgress(): Int? = playback.getProgress()
 
     /**
      * @return the track duration, in milliseconds
      */
-    fun getDuration(): Int? {
-        return playback.getDuration()
-    }
+    fun getDuration(): Int? = playback.getDuration()
 
     /**
      * The position to seek to, in milliseconds
@@ -302,9 +296,7 @@ class PlaybackManager(
         }
     }
 
-    fun getPlayback(): Playback {
-        return playback
-    }
+    fun getPlayback(): Playback = playback
 
     fun switchToPlayback(playback: Playback) {
         Timber.v("switchToPlayback(playback: ${playback.javaClass.simpleName})")
@@ -342,9 +334,7 @@ class PlaybackManager(
         playback.setPlaybackSpeed(multiplier)
     }
 
-    fun getPlaybackSpeed(): Float {
-        return playback.getPlaybackSpeed()
-    }
+    fun getPlaybackSpeed(): Float = playback.getPlaybackSpeed()
 
     // Private
 
@@ -469,6 +459,4 @@ class PlaybackManager(
     }
 }
 
-private fun Song.getStartPosition(): Int? {
-    return if (type == Song.Type.Podcast || type == Song.Type.Audiobook) max(0, playbackPosition - 5000) else null
-}
+private fun Song.getStartPosition(): Int? = if (type == Song.Type.Podcast || type == Song.Type.Audiobook) max(0, playbackPosition - 5000) else null
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/PlaybackService.kt b/android/playback/src/main/java/com/simplecityapps/playback/PlaybackService.kt
index b03477cbf..edfaf2541 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/PlaybackService.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/PlaybackService.kt
@@ -286,13 +286,11 @@ class PlaybackService :
         clientPackageName: String,
         clientUid: Int,
         rootHints: Bundle?
-    ): BrowserRoot? {
-        return if (packageValidator.isKnownCaller(clientPackageName, clientUid)) {
-            BrowserRoot("media:/root/", null)
-        } else {
-            Timber.v("OnGetRoot: Browsing NOT ALLOWED for unknown caller. Returning empty browser root so all apps can use MediaController. $clientPackageName")
-            BrowserRoot("EMPTY_ROOT", null)
-        }
+    ): BrowserRoot? = if (packageValidator.isKnownCaller(clientPackageName, clientUid)) {
+        BrowserRoot("media:/root/", null)
+    } else {
+        Timber.v("OnGetRoot: Browsing NOT ALLOWED for unknown caller. Returning empty browser root so all apps can use MediaController. $clientPackageName")
+        BrowserRoot("EMPTY_ROOT", null)
     }
 
     // Static
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/PlaybackState.kt b/android/playback/src/main/java/com/simplecityapps/playback/PlaybackState.kt
index 481c06d90..231ecc811 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/PlaybackState.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/PlaybackState.kt
@@ -2,20 +2,14 @@ package com.simplecityapps.playback
 
 sealed class PlaybackState {
     object Loading : PlaybackState() {
-        override fun toString(): String {
-            return "Loading"
-        }
+        override fun toString(): String = "Loading"
     }
 
     object Playing : PlaybackState() {
-        override fun toString(): String {
-            return "Playing"
-        }
+        override fun toString(): String = "Playing"
     }
 
     object Paused : PlaybackState()
 
-    override fun toString(): String {
-        return "Paused"
-    }
+    override fun toString(): String = "Paused"
 }
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/androidauto/MediaIdHelper.kt b/android/playback/src/main/java/com/simplecityapps/playback/androidauto/MediaIdHelper.kt
index 1d89189b4..ce5ad4e71 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/androidauto/MediaIdHelper.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/androidauto/MediaIdHelper.kt
@@ -31,138 +31,128 @@ constructor(
     private val albumRepository: AlbumRepository,
     private val songRepository: SongRepository
 ) {
-    suspend fun getChildren(mediaId: String): List<MediaBrowserCompat.MediaItem> {
-        return withContext(Dispatchers.IO) {
-            when (val mediaIdWrapper: MediaIdWrapper? = parseMediaId(mediaId)) {
-                is MediaIdWrapper.Directory.Root -> {
-                    mutableListOf(
-                        MediaBrowserCompat.MediaItem(
-                            MediaDescriptionCompat.Builder()
-                                .setTitle("Artists")
-                                .setMediaId("media:/artist_root/")
-                                .build(),
-                            MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
-                        ),
-                        MediaBrowserCompat.MediaItem(
-                            MediaDescriptionCompat.Builder()
-                                .setTitle("Albums")
-                                .setMediaId("media:/album_root/")
-                                .build(),
-                            MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
-                        ),
-                        MediaBrowserCompat.MediaItem(
-                            MediaDescriptionCompat.Builder()
-                                .setTitle("Playlists")
-                                .setMediaId("media:/playlist_root/")
-                                .build(),
-                            MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
-                        ),
-                        MediaBrowserCompat.MediaItem(
-                            MediaDescriptionCompat.Builder()
-                                .setTitle("Shuffle All")
-                                .setMediaId("media:/shuffle_all")
-                                .build(),
-                            MediaBrowserCompat.MediaItem.FLAG_PLAYABLE
-                        )
+    suspend fun getChildren(mediaId: String): List<MediaBrowserCompat.MediaItem> = withContext(Dispatchers.IO) {
+        when (val mediaIdWrapper: MediaIdWrapper? = parseMediaId(mediaId)) {
+            is MediaIdWrapper.Directory.Root -> {
+                mutableListOf(
+                    MediaBrowserCompat.MediaItem(
+                        MediaDescriptionCompat.Builder()
+                            .setTitle("Artists")
+                            .setMediaId("media:/artist_root/")
+                            .build(),
+                        MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
+                    ),
+                    MediaBrowserCompat.MediaItem(
+                        MediaDescriptionCompat.Builder()
+                            .setTitle("Albums")
+                            .setMediaId("media:/album_root/")
+                            .build(),
+                        MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
+                    ),
+                    MediaBrowserCompat.MediaItem(
+                        MediaDescriptionCompat.Builder()
+                            .setTitle("Playlists")
+                            .setMediaId("media:/playlist_root/")
+                            .build(),
+                        MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
+                    ),
+                    MediaBrowserCompat.MediaItem(
+                        MediaDescriptionCompat.Builder()
+                            .setTitle("Shuffle All")
+                            .setMediaId("media:/shuffle_all")
+                            .build(),
+                        MediaBrowserCompat.MediaItem.FLAG_PLAYABLE
                     )
-                }
+                )
+            }
 
-                is MediaIdWrapper.Directory.Artists -> {
-                    artistRepository.getAlbumArtists(AlbumArtistQuery.All()).firstOrNull().orEmpty().map { it.toMediaItem(mediaId) }
-                }
+            is MediaIdWrapper.Directory.Artists -> {
+                artistRepository.getAlbumArtists(AlbumArtistQuery.All()).firstOrNull().orEmpty().map { it.toMediaItem(mediaId) }
+            }
 
-                is MediaIdWrapper.Directory.Albums.All -> {
-                    albumRepository.getAlbums(AlbumQuery.All()).firstOrNull().orEmpty().map { it.toMediaItem(mediaId) }
-                }
+            is MediaIdWrapper.Directory.Albums.All -> {
+                albumRepository.getAlbums(AlbumQuery.All()).firstOrNull().orEmpty().map { it.toMediaItem(mediaId) }
+            }
 
-                is MediaIdWrapper.Directory.Albums.Artist -> {
-                    albumRepository.getAlbums(
-                        AlbumQuery.ArtistGroupKey(
-                            AlbumArtistGroupKey(
-                                mediaIdWrapper.albumArtistGroupKey
-                            )
+            is MediaIdWrapper.Directory.Albums.Artist -> {
+                albumRepository.getAlbums(
+                    AlbumQuery.ArtistGroupKey(
+                        AlbumArtistGroupKey(
+                            mediaIdWrapper.albumArtistGroupKey
                         )
-                    ).firstOrNull().orEmpty()
-                        .map { it.toMediaItem(mediaId) }
-                }
+                    )
+                ).firstOrNull().orEmpty()
+                    .map { it.toMediaItem(mediaId) }
+            }
 
-                is MediaIdWrapper.Directory.Playlists -> {
-                    playlistRepository.getPlaylists(PlaylistQuery.All(mediaProviderType = null)).firstOrNull().orEmpty().map { it.toMediaItem(mediaId) }
-                }
+            is MediaIdWrapper.Directory.Playlists -> {
+                playlistRepository.getPlaylists(PlaylistQuery.All(mediaProviderType = null)).firstOrNull().orEmpty().map { it.toMediaItem(mediaId) }
+            }
 
-                is MediaIdWrapper.Directory.Songs.Album -> {
-                    songRepository
-                        .getSongs(
-                            SongQuery.AlbumGroupKeys(
-                                listOf(
-                                    SongQuery.AlbumGroupKey(
-                                        key =
-                                        AlbumGroupKey(
-                                            key = mediaIdWrapper.albumGroupKey,
-                                            albumArtistGroupKey = AlbumArtistGroupKey(mediaIdWrapper.albumArtistGroupKey)
-                                        )
+            is MediaIdWrapper.Directory.Songs.Album -> {
+                songRepository
+                    .getSongs(
+                        SongQuery.AlbumGroupKeys(
+                            listOf(
+                                SongQuery.AlbumGroupKey(
+                                    key =
+                                    AlbumGroupKey(
+                                        key = mediaIdWrapper.albumGroupKey,
+                                        albumArtistGroupKey = AlbumArtistGroupKey(mediaIdWrapper.albumArtistGroupKey)
                                     )
                                 )
                             )
                         )
+                    )
+                    .firstOrNull()
+                    .orEmpty()
+                    .map { it.toMediaItem(mediaId) }
+            }
+
+            is MediaIdWrapper.Directory.Songs.Playlist -> {
+                playlistRepository.getPlaylists(PlaylistQuery.PlaylistId(mediaIdWrapper.playlistId)).firstOrNull()?.firstOrNull()?.let { playlist ->
+                    playlistRepository.getSongsForPlaylist(playlist)
                         .firstOrNull()
                         .orEmpty()
-                        .map { it.toMediaItem(mediaId) }
-                }
-
-                is MediaIdWrapper.Directory.Songs.Playlist -> {
-                    playlistRepository.getPlaylists(PlaylistQuery.PlaylistId(mediaIdWrapper.playlistId)).firstOrNull()?.firstOrNull()?.let { playlist ->
-                        playlistRepository.getSongsForPlaylist(playlist)
-                            .firstOrNull()
-                            .orEmpty()
-                            .map { it.song.toMediaItem(mediaId) }
-                    }.orEmpty()
-                }
-
-                else -> mutableListOf()
+                        .map { it.song.toMediaItem(mediaId) }
+                }.orEmpty()
             }
-        }
-    }
-
-    private fun AlbumArtist.toMediaItem(parentMediaId: String): MediaBrowserCompat.MediaItem {
-        return MediaBrowserCompat.MediaItem(
-            MediaDescriptionCompat.Builder()
-                .setTitle(name ?: friendlyArtistName)
-                .setMediaId("${parentMediaId}artist/${groupKey.key}/albums/")
-                .build(),
-            MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
-        )
-    }
 
-    private fun Playlist.toMediaItem(parentMediaId: String): MediaBrowserCompat.MediaItem {
-        return MediaBrowserCompat.MediaItem(
-            MediaDescriptionCompat.Builder()
-                .setTitle(name)
-                .setMediaId("${parentMediaId}playlist/$id/songs/")
-                .build(),
-            MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
-        )
-    }
-
-    private fun Album.toMediaItem(parentMediaId: String): MediaBrowserCompat.MediaItem {
-        return MediaBrowserCompat.MediaItem(
-            MediaDescriptionCompat.Builder()
-                .setTitle(name)
-                .setMediaId("${parentMediaId}artist/${groupKey?.albumArtistGroupKey?.key}/album/${groupKey?.key}/songs/")
-                .build(),
-            MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
-        )
+            else -> mutableListOf()
+        }
     }
 
-    private fun Song.toMediaItem(parentMediaId: String): MediaBrowserCompat.MediaItem {
-        return MediaBrowserCompat.MediaItem(
-            MediaDescriptionCompat.Builder()
-                .setTitle(name)
-                .setMediaId("$parentMediaId$id")
-                .build(),
-            MediaBrowserCompat.MediaItem.FLAG_PLAYABLE
-        )
-    }
+    private fun AlbumArtist.toMediaItem(parentMediaId: String): MediaBrowserCompat.MediaItem = MediaBrowserCompat.MediaItem(
+        MediaDescriptionCompat.Builder()
+            .setTitle(name ?: friendlyArtistName)
+            .setMediaId("${parentMediaId}artist/${groupKey.key}/albums/")
+            .build(),
+        MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
+    )
+
+    private fun Playlist.toMediaItem(parentMediaId: String): MediaBrowserCompat.MediaItem = MediaBrowserCompat.MediaItem(
+        MediaDescriptionCompat.Builder()
+            .setTitle(name)
+            .setMediaId("${parentMediaId}playlist/$id/songs/")
+            .build(),
+        MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
+    )
+
+    private fun Album.toMediaItem(parentMediaId: String): MediaBrowserCompat.MediaItem = MediaBrowserCompat.MediaItem(
+        MediaDescriptionCompat.Builder()
+            .setTitle(name)
+            .setMediaId("${parentMediaId}artist/${groupKey?.albumArtistGroupKey?.key}/album/${groupKey?.key}/songs/")
+            .build(),
+        MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
+    )
+
+    private fun Song.toMediaItem(parentMediaId: String): MediaBrowserCompat.MediaItem = MediaBrowserCompat.MediaItem(
+        MediaDescriptionCompat.Builder()
+            .setTitle(name)
+            .setMediaId("$parentMediaId$id")
+            .build(),
+        MediaBrowserCompat.MediaItem.FLAG_PLAYABLE
+    )
 
     sealed class MediaIdWrapper {
         sealed class Directory : MediaIdWrapper() {
@@ -195,44 +185,42 @@ constructor(
         return parsePathSegments(Uri.parse(mediaId).pathSegments)
     }
 
-    private fun parsePathSegments(pathSegments: List<String>): MediaIdWrapper? {
-        return when (pathSegments.last()) {
-            "root" -> MediaIdWrapper.Directory.Root
-            "artist_root" -> MediaIdWrapper.Directory.Artists
-            "album_root" -> MediaIdWrapper.Directory.Albums.All
-            "playlist_root" -> MediaIdWrapper.Directory.Playlists
-            "shuffle_all" -> MediaIdWrapper.ShuffleAll
-            "albums" -> {
-                if (pathSegments.contains("artist")) {
-                    MediaIdWrapper.Directory.Albums.Artist(pathSegments.getNextSegment("artist")!!)
-                } else {
-                    MediaIdWrapper.Directory.Albums.All
-                }
+    private fun parsePathSegments(pathSegments: List<String>): MediaIdWrapper? = when (pathSegments.last()) {
+        "root" -> MediaIdWrapper.Directory.Root
+        "artist_root" -> MediaIdWrapper.Directory.Artists
+        "album_root" -> MediaIdWrapper.Directory.Albums.All
+        "playlist_root" -> MediaIdWrapper.Directory.Playlists
+        "shuffle_all" -> MediaIdWrapper.ShuffleAll
+        "albums" -> {
+            if (pathSegments.contains("artist")) {
+                MediaIdWrapper.Directory.Albums.Artist(pathSegments.getNextSegment("artist")!!)
+            } else {
+                MediaIdWrapper.Directory.Albums.All
             }
+        }
 
-            "songs" -> {
-                when {
-                    pathSegments.contains("album") -> {
-                        MediaIdWrapper.Directory.Songs.Album(
-                            albumGroupKey = pathSegments.getNextSegment("album")!!,
-                            albumArtistGroupKey = pathSegments.getNextSegment("artist")!!
-                        )
-                    }
-
-                    pathSegments.contains("playlist") -> MediaIdWrapper.Directory.Songs.Playlist(pathSegments.getNextSegment("playlist")!!.toLong())
-                    else -> throw IllegalStateException()
+        "songs" -> {
+            when {
+                pathSegments.contains("album") -> {
+                    MediaIdWrapper.Directory.Songs.Album(
+                        albumGroupKey = pathSegments.getNextSegment("album")!!,
+                        albumArtistGroupKey = pathSegments.getNextSegment("artist")!!
+                    )
                 }
+
+                pathSegments.contains("playlist") -> MediaIdWrapper.Directory.Songs.Playlist(pathSegments.getNextSegment("playlist")!!.toLong())
+                else -> throw IllegalStateException()
             }
+        }
 
-            else -> {
-                val directoryPath = pathSegments.toMutableList()
-                directoryPath.removeAt(directoryPath.size - 1)
-                pathSegments.getNextSegment("songs")?.let { thing ->
-                    MediaIdWrapper.Song(thing.toLong(), parsePathSegments(directoryPath) as MediaIdWrapper.Directory)
-                } ?: run {
-                    Timber.e("Failed to parse path segments: ${pathSegments.joinToString("/") { it }}")
-                    null
-                }
+        else -> {
+            val directoryPath = pathSegments.toMutableList()
+            directoryPath.removeAt(directoryPath.size - 1)
+            pathSegments.getNextSegment("songs")?.let { thing ->
+                MediaIdWrapper.Song(thing.toLong(), parsePathSegments(directoryPath) as MediaIdWrapper.Directory)
+            } ?: run {
+                Timber.e("Failed to parse path segments: ${pathSegments.joinToString("/") { it }}")
+                null
             }
         }
     }
@@ -245,56 +233,54 @@ constructor(
         return null
     }
 
-    suspend fun getPlayQueue(mediaId: String): PlayQueue? {
-        return withContext(Dispatchers.IO) {
-            when (val mediaIdWrapper = parseMediaId(mediaId)) {
-                is MediaIdWrapper.Song -> {
-                    when (mediaIdWrapper.directory) {
-                        is MediaIdWrapper.Directory.Songs.Album -> {
-                            val songs =
-                                songRepository
-                                    .getSongs(
-                                        SongQuery.AlbumGroupKeys(
-                                            listOf(
-                                                SongQuery.AlbumGroupKey(
-                                                    AlbumGroupKey(
-                                                        key = mediaIdWrapper.directory.albumGroupKey,
-                                                        albumArtistGroupKey = AlbumArtistGroupKey(mediaIdWrapper.directory.albumArtistGroupKey)
-                                                    )
+    suspend fun getPlayQueue(mediaId: String): PlayQueue? = withContext(Dispatchers.IO) {
+        when (val mediaIdWrapper = parseMediaId(mediaId)) {
+            is MediaIdWrapper.Song -> {
+                when (mediaIdWrapper.directory) {
+                    is MediaIdWrapper.Directory.Songs.Album -> {
+                        val songs =
+                            songRepository
+                                .getSongs(
+                                    SongQuery.AlbumGroupKeys(
+                                        listOf(
+                                            SongQuery.AlbumGroupKey(
+                                                AlbumGroupKey(
+                                                    key = mediaIdWrapper.directory.albumGroupKey,
+                                                    albumArtistGroupKey = AlbumArtistGroupKey(mediaIdWrapper.directory.albumArtistGroupKey)
                                                 )
                                             )
                                         )
                                     )
-                                    .firstOrNull()
-                                    .orEmpty()
-                            PlayQueue(songs, songs.indexOfFirst { it.id == mediaIdWrapper.songId })
-                        }
-
-                        is MediaIdWrapper.Directory.Songs.Playlist -> {
-                            val playlistSongs =
-                                playlistRepository.getPlaylists(PlaylistQuery.PlaylistId(mediaIdWrapper.directory.playlistId)).firstOrNull()?.firstOrNull()?.let { playlist ->
-                                    playlistRepository.getSongsForPlaylist(playlist).firstOrNull().orEmpty()
-                                }.orEmpty()
-                            PlayQueue(playlistSongs.map { it.song }, playlistSongs.indexOfFirst { it.song.id == mediaIdWrapper.songId })
-                        }
-
-                        else -> throw IllegalStateException("Cannot retrieve play queue for songId: ${mediaIdWrapper.songId}, directory: ${mediaIdWrapper.directory}")
+                                )
+                                .firstOrNull()
+                                .orEmpty()
+                        PlayQueue(songs, songs.indexOfFirst { it.id == mediaIdWrapper.songId })
                     }
-                }
 
-                is MediaIdWrapper.ShuffleAll -> {
-                    val songs =
-                        songRepository
-                            .getSongs(SongQuery.All())
-                            .firstOrNull()
-                            .orEmpty()
-                    PlayQueue(songs.shuffled(), 0)
-                }
+                    is MediaIdWrapper.Directory.Songs.Playlist -> {
+                        val playlistSongs =
+                            playlistRepository.getPlaylists(PlaylistQuery.PlaylistId(mediaIdWrapper.directory.playlistId)).firstOrNull()?.firstOrNull()?.let { playlist ->
+                                playlistRepository.getSongsForPlaylist(playlist).firstOrNull().orEmpty()
+                            }.orEmpty()
+                        PlayQueue(playlistSongs.map { it.song }, playlistSongs.indexOfFirst { it.song.id == mediaIdWrapper.songId })
+                    }
 
-                else -> {
-                    null
+                    else -> throw IllegalStateException("Cannot retrieve play queue for songId: ${mediaIdWrapper.songId}, directory: ${mediaIdWrapper.directory}")
                 }
             }
+
+            is MediaIdWrapper.ShuffleAll -> {
+                val songs =
+                    songRepository
+                        .getSongs(SongQuery.All())
+                        .firstOrNull()
+                        .orEmpty()
+                PlayQueue(songs.shuffled(), 0)
+            }
+
+            else -> {
+                null
+            }
         }
     }
 }
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/androidauto/PackageValidator.kt b/android/playback/src/main/java/com/simplecityapps/playback/androidauto/PackageValidator.kt
index f52e1911c..2703f4bfe 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/androidauto/PackageValidator.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/androidauto/PackageValidator.kt
@@ -206,11 +206,10 @@ class PackageValidator(
      * @return [PackageInfo] for the package name or null if it's not found.
      */
     @SuppressLint("PackageManagerGetSignatures")
-    private fun getPackageInfo(callingPackage: String): PackageInfo? =
-        packageManager.getPackageInfo(
-            callingPackage,
-            PackageManager.GET_SIGNATURES or PackageManager.GET_PERMISSIONS
-        )
+    private fun getPackageInfo(callingPackage: String): PackageInfo? = packageManager.getPackageInfo(
+        callingPackage,
+        PackageManager.GET_SIGNATURES or PackageManager.GET_PERMISSIONS
+    )
 
     /**
      * Gets the signature of a given package's [PackageInfo].
@@ -304,17 +303,14 @@ class PackageValidator(
     /**
      * Finds the Android platform signing key signature. This key is never null.
      */
-    private fun getSystemSignature(): String =
-        getPackageInfo(ANDROID_PLATFORM)?.let { platformInfo ->
-            getSignature(platformInfo)
-        } ?: throw IllegalStateException("Platform signature not found")
+    private fun getSystemSignature(): String = getPackageInfo(ANDROID_PLATFORM)?.let { platformInfo ->
+        getSignature(platformInfo)
+    } ?: throw IllegalStateException("Platform signature not found")
 
     /**
      * Creates a SHA-256 signature given a Base64 encoded certificate.
      */
-    private fun getSignatureSha256(certificate: String): String {
-        return getSignatureSha256(Base64.decode(certificate, Base64.DEFAULT))
-    }
+    private fun getSignatureSha256(certificate: String): String = getSignatureSha256(Base64.decode(certificate, Base64.DEFAULT))
 
     /**
      * Creates a SHA-256 signature given a certificate byte array.
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/chromecast/CastOptionsProvider.kt b/android/playback/src/main/java/com/simplecityapps/playback/chromecast/CastOptionsProvider.kt
index 06b456e08..fa7ea9c0d 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/chromecast/CastOptionsProvider.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/chromecast/CastOptionsProvider.kt
@@ -8,13 +8,9 @@ import com.simplecityapps.playback.R
 
 @Suppress("unused")
 class CastOptionsProvider : OptionsProvider {
-    override fun getCastOptions(context: Context): CastOptions {
-        return CastOptions.Builder()
-            .setReceiverApplicationId(context.getString(R.string.cast_app_id))
-            .build()
-    }
+    override fun getCastOptions(context: Context): CastOptions = CastOptions.Builder()
+        .setReceiverApplicationId(context.getString(R.string.cast_app_id))
+        .build()
 
-    override fun getAdditionalSessionProviders(context: Context): List<SessionProvider>? {
-        return null
-    }
+    override fun getAdditionalSessionProviders(context: Context): List<SessionProvider>? = null
 }
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/chromecast/CastPlayback.kt b/android/playback/src/main/java/com/simplecityapps/playback/chromecast/CastPlayback.kt
index 6ddc141f1..00386b291 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/chromecast/CastPlayback.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/chromecast/CastPlayback.kt
@@ -138,12 +138,10 @@ class CastPlayback(
         isReleased = true
     }
 
-    override fun playBackState(): PlaybackState {
-        return if (castSession.remoteMediaClient?.isPlaying == true || isMeantToBePlaying) {
-            PlaybackState.Playing
-        } else {
-            PlaybackState.Paused
-        }
+    override fun playBackState(): PlaybackState = if (castSession.remoteMediaClient?.isPlaying == true || isMeantToBePlaying) {
+        PlaybackState.Playing
+    } else {
+        PlaybackState.Paused
     }
 
     override fun seek(position: Int) {
@@ -170,17 +168,13 @@ class CastPlayback(
         return castSession.remoteMediaClient?.approximateStreamPosition?.toInt()
     }
 
-    override fun getDuration(): Int? {
-        return castSession.remoteMediaClient?.streamDuration?.toInt()
-    }
+    override fun getDuration(): Int? = castSession.remoteMediaClient?.streamDuration?.toInt()
 
     override fun setVolume(volume: Float) {
         // Nothing to do
     }
 
-    override fun getResumeWhenSwitched(oldPlayback: Playback): Boolean {
-        return true
-    }
+    override fun getResumeWhenSwitched(oldPlayback: Playback): Boolean = true
 
     override fun setRepeatMode(repeatMode: QueueManager.RepeatMode) {
     }
@@ -189,9 +183,7 @@ class CastPlayback(
         castSession.remoteMediaClient?.setPlaybackRate(multiplier.toDouble())
     }
 
-    override fun getPlaybackSpeed(): Float {
-        return castSession.remoteMediaClient?.mediaStatus?.playbackRate?.toFloat() ?: 1f
-    }
+    override fun getPlaybackSpeed(): Float = castSession.remoteMediaClient?.mediaStatus?.playbackRate?.toFloat() ?: 1f
 
     override fun updateLastKnownStreamPosition() {
         super.updateLastKnownStreamPosition()
@@ -201,9 +193,7 @@ class CastPlayback(
         }
     }
 
-    override fun respondsToAudioFocus(): Boolean {
-        return false
-    }
+    override fun respondsToAudioFocus(): Boolean = false
 
     private fun updatePlaybackState() {
         val playerState = castSession.remoteMediaClient?.playerState
@@ -264,14 +254,12 @@ class CastPlayback(
     }
 }
 
-fun Int.playerStateToString(): String {
-    return when (this) {
-        MediaStatus.PLAYER_STATE_IDLE -> "IDLE"
-        MediaStatus.PLAYER_STATE_PLAYING -> "PLAYING"
-        MediaStatus.PLAYER_STATE_PAUSED -> "PAUSED"
-        MediaStatus.PLAYER_STATE_LOADING -> "LOADING"
-        MediaStatus.PLAYER_STATE_BUFFERING -> "BUFFERING"
-        MediaStatus.PLAYER_STATE_UNKNOWN -> "UNKNOWN"
-        else -> "Unknown"
-    }
+fun Int.playerStateToString(): String = when (this) {
+    MediaStatus.PLAYER_STATE_IDLE -> "IDLE"
+    MediaStatus.PLAYER_STATE_PLAYING -> "PLAYING"
+    MediaStatus.PLAYER_STATE_PAUSED -> "PAUSED"
+    MediaStatus.PLAYER_STATE_LOADING -> "LOADING"
+    MediaStatus.PLAYER_STATE_BUFFERING -> "BUFFERING"
+    MediaStatus.PLAYER_STATE_UNKNOWN -> "UNKNOWN"
+    else -> "Unknown"
 }
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/chromecast/CastService.kt b/android/playback/src/main/java/com/simplecityapps/playback/chromecast/CastService.kt
index 9343846ce..69981f95c 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/chromecast/CastService.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/chromecast/CastService.kt
@@ -22,55 +22,51 @@ class CastService(
 ) {
     class AudioStream(val stream: InputStream, val length: Long, val mimeType: String)
 
-    suspend fun getArtwork(songId: Long): ByteArray? {
-        return songRepository.getSongs(SongQuery.SongIds(listOf(songId))).firstOrNull()?.firstOrNull()?.let { song ->
-            artworkImageLoader.loadBitmap(song)
-        }
+    suspend fun getArtwork(songId: Long): ByteArray? = songRepository.getSongs(SongQuery.SongIds(listOf(songId))).firstOrNull()?.firstOrNull()?.let { song ->
+        artworkImageLoader.loadBitmap(song)
     }
 
-    suspend fun getAudio(songId: Long): AudioStream? {
-        return withContext(Dispatchers.IO) {
-            songRepository.getSongs(SongQuery.SongIds(listOf(songId))).firstOrNull()?.firstOrNull()?.let { song ->
-                val uri = Uri.parse(song.path)
-                if (song.path.startsWith("content://")) {
-                    if (DocumentsContract.isDocumentUri(context, uri)) {
-                        val documentFile = DocumentFile.fromSingleUri(context, uri)
-                        documentFile?.let {
-                            if (it.exists()) {
-                                try {
-                                    context.contentResolver.openInputStream(documentFile.uri)?.let { inputStream ->
-                                        AudioStream(inputStream, documentFile.length(), documentFile.type ?: "audio/*")
-                                    }
-                                } catch (e: FileNotFoundException) {
-                                    Timber.e(e, "Failed to retrieve audio from songId: $songId")
-                                    null
+    suspend fun getAudio(songId: Long): AudioStream? = withContext(Dispatchers.IO) {
+        songRepository.getSongs(SongQuery.SongIds(listOf(songId))).firstOrNull()?.firstOrNull()?.let { song ->
+            val uri = Uri.parse(song.path)
+            if (song.path.startsWith("content://")) {
+                if (DocumentsContract.isDocumentUri(context, uri)) {
+                    val documentFile = DocumentFile.fromSingleUri(context, uri)
+                    documentFile?.let {
+                        if (it.exists()) {
+                            try {
+                                context.contentResolver.openInputStream(documentFile.uri)?.let { inputStream ->
+                                    AudioStream(inputStream, documentFile.length(), documentFile.type ?: "audio/*")
                                 }
-                            } else {
-                                Timber.e("Failed to retrieve audio from songId: $songId (Document file doesn't exist)")
+                            } catch (e: FileNotFoundException) {
+                                Timber.e(e, "Failed to retrieve audio from songId: $songId")
                                 null
                             }
-                        }
-                    } else {
-                        try {
-                            context.contentResolver.openInputStream(uri)?.let { inputStream ->
-                                AudioStream(inputStream, song.size, song.mimeType)
-                            }
-                        } catch (e: FileNotFoundException) {
-                            Timber.e(e, "Failed to retrieve audio from songId: $songId")
+                        } else {
+                            Timber.e("Failed to retrieve audio from songId: $songId (Document file doesn't exist)")
                             null
                         }
                     }
                 } else {
                     try {
-                        AudioStream(File(uri.toString()).inputStream(), song.size, song.mimeType)
+                        context.contentResolver.openInputStream(uri)?.let { inputStream ->
+                            AudioStream(inputStream, song.size, song.mimeType)
+                        }
                     } catch (e: FileNotFoundException) {
                         Timber.e(e, "Failed to retrieve audio from songId: $songId")
                         null
-                    } catch (e: SecurityException) {
-                        Timber.e(e, "Failed to retrieve audio from songId: $songId")
-                        null
                     }
                 }
+            } else {
+                try {
+                    AudioStream(File(uri.toString()).inputStream(), song.size, song.mimeType)
+                } catch (e: FileNotFoundException) {
+                    Timber.e(e, "Failed to retrieve audio from songId: $songId")
+                    null
+                } catch (e: SecurityException) {
+                    Timber.e(e, "Failed to retrieve audio from songId: $songId")
+                    null
+                }
             }
         }
     }
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/chromecast/HttpServer.kt b/android/playback/src/main/java/com/simplecityapps/playback/chromecast/HttpServer.kt
index bbe98ba1f..e8c4fbd28 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/chromecast/HttpServer.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/chromecast/HttpServer.kt
@@ -94,7 +94,5 @@ class HttpServer(private val castService: CastService) : NanoHTTPD(5000) {
         inputStream: InputStream,
         mimeType: String,
         length: Long
-    ): Response {
-        return newFixedLengthResponse(Response.Status.OK, mimeType, inputStream, length)
-    }
+    ): Response = newFixedLengthResponse(Response.Status.OK, mimeType, inputStream, length)
 }
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/di/PlaybackModule.kt b/android/playback/src/main/java/com/simplecityapps/playback/di/PlaybackModule.kt
index b6d24f787..20d241eef 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/di/PlaybackModule.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/di/PlaybackModule.kt
@@ -54,32 +54,26 @@ import kotlinx.coroutines.CoroutineScope
 class PlaybackModule {
     @Singleton
     @Provides
-    fun provideQueueWatcher(): QueueWatcher {
-        return QueueWatcher()
-    }
+    fun provideQueueWatcher(): QueueWatcher = QueueWatcher()
 
     @Singleton
     @Provides
     fun provideQueueManager(
         queueWatcher: QueueWatcher,
         preferenceManager: GeneralPreferenceManager
-    ): QueueManager {
-        return QueueManager(queueWatcher, preferenceManager)
-    }
+    ): QueueManager = QueueManager(queueWatcher, preferenceManager)
 
     @Singleton
     @Provides
-    fun provideEqualizer(playbackPreferenceManager: PlaybackPreferenceManager): EqualizerAudioProcessor {
-        return EqualizerAudioProcessor(playbackPreferenceManager.equalizerEnabled).apply {
-            // Restore current eq
-            preset = playbackPreferenceManager.preset
+    fun provideEqualizer(playbackPreferenceManager: PlaybackPreferenceManager): EqualizerAudioProcessor = EqualizerAudioProcessor(playbackPreferenceManager.equalizerEnabled).apply {
+        // Restore current eq
+        preset = playbackPreferenceManager.preset
 
-            // Restore custom eq bands
-            playbackPreferenceManager.customPresetBands?.forEach { restoredBand ->
-                Equalizer.Presets.custom.bands.forEach { customBand ->
-                    if (customBand.centerFrequency == restoredBand.centerFrequency) {
-                        customBand.gain = restoredBand.gain
-                    }
+        // Restore custom eq bands
+        playbackPreferenceManager.customPresetBands?.forEach { restoredBand ->
+            Equalizer.Presets.custom.bands.forEach { customBand ->
+                if (customBand.centerFrequency == restoredBand.centerFrequency) {
+                    customBand.gain = restoredBand.gain
                 }
             }
         }
@@ -87,18 +81,14 @@ class PlaybackModule {
 
     @Singleton
     @Provides
-    fun provideReplayGainAudioProcessor(playbackPreferenceManager: PlaybackPreferenceManager): ReplayGainAudioProcessor {
-        return ReplayGainAudioProcessor(playbackPreferenceManager.replayGainMode, playbackPreferenceManager.preAmpGain)
-    }
+    fun provideReplayGainAudioProcessor(playbackPreferenceManager: PlaybackPreferenceManager): ReplayGainAudioProcessor = ReplayGainAudioProcessor(playbackPreferenceManager.replayGainMode, playbackPreferenceManager.preAmpGain)
 
     @Singleton
     @Provides
     fun providePlaybackPreferenceManager(
         sharedPreferences: SharedPreferences,
         moshi: Moshi
-    ): PlaybackPreferenceManager {
-        return PlaybackPreferenceManager(sharedPreferences, moshi)
-    }
+    ): PlaybackPreferenceManager = PlaybackPreferenceManager(sharedPreferences, moshi)
 
     @Singleton
     @Provides
@@ -106,15 +96,13 @@ class PlaybackModule {
         embyMediaPathProvider: EmbyMediaInfoProvider,
         jellyfinMediaPathProvider: JellyfinMediaInfoProvider,
         plexMediaPathProvider: PlexMediaInfoProvider
-    ): AggregateMediaInfoProvider {
-        return AggregateMediaInfoProvider(
-            mutableSetOf(
-                embyMediaPathProvider,
-                jellyfinMediaPathProvider,
-                plexMediaPathProvider
-            )
+    ): AggregateMediaInfoProvider = AggregateMediaInfoProvider(
+        mutableSetOf(
+            embyMediaPathProvider,
+            jellyfinMediaPathProvider,
+            plexMediaPathProvider
         )
-    }
+    )
 
     @Provides
     fun provideExoPlayerPlayback(
@@ -122,15 +110,11 @@ class PlaybackModule {
         equalizerAudioProcessor: EqualizerAudioProcessor,
         replayGainAudioProcessor: ReplayGainAudioProcessor,
         mediaPathProvider: AggregateMediaInfoProvider
-    ): ExoPlayerPlayback {
-        return ExoPlayerPlayback(context, equalizerAudioProcessor, replayGainAudioProcessor, mediaPathProvider)
-    }
+    ): ExoPlayerPlayback = ExoPlayerPlayback(context, equalizerAudioProcessor, replayGainAudioProcessor, mediaPathProvider)
 
     @Singleton
     @Provides
-    fun providePlaybackWatcher(): PlaybackWatcher {
-        return PlaybackWatcher()
-    }
+    fun providePlaybackWatcher(): PlaybackWatcher = PlaybackWatcher()
 
     @Singleton
     @Provides
@@ -151,23 +135,17 @@ class PlaybackModule {
         artistRepository: AlbumArtistRepository,
         albumRepository: AlbumRepository,
         songRepository: SongRepository
-    ): MediaIdHelper {
-        return MediaIdHelper(playlistRepository, artistRepository, albumRepository, songRepository)
-    }
+    ): MediaIdHelper = MediaIdHelper(playlistRepository, artistRepository, albumRepository, songRepository)
 
     @Provides
     fun provideAudioManager(
         @ApplicationContext context: Context
-    ): AudioManager? {
-        return context.getSystemService()
-    }
+    ): AudioManager? = context.getSystemService()
 
     @Provides
     fun provideAudioEffectSessionManager(
         @ApplicationContext context: Context
-    ): AudioEffectSessionManager {
-        return AudioEffectSessionManager(context)
-    }
+    ): AudioEffectSessionManager = AudioEffectSessionManager(context)
 
     @Singleton
     @Provides
@@ -181,9 +159,7 @@ class PlaybackModule {
         @AppCoroutineScope coroutineScope: CoroutineScope,
         queueWatcher: QueueWatcher,
         audioManager: AudioManager?
-    ): PlaybackManager {
-        return PlaybackManager(queueManager, playbackWatcher, audioFocusHelper, playbackPreferenceManager, audioEffectSessionManager, coroutineScope, playback, queueWatcher, audioManager)
-    }
+    ): PlaybackManager = PlaybackManager(queueManager, playbackWatcher, audioFocusHelper, playbackPreferenceManager, audioEffectSessionManager, coroutineScope, playback, queueWatcher, audioManager)
 
     @Singleton
     @Provides
@@ -191,15 +167,11 @@ class PlaybackModule {
         @ApplicationContext context: Context,
         songRepository: SongRepository,
         artworkImageLoader: ArtworkImageLoader
-    ): CastService {
-        return CastService(context, songRepository, artworkImageLoader)
-    }
+    ): CastService = CastService(context, songRepository, artworkImageLoader)
 
     @Singleton
     @Provides
-    fun provideHttpServer(castService: CastService): HttpServer {
-        return HttpServer(castService)
-    }
+    fun provideHttpServer(castService: CastService): HttpServer = HttpServer(castService)
 
     @Singleton
     @Provides
@@ -209,9 +181,7 @@ class PlaybackModule {
         httpServer: HttpServer,
         exoPlayerPlayback: ExoPlayerPlayback,
         mediaPathProvider: AggregateMediaInfoProvider
-    ): CastSessionManager {
-        return CastSessionManager(playbackManager, context, httpServer, exoPlayerPlayback, mediaPathProvider)
-    }
+    ): CastSessionManager = CastSessionManager(playbackManager, context, httpServer, exoPlayerPlayback, mediaPathProvider)
 
     @Singleton
     @Provides
@@ -230,24 +200,22 @@ class PlaybackModule {
         playbackWatcher: PlaybackWatcher,
         queueWatcher: QueueWatcher,
         mediaIdHelper: MediaIdHelper
-    ): MediaSessionManager {
-        return MediaSessionManager(
-            context,
-            appCoroutineScope,
-            playbackManager,
-            queueManager,
-            mediaIdHelper,
-            artistRepository,
-            albumRepository,
-            songRepository,
-            genreRepository,
-            artworkImageLoader,
-            artworkCache,
-            preferenceManager,
-            playbackWatcher,
-            queueWatcher
-        )
-    }
+    ): MediaSessionManager = MediaSessionManager(
+        context,
+        appCoroutineScope,
+        playbackManager,
+        queueManager,
+        mediaIdHelper,
+        artistRepository,
+        albumRepository,
+        songRepository,
+        genreRepository,
+        artworkImageLoader,
+        artworkCache,
+        preferenceManager,
+        playbackWatcher,
+        queueWatcher
+    )
 
     @Singleton
     @Provides
@@ -255,9 +223,7 @@ class PlaybackModule {
         @ApplicationContext context: Context,
         playbackManager: PlaybackManager,
         playbackWatcher: PlaybackWatcher
-    ): NoiseManager {
-        return NoiseManager(context, playbackManager, playbackWatcher)
-    }
+    ): NoiseManager = NoiseManager(context, playbackManager, playbackWatcher)
 
     @Singleton
     @Provides
@@ -270,26 +236,22 @@ class PlaybackModule {
         queueWatcher: QueueWatcher,
         lruCache: LruCache<String, Bitmap>,
         artworkImageLoader: ArtworkImageLoader
-    ): PlaybackNotificationManager {
-        return PlaybackNotificationManager(
-            context,
-            context.getSystemService()!!,
-            playbackManager,
-            queueManager,
-            mediaSessionManager,
-            playbackWatcher,
-            queueWatcher,
-            lruCache,
-            artworkImageLoader
-        )
-    }
+    ): PlaybackNotificationManager = PlaybackNotificationManager(
+        context,
+        context.getSystemService()!!,
+        playbackManager,
+        queueManager,
+        mediaSessionManager,
+        playbackWatcher,
+        queueWatcher,
+        lruCache,
+        artworkImageLoader
+    )
 
     @Singleton
     @Provides
     fun provideSleepTimer(
         playbackManager: PlaybackManager,
         playbackWatcher: PlaybackWatcher
-    ): SleepTimer {
-        return SleepTimer(playbackManager, playbackWatcher)
-    }
+    ): SleepTimer = SleepTimer(playbackManager, playbackWatcher)
 }
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/dsp/equalizer/Equalizer.kt b/android/playback/src/main/java/com/simplecityapps/playback/dsp/equalizer/Equalizer.kt
index 33b370a9f..a275f2e59 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/dsp/equalizer/Equalizer.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/dsp/equalizer/Equalizer.kt
@@ -122,9 +122,7 @@ object Equalizer {
                 return true
             }
 
-            override fun hashCode(): Int {
-                return name.hashCode()
-            }
+            override fun hashCode(): Int = name.hashCode()
         }
 
         val flat = Preset.Flat
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/dsp/equalizer/Utils.kt b/android/playback/src/main/java/com/simplecityapps/playback/dsp/equalizer/Utils.kt
index 6c117b729..e2fe71a9e 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/dsp/equalizer/Utils.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/dsp/equalizer/Utils.kt
@@ -3,10 +3,6 @@ package com.simplecityapps.playback.dsp.equalizer
 import kotlin.math.log10
 import kotlin.math.pow
 
-fun Double.fromDb(): Double {
-    return 10.0.pow(this / 20.0)
-}
+fun Double.fromDb(): Double = 10.0.pow(this / 20.0)
 
-fun Double.toDb(): Double {
-    return 20 * log10(this)
-}
+fun Double.toDb(): Double = 20 * log10(this)
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/dsp/replaygain/ReplayGainMode.kt b/android/playback/src/main/java/com/simplecityapps/playback/dsp/replaygain/ReplayGainMode.kt
index 351705bb1..f35e23467 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/dsp/replaygain/ReplayGainMode.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/dsp/replaygain/ReplayGainMode.kt
@@ -7,13 +7,11 @@ enum class ReplayGainMode {
     ;
 
     companion object {
-        fun init(ordinal: Int): ReplayGainMode {
-            return when (ordinal) {
-                Track.ordinal -> Track
-                Album.ordinal -> Album
-                Off.ordinal -> Off
-                else -> Off
-            }
+        fun init(ordinal: Int): ReplayGainMode = when (ordinal) {
+            Track.ordinal -> Track
+            Album.ordinal -> Album
+            Off.ordinal -> Off
+            else -> Off
         }
     }
 }
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/exoplayer/ExoPlayerPlayback.kt b/android/playback/src/main/java/com/simplecityapps/playback/exoplayer/ExoPlayerPlayback.kt
index 00162feac..f19935a6e 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/exoplayer/ExoPlayerPlayback.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/exoplayer/ExoPlayerPlayback.kt
@@ -115,15 +115,13 @@ class ExoPlayerPlayback(
                 enableFloatOutput: Boolean,
                 enableAudioTrackPlaybackParams: Boolean,
                 enableOffload: Boolean
-            ): AudioSink {
-                return DefaultAudioSink(
-                    AudioCapabilities.DEFAULT_AUDIO_CAPABILITIES,
-                    DefaultAudioSink.DefaultAudioProcessorChain(
-                        equalizerAudioProcessor,
-                        replayGainAudioProcessor
-                    ).audioProcessors
-                )
-            }
+            ): AudioSink = DefaultAudioSink(
+                AudioCapabilities.DEFAULT_AUDIO_CAPABILITIES,
+                DefaultAudioSink.DefaultAudioProcessorChain(
+                    equalizerAudioProcessor,
+                    replayGainAudioProcessor
+                ).audioProcessors
+            )
         }.apply {
             setExtensionRendererMode(EXTENSION_RENDERER_MODE_ON)
         }
@@ -216,33 +214,25 @@ class ExoPlayerPlayback(
         isReleased = true
     }
 
-    override fun playBackState(): PlaybackState {
-        return if (player.isPlaying || player.playWhenReady) {
-            PlaybackState.Playing
-        } else {
-            PlaybackState.Paused
-        }
+    override fun playBackState(): PlaybackState = if (player.isPlaying || player.playWhenReady) {
+        PlaybackState.Playing
+    } else {
+        PlaybackState.Paused
     }
 
     override fun seek(position: Int) {
         player.seekTo(position.toLong())
     }
 
-    override fun getProgress(): Int {
-        return player.contentPosition.toInt()
-    }
+    override fun getProgress(): Int = player.contentPosition.toInt()
 
-    override fun getDuration(): Int? {
-        return player.duration.takeIf { duration -> duration != C.TIME_UNSET }?.toInt()
-    }
+    override fun getDuration(): Int? = player.duration.takeIf { duration -> duration != C.TIME_UNSET }?.toInt()
 
     override fun setVolume(volume: Float) {
         player.audioComponent?.volume = volume
     }
 
-    override fun getResumeWhenSwitched(oldPlayback: Playback): Boolean {
-        return oldPlayback !is CastPlayback
-    }
+    override fun getResumeWhenSwitched(oldPlayback: Playback): Boolean = oldPlayback !is CastPlayback
 
     override fun setRepeatMode(repeatMode: QueueManager.RepeatMode) {
         player.repeatMode = repeatMode.toRepeatMode()
@@ -269,9 +259,7 @@ class ExoPlayerPlayback(
         player.setPlaybackParameters(PlaybackParameters(multiplier, multiplier))
     }
 
-    override fun getPlaybackSpeed(): Float {
-        return player.playbackParameters.speed
-    }
+    override fun getPlaybackSpeed(): Float = player.playbackParameters.speed
 
     enum class ExoPlaybackState {
         Idle,
@@ -281,14 +269,12 @@ class ExoPlayerPlayback(
         Unknown
     }
 
-    fun Int.toExoPlaybackState(): ExoPlaybackState {
-        return when (this) {
-            1 -> ExoPlaybackState.Idle
-            2 -> ExoPlaybackState.Buffering
-            3 -> ExoPlaybackState.Ready
-            4 -> ExoPlaybackState.Ended
-            else -> ExoPlaybackState.Unknown
-        }
+    fun Int.toExoPlaybackState(): ExoPlaybackState = when (this) {
+        1 -> ExoPlaybackState.Idle
+        2 -> ExoPlaybackState.Buffering
+        3 -> ExoPlaybackState.Ready
+        4 -> ExoPlaybackState.Ended
+        else -> ExoPlaybackState.Unknown
     }
 
     enum class TransitionReason {
@@ -299,21 +285,17 @@ class ExoPlayerPlayback(
         Unknown
     }
 
-    fun Int.toTransitionReason(): TransitionReason {
-        return when (this) {
-            0 -> TransitionReason.Repeat
-            1 -> TransitionReason.Auto
-            2 -> TransitionReason.Seek
-            3 -> TransitionReason.PlaylistChanged
-            else -> TransitionReason.Unknown
-        }
+    fun Int.toTransitionReason(): TransitionReason = when (this) {
+        0 -> TransitionReason.Repeat
+        1 -> TransitionReason.Auto
+        2 -> TransitionReason.Seek
+        3 -> TransitionReason.PlaylistChanged
+        else -> TransitionReason.Unknown
     }
 
     @Throws(IllegalStateException::class)
-    fun getMediaItem(mediaInfo: MediaInfo): MediaItem {
-        return MediaItem.Builder()
-            .setMimeType(mediaInfo.mimeType)
-            .setUri(mediaInfo.path)
-            .build()
-    }
+    fun getMediaItem(mediaInfo: MediaInfo): MediaItem = MediaItem.Builder()
+        .setMimeType(mediaInfo.mimeType)
+        .setUri(mediaInfo.path)
+        .build()
 }
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/mediasession/MediaSessionExt.kt b/android/playback/src/main/java/com/simplecityapps/playback/mediasession/MediaSessionExt.kt
index 6523cad93..7c575f575 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/mediasession/MediaSessionExt.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/mediasession/MediaSessionExt.kt
@@ -6,38 +6,30 @@ import android.support.v4.media.session.PlaybackStateCompat
 import com.simplecityapps.playback.queue.QueueItem
 import com.simplecityapps.playback.queue.QueueManager
 
-fun Int.toRepeatMode(): QueueManager.RepeatMode {
-    return when (this) {
-        PlaybackStateCompat.REPEAT_MODE_ALL -> QueueManager.RepeatMode.All
-        PlaybackStateCompat.REPEAT_MODE_NONE -> QueueManager.RepeatMode.Off
-        PlaybackStateCompat.REPEAT_MODE_ONE -> QueueManager.RepeatMode.One
-        else -> QueueManager.RepeatMode.Off
-    }
+fun Int.toRepeatMode(): QueueManager.RepeatMode = when (this) {
+    PlaybackStateCompat.REPEAT_MODE_ALL -> QueueManager.RepeatMode.All
+    PlaybackStateCompat.REPEAT_MODE_NONE -> QueueManager.RepeatMode.Off
+    PlaybackStateCompat.REPEAT_MODE_ONE -> QueueManager.RepeatMode.One
+    else -> QueueManager.RepeatMode.Off
 }
 
 @PlaybackStateCompat.RepeatMode
-fun QueueManager.RepeatMode.toRepeatMode(): Int {
-    return when (this) {
-        QueueManager.RepeatMode.All -> PlaybackStateCompat.REPEAT_MODE_ALL
-        QueueManager.RepeatMode.Off -> PlaybackStateCompat.REPEAT_MODE_NONE
-        QueueManager.RepeatMode.One -> PlaybackStateCompat.REPEAT_MODE_ONE
-    }
+fun QueueManager.RepeatMode.toRepeatMode(): Int = when (this) {
+    QueueManager.RepeatMode.All -> PlaybackStateCompat.REPEAT_MODE_ALL
+    QueueManager.RepeatMode.Off -> PlaybackStateCompat.REPEAT_MODE_NONE
+    QueueManager.RepeatMode.One -> PlaybackStateCompat.REPEAT_MODE_ONE
 }
 
-fun Int.toShuffleMode(): QueueManager.ShuffleMode {
-    return when (this) {
-        PlaybackStateCompat.SHUFFLE_MODE_ALL -> QueueManager.ShuffleMode.On
-        PlaybackStateCompat.SHUFFLE_MODE_NONE -> QueueManager.ShuffleMode.Off
-        else -> QueueManager.ShuffleMode.Off
-    }
+fun Int.toShuffleMode(): QueueManager.ShuffleMode = when (this) {
+    PlaybackStateCompat.SHUFFLE_MODE_ALL -> QueueManager.ShuffleMode.On
+    PlaybackStateCompat.SHUFFLE_MODE_NONE -> QueueManager.ShuffleMode.Off
+    else -> QueueManager.ShuffleMode.Off
 }
 
 @PlaybackStateCompat.ShuffleMode
-fun QueueManager.ShuffleMode.toShuffleMode(): Int {
-    return when (this) {
-        QueueManager.ShuffleMode.On -> PlaybackStateCompat.SHUFFLE_MODE_ALL
-        QueueManager.ShuffleMode.Off -> PlaybackStateCompat.SHUFFLE_MODE_NONE
-    }
+fun QueueManager.ShuffleMode.toShuffleMode(): Int = when (this) {
+    QueueManager.ShuffleMode.On -> PlaybackStateCompat.SHUFFLE_MODE_ALL
+    QueueManager.ShuffleMode.Off -> PlaybackStateCompat.SHUFFLE_MODE_NONE
 }
 
 fun QueueItem.toQueueItem(): MediaSessionCompat.QueueItem {
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/mediasession/MediaSessionManager.kt b/android/playback/src/main/java/com/simplecityapps/playback/mediasession/MediaSessionManager.kt
index 77b2bfc7b..c2c56d988 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/mediasession/MediaSessionManager.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/mediasession/MediaSessionManager.kt
@@ -129,12 +129,11 @@ constructor(
         }
     }
 
-    private fun getPlaybackState() =
-        when (playbackManager.playbackState()) {
-            is PlaybackState.Loading -> PlaybackStateCompat.STATE_BUFFERING
-            is PlaybackState.Playing -> PlaybackStateCompat.STATE_PLAYING
-            else -> PlaybackStateCompat.STATE_PAUSED
-        }
+    private fun getPlaybackState() = when (playbackManager.playbackState()) {
+        is PlaybackState.Loading -> PlaybackStateCompat.STATE_BUFFERING
+        is PlaybackState.Playing -> PlaybackStateCompat.STATE_PLAYING
+        else -> PlaybackStateCompat.STATE_PAUSED
+    }
 
     private fun updatePlaybackState() {
         Timber.v("updatePlaybackState()")
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/queue/QueueItem.kt b/android/playback/src/main/java/com/simplecityapps/playback/queue/QueueItem.kt
index d44f687d5..c9d488a73 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/queue/QueueItem.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/queue/QueueItem.kt
@@ -19,23 +19,15 @@ class QueueItem(
         return true
     }
 
-    override fun hashCode(): Int {
-        return uid.hashCode()
-    }
+    override fun hashCode(): Int = uid.hashCode()
 
-    override fun toString(): String {
-        return "QueueItem(song=${song.name}, isCurrent=$isCurrent)"
-    }
+    override fun toString(): String = "QueueItem(song=${song.name}, isCurrent=$isCurrent)"
 }
 
-fun Song.toQueueItem(isCurrent: Boolean): QueueItem {
-    return QueueItem(UUID.randomUUID().mostSignificantBits and Long.MAX_VALUE, this, isCurrent)
-}
+fun Song.toQueueItem(isCurrent: Boolean): QueueItem = QueueItem(UUID.randomUUID().mostSignificantBits and Long.MAX_VALUE, this, isCurrent)
 
 fun QueueItem.clone(
     uid: Long = this.uid,
     song: Song = this.song,
     isCurrent: Boolean = this.isCurrent
-): QueueItem {
-    return QueueItem(uid, song, isCurrent)
-}
+): QueueItem = QueueItem(uid, song, isCurrent)
diff --git a/android/playback/src/main/java/com/simplecityapps/playback/queue/QueueManager.kt b/android/playback/src/main/java/com/simplecityapps/playback/queue/QueueManager.kt
index 4d9f209b6..ac9f963e2 100644
--- a/android/playback/src/main/java/com/simplecityapps/playback/queue/QueueManager.kt
+++ b/android/playback/src/main/java/com/simplecityapps/playback/queue/QueueManager.kt
@@ -16,12 +16,10 @@ class QueueManager(
         ;
 
         companion object {
-            fun init(ordinal: Int): ShuffleMode {
-                return when (ordinal) {
-                    On.ordinal -> On
-                    Off.ordinal -> Off
-                    else -> Off
-                }
+            fun init(ordinal: Int): ShuffleMode = when (ordinal) {
+                On.ordinal -> On
+                Off.ordinal -> Off
+                else -> Off
             }
         }
     }
@@ -33,13 +31,11 @@ class QueueManager(
         ;
 
         companion object {
-            fun init(ordinal: Int): RepeatMode {
-                return when (ordinal) {
-                    All.ordinal -> All
-                    One.ordinal -> One
-                    Off.ordinal -> Off
-                    else -> Off
-                }
+            fun init(ordinal: Int): RepeatMode = when (ordinal) {
+                All.ordinal -> All
+                One.ordinal -> One
+                Off.ordinal -> Off
+                else -> Off
             }
         }
     }
@@ -154,9 +150,7 @@ class QueueManager(
         }
     }
 
-    fun getCurrentItem(): QueueItem? {
-        return currentItem
-    }
+    fun getCurrentItem(): QueueItem? = currentItem
 
     fun getCurrentPosition(): Int? {
         val index = queue.get(shuffleMode).indexOf(currentItem)
@@ -167,9 +161,7 @@ class QueueManager(
         return null
     }
 
-    fun getSize(): Int {
-        return queue.size()
-    }
+    fun getSize(): Int = queue.size()
 
     fun remove(items: List<QueueItem>) {
         val oldPosition = getCurrentPosition()
@@ -192,12 +184,10 @@ class QueueManager(
      *
      * @param ignoreRepeat whether to ignore the current repeat mode, and return the next item as if repeat mode is 'all'
      */
-    fun getNext(ignoreRepeat: Boolean = false): QueueItem? {
-        return if (ignoreRepeat) {
-            getNext(RepeatMode.All)
-        } else {
-            getNext(repeatMode)
-        }
+    fun getNext(ignoreRepeat: Boolean = false): QueueItem? = if (ignoreRepeat) {
+        getNext(RepeatMode.All)
+    } else {
+        getNext(repeatMode)
     }
 
     private fun getNext(repeatMode: RepeatMode): QueueItem? {
@@ -226,13 +216,9 @@ class QueueManager(
         return currentQueue.getOrNull(currentQueue.indexOf(currentItem) - 1)
     }
 
-    fun getQueue(): List<QueueItem> {
-        return queue.get(shuffleMode)
-    }
+    fun getQueue(): List<QueueItem> = queue.get(shuffleMode)
 
-    fun getQueue(shuffleMode: ShuffleMode): List<QueueItem> {
-        return queue.get(shuffleMode)
-    }
+    fun getQueue(shuffleMode: ShuffleMode): List<QueueItem> = queue.get(shuffleMode)
 
     /**
      * Sets the shuffle mode
@@ -267,9 +253,7 @@ class QueueManager(
         }
     }
 
-    fun getShuffleMode(): ShuffleMode {
-        return shuffleMode
-    }
+    fun getShuffleMode(): ShuffleMode = shuffleMode
 
     suspend fun toggleShuffleMode() {
         when (shuffleMode) {
@@ -285,9 +269,7 @@ class QueueManager(
         }
     }
 
-    fun getRepeatMode(): RepeatMode {
-        return repeatMode
-    }
+    fun getRepeatMode(): RepeatMode = repeatMode
 
     fun toggleRepeatMode() {
         when (repeatMode) {
@@ -354,19 +336,15 @@ class QueueManager(
         private var baseList: MutableList<QueueItem> = mutableListOf()
         private var shuffleList: MutableList<QueueItem> = mutableListOf()
 
-        fun get(shuffleMode: ShuffleMode): MutableList<QueueItem> {
-            return when (shuffleMode) {
-                ShuffleMode.Off -> baseList
-                ShuffleMode.On -> shuffleList
-            }
+        fun get(shuffleMode: ShuffleMode): MutableList<QueueItem> = when (shuffleMode) {
+            ShuffleMode.Off -> baseList
+            ShuffleMode.On -> shuffleList
         }
 
         fun getItem(
             shuffleMode: ShuffleMode,
             position: Int
-        ): QueueItem? {
-            return get(shuffleMode).getOrNull(position)
-        }
+        ): QueueItem? = get(shuffleMode).getOrNull(position)
 
         fun setBaseQueue(items: List<QueueItem>) {
             baseList = items.toMutableList()
@@ -436,8 +414,6 @@ class QueueManager(
             list.add(to, list.removeAt(from))
         }
 
-        fun size(): Int {
-            return baseList.size
-        }
+        fun size(): Int = baseList.size
     }
 }
diff --git a/android/recyclerview-adapter/src/main/java/com/simplecityapps/adapter/RecyclerAdapter.kt b/android/recyclerview-adapter/src/main/java/com/simplecityapps/adapter/RecyclerAdapter.kt
index 052197453..6cc132079 100644
--- a/android/recyclerview-adapter/src/main/java/com/simplecityapps/adapter/RecyclerAdapter.kt
+++ b/android/recyclerview-adapter/src/main/java/com/simplecityapps/adapter/RecyclerAdapter.kt
@@ -159,22 +159,16 @@ open class RecyclerAdapter(scope: CoroutineScope, val skipIntermediateUpdates: B
 
     // RecyclerView.Adapter Implementation
 
-    override fun getItemViewType(position: Int): Int {
-        return items[position].viewType()
-    }
+    override fun getItemViewType(position: Int): Int = items[position].viewType()
 
-    override fun getItemCount(): Int {
-        return items.size
-    }
+    override fun getItemCount(): Int = items.size
 
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int
-    ): RecyclerView.ViewHolder {
-        return items.firstOrNull { adapterViewModel -> adapterViewModel.viewType() == viewType }?.createViewHolder(
-            parent
-        ) ?: throw IllegalStateException("Cannot create ViewHolder for view viewType: $viewType")
-    }
+    ): RecyclerView.ViewHolder = items.firstOrNull { adapterViewModel -> adapterViewModel.viewType() == viewType }?.createViewHolder(
+        parent
+    ) ?: throw IllegalStateException("Cannot create ViewHolder for view viewType: $viewType")
 
     override fun onBindViewHolder(
         holder: RecyclerView.ViewHolder,
diff --git a/android/recyclerview-adapter/src/main/java/com/simplecityapps/adapter/SpanSizeLookup.kt b/android/recyclerview-adapter/src/main/java/com/simplecityapps/adapter/SpanSizeLookup.kt
index 56ec2c114..c149a8c41 100644
--- a/android/recyclerview-adapter/src/main/java/com/simplecityapps/adapter/SpanSizeLookup.kt
+++ b/android/recyclerview-adapter/src/main/java/com/simplecityapps/adapter/SpanSizeLookup.kt
@@ -10,7 +10,5 @@ class SpanSizeLookup(
         this.spanCount = spanCount
     }
 
-    override fun getSpanSize(position: Int): Int {
-        return viewModelAdapter.items.getOrNull(position)?.spanSize(spanCount) ?: 1
-    }
+    override fun getSpanSize(position: Int): Int = viewModelAdapter.items.getOrNull(position)?.spanSize(spanCount) ?: 1
 }
diff --git a/android/recyclerview-adapter/src/main/java/com/simplecityapps/adapter/ViewBinder.kt b/android/recyclerview-adapter/src/main/java/com/simplecityapps/adapter/ViewBinder.kt
index 5b62f44d9..0a37459c8 100644
--- a/android/recyclerview-adapter/src/main/java/com/simplecityapps/adapter/ViewBinder.kt
+++ b/android/recyclerview-adapter/src/main/java/com/simplecityapps/adapter/ViewBinder.kt
@@ -13,9 +13,7 @@ interface ViewBinder : ContentsComparator {
 
     fun viewType(): Int
 
-    fun spanSize(spanCount: Int): Int {
-        return spanCount
-    }
+    fun spanSize(spanCount: Int): Int = spanCount
 
     fun bindViewHolder(
         holder: ViewHolder<ViewBinder>,
@@ -24,9 +22,7 @@ interface ViewBinder : ContentsComparator {
         holder.bind(this, isPartial)
     }
 
-    override fun areContentsTheSame(other: Any): Boolean {
-        return true
-    }
+    override fun areContentsTheSame(other: Any): Boolean = true
 
     open class ViewHolder<B : ViewBinder>(itemView: View) :
         RecyclerView.ViewHolder(itemView),
@@ -56,7 +52,5 @@ interface ViewBinder : ContentsComparator {
 
     fun ViewGroup.inflateView(
         @LayoutRes layoutResId: Int
-    ): View {
-        return LayoutInflater.from(context).inflate(layoutResId, this, false)
-    }
+    ): View = LayoutInflater.from(context).inflate(layoutResId, this, false)
 }
diff --git a/android/recyclerview-adapter/src/main/java/com/simplecityapps/diff/DiffCallbacks.kt b/android/recyclerview-adapter/src/main/java/com/simplecityapps/diff/DiffCallbacks.kt
index 52d0f9635..aeffc94e9 100644
--- a/android/recyclerview-adapter/src/main/java/com/simplecityapps/diff/DiffCallbacks.kt
+++ b/android/recyclerview-adapter/src/main/java/com/simplecityapps/diff/DiffCallbacks.kt
@@ -2,34 +2,23 @@ package com.simplecityapps.diff
 
 import androidx.recyclerview.widget.DiffUtil
 
-class DiffCallbacks(private val oldList: List<ContentsComparator>, private val newList: List<ContentsComparator>) :
-    DiffUtil.Callback() {
-    override fun getOldListSize(): Int {
-        return oldList.size
-    }
+class DiffCallbacks(private val oldList: List<ContentsComparator>, private val newList: List<ContentsComparator>) : DiffUtil.Callback() {
+    override fun getOldListSize(): Int = oldList.size
 
-    override fun getNewListSize(): Int {
-        return newList.size
-    }
+    override fun getNewListSize(): Int = newList.size
 
     override fun areItemsTheSame(
         oldItemPosition: Int,
         newItemPosition: Int
-    ): Boolean {
-        return oldList[oldItemPosition] == newList[newItemPosition]
-    }
+    ): Boolean = oldList[oldItemPosition] == newList[newItemPosition]
 
     override fun areContentsTheSame(
         oldItemPosition: Int,
         newItemPosition: Int
-    ): Boolean {
-        return oldList[oldItemPosition].areContentsTheSame(newList[newItemPosition])
-    }
+    ): Boolean = oldList[oldItemPosition].areContentsTheSame(newList[newItemPosition])
 
     override fun getChangePayload(
         oldItemPosition: Int,
         newItemPosition: Int
-    ): Any? {
-        return 0
-    }
+    ): Any? = 0
 }
diff --git a/android/saf/src/main/java/com/simplecityapps/saf/DocumentNodeTree.kt b/android/saf/src/main/java/com/simplecityapps/saf/DocumentNodeTree.kt
index 03b8dc49d..ea123a7d8 100644
--- a/android/saf/src/main/java/com/simplecityapps/saf/DocumentNodeTree.kt
+++ b/android/saf/src/main/java/com/simplecityapps/saf/DocumentNodeTree.kt
@@ -8,8 +8,8 @@ class DocumentNodeTree(
     override val documentId: String,
     override val displayName: String,
     override val mimeType: String
-) : Trie<DocumentNodeTree, DocumentNode>,
-    DocumentNode(uri, documentId, displayName, mimeType) {
+) : DocumentNode(uri, documentId, displayName, mimeType),
+    Trie<DocumentNodeTree, DocumentNode> {
     override val treeNodes: LinkedHashSet<DocumentNodeTree> = linkedSetOf()
     override val leafNodes: LinkedHashSet<DocumentNode> = linkedSetOf()
 
diff --git a/android/saf/src/main/java/com/simplecityapps/saf/FileNode.kt b/android/saf/src/main/java/com/simplecityapps/saf/FileNode.kt
index 0f8bb6dc8..50e77195e 100644
--- a/android/saf/src/main/java/com/simplecityapps/saf/FileNode.kt
+++ b/android/saf/src/main/java/com/simplecityapps/saf/FileNode.kt
@@ -3,7 +3,9 @@ package com.simplecityapps.saf
 import android.net.Uri
 import java.io.Serializable
 
-interface FileNode : Node, Serializable {
+interface FileNode :
+    Node,
+    Serializable {
     val uri: Uri
     val displayName: String
 }
diff --git a/android/saf/src/main/java/com/simplecityapps/saf/SafDirectoryHelper.kt b/android/saf/src/main/java/com/simplecityapps/saf/SafDirectoryHelper.kt
index 2fd245112..9eb96bcbd 100644
--- a/android/saf/src/main/java/com/simplecityapps/saf/SafDirectoryHelper.kt
+++ b/android/saf/src/main/java/com/simplecityapps/saf/SafDirectoryHelper.kt
@@ -21,21 +21,19 @@ object SafDirectoryHelper {
     fun buildFolderNodeTree(
         contentResolver: ContentResolver,
         rootUri: Uri
-    ): Flow<TreeStatus> {
-        return flow {
-            try {
-                val docUri = DocumentsContract.buildDocumentUriUsingTree(rootUri, DocumentsContract.getTreeDocumentId(rootUri))
-                retrieveDocumentNodes(contentResolver, docUri, rootUri).firstOrNull()?.let { rootDocumentNode ->
-                    val tree = DocumentNodeTree(docUri, rootUri, rootDocumentNode.documentId, rootDocumentNode.displayName, rootDocumentNode.mimeType)
-                    emit(TreeStatus.Progress(tree))
-                    traverseDocumentNodes(tree, contentResolver, rootUri)
-                    emit(TreeStatus.Complete(tree))
-                }
-            } catch (e: SecurityException) {
-                Timber.e(e, "Failed to build folder tree ($rootUri)")
+    ): Flow<TreeStatus> = flow {
+        try {
+            val docUri = DocumentsContract.buildDocumentUriUsingTree(rootUri, DocumentsContract.getTreeDocumentId(rootUri))
+            retrieveDocumentNodes(contentResolver, docUri, rootUri).firstOrNull()?.let { rootDocumentNode ->
+                val tree = DocumentNodeTree(docUri, rootUri, rootDocumentNode.documentId, rootDocumentNode.displayName, rootDocumentNode.mimeType)
+                emit(TreeStatus.Progress(tree))
+                traverseDocumentNodes(tree, contentResolver, rootUri)
+                emit(TreeStatus.Complete(tree))
             }
-        }.flowOn(Dispatchers.IO)
-    }
+        } catch (e: SecurityException) {
+            Timber.e(e, "Failed to build folder tree ($rootUri)")
+        }
+    }.flowOn(Dispatchers.IO)
 
     private suspend fun traverseDocumentNodes(
         parent: DocumentNodeTree,
@@ -74,53 +72,51 @@ object SafDirectoryHelper {
         contentResolver: ContentResolver,
         uri: Uri,
         rootUri: Uri
-    ): List<DocumentNode> {
-        return withContext(Dispatchers.IO) {
-            val documentNodes = mutableListOf<DocumentNode>()
-            try {
-                contentResolver.query(
-                    uri,
-                    arrayOf(
-                        DocumentsContract.Document.COLUMN_DOCUMENT_ID,
-                        DocumentsContract.Document.COLUMN_DISPLAY_NAME,
-                        DocumentsContract.Document.COLUMN_MIME_TYPE
-                    ),
-                    null,
-                    null,
-                    null
-                ).use { cursor ->
-                    cursor?.let {
-                        while (cursor.moveToNext()) {
-                            val mimeType = cursor.getString(2)
-                            val documentId = cursor.getString(0)
-                            if (mimeType == DocumentsContract.Document.MIME_TYPE_DIR) {
-                                documentNodes.add(
-                                    DocumentNodeTree(
-                                        uri = DocumentsContract.buildDocumentUriUsingTree(uri, documentId),
-                                        rootUri = rootUri,
-                                        documentId = documentId,
-                                        displayName = cursor.getString(1),
-                                        mimeType = mimeType
-                                    )
+    ): List<DocumentNode> = withContext(Dispatchers.IO) {
+        val documentNodes = mutableListOf<DocumentNode>()
+        try {
+            contentResolver.query(
+                uri,
+                arrayOf(
+                    DocumentsContract.Document.COLUMN_DOCUMENT_ID,
+                    DocumentsContract.Document.COLUMN_DISPLAY_NAME,
+                    DocumentsContract.Document.COLUMN_MIME_TYPE
+                ),
+                null,
+                null,
+                null
+            ).use { cursor ->
+                cursor?.let {
+                    while (cursor.moveToNext()) {
+                        val mimeType = cursor.getString(2)
+                        val documentId = cursor.getString(0)
+                        if (mimeType == DocumentsContract.Document.MIME_TYPE_DIR) {
+                            documentNodes.add(
+                                DocumentNodeTree(
+                                    uri = DocumentsContract.buildDocumentUriUsingTree(uri, documentId),
+                                    rootUri = rootUri,
+                                    documentId = documentId,
+                                    displayName = cursor.getString(1),
+                                    mimeType = mimeType
                                 )
-                            } else {
-                                documentNodes.add(
-                                    DocumentNode(
-                                        uri = DocumentsContract.buildDocumentUriUsingTree(uri, documentId),
-                                        documentId = documentId,
-                                        displayName = cursor.getString(1),
-                                        mimeType = mimeType
-                                    )
+                            )
+                        } else {
+                            documentNodes.add(
+                                DocumentNode(
+                                    uri = DocumentsContract.buildDocumentUriUsingTree(uri, documentId),
+                                    documentId = documentId,
+                                    displayName = cursor.getString(1),
+                                    mimeType = mimeType
                                 )
-                            }
+                            )
                         }
-                    } ?: Timber.e("Failed to iterate cursor (null)")
-                }
-            } catch (e: SecurityException) {
-                Timber.e("Failed to retrieve document node for uri: $uri")
+                    }
+                } ?: Timber.e("Failed to iterate cursor (null)")
             }
-            documentNodes
+        } catch (e: SecurityException) {
+            Timber.e("Failed to retrieve document node for uri: $uri")
         }
+        documentNodes
     }
 
     sealed class TreeStatus(val tree: DocumentNodeTree) {
@@ -139,8 +135,6 @@ object SafDirectoryHelper {
             return true
         }
 
-        override fun hashCode(): Int {
-            return tree.hashCode()
-        }
+        override fun hashCode(): Int = tree.hashCode()
     }
 }
diff --git a/android/trial/src/main/java/com/simplecityapps/trial/TrialManager.kt b/android/trial/src/main/java/com/simplecityapps/trial/TrialManager.kt
index a6c1bc4a4..298d7a902 100644
--- a/android/trial/src/main/java/com/simplecityapps/trial/TrialManager.kt
+++ b/android/trial/src/main/java/com/simplecityapps/trial/TrialManager.kt
@@ -119,16 +119,14 @@ class TrialManager(
         }
     }
 
-    private suspend fun getRemoteDevice(deviceId: String): Device? {
-        return when (val result = deviceService.getDevice(deviceId)) {
-            is NetworkResult.Success -> {
-                Timber.i("Retrieved remote device")
-                result.body
-            }
-            is NetworkResult.Failure -> {
-                Timber.e("Failed to retrieve remote device: ${result.error}")
-                null
-            }
+    private suspend fun getRemoteDevice(deviceId: String): Device? = when (val result = deviceService.getDevice(deviceId)) {
+        is NetworkResult.Success -> {
+            Timber.i("Retrieved remote device")
+            result.body
+        }
+        is NetworkResult.Failure -> {
+            Timber.e("Failed to retrieve remote device: ${result.error}")
+            null
         }
     }
 
@@ -162,11 +160,9 @@ class TrialManager(
      * Otherwise, a GUID is generated and stored in internal storage - which will persist across installations via auto-backup, if enabled by the user
      */
     @SuppressLint("HardwareIds")
-    private fun getDeviceId(): String {
-        return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
-        } else {
-            UUID.randomUUID().toString()
-        }
+    private fun getDeviceId(): String = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+        Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
+    } else {
+        UUID.randomUUID().toString()
     }
 }
diff --git a/android/trial/src/main/java/com/simplecityapps/trial/TrialState.kt b/android/trial/src/main/java/com/simplecityapps/trial/TrialState.kt
index b1ecfd5b9..e1da4fbe6 100644
--- a/android/trial/src/main/java/com/simplecityapps/trial/TrialState.kt
+++ b/android/trial/src/main/java/com/simplecityapps/trial/TrialState.kt
@@ -5,24 +5,18 @@ import kotlin.math.min
 
 sealed class TrialState {
     object Unknown : TrialState() {
-        override fun toString(): String {
-            return "Unknown"
-        }
+        override fun toString(): String = "Unknown"
     }
 
     data class Pretrial(val timeRemaining: Long) : TrialState()
 
     object Paid : TrialState() {
-        override fun toString(): String {
-            return "Paid"
-        }
+        override fun toString(): String = "Paid"
     }
 
     data class Trial(val timeRemaining: Long) : TrialState()
 
     data class Expired(val timeSince: Long) : TrialState() {
-        fun multiplier(): Float {
-            return min(1 + ((timeSince / TimeUnit.DAYS.toMillis(1)) * 0.02f), 1.5f)
-        }
+        fun multiplier(): Float = min(1 + ((timeSince / TimeUnit.DAYS.toMillis(1)) * 0.02f), 1.5f)
     }
 }
diff --git a/android/trial/src/main/java/com/simplecityapps/trial/di/TrialModule.kt b/android/trial/src/main/java/com/simplecityapps/trial/di/TrialModule.kt
index 0088962d4..759adad0e 100644
--- a/android/trial/src/main/java/com/simplecityapps/trial/di/TrialModule.kt
+++ b/android/trial/src/main/java/com/simplecityapps/trial/di/TrialModule.kt
@@ -34,50 +34,42 @@ class TrialModule {
         @ApplicationContext context: Context,
         okHttpClient: OkHttpClient,
         moshi: Moshi
-    ): Retrofit {
-        return Retrofit.Builder()
-            .baseUrl("https://api.shuttlemusicplayer.app/")
-            .addCallAdapterFactory(NetworkResultAdapterFactory(context.getSystemService()))
-            .addConverterFactory(MoshiConverterFactory.create(moshi))
-            .client(
-                okHttpClient.newBuilder().authenticator { route, response ->
-                    if (route?.address?.url?.host == "api.shuttlemusicplayer.app") {
-                        response.request
-                            .newBuilder()
-                            .header("Authorization", Credentials.basic("s2", "aEqRKgkCbqALjEm9Eg7e7Qi5"))
-                            .build()
-                    } else {
-                        response.request
-                    }
-                }.build()
-            )
-            .build()
-    }
+    ): Retrofit = Retrofit.Builder()
+        .baseUrl("https://api.shuttlemusicplayer.app/")
+        .addCallAdapterFactory(NetworkResultAdapterFactory(context.getSystemService()))
+        .addConverterFactory(MoshiConverterFactory.create(moshi))
+        .client(
+            okHttpClient.newBuilder().authenticator { route, response ->
+                if (route?.address?.url?.host == "api.shuttlemusicplayer.app") {
+                    response.request
+                        .newBuilder()
+                        .header("Authorization", Credentials.basic("s2", "aEqRKgkCbqALjEm9Eg7e7Qi5"))
+                        .build()
+                } else {
+                    response.request
+                }
+            }.build()
+        )
+        .build()
 
     @Provides
     @Singleton
     fun provideDeviceService(
         @Named("S2ApiRetrofit") retrofit: Retrofit
-    ): DeviceService {
-        return retrofit.create(DeviceService::class.java)
-    }
+    ): DeviceService = retrofit.create(DeviceService::class.java)
 
     @Provides
     @Singleton
     fun providePromoCodeService(
         @Named("S2ApiRetrofit") retrofit: Retrofit
-    ): PromoCodeService {
-        return retrofit.create(PromoCodeService::class.java)
-    }
+    ): PromoCodeService = retrofit.create(PromoCodeService::class.java)
 
     @Provides
     @Singleton
     fun provideBillingManager(
         @ApplicationContext context: Context,
         @AppCoroutineScope coroutineScope: CoroutineScope
-    ): BillingManager {
-        return BillingManager(context, coroutineScope)
-    }
+    ): BillingManager = BillingManager(context, coroutineScope)
 
     @Provides
     @Singleton
@@ -89,7 +81,5 @@ class TrialModule {
         remoteConfig: FirebaseRemoteConfig,
         billingManager: BillingManager,
         @AppCoroutineScope coroutineScope: CoroutineScope
-    ): TrialManager {
-        return TrialManager(context, moshi, deviceService, preferenceManager, remoteConfig, billingManager, coroutineScope)
-    }
+    ): TrialManager = TrialManager(context, moshi, deviceService, preferenceManager, remoteConfig, billingManager, coroutineScope)
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index eb386b1d9..49404203a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.kotlin.compose) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.google.services) apply false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dd4c2bcf7..e66f97ce6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,11 +2,11 @@
 aboutlibraries = "10.9.2"
 android-device-names = "2.0.0"
 annotation = "1.9.1"
-annotations = "4.16.0"
 appcompat = "1.7.0"
 agp = "8.8.0"
 billing-ktx = "7.1.1"
 circleindicator = "2.1.6"
+compose = "2025.01.00"
 ksp = "2.1.0-1.0.29"
 constraintlayout = "2.2.0"
 converter-moshi = "2.11.0"
@@ -33,12 +33,12 @@ kotlinx-coroutines-android = "1.8.1"
 kotlinx-coroutines-core = "1.8.1"
 kotlinx-coroutines-play-services = "1.8.1"
 kotlinx-datetime = "0.4.1"
-glide-ksp = "4.14.2"
 ktaglib = "1.4.1"
 leakcanary-android = "2.10"
 lifecycle-common-java8 = "2.8.7"
 lifecycle-extensions = "2.2.0"
 lifecycle-runtime-ktx = "2.8.7"
+lifecycle-viewmodel-compose = "2.8.7"
 logging-interceptor = "4.12.0"
 material = "1.12.0"
 media = "1.7.0"
@@ -71,11 +71,13 @@ work-runtime-ktx = "2.10.0"
 [libraries]
 androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose"}
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 androidx-core-ktx = { module = "androidx.test:core-ktx", version.ref = "core-ktx-version" }
 androidx-documentfile = { module = "androidx.documentfile:documentfile", version.ref = "documentfile" }
 androidx-drawerlayout = { module = "androidx.drawerlayout:drawerlayout", version.ref = "drawerlayout" }
 androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso-core" }
+androidx-foundation = { module = "androidx.compose.foundation:foundation" }
 androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragment-ktx" }
 androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hilt-compiler" }
 androidx-hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "hilt-work" }
@@ -83,6 +85,9 @@ androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junit-vers
 androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "lifecycle-common-java8" }
 androidx-lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "lifecycle-extensions" }
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle-runtime-ktx" }
+androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle-viewmodel-compose" }
+androidx-material = { module = "androidx.compose.material:material" }
+androidx-material3 = { module = "androidx.compose.material3:material3" }
 androidx-media = { module = "androidx.media:media", version.ref = "media" }
 androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation-ui-ktx" }
 androidx-navigation-safe-args-gradle-plugin = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "navigation-safe-args-gradle-plugin" }
@@ -96,6 +101,9 @@ androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "
 androidx-rules = { module = "androidx.test:rules", version.ref = "core-ktx-version" }
 androidx-runner = { module = "androidx.test:runner", version.ref = "runner" }
 androidx-security-crypto = { module = "androidx.security:security-crypto", version.ref = "security-crypto" }
+androidx-ui = { module = "androidx.compose.ui:ui" }
+androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
+androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" }
 androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "work-runtime-ktx" }
 billingclient-billingKtx = { module = "com.android.billingclient:billing-ktx", version.ref = "billing-ktx" }
@@ -109,8 +117,8 @@ firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "fir
 firebase-config-ktx = { module = "com.google.firebase:firebase-config-ktx" }
 firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
 glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
-glide-annotations = { module = "com.github.bumptech.glide:annotations", version.ref = "annotations" }
-glide-ksp = { module = "com.github.bumptech.glide:ksp", version.ref = "glide-ksp" }
+glide-annotations = { module = "com.github.bumptech.glide:annotations", version.ref = "glide" }
+glide-ksp = { module = "com.github.bumptech.glide:ksp", version.ref = "glide" }
 glide-okhttp3Integration = { module = "com.github.bumptech.glide:okhttp3-integration", version.ref = "okhttp3-integration" }
 google-material = { module = "com.google.android.material:material", version.ref = "material" }
 google-play-services-cast-framework = { module = "com.google.android.gms:play-services-cast-framework", version.ref = "play-services-cast-framework" }
@@ -152,9 +160,9 @@ vdurmont-semver4j = { module = "com.vdurmont:semver4j", version.ref = "semver4j"
 
 aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlibraries" }
 android-application = { id = "com.android.application", version.ref = "agp" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics" }
 google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt-android" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
diff --git a/support/scripts/lint b/support/scripts/lint
index 9d2a76864..506feb02c 100755
--- a/support/scripts/lint
+++ b/support/scripts/lint
@@ -7,4 +7,5 @@ VENDOR_DIR="${SUPPORT_DIR}/vendor"
 
 PATH="${VENDOR_DIR}/ktlint:$PATH"
 
-ktlint "$@" "**.kt" "!**/generated/**" "!**/build/**"
+ktlint -R "${VENDOR_DIR}/ktlint/ktlint-compose-0.4.22-all.jar" \
+  "$@" "**.kt" "!**/generated/**" "!**/build/**"
\ No newline at end of file
diff --git a/support/vendor/ktlint/ktlint b/support/vendor/ktlint/ktlint
index ff7e4e864..ce5cccf7a 100755
Binary files a/support/vendor/ktlint/ktlint and b/support/vendor/ktlint/ktlint differ
diff --git a/support/vendor/ktlint/ktlint-compose-0.4.22-all.jar b/support/vendor/ktlint/ktlint-compose-0.4.22-all.jar
new file mode 100644
index 000000000..bf71c7e32
Binary files /dev/null and b/support/vendor/ktlint/ktlint-compose-0.4.22-all.jar differ