diff --git a/.editorconfig b/.editorconfig
index 68f67b96db..20d412a0e5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,7 +13,9 @@ ktlint_standard_filename = disabled
 ktlint_standard_function-naming = disabled
 ktlint_standard_backing-property-naming = disabled
 ktlint_code_style = intellij_idea
+ktlint_standard_function-expression-body = disabled
 ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
+ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
 ij_java_class_count_to_use_import_on_demand = 999
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 70e48c4344..65eca435f9 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -18,7 +18,6 @@ env:
   SIGNING_KEYSTORE_GITHUB: ${{ secrets.SIGNING_KEYSTORE_GITHUB }}
   SIGNING_PROPERTIES_GITHUB: ${{ secrets.SIGNING_PROPERTIES_GITHUB }}
   GOOGLE_SERVICES: ${{ secrets.GOOGLE_SERVICES }}
-  VOICE_USE_PROPRIETARY_LIBRARIES: "true"
 
 jobs:
   test:
@@ -26,13 +25,13 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
 
       - name: Set up JDK
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'zulu'
           java-version: 17
@@ -52,7 +51,7 @@ jobs:
             app/build/reports/*.html
 
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v4
+        uses: mikepenz/action-junit-report@v5
         if: always()
         with:
           report_paths: '**/test-results/**/TEST-*.xml'
@@ -62,10 +61,10 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b80ff79f1755d06ba70441c368a6fe801f5f3a62
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb
 
       - name: Set up JDK
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'zulu'
           java-version: 17
diff --git a/.gitignore b/.gitignore
index e54e7872fc..221c49023e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ Gemfile.lock
 releases
 .transifexrc
 /plugins/.idea/workspace.xml
+/.kotlin
+/.idea/deviceManager.xml
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 115257d44c..30f6a0680a 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -17,3 +17,5 @@ kotlinScripting.xml
 /modules.xml
 /deploymentTargetSelector.xml
 /other.xml
+/studiobot.xml
+/runConfigurations.xml
diff --git a/.idea/inspectionProfiles/ktlint.xml b/.idea/inspectionProfiles/ktlint.xml
index 64d8f2eec1..e40a7a8872 100644
--- a/.idea/inspectionProfiles/ktlint.xml
+++ b/.idea/inspectionProfiles/ktlint.xml
@@ -1,12 +1,41 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="ktlint" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <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="PreviewApiLevelMustBeValid" 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="composableFile" value="true" />
@@ -14,6 +43,7 @@
     </inspection_tool>
     <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="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" />
@@ -29,6 +59,7 @@
     </inspection_tool>
     <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index dced576f14..fe1b8c164a 100755
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,15 +11,9 @@ plugins {
   id("kotlin-kapt")
   alias(libs.plugins.kotlin.serialization)
   alias(libs.plugins.anvil)
-  alias(libs.plugins.crashlytics)
-  alias(libs.plugins.googleServices) apply false
   alias(libs.plugins.playPublish)
 }
 
-if (file("google-services.json").exists()) {
-  pluginManager.apply(libs.plugins.googleServices.get().pluginId)
-}
-
 play {
   defaultToAppBundles.value(true)
   val serviceAccountJson = file("play_service_account.json")
@@ -102,6 +96,7 @@ android {
     getByName("debug") {
       isMinifyEnabled = false
       isShrinkResources = false
+      applicationIdSuffix = ".debug"
     }
     all {
       setProguardFiles(
@@ -175,11 +170,10 @@ dependencies {
   implementation(projects.cover)
   implementation(projects.documentfile)
   implementation(projects.onboarding)
+  implementation(projects.bookmark)
 
   implementation(libs.appCompat)
-  implementation(libs.recyclerView)
   implementation(libs.material)
-  implementation(libs.constraintLayout)
   implementation(libs.datastore)
   implementation(libs.appStartup)
 
@@ -189,10 +183,6 @@ dependencies {
   implementation(libs.materialDialog.input)
   implementation(libs.coil)
 
-  "proprietaryImplementation"(libs.firebase.crashlytics)
-  "proprietaryImplementation"(libs.firebase.analytics)
-  "proprietaryImplementation"(libs.firebase.remoteconfig)
-  "proprietaryImplementation"(projects.logging.crashlytics)
   "proprietaryImplementation"(projects.review.play)
   "libreImplementation"(projects.review.noop)
 
@@ -214,8 +204,7 @@ dependencies {
 
   implementation(libs.conductor)
 
-  implementation(libs.prefs.android)
-  testImplementation(libs.prefs.inMemory)
+  implementation(projects.pref)
 
   testImplementation(libs.androidX.test.runner)
   testImplementation(libs.androidX.test.junit)
diff --git a/app/src/main/kotlin/voice/app/features/MainActivity.kt b/app/src/main/kotlin/voice/app/features/MainActivity.kt
index c122e39b0d..59e39b2914 100644
--- a/app/src/main/kotlin/voice/app/features/MainActivity.kt
+++ b/app/src/main/kotlin/voice/app/features/MainActivity.kt
@@ -4,6 +4,7 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.net.toUri
 import androidx.datastore.core.DataStore
@@ -17,9 +18,9 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import voice.app.AppController
 import voice.app.features.bookOverview.EditCoverDialogController
-import voice.app.features.bookmarks.BookmarkController
 import voice.app.injection.appComponent
 import voice.app.misc.conductor.asVerticalChangeHandlerTransaction
+import voice.bookmark.BookmarkController
 import voice.common.BookId
 import voice.common.navigation.Destination
 import voice.common.navigation.NavigationCommand
@@ -57,6 +58,9 @@ class MainActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     appComponent.inject(this)
     super.onCreate(savedInstanceState)
+
+    enableEdgeToEdge()
+
     val root = ChangeHandlerFrameLayout(this)
     setContentView(root)
 
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkController.kt b/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkController.kt
deleted file mode 100644
index 2f07976d21..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkController.kt
+++ /dev/null
@@ -1,163 +0,0 @@
-package voice.app.features.bookmarks
-
-import android.os.Bundle
-import android.view.View
-import androidx.appcompat.widget.PopupMenu
-import androidx.recyclerview.widget.DefaultItemAnimator
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.snackbar.Snackbar
-import voice.app.R
-import voice.app.databinding.BookmarkBinding
-import voice.app.features.bookmarks.dialogs.AddBookmarkDialog
-import voice.app.features.bookmarks.dialogs.EditBookmarkDialog
-import voice.app.features.bookmarks.list.BookMarkHolder
-import voice.app.features.bookmarks.list.BookmarkAdapter
-import voice.app.features.bookmarks.list.BookmarkClickListener
-import voice.app.injection.appComponent
-import voice.app.misc.conductor.context
-import voice.app.mvp.MvpController
-import voice.common.BookId
-import voice.data.Bookmark
-import voice.data.Chapter
-import voice.data.getBookId
-import voice.data.putBookId
-import voice.strings.R as StringsR
-
-/**
- * Dialog for creating a bookmark
- */
-private const val NI_BOOK_ID = "ni#bookId"
-
-class BookmarkController(args: Bundle) :
-  MvpController<BookmarkView, BookmarkPresenter, BookmarkBinding>(BookmarkBinding::inflate, args),
-  BookmarkView,
-  BookmarkClickListener,
-  AddBookmarkDialog.Callback,
-  EditBookmarkDialog.Callback {
-
-  constructor(bookId: BookId) : this(
-    Bundle().apply {
-      putBookId(NI_BOOK_ID, bookId)
-    },
-  )
-
-  private val bookId = args.getBookId(NI_BOOK_ID)!!
-  private val adapter = BookmarkAdapter(this)
-
-  override fun createPresenter() = appComponent.bookmarkPresenter.apply {
-    bookId = this@BookmarkController.bookId
-  }
-
-  override fun render(
-    bookmarks: List<Bookmark>,
-    chapters: List<Chapter>,
-  ) {
-    adapter.newData(bookmarks, chapters)
-  }
-
-  override fun showBookmarkAdded(bookmark: Bookmark) {
-    val index = adapter.indexOf(bookmark)
-    binding.recycler.smoothScrollToPosition(index)
-    Snackbar.make(view!!, StringsR.string.bookmark_added, Snackbar.LENGTH_SHORT)
-      .show()
-  }
-
-  override fun onBookmarkClicked(bookmark: Bookmark) {
-    presenter.selectBookmark(bookmark.id)
-    router.popController(this)
-  }
-
-  override fun onEditBookmark(
-    id: Bookmark.Id,
-    title: String,
-  ) {
-    presenter.editBookmark(id, title)
-  }
-
-  override fun onBookmarkNameChosen(name: String) {
-    presenter.addBookmark(name)
-  }
-
-  override fun finish() {
-    router.popController(this)
-  }
-
-  override fun BookmarkBinding.onBindingCreated() {
-    setupToolbar()
-    setupList()
-
-    addBookmarkFab.setOnClickListener {
-      showAddBookmarkDialog()
-    }
-  }
-
-  override fun onDestroyView() {
-    binding.recycler.adapter = null
-  }
-
-  private fun BookmarkBinding.setupToolbar() {
-    toolbar.setNavigationIcon(R.drawable.close)
-    toolbar.setNavigationOnClickListener {
-      router.popController(this@BookmarkController)
-    }
-  }
-
-  private fun BookmarkBinding.setupList() {
-    val layoutManager = LinearLayoutManager(context)
-    recycler.layoutManager = layoutManager
-    recycler.adapter = adapter
-    val itemAnimator = recycler.itemAnimator as DefaultItemAnimator
-    itemAnimator.supportsChangeAnimations = false
-
-    val swipeCallback = object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) {
-      override fun onMove(
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder,
-        target: RecyclerView.ViewHolder,
-      ): Boolean {
-        return false
-      }
-
-      override fun onSwiped(
-        viewHolder: RecyclerView.ViewHolder,
-        direction: Int,
-      ) {
-        val boundBookmark = (viewHolder as BookMarkHolder).boundBookmark
-        boundBookmark?.let { presenter.deleteBookmark(it.id) }
-      }
-    }
-    ItemTouchHelper(swipeCallback).attachToRecyclerView(recycler)
-  }
-
-  override fun onOptionsMenuClicked(
-    bookmark: Bookmark,
-    v: View,
-  ) {
-    val popup = PopupMenu(context, v)
-    popup.menuInflater.inflate(R.menu.bookmark_popup, popup.menu)
-    popup.setOnMenuItemClickListener {
-      when (it.itemId) {
-        R.id.edit -> {
-          showEditBookmarkDialog(bookmark)
-          true
-        }
-        R.id.delete -> {
-          presenter.deleteBookmark(bookmark.id)
-          true
-        }
-        else -> false
-      }
-    }
-    popup.show()
-  }
-
-  private fun showEditBookmarkDialog(bookmark: Bookmark) {
-    EditBookmarkDialog(this, bookmark).showDialog(router)
-  }
-
-  private fun showAddBookmarkDialog() {
-    AddBookmarkDialog(this).showDialog(router)
-  }
-}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkPresenter.kt b/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkPresenter.kt
deleted file mode 100644
index 6f5370cf6f..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkPresenter.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-package voice.app.features.bookmarks
-
-import androidx.datastore.core.DataStore
-import kotlinx.coroutines.launch
-import voice.app.mvp.Presenter
-import voice.common.BookId
-import voice.common.pref.CurrentBook
-import voice.data.Bookmark
-import voice.data.Chapter
-import voice.data.repo.BookRepository
-import voice.data.repo.BookmarkRepo
-import voice.playback.PlayerController
-import voice.playback.playstate.PlayStateManager
-import javax.inject.Inject
-
-class BookmarkPresenter
-@Inject constructor(
-  @CurrentBook
-  private val currentBook: DataStore<BookId?>,
-  private val repo: BookRepository,
-  private val bookmarkRepo: BookmarkRepo,
-  private val playStateManager: PlayStateManager,
-  private val playerController: PlayerController,
-) : Presenter<BookmarkView>() {
-
-  lateinit var bookId: BookId
-  private val bookmarks = ArrayList<Bookmark>()
-  private val chapters = ArrayList<Chapter>()
-
-  override fun onAttach(view: BookmarkView) {
-    onAttachScope.launch {
-      val book = repo.get(bookId) ?: return@launch
-      bookmarks.clear()
-      bookmarks.addAll(
-        bookmarkRepo.bookmarks(book.content)
-          .sortedByDescending { it.addedAt },
-      )
-      chapters.clear()
-      chapters.addAll(book.chapters)
-
-      renderView()
-    }
-  }
-
-  fun deleteBookmark(id: Bookmark.Id) {
-    scope.launch {
-      bookmarkRepo.deleteBookmark(id)
-      bookmarks.removeAll { it.id == id }
-
-      renderView()
-    }
-  }
-
-  fun selectBookmark(id: Bookmark.Id) {
-    val bookmark = bookmarks.find { it.id == id }
-      ?: return
-
-    val wasPlaying = playStateManager.playState == PlayStateManager.PlayState.Playing
-
-    scope.launch {
-      currentBook.updateData { bookId }
-    }
-    playerController.setPosition(bookmark.time, bookmark.chapterId)
-
-    if (wasPlaying) {
-      playerController.play()
-    }
-
-    view.finish()
-  }
-
-  fun editBookmark(
-    id: Bookmark.Id,
-    newTitle: String,
-  ) {
-    scope.launch {
-      bookmarks.find { it.id == id }?.let {
-        val withNewTitle = it.copy(
-          title = newTitle,
-          setBySleepTimer = false,
-        )
-        bookmarkRepo.addBookmark(withNewTitle)
-        val index = bookmarks.indexOfFirst { bookmarkId -> bookmarkId.id == id }
-        bookmarks[index] = withNewTitle
-        if (attached) renderView()
-      }
-    }
-  }
-
-  fun addBookmark(name: String) {
-    scope.launch {
-      val book = repo.get(bookId) ?: return@launch
-      val addedBookmark = bookmarkRepo.addBookmarkAtBookPosition(
-        book = book,
-        title = name,
-        setBySleepTimer = false,
-      )
-      bookmarks.add(addedBookmark)
-      if (attached) renderView()
-    }
-  }
-
-  private fun renderView() {
-    if (attached) {
-      view.render(bookmarks, chapters)
-    }
-  }
-}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkView.kt b/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkView.kt
deleted file mode 100644
index 4e6452e23c..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkView.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package voice.app.features.bookmarks
-
-import voice.data.Bookmark
-import voice.data.Chapter
-
-/**
- * View of the bookmarks
- */
-interface BookmarkView {
-
-  fun render(
-    bookmarks: List<Bookmark>,
-    chapters: List<Chapter>,
-  )
-  fun showBookmarkAdded(bookmark: Bookmark)
-  fun finish()
-}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/AddBookmarkDialog.kt b/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/AddBookmarkDialog.kt
deleted file mode 100644
index 1a366185b1..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/AddBookmarkDialog.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package voice.app.features.bookmarks.dialogs
-
-import android.app.Dialog
-import android.os.Bundle
-import android.text.InputType
-import android.view.inputmethod.EditorInfo
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.input.getInputField
-import com.afollestad.materialdialogs.input.input
-import com.bluelinelabs.conductor.Controller
-import voice.common.conductor.DialogController
-import voice.strings.R as StringsR
-
-class AddBookmarkDialog : DialogController() {
-
-  override fun onCreateDialog(savedViewState: Bundle?): Dialog {
-    val inputType = InputType.TYPE_CLASS_TEXT or
-      InputType.TYPE_TEXT_FLAG_CAP_SENTENCES or
-      InputType.TYPE_TEXT_FLAG_AUTO_CORRECT or
-      InputType.TYPE_TEXT_FLAG_MULTI_LINE
-    val dialog = MaterialDialog(activity!!).apply {
-      title(StringsR.string.bookmark)
-      @Suppress("CheckResult")
-      input(hintRes = StringsR.string.bookmark_edit_hint, allowEmpty = true, inputType = inputType) { _, charSequence ->
-        val title = charSequence.toString()
-        val callback = targetController as Callback
-        callback.onBookmarkNameChosen(title)
-      }
-      positiveButton(StringsR.string.dialog_confirm)
-    }
-    val editText = dialog.getInputField()
-    editText.setOnEditorActionListener { _, actionId, _ ->
-      if (actionId == EditorInfo.IME_ACTION_DONE) {
-        val title = editText.text.toString()
-        val callback = targetController as Callback
-        callback.onBookmarkNameChosen(title)
-        dismissDialog()
-        true
-      } else {
-        false
-      }
-    }
-    return dialog
-  }
-
-  interface Callback {
-    fun onBookmarkNameChosen(name: String)
-  }
-
-  companion object {
-    operator fun <T> invoke(target: T) where T : Controller, T : Callback = AddBookmarkDialog().apply {
-      targetController = target
-    }
-  }
-}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/EditBookmarkDialog.kt b/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/EditBookmarkDialog.kt
deleted file mode 100644
index b8dbbd76a0..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/EditBookmarkDialog.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package voice.app.features.bookmarks.dialogs
-
-import android.app.Dialog
-import android.os.Bundle
-import android.text.InputType
-import android.view.inputmethod.EditorInfo
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.input.getInputField
-import com.afollestad.materialdialogs.input.input
-import com.bluelinelabs.conductor.Controller
-import voice.common.conductor.DialogController
-import voice.data.Bookmark
-import voice.data.getBookmarkId
-import voice.data.putBookmarkId
-import voice.strings.R as StringsR
-
-/**
- * Dialog for changing the bookmark title.
- */
-class EditBookmarkDialog(args: Bundle) : DialogController(args) {
-
-  override fun onCreateDialog(savedViewState: Bundle?): Dialog {
-    val bookmarkTitle = args.getString(NI_BOOKMARK_TITLE)
-    val bookmarkId = args.getBookmarkId(NI_BOOKMARK_ID)!!
-
-    val dialog = MaterialDialog(activity!!).apply {
-      title(StringsR.string.bookmark_edit_title)
-      val inputType = InputType.TYPE_CLASS_TEXT or
-        InputType.TYPE_TEXT_FLAG_CAP_SENTENCES or
-        InputType.TYPE_TEXT_FLAG_AUTO_CORRECT or
-        InputType.TYPE_TEXT_FLAG_MULTI_LINE
-      @Suppress("CheckResult")
-      input(
-        hintRes = StringsR.string.bookmark_edit_hint,
-        prefill = bookmarkTitle,
-        allowEmpty = false,
-        inputType = inputType,
-      ) { _, charSequence ->
-        val callback = targetController as Callback
-        val newTitle = charSequence.toString()
-        callback.onEditBookmark(bookmarkId, newTitle)
-      }
-      positiveButton(StringsR.string.dialog_confirm)
-    }
-    val editText = dialog.getInputField()
-    editText.setOnEditorActionListener { _, actionId, _ ->
-      if (actionId == EditorInfo.IME_ACTION_DONE) {
-        val callback = targetController as Callback
-        val newTitle = editText.text.toString()
-        callback.onEditBookmark(bookmarkId, newTitle)
-        dismissDialog()
-        true
-      } else {
-        false
-      }
-    }
-    return dialog
-  }
-
-  interface Callback {
-    fun onEditBookmark(
-      id: Bookmark.Id,
-      title: String,
-    )
-  }
-
-  companion object {
-
-    private const val NI_BOOKMARK_ID = "ni#bookMarkId"
-    private const val NI_BOOKMARK_TITLE = "ni#bookmarkTitle"
-
-    operator fun <T> invoke(
-      target: T,
-      bookmark: Bookmark,
-    ): EditBookmarkDialog where T : Controller, T : Callback {
-      val args = Bundle().apply {
-        putBookmarkId(NI_BOOKMARK_ID, bookmark.id)
-        putString(NI_BOOKMARK_TITLE, bookmark.title)
-      }
-      return EditBookmarkDialog(args).apply {
-        targetController = target
-      }
-    }
-  }
-}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookMarkHolder.kt b/app/src/main/kotlin/voice/app/features/bookmarks/list/BookMarkHolder.kt
deleted file mode 100644
index fd0af943ac..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookMarkHolder.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package voice.app.features.bookmarks.list
-
-import android.text.format.DateUtils
-import android.view.ViewGroup
-import voice.app.R
-import voice.app.databinding.BookmarkRowLayoutBinding
-import voice.app.uitools.ViewBindingHolder
-import voice.common.formatTime
-import voice.data.Bookmark
-import voice.data.Chapter
-import voice.data.markForPosition
-import java.time.Instant
-import java.time.temporal.ChronoUnit
-import kotlin.time.Duration.Companion.days
-import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.minutes
-import voice.strings.R as StringsR
-
-class BookMarkHolder(
-  parent: ViewGroup,
-  private val listener: BookmarkClickListener,
-) : ViewBindingHolder<BookmarkRowLayoutBinding>(parent, BookmarkRowLayoutBinding::inflate) {
-
-  var boundBookmark: Bookmark? = null
-    private set
-
-  init {
-    binding.edit.setOnClickListener { view ->
-      boundBookmark?.let {
-        listener.onOptionsMenuClicked(it, view)
-      }
-    }
-    itemView.setOnClickListener {
-      boundBookmark?.let { bookmark ->
-        listener.onBookmarkClicked(bookmark)
-      }
-    }
-  }
-
-  fun bind(
-    bookmark: Bookmark,
-    chapters: List<Chapter>,
-  ) {
-    boundBookmark = bookmark
-    val currentChapter = chapters.single { it.id == bookmark.chapterId }
-    val bookmarkTitle = bookmark.title
-    binding.title.text = when {
-      bookmark.setBySleepTimer -> {
-        val justNowThreshold = 1.minutes
-        if (ChronoUnit.MILLIS.between(bookmark.addedAt, Instant.now()).milliseconds < justNowThreshold) {
-          itemView.context.getString(StringsR.string.bookmark_just_now)
-        } else {
-          DateUtils.getRelativeDateTimeString(
-            itemView.context,
-            bookmark.addedAt.toEpochMilli(),
-            justNowThreshold.inWholeMilliseconds,
-            2.days.inWholeMilliseconds,
-            0,
-          )
-        }
-      }
-      !bookmarkTitle.isNullOrEmpty() -> bookmarkTitle
-      else -> currentChapter.markForPosition(bookmark.time).name
-    }
-    binding.title.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, if (bookmark.setBySleepTimer) R.drawable.ic_sleep else 0, 0)
-    binding.time.text = formatTime(bookmark.time)
-  }
-}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkAdapter.kt b/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkAdapter.kt
deleted file mode 100644
index 43d5a3bb97..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkAdapter.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package voice.app.features.bookmarks.list
-
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import voice.data.Bookmark
-import voice.data.Chapter
-
-/**
- * Adapter for displaying a list of bookmarks.
- */
-class BookmarkAdapter(
-  private val listener: BookmarkClickListener,
-) : RecyclerView.Adapter<BookMarkHolder>() {
-
-  private val bookmarks = ArrayList<Bookmark>()
-  private val chapters = ArrayList<Chapter>()
-
-  fun newData(
-    bookmarks: List<Bookmark>,
-    chapters: List<Chapter>,
-  ) {
-    this.chapters.clear()
-    this.chapters.addAll(chapters)
-
-    val newBookmarks = bookmarks
-    val callback = BookmarkDiffUtilCallback(this.bookmarks, newBookmarks)
-    val diff = DiffUtil.calculateDiff(callback)
-    this.bookmarks.clear()
-    this.bookmarks.addAll(newBookmarks)
-    diff.dispatchUpdatesTo(this)
-  }
-
-  fun indexOf(bookmark: Bookmark) = bookmarks.indexOf(bookmark)
-
-  override fun onCreateViewHolder(
-    parent: ViewGroup,
-    viewType: Int,
-  ) = BookMarkHolder(parent, listener)
-
-  override fun onBindViewHolder(
-    holder: BookMarkHolder,
-    position: Int,
-  ) {
-    val bookMark = bookmarks[position]
-    holder.bind(bookMark, chapters)
-  }
-
-  override fun getItemCount(): Int = bookmarks.size
-}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkClickListener.kt b/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkClickListener.kt
deleted file mode 100644
index ae74e0c002..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkClickListener.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package voice.app.features.bookmarks.list
-
-import voice.data.Bookmark
-
-interface BookmarkClickListener {
-
-  fun onOptionsMenuClicked(
-    bookmark: Bookmark,
-    v: android.view.View,
-  )
-  fun onBookmarkClicked(bookmark: Bookmark)
-}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkDiffUtilCallback.kt b/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkDiffUtilCallback.kt
deleted file mode 100644
index c45f933fda..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkDiffUtilCallback.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package voice.app.features.bookmarks.list
-
-import androidx.recyclerview.widget.DiffUtil
-import voice.data.Bookmark
-
-/**
- * Calculates the diff between two bookmark lists.
- */
-class BookmarkDiffUtilCallback(
-  private val oldItems: List<Bookmark>,
-  private val newItems: List<Bookmark>,
-) : DiffUtil.Callback() {
-
-  override fun areItemsTheSame(
-    oldItemPosition: Int,
-    newItemPosition: Int,
-  ): Boolean {
-    return oldItems[oldItemPosition] == newItems[newItemPosition]
-  }
-
-  override fun getOldListSize() = oldItems.size
-
-  override fun getNewListSize() = newItems.size
-
-  override fun areContentsTheSame(
-    oldItemPosition: Int,
-    newItemPosition: Int,
-  ) = areItemsTheSame(oldItemPosition, newItemPosition)
-}
diff --git a/app/src/main/kotlin/voice/app/injection/App.kt b/app/src/main/kotlin/voice/app/injection/App.kt
index 49ca8596a8..748ece431f 100644
--- a/app/src/main/kotlin/voice/app/injection/App.kt
+++ b/app/src/main/kotlin/voice/app/injection/App.kt
@@ -6,7 +6,6 @@ import androidx.appcompat.app.AppCompatDelegate
 import coil.Coil
 import coil.ImageLoader
 import com.google.android.material.color.DynamicColors
-import de.paulwoitaschek.flowpref.Pref
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
@@ -15,6 +14,7 @@ import voice.app.scanner.MediaScanTrigger
 import voice.common.DARK_THEME_SETTABLE
 import voice.common.pref.PrefKeys
 import voice.common.rootComponent
+import voice.pref.Pref
 import javax.inject.Inject
 import javax.inject.Named
 
diff --git a/app/src/main/kotlin/voice/app/injection/AppComponent.kt b/app/src/main/kotlin/voice/app/injection/AppComponent.kt
index 04ecce888a..00b7e93410 100644
--- a/app/src/main/kotlin/voice/app/injection/AppComponent.kt
+++ b/app/src/main/kotlin/voice/app/injection/AppComponent.kt
@@ -1,14 +1,12 @@
 package voice.app.injection
 
 import android.app.Application
-import android.content.Context
 import com.squareup.anvil.annotations.MergeComponent
 import dagger.BindsInstance
 import dagger.Component
 import voice.app.AppController
 import voice.app.features.MainActivity
 import voice.app.features.bookOverview.EditCoverDialogController
-import voice.app.features.bookmarks.BookmarkPresenter
 import voice.app.features.widget.BaseWidgetProvider
 import voice.common.AppScope
 import javax.inject.Singleton
@@ -19,9 +17,6 @@ import javax.inject.Singleton
 )
 interface AppComponent {
 
-  val bookmarkPresenter: BookmarkPresenter
-  val context: Context
-
   fun inject(target: App)
   fun inject(target: BaseWidgetProvider)
   fun inject(target: AppController)
diff --git a/app/src/main/kotlin/voice/app/injection/PrefsModule.kt b/app/src/main/kotlin/voice/app/injection/PrefsModule.kt
index 6980d0eaed..ce6dfedbef 100644
--- a/app/src/main/kotlin/voice/app/injection/PrefsModule.kt
+++ b/app/src/main/kotlin/voice/app/injection/PrefsModule.kt
@@ -7,12 +7,6 @@ import androidx.datastore.core.DataStore
 import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
-import de.paulwoitaschek.flowpref.Pref
-import de.paulwoitaschek.flowpref.android.AndroidPreferences
-import de.paulwoitaschek.flowpref.android.boolean
-import de.paulwoitaschek.flowpref.android.enum
-import de.paulwoitaschek.flowpref.android.int
-import de.paulwoitaschek.flowpref.android.stringSet
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.builtins.serializer
@@ -31,6 +25,12 @@ import voice.common.pref.RootAudiobookFolders
 import voice.common.pref.SingleFileAudiobookFolders
 import voice.common.pref.SingleFolderAudiobookFolders
 import voice.datastore.VoiceDataStoreFactory
+import voice.pref.AndroidPreferences
+import voice.pref.Pref
+import voice.pref.boolean
+import voice.pref.enum
+import voice.pref.int
+import voice.pref.stringSet
 import javax.inject.Named
 import javax.inject.Singleton
 
diff --git a/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt b/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt
index 4d58dda952..17c06a0b56 100644
--- a/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt
+++ b/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt
@@ -7,9 +7,7 @@ import voice.playback.notification.MainActivityIntentProvider
 import javax.inject.Inject
 
 class MainActivityIntentProviderImpl
-@Inject constructor(
-  private val context: Context,
-) : MainActivityIntentProvider {
+@Inject constructor(private val context: Context) : MainActivityIntentProvider {
 
   override fun toCurrentBook(): PendingIntent {
     val intent = MainActivity.goToBookIntent(context)
diff --git a/app/src/main/kotlin/voice/app/mvp/MvpController.kt b/app/src/main/kotlin/voice/app/mvp/MvpController.kt
deleted file mode 100644
index cdb770c104..0000000000
--- a/app/src/main/kotlin/voice/app/mvp/MvpController.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-package voice.app.mvp
-
-import android.os.Bundle
-import android.view.View
-import androidx.viewbinding.ViewBinding
-import com.bluelinelabs.conductor.Controller
-import voice.common.checkMainThread
-import voice.common.conductor.InflateBinding
-import voice.common.conductor.ViewBindingController
-
-/**
- * Base controller that provides a convenient way for binding a view to a presenter
- */
-abstract class MvpController<V : Any, out P, B : ViewBinding>(
-  inflateBinding: InflateBinding<B>,
-  args: Bundle = Bundle(),
-) : ViewBindingController<B>(args, inflateBinding) where P : Presenter<V> {
-
-  private var internalPresenter: P? = null
-  val presenter: P
-    get() {
-      checkMainThread()
-      check(!isDestroyed) { "Must not call presenter when destroyed!" }
-      if (internalPresenter == null) {
-        internalPresenter = createPresenter()
-      }
-      return internalPresenter!!
-    }
-
-  init {
-    addLifecycleListener(
-      object : LifecycleListener() {
-
-        override fun onRestoreInstanceState(
-          controller: Controller,
-          savedInstanceState: Bundle,
-        ) {
-          presenter.onRestore(savedInstanceState)
-        }
-
-        override fun postAttach(
-          controller: Controller,
-          view: View,
-        ) {
-          presenter.attach(provideView())
-        }
-
-        override fun preDetach(
-          controller: Controller,
-          view: View,
-        ) {
-          presenter.detach()
-        }
-
-        override fun onSaveInstanceState(
-          controller: Controller,
-          outState: Bundle,
-        ) {
-          presenter.onSave(outState)
-        }
-
-        override fun postDestroy(controller: Controller) {
-          internalPresenter = null
-        }
-      },
-    )
-  }
-
-  @Suppress("UNCHECKED_CAST")
-  open fun provideView(): V = this as V
-
-  abstract fun createPresenter(): P
-}
diff --git a/app/src/main/kotlin/voice/app/mvp/Presenter.kt b/app/src/main/kotlin/voice/app/mvp/Presenter.kt
deleted file mode 100644
index 177e520655..0000000000
--- a/app/src/main/kotlin/voice/app/mvp/Presenter.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package voice.app.mvp
-
-import android.os.Bundle
-import androidx.annotation.CallSuper
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.cancel
-import voice.common.checkMainThread
-import voice.logging.core.Logger
-
-abstract class Presenter<V : Any> {
-
-  protected val scope = MainScope()
-  protected var onAttachScope = MainScope().also { it.cancel() }
-
-  val view: V
-    get() {
-      checkMainThread()
-      return internalView!!
-    }
-  val attached: Boolean
-    get() {
-      checkMainThread()
-      return internalView != null
-    }
-
-  private var internalView: V? = null
-
-  @CallSuper
-  open fun onRestore(savedState: Bundle) {
-    checkMainThread()
-  }
-
-  fun attach(view: V) {
-    Logger.i("attach $view")
-    checkMainThread()
-    check(internalView == null) {
-      "$internalView already bound."
-    }
-
-    internalView = view
-    onAttachScope = MainScope()
-    onAttach(view)
-  }
-
-  fun detach() {
-    Logger.i("detach $internalView")
-    checkMainThread()
-    onAttachScope.cancel()
-    internalView = null
-  }
-
-  @CallSuper
-  open fun onSave(state: Bundle) {
-    checkMainThread()
-  }
-
-  open fun onAttach(view: V) {}
-}
diff --git a/app/src/main/kotlin/voice/app/uitools/CropTransformation.kt b/app/src/main/kotlin/voice/app/uitools/CropTransformation.kt
index 2a2e0e4f42..281636c5d2 100644
--- a/app/src/main/kotlin/voice/app/uitools/CropTransformation.kt
+++ b/app/src/main/kotlin/voice/app/uitools/CropTransformation.kt
@@ -7,8 +7,10 @@ import coil.size.Size
 import coil.transform.Transformation
 import voice.app.features.imagepicker.CropOverlay
 
-class CropTransformation(cropOverlay: CropOverlay, private val cropSource: ImageView) :
-  Transformation {
+class CropTransformation(
+  cropOverlay: CropOverlay,
+  private val cropSource: ImageView,
+) : Transformation {
 
   private val rect = cropOverlay.selectedRect
 
diff --git a/app/src/main/kotlin/voice/app/uitools/ViewBindingHolder.kt b/app/src/main/kotlin/voice/app/uitools/ViewBindingHolder.kt
deleted file mode 100644
index cf876786e1..0000000000
--- a/app/src/main/kotlin/voice/app/uitools/ViewBindingHolder.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package voice.app.uitools
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewbinding.ViewBinding
-import voice.common.conductor.InflateBinding
-
-abstract class ViewBindingHolder<B : ViewBinding>(val binding: B) : RecyclerView.ViewHolder(binding.root) {
-
-  constructor(parent: ViewGroup, inflateBinding: InflateBinding<B>) : this(
-    inflateBinding(LayoutInflater.from(parent.context), parent, false),
-  )
-}
diff --git a/app/src/main/res/layout/bookmark.xml b/app/src/main/res/layout/bookmark.xml
deleted file mode 100644
index b5b52fdde9..0000000000
--- a/app/src/main/res/layout/bookmark.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:background="?android:windowBackground"
-  android:focusableInTouchMode="true"
-  android:orientation="vertical">
-
-  <com.google.android.material.appbar.MaterialToolbar
-    android:id="@+id/toolbar"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    app:title="@string/bookmark" />
-
-  <!-- 88 dp bottom padding is the sum of the FAB + vertical margins.
-  that way, the controls for the last bookmark are always visible -->
-  <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/recycler"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginTop="?attr/actionBarSize"
-    android:clipToPadding="false"
-    android:paddingBottom="88dp" />
-
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    android:id="@+id/addBookmarkFab"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="end|bottom"
-    android:layout_margin="16dp"
-    android:contentDescription="@string/bookmark"
-    android:src="@drawable/plus" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/bookmark_row_layout.xml b/app/src/main/res/layout/bookmark_row_layout.xml
deleted file mode 100644
index 1fa494cad7..0000000000
--- a/app/src/main/res/layout/bookmark_row_layout.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:paddingTop="8dp"
-  android:paddingBottom="8dp"
-  android:background="?android:attr/windowBackground"
-  android:foreground="?attr/selectableItemBackground"
-  android:descendantFocusability="blocksDescendants"
-  android:gravity="center_vertical"
-  android:orientation="horizontal"
-  tools:ignore="Overdraw">
-
-  <ImageView
-    android:id="@+id/edit"
-    android:layout_width="40dp"
-    android:scaleType="center"
-    android:layout_height="40dp"
-    android:layout_alignParentEnd="true"
-    android:contentDescription="@string/popup_edit"
-    android:src="@drawable/ic_more_vert"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintTop_toTopOf="parent" />
-
-  <TextView
-    android:id="@+id/title"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="16dp"
-    android:layout_marginEnd="16dp"
-    android:drawablePadding="4dp"
-    android:textAppearance="?textAppearanceBodyMedium"
-    app:layout_constrainedWidth="true"
-    app:layout_constraintEnd_toStartOf="@+id/edit"
-    app:layout_constraintHorizontal_bias="0"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    tools:drawableEnd="@drawable/ic_sleep"
-    tools:text="Fictive bookmark title that might be too long to fit" />
-
-  <TextView
-    android:id="@+id/time"
-    android:layout_width="0dp"
-    android:layout_marginStart="16dp"
-    android:layout_height="wrap_content"
-    android:layout_marginEnd="16dp"
-    android:ellipsize="end"
-    android:textAppearance="?textAppearanceBodySmall"
-    app:layout_constraintStart_toStartOf="parent"
-    android:layout_marginTop="8dp"
-    app:layout_constraintEnd_toStartOf="@+id/edit"
-    app:layout_constraintTop_toBottomOf="@+id/title"
-    tools:text="10:10:10 / 12:12:12" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/bookmark_popup.xml b/app/src/main/res/menu/bookmark_popup.xml
deleted file mode 100644
index 674bb24547..0000000000
--- a/app/src/main/res/menu/bookmark_popup.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:id="@+id/edit"
-    android:title="@string/popup_edit" />
-
-  <item
-    android:id="@+id/delete"
-    android:title="@string/remove" />
-</menu>
diff --git a/app/src/test/kotlin/voice/app/mvp/PresenterTest.kt b/app/src/test/kotlin/voice/app/mvp/PresenterTest.kt
deleted file mode 100644
index 78f9012bf4..0000000000
--- a/app/src/test/kotlin/voice/app/mvp/PresenterTest.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package voice.app.mvp
-
-import io.kotest.matchers.booleans.shouldBeFalse
-import io.kotest.matchers.booleans.shouldBeTrue
-import org.junit.Before
-import org.junit.Test
-
-class PresenterTest {
-
-  private lateinit var presenter: Presenter<View>
-
-  @Before
-  fun setUp() {
-    presenter = object : Presenter<View>() {}
-  }
-
-  @Test
-  fun attached() {
-    presenter.attached.shouldBeFalse()
-    presenter.attach(View)
-    presenter.attached.shouldBeTrue()
-    presenter.detach()
-    presenter.attached.shouldBeFalse()
-  }
-
-  private object View
-}
diff --git a/bookOverview/build.gradle.kts b/bookOverview/build.gradle.kts
index 5960900419..4aadaf3195 100644
--- a/bookOverview/build.gradle.kts
+++ b/bookOverview/build.gradle.kts
@@ -16,12 +16,12 @@ dependencies {
   implementation(projects.data)
   implementation(projects.sleepTimer)
   implementation(projects.scanner)
+  implementation(projects.pref)
 
   implementation(libs.lifecycle)
   implementation(libs.documentFile)
   implementation(libs.dagger.core)
   implementation(libs.datastore)
-  implementation(libs.prefs.core)
 
   testImplementation(libs.bundles.testing.jvm)
 }
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetContent.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetContent.kt
index 476200f7f4..a57f2131ea 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetContent.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetContent.kt
@@ -15,13 +15,13 @@ import androidx.compose.ui.unit.dp
 @Composable
 internal fun BottomSheetContent(
   state: EditBookBottomSheetState,
-  onItemClicked: (BottomSheetItem) -> Unit,
+  onItemClick: (BottomSheetItem) -> Unit,
 ) {
   Column {
     state.items.forEach { item ->
       ListItem(
         modifier = Modifier.clickable {
-          onItemClicked(item)
+          onItemClick(item)
         },
         headlineContent = {
           Text(text = stringResource(item.titleRes))
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetItemViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetItemViewModel.kt
index d3894aa662..3686ef6e57 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetItemViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetItemViewModel.kt
@@ -5,7 +5,7 @@ import voice.common.BookId
 interface BottomSheetItemViewModel {
 
   suspend fun items(bookId: BookId): List<BottomSheetItem>
-  suspend fun onItemClicked(
+  suspend fun onItemClick(
     bookId: BookId,
     item: BottomSheetItem,
   )
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
index 5da211230b..56e7b59d92 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
@@ -11,9 +11,7 @@ import javax.inject.Inject
 
 @BookOverviewScope
 class BottomSheetViewModel
-@Inject constructor(
-  private val viewModels: Set<@JvmSuppressWildcards BottomSheetItemViewModel>,
-) {
+@Inject constructor(private val viewModels: Set<@JvmSuppressWildcards BottomSheetItemViewModel>) {
 
   private val scope = MainScope()
 
@@ -36,7 +34,7 @@ class BottomSheetViewModel
     val bookId = bookId ?: return
     scope.launch {
       viewModels.forEach {
-        it.onItemClicked(bookId, item)
+        it.onItemClick(bookId, item)
       }
     }
   }
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt
index 37275eaf03..ae6b556650 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt
@@ -12,9 +12,7 @@ import androidx.compose.material.icons.outlined.Title
 import androidx.compose.ui.graphics.vector.ImageVector
 import voice.strings.R as StringsR
 
-internal data class EditBookBottomSheetState(
-  val items: List<BottomSheetItem>,
-)
+internal data class EditBookBottomSheetState(val items: List<BottomSheetItem>)
 
 enum class BottomSheetItem(
   @StringRes val titleRes: Int,
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookDialog.kt b/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookDialog.kt
index 737e86adcc..e56401cbbe 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookDialog.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookDialog.kt
@@ -26,7 +26,7 @@ internal fun DeleteBookDialog(
   viewState: DeleteBookViewState,
   onDismiss: () -> Unit,
   onConfirmDeletion: () -> Unit,
-  onDeleteCheckBoxChecked: (Boolean) -> Unit,
+  onDeleteCheckBoxCheck: (Boolean) -> Unit,
 ) {
   AlertDialog(
     onDismissRequest = onDismiss,
@@ -65,12 +65,12 @@ internal fun DeleteBookDialog(
             .padding(top = 8.dp)
             .fillMaxWidth()
             .clickable {
-              onDeleteCheckBoxChecked(!viewState.deleteCheckBoxChecked)
+              onDeleteCheckBoxCheck(!viewState.deleteCheckBoxChecked)
             },
         ) {
           Checkbox(
             checked = viewState.deleteCheckBoxChecked,
-            onCheckedChange = onDeleteCheckBoxChecked,
+            onCheckedChange = onDeleteCheckBoxCheck,
           )
           Text(stringResource(id = StringsR.string.delete_book_dialog_deletion_confirmation))
         }
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookViewModel.kt
index cc30b9a017..e49d5d65f0 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookViewModel.kt
@@ -36,7 +36,7 @@ constructor(
     return listOf(BottomSheetItem.DeleteBook)
   }
 
-  override suspend fun onItemClicked(
+  override suspend fun onItemClick(
     bookId: BookId,
     item: BottomSheetItem,
   ) {
@@ -62,7 +62,7 @@ constructor(
     _state.value = null
   }
 
-  internal fun onDeleteCheckBoxChecked(checked: Boolean) {
+  internal fun onDeleteCheckBoxCheck(checked: Boolean) {
     _state.value = _state.value?.copy(deleteCheckBoxChecked = checked)
   }
 
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
index d5bb5dc9f5..0bce415e07 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
@@ -18,9 +18,7 @@ import javax.inject.Inject
 )
 class EditBookCategoryViewModel
 @Inject
-constructor(
-  private val repo: BookRepository,
-) : BottomSheetItemViewModel {
+constructor(private val repo: BookRepository) : BottomSheetItemViewModel {
 
   override suspend fun items(bookId: BookId): List<BottomSheetItem> {
     val book = repo.get(bookId) ?: return emptyList()
@@ -40,7 +38,7 @@ constructor(
     }
   }
 
-  override suspend fun onItemClicked(
+  override suspend fun onItemClick(
     bookId: BookId,
     item: BottomSheetItem,
   ) {
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
index 8f3b7a2bb8..e9fa900e8a 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
@@ -19,9 +19,7 @@ import javax.inject.Inject
 )
 class EditBookTitleViewModel
 @Inject
-constructor(
-  private val repo: BookRepository,
-) : BottomSheetItemViewModel {
+constructor(private val repo: BookRepository) : BottomSheetItemViewModel {
 
   private val scope = MainScope()
 
@@ -32,7 +30,7 @@ constructor(
     return listOf(BottomSheetItem.Title)
   }
 
-  override suspend fun onItemClicked(
+  override suspend fun onItemClick(
     bookId: BookId,
     item: BottomSheetItem,
   ) {
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
index 308a04ce99..62aa721061 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
@@ -14,9 +14,7 @@ import javax.inject.Inject
 @ContributesMultibinding(BookOverviewScope::class, boundType = BottomSheetItemViewModel::class)
 class FileCoverViewModel
 @Inject
-constructor(
-  private val navigator: Navigator,
-) : BottomSheetItemViewModel {
+constructor(private val navigator: Navigator) : BottomSheetItemViewModel {
 
   private var bookId: BookId? = null
 
@@ -24,7 +22,7 @@ constructor(
     return listOf(BottomSheetItem.FileCover)
   }
 
-  override suspend fun onItemClicked(
+  override suspend fun onItemClick(
     bookId: BookId,
     item: BottomSheetItem,
   ) {
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
index 9accc6bf2f..3f22f57cee 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
@@ -13,15 +13,13 @@ import javax.inject.Inject
 @ContributesMultibinding(BookOverviewScope::class)
 class InternetCoverViewModel
 @Inject
-constructor(
-  private val navigator: Navigator,
-) : BottomSheetItemViewModel {
+constructor(private val navigator: Navigator) : BottomSheetItemViewModel {
 
   override suspend fun items(bookId: BookId): List<BottomSheetItem> {
     return listOf(BottomSheetItem.InternetCover)
   }
 
-  override suspend fun onItemClicked(
+  override suspend fun onItemClick(
     bookId: BookId,
     item: BottomSheetItem,
   ) {
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt
index 652d78e3a4..d307513306 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt
@@ -13,7 +13,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.core.net.toUri
 import androidx.datastore.core.DataStore
-import de.paulwoitaschek.flowpref.Pref
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
@@ -37,6 +36,7 @@ import voice.data.repo.internals.dao.LegacyBookDao
 import voice.data.repo.internals.dao.RecentBookSearchDao
 import voice.playback.PlayerController
 import voice.playback.playstate.PlayStateManager
+import voice.pref.Pref
 import voice.search.BookSearch
 import javax.inject.Inject
 import javax.inject.Named
@@ -237,7 +237,7 @@ constructor(
     playerController.playPause()
   }
 
-  fun onPermissionBugCardClicked() {
+  fun onPermissionBugCardClick() {
     if (Build.VERSION.SDK_INT >= 30) {
       navigator.goTo(
         Destination.Activity(
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/search/BookSearchScreen.kt b/bookOverview/src/main/kotlin/voice/bookOverview/search/BookSearchScreen.kt
index f5dfd0bb1e..7b0dff0d94 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/search/BookSearchScreen.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/search/BookSearchScreen.kt
@@ -16,9 +16,11 @@ import androidx.compose.material.icons.outlined.History
 import androidx.compose.material.icons.outlined.SentimentSatisfied
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import voice.bookOverview.overview.BookOverviewLayoutMode
@@ -46,6 +48,7 @@ internal fun BookSearchContent(
           ListItem(
             modifier = Modifier.clickable { onQueryChange(query) },
             headlineContent = { Text(query) },
+            colors = ListItemDefaults.colors(containerColor = Color.Transparent),
             leadingContent = {
               Icon(
                 imageVector = Icons.Outlined.History,
@@ -58,6 +61,7 @@ internal fun BookSearchContent(
           ListItem(
             modifier = Modifier.clickable { onQueryChange(author) },
             headlineContent = { Text(author) },
+            colors = ListItemDefaults.colors(containerColor = Color.Transparent),
             leadingContent = {
               Icon(
                 imageVector = Icons.Outlined.SentimentSatisfied,
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt
index a8745c41ba..3ce0a8d30a 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt
@@ -3,6 +3,8 @@ package voice.bookOverview.views
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
@@ -17,13 +19,13 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.coroutines.launch
 import voice.bookOverview.bottomSheet.BottomSheetContent
@@ -100,7 +102,7 @@ fun BookOverviewScreen(modifier: Modifier = Modifier) {
     onSearchActiveChange = bookOverviewViewModel::onSearchActiveChange,
     onSearchQueryChange = bookOverviewViewModel::onSearchQueryChange,
     onSearchBookClick = bookOverviewViewModel::onSearchBookClick,
-    onPermissionBugCardClicked = bookOverviewViewModel::onPermissionBugCardClicked,
+    onPermissionBugCardClick = bookOverviewViewModel::onPermissionBugCardClick,
   )
   val deleteBookViewState = deleteBookViewModel.state.value
   if (deleteBookViewState != null) {
@@ -108,7 +110,7 @@ fun BookOverviewScreen(modifier: Modifier = Modifier) {
       viewState = deleteBookViewState,
       onDismiss = deleteBookViewModel::onDismiss,
       onConfirmDeletion = deleteBookViewModel::onConfirmDeletion,
-      onDeleteCheckBoxChecked = deleteBookViewModel::onDeleteCheckBoxChecked,
+      onDeleteCheckBoxCheck = deleteBookViewModel::onDeleteCheckBoxCheck,
     )
   }
   val editBookTitleState = editBookTitleViewModel.state.value
@@ -129,7 +131,7 @@ fun BookOverviewScreen(modifier: Modifier = Modifier) {
       content = {
         BottomSheetContent(
           state = bottomSheetViewModel.state.value,
-          onItemClicked = { item ->
+          onItemClick = { item ->
             if (item == BottomSheetItem.FileCover) {
               getContentLauncher.launch("image/*")
             }
@@ -161,7 +163,7 @@ internal fun BookOverview(
   onSearchActiveChange: (Boolean) -> Unit,
   onSearchQueryChange: (String) -> Unit,
   onSearchBookClick: (BookId) -> Unit,
-  onPermissionBugCardClicked: () -> Unit,
+  onPermissionBugCardClick: () -> Unit,
   modifier: Modifier = Modifier,
 ) {
   val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
@@ -189,8 +191,13 @@ internal fun BookOverview(
         )
       }
     },
+    contentWindowInsets = WindowInsets(0, 0, 0, 0),
   ) { contentPadding ->
-    Box(Modifier.padding(contentPadding)) {
+    Box(
+      Modifier
+        .padding(contentPadding)
+        .consumeWindowInsets(contentPadding),
+    ) {
       when (viewState.layoutMode) {
         BookOverviewLayoutMode.List -> {
           ListBooks(
@@ -198,7 +205,7 @@ internal fun BookOverview(
             onBookClick = onBookClick,
             onBookLongClick = onBookLongClick,
             showPermissionBugCard = viewState.showStoragePermissionBugCard,
-            onPermissionBugCardClicked = onPermissionBugCardClicked,
+            onPermissionBugCardClick = onPermissionBugCardClick,
           )
         }
         BookOverviewLayoutMode.Grid -> {
@@ -207,7 +214,7 @@ internal fun BookOverview(
             onBookClick = onBookClick,
             onBookLongClick = onBookLongClick,
             showPermissionBugCard = viewState.showStoragePermissionBugCard,
-            onPermissionBugCardClicked = onPermissionBugCardClicked,
+            onPermissionBugCardClick = onPermissionBugCardClick,
           )
         }
       }
@@ -235,7 +242,7 @@ fun BookOverviewPreview(
       onSearchActiveChange = {},
       onSearchQueryChange = {},
       onSearchBookClick = {},
-      onPermissionBugCardClicked = {},
+      onPermissionBugCardClick = {},
     )
   }
 }
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt
index de5586aac6..89a3332be7 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt
@@ -1,16 +1,22 @@
 package voice.bookOverview.views
 
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Card
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -28,7 +34,6 @@ import kotlinx.collections.immutable.ImmutableMap
 import voice.bookOverview.overview.BookOverviewCategory
 import voice.bookOverview.overview.BookOverviewItemViewState
 import voice.common.BookId
-import voice.common.compose.LongClickableCard
 import kotlin.math.roundToInt
 import voice.common.R as CommonR
 
@@ -38,7 +43,7 @@ internal fun GridBooks(
   onBookClick: (BookId) -> Unit,
   onBookLongClick: (BookId) -> Unit,
   showPermissionBugCard: Boolean,
-  onPermissionBugCardClicked: () -> Unit,
+  onPermissionBugCardClick: () -> Unit,
 ) {
   val cellCount = gridColumnCount()
   LazyVerticalGrid(
@@ -51,7 +56,7 @@ internal fun GridBooks(
       item(
         span = { GridItemSpan(maxLineSpan) },
       ) {
-        PermissionBugCard(onPermissionBugCardClicked)
+        PermissionBugCard(onPermissionBugCardClick)
       }
     }
     books.forEach { (category, books) ->
@@ -77,6 +82,11 @@ internal fun GridBooks(
           onBookLongClick = onBookLongClick,
         )
       }
+      item(
+        span = { GridItemSpan(maxLineSpan) },
+      ) {
+        Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
+      }
     }
   }
 }
@@ -87,14 +97,17 @@ internal fun GridBook(
   onBookClick: (BookId) -> Unit,
   onBookLongClick: (BookId) -> Unit,
 ) {
-  LongClickableCard(
-    onClick = {
-      onBookClick(book.id)
-    },
-    onLongClick = {
-      onBookLongClick(book.id)
-    },
-    modifier = Modifier.fillMaxWidth(),
+  Card(
+    modifier = Modifier
+      .fillMaxWidth()
+      .combinedClickable(
+        onClick = {
+          onBookClick(book.id)
+        },
+        onLongClick = {
+          onBookLongClick(book.id)
+        },
+      ),
   ) {
     Column {
       AsyncImage(
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt
index 5951d55da5..32c327d2ed 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt
@@ -1,16 +1,22 @@
 package voice.bookOverview.views
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Card
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -29,7 +35,6 @@ import voice.bookOverview.overview.BookOverviewCategory
 import voice.bookOverview.overview.BookOverviewItemViewState
 import voice.common.BookId
 import voice.common.compose.ImmutableFile
-import voice.common.compose.LongClickableCard
 import voice.common.R as CommonR
 
 @Composable
@@ -38,7 +43,7 @@ internal fun ListBooks(
   onBookClick: (BookId) -> Unit,
   onBookLongClick: (BookId) -> Unit,
   showPermissionBugCard: Boolean,
-  onPermissionBugCardClicked: () -> Unit,
+  onPermissionBugCardClick: () -> Unit,
 ) {
   LazyColumn(
     verticalArrangement = Arrangement.spacedBy(8.dp),
@@ -46,7 +51,7 @@ internal fun ListBooks(
   ) {
     if (showPermissionBugCard) {
       item {
-        PermissionBugCard(onPermissionBugCardClicked)
+        PermissionBugCard(onPermissionBugCardClick)
       }
     }
     books.forEach { (category, books) ->
@@ -74,6 +79,9 @@ internal fun ListBooks(
           onBookLongClick = onBookLongClick,
         )
       }
+      item {
+        Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
+      }
     }
   }
 }
@@ -85,38 +93,48 @@ internal fun ListBookRow(
   onBookLongClick: (BookId) -> Unit,
   modifier: Modifier = Modifier,
 ) {
-  LongClickableCard(
-    onClick = {
-      onBookClick(book.id)
-    },
-    onLongClick = {
-      onBookLongClick(book.id)
-    },
+  Card(
     modifier = modifier
-      .fillMaxWidth(),
-  ) {
-    Column {
-      Row {
-        CoverImage(book.cover)
-        Column(
-          Modifier
-            .padding(start = 8.dp, end = 8.dp, top = 8.dp, bottom = 8.dp)
-            .align(Alignment.CenterVertically),
-        ) {
-          if (book.author != null) {
+      .fillMaxWidth()
+      .combinedClickable(
+        onClick = {
+          onBookClick(book.id)
+        },
+        onLongClick = {
+          onBookLongClick(book.id)
+        },
+      ),
+    content = {
+      Column {
+        Row {
+          CoverImage(book.cover)
+          Column(
+            Modifier
+              .padding(start = 8.dp, end = 8.dp, top = 8.dp, bottom = 8.dp)
+              .align(Alignment.CenterVertically),
+          ) {
+            if (book.author != null) {
+              Text(
+                text = book.author.toUpperCase(LocaleList.current),
+                style = MaterialTheme.typography.labelSmall,
+                maxLines = 1,
+              )
+            }
             Text(
-              text = book.author.toUpperCase(LocaleList.current),
-              style = MaterialTheme.typography.labelSmall,
-              maxLines = 1,
+              text = book.name,
+              style = MaterialTheme.typography.bodyMedium,
+            )
+            Text(
+              text = book.remainingTime,
+              style = MaterialTheme.typography.bodySmall,
             )
           }
-          Text(
-            text = book.name,
-            style = MaterialTheme.typography.bodyMedium,
-          )
-          Text(
-            text = book.remainingTime,
-            style = MaterialTheme.typography.bodySmall,
+        }
+
+        if (book.progress > 0.05) {
+          LinearProgressIndicator(
+            modifier = Modifier.fillMaxWidth(),
+            progress = { book.progress },
           )
           if (book.progress > 0.05) {
             Text(
@@ -126,15 +144,8 @@ internal fun ListBookRow(
           }
         }
       }
-
-      if (book.progress > 0.05) {
-        LinearProgressIndicator(
-          modifier = Modifier.fillMaxWidth(),
-          progress = { book.progress },
-        )
-      }
-    }
-  }
+    },
+  )
 }
 
 @Composable
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/PermissionBugCard.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/PermissionBugCard.kt
index d461b84a65..708a139032 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/PermissionBugCard.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/PermissionBugCard.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.unit.dp
 import voice.strings.R as StringsR
 
 @Composable
-internal fun PermissionBugCard(onPermissionBugCardClicked: () -> Unit) {
+internal fun PermissionBugCard(onPermissionBugCardClick: () -> Unit) {
   Card(
     Modifier
       .padding(horizontal = 8.dp)
@@ -29,7 +29,7 @@ internal fun PermissionBugCard(onPermissionBugCardClicked: () -> Unit) {
       Text(text = stringResource(id = StringsR.string.storage_bug_subtitle))
       Spacer(modifier = Modifier.size(16.dp))
       Button(
-        onClick = onPermissionBugCardClicked,
+        onClick = onPermissionBugCardClick,
       ) {
         Text(text = stringResource(id = StringsR.string.storage_bug_button))
       }
@@ -40,5 +40,5 @@ internal fun PermissionBugCard(onPermissionBugCardClicked: () -> Unit) {
 @Composable
 @Preview
 private fun PermissionBugCardPreview() {
-  PermissionBugCard(onPermissionBugCardClicked = {})
+  PermissionBugCard(onPermissionBugCardClick = {})
 }
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/topbar/BookOverviewSearchBar.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/topbar/BookOverviewSearchBar.kt
index 638ae842ca..ac578d68f3 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/topbar/BookOverviewSearchBar.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/topbar/BookOverviewSearchBar.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.SearchBar
+import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
@@ -29,42 +30,49 @@ internal fun ColumnScope.BookOverviewSearchBar(
   searchViewState: BookSearchViewState,
 ) {
   SearchBar(
+    inputField = {
+      SearchBarDefaults.InputField(
+        query = if (searchActive) {
+          searchViewState.query
+        } else {
+          ""
+        },
+        onQueryChange = onQueryChange,
+        onSearch = onQueryChange,
+        expanded = searchActive,
+        onExpandedChange = onActiveChange,
+        leadingIcon = {
+          TopBarLeadingIcon(
+            searchActive = searchActive,
+            onActiveChange = onActiveChange,
+          )
+        },
+        trailingIcon = {
+          TopBarTrailingIcon(
+            searchActive = searchActive,
+            showMigrateIcon = showMigrateIcon,
+            showMigrateHint = showMigrateHint,
+            showAddBookHint = showAddBookHint,
+            onBookMigrationClick = onBookMigrationClick,
+            onBoomMigrationHelperConfirmClick = onBoomMigrationHelperConfirmClick,
+            onBookFolderClick = onBookFolderClick,
+            onSettingsClick = onSettingsClick,
+          )
+        },
+      )
+    },
+    expanded = searchActive,
+    onExpandedChange = onActiveChange,
     modifier = Modifier
       .fillMaxWidth()
       .padding(horizontal = horizontalPadding),
-    query = if (searchActive) {
-      searchViewState.query
-    } else {
-      ""
-    },
-    onQueryChange = onQueryChange,
-    onSearch = onQueryChange,
-    active = searchActive,
-    onActiveChange = onActiveChange,
-    leadingIcon = {
-      TopBarLeadingIcon(
-        searchActive = searchActive,
-        onActiveChange = onActiveChange,
-      )
-    },
-    trailingIcon = {
-      TopBarTrailingIcon(
-        searchActive = searchActive,
-        showMigrateIcon = showMigrateIcon,
-        showMigrateHint = showMigrateHint,
-        showAddBookHint = showAddBookHint,
-        onBookMigrationClick = onBookMigrationClick,
-        onBoomMigrationHelperConfirmClick = onBoomMigrationHelperConfirmClick,
-        onBookFolderClick = onBookFolderClick,
-        onSettingsClick = onSettingsClick,
+    content = {
+      BookSearchContent(
+        viewState = searchViewState,
+        contentPadding = PaddingValues(),
+        onQueryChange = onQueryChange,
+        onBookClick = onSearchBookClick,
       )
     },
-  ) {
-    BookSearchContent(
-      viewState = searchViewState,
-      contentPadding = PaddingValues(),
-      onQueryChange = onQueryChange,
-      onBookClick = onSearchBookClick,
-    )
-  }
+  )
 }
diff --git a/bookmark/build.gradle.kts b/bookmark/build.gradle.kts
new file mode 100644
index 0000000000..89f27c0cf3
--- /dev/null
+++ b/bookmark/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+  id("voice.library")
+  id("voice.compose")
+  alias(libs.plugins.anvil)
+}
+
+anvil {
+  generateDaggerFactories.set(true)
+}
+
+dependencies {
+  implementation(projects.common)
+  implementation(projects.strings)
+  implementation(projects.playback)
+  implementation(projects.data)
+  implementation(projects.datastore)
+  implementation(libs.dagger.core)
+  implementation(libs.materialDialog.core)
+  implementation(libs.materialDialog.input)
+}
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
new file mode 100644
index 0000000000..5d1daded76
--- /dev/null
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
@@ -0,0 +1,26 @@
+package voice.bookmark
+
+import android.os.Bundle
+import androidx.compose.runtime.Composable
+import voice.common.BookId
+import voice.common.compose.ComposeController
+import voice.data.getBookId
+import voice.data.putBookId
+
+private const val NI_BOOK_ID = "ni#bookId"
+
+class BookmarkController(args: Bundle) : ComposeController(args) {
+
+  constructor(bookId: BookId) : this(
+    Bundle().apply {
+      putBookId(NI_BOOK_ID, bookId)
+    },
+  )
+
+  private val bookId = args.getBookId(NI_BOOK_ID)!!
+
+  @Composable
+  override fun Content() {
+    BookmarkScreen(bookId)
+  }
+}
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
new file mode 100644
index 0000000000..8b981475dc
--- /dev/null
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
@@ -0,0 +1,25 @@
+package voice.bookmark
+
+import voice.data.Bookmark
+
+data class BookmarkItemViewState(
+  val title: String,
+  val subtitle: String,
+  val id: Bookmark.Id,
+  val showSleepIcon: Boolean,
+)
+
+data class BookmarkViewState(
+  val bookmarks: List<BookmarkItemViewState>,
+  val shouldScrollTo: Bookmark.Id?,
+  val dialogViewState: BookmarkDialogViewState,
+)
+
+sealed interface BookmarkDialogViewState {
+  data object None : BookmarkDialogViewState
+  data object AddBookmark : BookmarkDialogViewState
+  data class EditBookmark(
+    val id: Bookmark.Id,
+    val title: String?,
+  ) : BookmarkDialogViewState
+}
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
new file mode 100644
index 0000000000..40ce8bd056
--- /dev/null
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
@@ -0,0 +1,292 @@
+package voice.bookmark
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.Timer
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.SwipeToDismissBox
+import androidx.compose.material3.SwipeToDismissBoxValue
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.rememberSwipeToDismissBoxState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.squareup.anvil.annotations.ContributesTo
+import voice.bookmark.dialogs.AddBookmarkDialog
+import voice.bookmark.dialogs.EditBookmarkDialog
+import voice.common.AppScope
+import voice.common.BookId
+import voice.common.compose.rememberScoped
+import voice.common.rootComponentAs
+import voice.data.Bookmark
+import java.util.UUID
+import voice.strings.R as StringsR
+
+@ContributesTo(AppScope::class)
+interface Component {
+  val bookmarkViewModelFactory: BookmarkViewModel.Factory
+}
+
+@Composable
+fun BookmarkScreen(bookId: BookId) {
+  val viewModel = rememberScoped(bookId.value) {
+    rootComponentAs<Component>().bookmarkViewModelFactory.create(bookId)
+  }
+  val viewState = viewModel.viewState()
+  BookmarkScreen(
+    viewState = viewState,
+    onClose = viewModel::closeScreen,
+    onAdd = viewModel::onAddClick,
+    onDelete = viewModel::deleteBookmark,
+    onEdit = viewModel::onEditClick,
+    onScrollConfirm = viewModel::onScrollConfirm,
+    onClick = viewModel::selectBookmark,
+    onNewBookmarkNameChoose = viewModel::addBookmark,
+    onCloseDialog = viewModel::closeDialog,
+    onEditBookmark = viewModel::editBookmark,
+  )
+}
+
+@Composable
+internal fun BookmarkScreen(
+  viewState: BookmarkViewState,
+  onClose: () -> Unit,
+  onAdd: () -> Unit,
+  onDelete: (Bookmark.Id) -> Unit,
+  onEdit: (Bookmark.Id) -> Unit,
+  onScrollConfirm: () -> Unit,
+  onClick: (Bookmark.Id) -> Unit,
+  onCloseDialog: () -> Unit,
+  onNewBookmarkNameChoose: (String) -> Unit,
+  onEditBookmark: (Bookmark.Id, String) -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  val snackbarHostState = remember { SnackbarHostState() }
+
+  Scaffold(
+    modifier = modifier,
+    snackbarHost = {
+      SnackbarHost(hostState = snackbarHostState)
+    },
+    topBar = {
+      TopAppBar(
+        title = { Text(text = stringResource(id = StringsR.string.bookmark)) },
+        navigationIcon = {
+          IconButton(onClick = onClose) {
+            Icon(
+              imageVector = Icons.Default.Close,
+              contentDescription = stringResource(id = StringsR.string.close),
+            )
+          }
+        },
+      )
+    },
+    floatingActionButton = {
+      FloatingActionButton(
+        onClick = onAdd,
+        content = {
+          Icon(Icons.Default.Add, contentDescription = stringResource(id = StringsR.string.add))
+        },
+      )
+    },
+  ) { paddingValues ->
+    val lazyListState = rememberLazyListState()
+    LaunchedEffect(viewState.shouldScrollTo, onScrollConfirm) {
+      val index = viewState.bookmarks.indexOfFirst { it.id == viewState.shouldScrollTo }
+      if (index != -1) {
+        lazyListState.animateScrollToItem(index)
+        onScrollConfirm()
+      }
+    }
+    LazyColumn(
+      state = lazyListState,
+      contentPadding = paddingValues,
+    ) {
+      items(
+        items = viewState.bookmarks,
+        key = { it.id.value.toString() },
+      ) { bookmark ->
+        BookmarkItem(
+          modifier = Modifier.animateItem(),
+          bookmark = bookmark,
+          onDelete = onDelete,
+          onEdit = onEdit,
+          onClick = onClick,
+        )
+      }
+      item {
+        Spacer(Modifier.size(88.dp))
+      }
+    }
+  }
+
+  when (viewState.dialogViewState) {
+    BookmarkDialogViewState.AddBookmark -> {
+      AddBookmarkDialog(
+        onDismissRequest = onCloseDialog,
+        onBookmarkNameChoose = onNewBookmarkNameChoose,
+      )
+    }
+    BookmarkDialogViewState.None -> {
+    }
+    is BookmarkDialogViewState.EditBookmark -> {
+      EditBookmarkDialog(
+        onDismissRequest = onCloseDialog,
+        onEditBookmark = onEditBookmark,
+        bookmarkId = viewState.dialogViewState.id,
+        initialTitle = viewState.dialogViewState.title ?: "",
+      )
+    }
+  }
+}
+
+@Composable
+internal fun BookmarkItem(
+  bookmark: BookmarkItemViewState,
+  onDelete: (Bookmark.Id) -> Unit,
+  onEdit: (Bookmark.Id) -> Unit,
+  onClick: (Bookmark.Id) -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  var expanded by remember { mutableStateOf(false) }
+
+  SwipeToDismissBox(
+    modifier = modifier,
+    state = rememberSwipeToDismissBoxState(
+      confirmValueChange = {
+        when (it) {
+          SwipeToDismissBoxValue.StartToEnd -> {
+            onDelete(bookmark.id)
+            true
+          }
+          SwipeToDismissBoxValue.EndToStart,
+          SwipeToDismissBoxValue.Settled,
+          -> false
+        }
+      },
+    ),
+    backgroundContent = {
+      Box(
+        Modifier
+          .fillMaxSize()
+          .background(Color.Red),
+      ) {
+        Icon(
+          modifier = Modifier
+            .padding(start = 16.dp)
+            .align(Alignment.CenterStart),
+          imageVector = Icons.Outlined.Delete,
+          contentDescription = stringResource(id = StringsR.string.delete),
+          tint = Color.White,
+        )
+      }
+    },
+    content = {
+      ListItem(
+        modifier = Modifier
+          .clickable {
+            onClick(bookmark.id)
+          },
+        headlineContent = {
+          Row(verticalAlignment = Alignment.CenterVertically) {
+            Text(text = bookmark.title)
+            if (bookmark.showSleepIcon) {
+              Icon(
+                modifier = Modifier
+                  .padding(start = 4.dp)
+                  .size(16.dp),
+                imageVector = Icons.Outlined.Timer,
+                contentDescription = stringResource(StringsR.string.action_sleep),
+              )
+            }
+          }
+        },
+        trailingContent = {
+          Box {
+            IconButton(
+              onClick = {
+                expanded = !expanded
+              },
+              content = {
+                Icon(
+                  imageVector = Icons.Default.MoreVert,
+                  contentDescription = stringResource(id = StringsR.string.popup_edit),
+                )
+              },
+            )
+            DropdownMenu(
+              expanded = expanded,
+              onDismissRequest = { expanded = false },
+            ) {
+              DropdownMenuItem(
+                text = { Text(stringResource(id = StringsR.string.popup_edit)) },
+                onClick = {
+                  expanded = false
+                  onEdit(bookmark.id)
+                },
+              )
+              DropdownMenuItem(
+                text = { Text(stringResource(id = StringsR.string.remove)) },
+                onClick = {
+                  expanded = false
+                  onDelete(bookmark.id)
+                },
+              )
+            }
+          }
+        },
+        supportingContent = {
+          Text(text = bookmark.subtitle)
+        },
+      )
+    },
+  )
+}
+
+@Composable
+@Preview
+private fun BookmarkItemPreview() {
+  BookmarkItem(
+    bookmark = BookmarkItemViewState(
+      title = "Bookmark 1",
+      subtitle = "10:10:10 / 12:12:12",
+      id = Bookmark.Id(UUID.randomUUID()),
+      showSleepIcon = true,
+    ),
+    onDelete = {},
+    onEdit = { },
+    onClick = {},
+  )
+}
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt
new file mode 100644
index 0000000000..9e13d78343
--- /dev/null
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt
@@ -0,0 +1,183 @@
+package voice.bookmark
+
+import android.content.Context
+import android.text.format.DateUtils
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.datastore.core.DataStore
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
+import voice.common.BookId
+import voice.common.formatTime
+import voice.common.navigation.Navigator
+import voice.common.pref.CurrentBook
+import voice.data.Bookmark
+import voice.data.Chapter
+import voice.data.markForPosition
+import voice.data.repo.BookRepository
+import voice.data.repo.BookmarkRepo
+import voice.playback.PlayerController
+import voice.playback.playstate.PlayStateManager
+import voice.strings.R
+import java.time.Instant
+import java.time.temporal.ChronoUnit
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.minutes
+
+class BookmarkViewModel
+@AssistedInject constructor(
+  @CurrentBook
+  private val currentBook: DataStore<BookId?>,
+  private val repo: BookRepository,
+  private val bookmarkRepo: BookmarkRepo,
+  private val playStateManager: PlayStateManager,
+  private val playerController: PlayerController,
+  private val navigator: Navigator,
+  private val context: Context,
+  @Assisted
+  private val bookId: BookId,
+) {
+
+  private val scope = MainScope()
+  private var bookmarks by mutableStateOf<List<Bookmark>>(emptyList())
+  private var chapters by mutableStateOf<List<Chapter>>(emptyList())
+
+  private var shouldScrollTo by mutableStateOf<Bookmark.Id?>(null)
+  private var dialogViewState: BookmarkDialogViewState by mutableStateOf(BookmarkDialogViewState.None)
+
+  @Composable
+  fun viewState(): BookmarkViewState {
+    LaunchedEffect(bookId) {
+      val book = repo.get(bookId)
+      if (book != null) {
+        bookmarks = bookmarkRepo.bookmarks(book.content)
+          .sortedByDescending { it.addedAt }
+        chapters = book.chapters
+      }
+    }
+    return BookmarkViewState(
+      bookmarks = bookmarks.map { bookmark ->
+        val currentChapter = chapters.single { it.id == bookmark.chapterId }
+        val bookmarkTitle = bookmark.title
+        val title: String = when {
+          bookmark.setBySleepTimer -> {
+            val justNowThreshold = 1.minutes
+            if (ChronoUnit.MILLIS.between(bookmark.addedAt, Instant.now()).milliseconds < justNowThreshold) {
+              context.getString(R.string.bookmark_just_now)
+            } else {
+              DateUtils.getRelativeDateTimeString(
+                context,
+                bookmark.addedAt.toEpochMilli(),
+                justNowThreshold.inWholeMilliseconds,
+                2.days.inWholeMilliseconds,
+                0,
+              ).toString()
+            }
+          }
+          !bookmarkTitle.isNullOrEmpty() -> bookmarkTitle
+          else -> currentChapter.markForPosition(bookmark.time).name ?: ""
+        }
+
+        BookmarkItemViewState(
+          title = title,
+          subtitle = formatTime(bookmark.time),
+          id = bookmark.id,
+          showSleepIcon = bookmark.setBySleepTimer,
+        )
+      },
+      shouldScrollTo = shouldScrollTo,
+      dialogViewState = dialogViewState,
+    )
+  }
+
+  fun deleteBookmark(id: Bookmark.Id) {
+    scope.launch {
+      bookmarkRepo.deleteBookmark(id)
+      bookmarks = bookmarks.filter { it.id != id }
+    }
+  }
+
+  fun selectBookmark(id: Bookmark.Id) {
+    val bookmark = bookmarks.find { it.id == id }
+      ?: return
+
+    val wasPlaying = playStateManager.playState == PlayStateManager.PlayState.Playing
+
+    scope.launch {
+      currentBook.updateData { bookId }
+    }
+    playerController.setPosition(bookmark.time, bookmark.chapterId)
+
+    if (wasPlaying) {
+      playerController.play()
+    }
+
+    navigator.goBack()
+  }
+
+  fun editBookmark(
+    id: Bookmark.Id,
+    newTitle: String,
+  ) {
+    scope.launch {
+      bookmarks.find { it.id == id }?.let {
+        val withNewTitle = it.copy(
+          title = newTitle,
+          setBySleepTimer = false,
+        )
+        bookmarkRepo.addBookmark(withNewTitle)
+        val index = bookmarks.indexOfFirst { bookmarkId -> bookmarkId.id == id }
+        bookmarks = bookmarks.toMutableList().apply {
+          this[index] = withNewTitle
+        }
+      }
+    }
+  }
+
+  fun addBookmark(name: String) {
+    scope.launch {
+      val book = repo.get(bookId) ?: return@launch
+      val newBookmark = bookmarkRepo.addBookmarkAtBookPosition(
+        book = book,
+        title = name,
+        setBySleepTimer = false,
+      )
+      bookmarks = (bookmarks + newBookmark)
+        .sortedByDescending { it.addedAt }
+      shouldScrollTo = newBookmark.id
+    }
+  }
+
+  fun onScrollConfirm() {
+    shouldScrollTo = null
+  }
+
+  fun closeDialog() {
+    dialogViewState = BookmarkDialogViewState.None
+  }
+
+  fun onAddClick() {
+    dialogViewState = BookmarkDialogViewState.AddBookmark
+  }
+
+  fun onEditClick(id: Bookmark.Id) {
+    val bookmark = bookmarks.find { it.id == id } ?: return
+    dialogViewState = BookmarkDialogViewState.EditBookmark(id, bookmark.title)
+  }
+
+  fun closeScreen() {
+    navigator.goBack()
+  }
+
+  @AssistedFactory
+  interface Factory {
+    fun create(id: BookId): BookmarkViewModel
+  }
+}
diff --git a/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt b/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
new file mode 100644
index 0000000000..adbaf954e0
--- /dev/null
+++ b/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
@@ -0,0 +1,84 @@
+package voice.bookmark.dialogs
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
+import voice.strings.R as StringsR
+
+@Composable
+internal fun AddBookmarkDialog(
+  onDismissRequest: () -> Unit,
+  onBookmarkNameChoose: (String) -> Unit,
+) {
+  var bookmarkName by remember { mutableStateOf("") }
+  val focusRequester = remember { FocusRequester() }
+  AlertDialog(
+    onDismissRequest = onDismissRequest,
+    title = { Text(text = stringResource(StringsR.string.bookmark)) },
+    text = {
+      Column {
+        OutlinedTextField(
+          value = bookmarkName,
+          onValueChange = { bookmarkName = it },
+          label = { Text(stringResource(StringsR.string.bookmark_edit_hint)) },
+          modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 8.dp)
+            .focusRequester(focusRequester),
+          keyboardOptions = KeyboardOptions(
+            capitalization = KeyboardCapitalization.Sentences,
+            autoCorrectEnabled = true,
+            keyboardType = KeyboardType.Text,
+            imeAction = ImeAction.Done,
+          ),
+          keyboardActions = KeyboardActions(
+            onDone = {
+              onBookmarkNameChoose(bookmarkName)
+            },
+          ),
+          singleLine = true,
+        )
+      }
+    },
+    confirmButton = {
+      Button(
+        onClick = {
+          onBookmarkNameChoose(bookmarkName)
+          onDismissRequest()
+        },
+      ) {
+        Text(stringResource(StringsR.string.dialog_confirm))
+      }
+    },
+    dismissButton = {
+      TextButton(onClick = onDismissRequest) {
+        Text(stringResource(StringsR.string.dialog_cancel))
+      }
+    },
+  )
+
+  LaunchedEffect(Unit) {
+    focusRequester.requestFocus()
+  }
+}
diff --git a/bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt b/bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt
new file mode 100644
index 0000000000..b9319e7e67
--- /dev/null
+++ b/bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt
@@ -0,0 +1,103 @@
+package voice.bookmark.dialogs
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.unit.dp
+import voice.data.Bookmark
+import voice.strings.R as StringsR
+
+@Composable
+internal fun EditBookmarkDialog(
+  onDismissRequest: () -> Unit,
+  onEditBookmark: (Bookmark.Id, String) -> Unit,
+  bookmarkId: Bookmark.Id,
+  initialTitle: String,
+) {
+  var bookmarkTitle by remember {
+    mutableStateOf(
+      TextFieldValue(
+        text = initialTitle,
+        selection = TextRange(0, initialTitle.length),
+      ),
+    )
+  }
+  val focusRequester = remember { FocusRequester() }
+
+  AlertDialog(
+    onDismissRequest = onDismissRequest,
+    title = { Text(text = stringResource(StringsR.string.bookmark_edit_title)) },
+    text = {
+      Column {
+        OutlinedTextField(
+          value = bookmarkTitle,
+          onValueChange = { bookmarkTitle = it },
+          label = { Text(stringResource(StringsR.string.bookmark_edit_hint)) },
+          modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 8.dp)
+            .focusRequester(focusRequester),
+          keyboardOptions = KeyboardOptions(
+            capitalization = KeyboardCapitalization.Sentences,
+            autoCorrectEnabled = true,
+            keyboardType = KeyboardType.Text,
+            imeAction = ImeAction.Done,
+          ),
+          keyboardActions = KeyboardActions(
+            onDone = {
+              if (bookmarkTitle.text.isNotEmpty()) {
+                onEditBookmark(bookmarkId, bookmarkTitle.text)
+                onDismissRequest()
+              }
+            },
+          ),
+          singleLine = true,
+        )
+      }
+    },
+    confirmButton = {
+      Button(
+        onClick = {
+          if (bookmarkTitle.text.isNotEmpty()) {
+            onEditBookmark(bookmarkId, bookmarkTitle.text)
+            onDismissRequest()
+          }
+        },
+        enabled = bookmarkTitle.text.isNotEmpty(),
+      ) {
+        Text(stringResource(StringsR.string.dialog_confirm))
+      }
+    },
+    dismissButton = {
+      TextButton(onClick = onDismissRequest) {
+        Text(stringResource(StringsR.string.dialog_cancel))
+      }
+    },
+  )
+
+  LaunchedEffect(Unit) {
+    focusRequester.requestFocus()
+  }
+}
diff --git a/build.gradle.kts b/build.gradle.kts
index 89a68958f9..e21c1daf2c 100755
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
   alias(libs.plugins.kotlin.jvm) apply false
   alias(libs.plugins.android.app) apply false
   alias(libs.plugins.android.library) apply false
+  alias(libs.plugins.compose.compiler) apply false
   id("voice.ktlint")
 }
 
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 08919ad623..1d8cc5bd67 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -18,11 +18,12 @@ android {
 
 dependencies {
   implementation(projects.strings)
+  implementation(projects.pref)
+
   implementation(libs.appCompat)
   implementation(libs.dagger.core)
   implementation(libs.material)
   api(libs.immutable)
-  implementation(libs.prefs.core)
   api(libs.conductor)
   implementation(libs.androidxCore)
   implementation(libs.viewBinding)
diff --git a/common/src/main/kotlin/voice/common/AndroidExtensions.kt b/common/src/main/kotlin/voice/common/AndroidExtensions.kt
index f1f6e8c1b1..6b4549ffdf 100644
--- a/common/src/main/kotlin/voice/common/AndroidExtensions.kt
+++ b/common/src/main/kotlin/voice/common/AndroidExtensions.kt
@@ -3,7 +3,6 @@ package voice.common
 import android.content.Context
 import android.os.Build
 import android.os.Bundle
-import android.os.Looper
 import android.os.Parcelable
 import android.util.TypedValue
 import android.view.LayoutInflater
@@ -15,12 +14,6 @@ fun Context.dpToPx(dp: Float) = TypedValue.applyDimension(TypedValue.COMPLEX_UNI
 
 fun Context.dpToPxRounded(dp: Float): Int = dpToPx(dp).roundToInt()
 
-fun checkMainThread() {
-  check(Looper.getMainLooper() == Looper.myLooper()) {
-    "Is not on ui thread!"
-  }
-}
-
 inline fun <reified T : Parcelable> Bundle.parcelable(key: String): T? {
   return if (Build.VERSION.SDK_INT >= 33) {
     getParcelable(key, T::class.java)
diff --git a/common/src/main/kotlin/voice/common/compose/LongClickableCard.kt b/common/src/main/kotlin/voice/common/compose/LongClickableCard.kt
deleted file mode 100644
index bbcfa1c799..0000000000
--- a/common/src/main/kotlin/voice/common/compose/LongClickableCard.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package voice.common.compose
-
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.ripple.rememberRipple
-import androidx.compose.material3.Card
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.semantics.Role
-
-@Composable
-fun LongClickableCard(
-  onClick: () -> Unit,
-  onLongClick: () -> Unit,
-  modifier: Modifier = Modifier,
-  content: @Composable () -> Unit,
-) {
-  Card(modifier = modifier) {
-    Box(
-      modifier = Modifier
-        .fillMaxSize()
-        .combinedClickable(
-          interactionSource = remember { MutableInteractionSource() },
-          indication = rememberRipple(),
-          enabled = true,
-          role = Role.Button,
-          onClick = onClick,
-          onLongClick = onLongClick,
-        ),
-    ) {
-      content()
-    }
-  }
-}
diff --git a/common/src/main/kotlin/voice/common/compose/SharedComponent.kt b/common/src/main/kotlin/voice/common/compose/SharedComponent.kt
index fcef111f7a..8a4108898a 100644
--- a/common/src/main/kotlin/voice/common/compose/SharedComponent.kt
+++ b/common/src/main/kotlin/voice/common/compose/SharedComponent.kt
@@ -1,9 +1,9 @@
 package voice.common.compose
 
 import com.squareup.anvil.annotations.ContributesTo
-import de.paulwoitaschek.flowpref.Pref
 import voice.common.AppScope
 import voice.common.pref.PrefKeys
+import voice.pref.Pref
 import javax.inject.Named
 
 @ContributesTo(AppScope::class)
diff --git a/common/src/main/kotlin/voice/common/conductor/ViewBindingController.kt b/common/src/main/kotlin/voice/common/conductor/ViewBindingController.kt
deleted file mode 100644
index ee2360d689..0000000000
--- a/common/src/main/kotlin/voice/common/conductor/ViewBindingController.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package voice.common.conductor
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.viewbinding.ViewBinding
-import com.bluelinelabs.conductor.Controller
-
-typealias InflateBinding<B> = (LayoutInflater, ViewGroup?, Boolean) -> B
-
-abstract class ViewBindingController<B : ViewBinding>(
-  args: Bundle = Bundle(),
-  private val inflateBinding: InflateBinding<B>,
-) : Controller(args) {
-
-  private var _binding: B? = null
-  val binding: B get() = _binding ?: error("No binding present.")
-
-  final override fun onCreateView(
-    inflater: LayoutInflater,
-    container: ViewGroup,
-    savedViewState: Bundle?,
-  ): View {
-    return inflateBinding(inflater, container, false)
-      .also {
-        _binding = it
-        it.onBindingCreated()
-      }
-      .root
-  }
-
-  final override fun onDestroyView(view: View) {
-    super.onDestroyView(view)
-    onDestroyView()
-    _binding = null
-  }
-
-  open fun onDestroyView() {}
-
-  open fun B.onBindingCreated() {}
-}
diff --git a/common/src/main/kotlin/voice/common/grid/GridCount.kt b/common/src/main/kotlin/voice/common/grid/GridCount.kt
index 7b97f27bc5..3c7d98db79 100644
--- a/common/src/main/kotlin/voice/common/grid/GridCount.kt
+++ b/common/src/main/kotlin/voice/common/grid/GridCount.kt
@@ -4,9 +4,7 @@ import android.content.Context
 import javax.inject.Inject
 
 class GridCount
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   fun useGridAsDefault(): Boolean {
     val displayMetrics = context.resources.displayMetrics
diff --git a/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt b/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt
index 048e5dcaf5..e6e296c996 100644
--- a/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt
+++ b/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt
@@ -14,9 +14,7 @@ sealed interface NavigationCommand {
     val replace: Boolean,
   ) : NavigationCommand
 
-  data class Execute(
-    val action: (NavController<Destination.Compose>) -> Unit,
-  ) : NavigationCommand
+  data class Execute(val action: (NavController<Destination.Compose>) -> Unit) : NavigationCommand
 }
 
 sealed interface Destination {
@@ -26,11 +24,16 @@ sealed interface Destination {
   @Parcelize
   data class CoverFromInternet(val bookId: BookId) : Compose
   data class Website(val url: String) : Destination
-  data class EditCover(val bookId: BookId, val cover: Uri) : Destination
+  data class EditCover(
+    val bookId: BookId,
+    val cover: Uri,
+  ) : Destination
 
   data class Activity(val intent: Intent) : Destination
 
-  sealed interface Compose : Destination, Parcelable
+  sealed interface Compose :
+    Destination,
+    Parcelable
 
   @Parcelize
   object Migration : Compose
@@ -45,7 +48,10 @@ sealed interface Destination {
   object FolderPicker : Compose
 
   @Parcelize
-  data class SelectFolderType(val uri: Uri, val mode: Mode) : Compose {
+  data class SelectFolderType(
+    val uri: Uri,
+    val mode: Mode,
+  ) : Compose {
 
     enum class Mode {
       Default,
diff --git a/cover/src/main/kotlin/voice/cover/CoverContents.kt b/cover/src/main/kotlin/voice/cover/CoverContents.kt
index 32a23da938..5a7dfbf87d 100644
--- a/cover/src/main/kotlin/voice/cover/CoverContents.kt
+++ b/cover/src/main/kotlin/voice/cover/CoverContents.kt
@@ -82,7 +82,7 @@ private fun ItemsContent(
   val items = viewState.items
   LazyVerticalStaggeredGrid(
     columns = StaggeredGridCells.Adaptive(minSize = 150.dp),
-    contentPadding = PaddingValues(top = 80.dp),
+    contentPadding = PaddingValues(top = 96.dp),
     content = {
       items(
         count = items.itemCount,
diff --git a/cover/src/main/kotlin/voice/cover/CoverSearchBar.kt b/cover/src/main/kotlin/voice/cover/CoverSearchBar.kt
index 80b3904280..9db0525d4e 100644
--- a/cover/src/main/kotlin/voice/cover/CoverSearchBar.kt
+++ b/cover/src/main/kotlin/voice/cover/CoverSearchBar.kt
@@ -8,6 +8,7 @@ import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.SearchBar
+import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -21,34 +22,47 @@ internal fun CoverSearchBar(
   viewState: SelectCoverFromInternetViewModel.ViewState,
 ) {
   SearchBar(
+    inputField = {
+      SearchBarDefaults.InputField(
+        query = viewState.query,
+        onQueryChange = onQueryChange,
+        onSearch = {},
+        expanded = false,
+        onExpandedChange = {},
+        enabled = true,
+        placeholder = null,
+        leadingIcon = {
+          IconButton(onClick = onCloseClick) {
+            Icon(
+              imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
+              contentDescription = stringResource(id = R.string.close),
+            )
+          }
+        },
+        trailingIcon = {
+          IconButton(
+            onClick = {
+              onQueryChange("")
+            },
+          ) {
+            Icon(
+              imageVector = Icons.Outlined.Close,
+              contentDescription = stringResource(id = R.string.delete),
+            )
+          }
+        },
+        interactionSource = null,
+      )
+    },
+    expanded = false,
+    onExpandedChange = {},
     modifier = Modifier
       .fillMaxWidth()
       .padding(horizontal = 16.dp),
-    leadingIcon = {
-      IconButton(onClick = onCloseClick) {
-        Icon(
-          imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
-          contentDescription = stringResource(id = R.string.close),
-        )
-      }
-    },
-    trailingIcon = {
-      IconButton(
-        onClick = {
-          onQueryChange("")
-        },
-      ) {
-        Icon(
-          imageVector = Icons.Outlined.Close,
-          contentDescription = stringResource(id = R.string.delete),
-        )
-      }
-    },
-    query = viewState.query,
-    onQueryChange = onQueryChange,
-    onSearch = {},
-    active = false,
-    onActiveChange = {},
-    content = {},
+    shape = SearchBarDefaults.inputFieldShape,
+    tonalElevation = SearchBarDefaults.TonalElevation,
+    shadowElevation = SearchBarDefaults.ShadowElevation,
+    windowInsets = SearchBarDefaults.windowInsets,
+    content = { },
   )
 }
diff --git a/cover/src/main/kotlin/voice/cover/api/CoverApi.kt b/cover/src/main/kotlin/voice/cover/api/CoverApi.kt
index 86f7924a34..7f0519f775 100644
--- a/cover/src/main/kotlin/voice/cover/api/CoverApi.kt
+++ b/cover/src/main/kotlin/voice/cover/api/CoverApi.kt
@@ -4,9 +4,7 @@ import voice.logging.core.Logger
 import javax.inject.Inject
 
 class CoverApi
-@Inject constructor(
-  private val api: InternalCoverApi,
-) {
+@Inject constructor(private val api: InternalCoverApi) {
 
   internal suspend fun token(query: String): String? {
     Logger.d("query token")
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index 8625afd0fb..df8a08bc9d 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
   implementation(libs.appCompat)
   implementation(libs.androidxCore)
   implementation(libs.serialization.json)
-  implementation(libs.prefs.core)
+  implementation(projects.pref)
 
   api(libs.room.runtime)
   ksp(libs.room.compiler)
@@ -51,7 +51,6 @@ dependencies {
   testImplementation(libs.androidX.test.runner)
   testImplementation(libs.junit)
   testImplementation(libs.robolectric)
-  testImplementation(libs.prefs.inMemory)
   testImplementation(libs.koTest.assert)
   testImplementation(libs.coroutines.test)
 }
diff --git a/data/src/main/kotlin/voice/data/BookComparator.kt b/data/src/main/kotlin/voice/data/BookComparator.kt
index a2829d4ce0..e10d7012ad 100644
--- a/data/src/main/kotlin/voice/data/BookComparator.kt
+++ b/data/src/main/kotlin/voice/data/BookComparator.kt
@@ -2,9 +2,7 @@ package voice.data
 
 import voice.common.comparator.NaturalOrderComparator
 
-enum class BookComparator(
-  private val comparatorFunction: Comparator<Book>,
-) : Comparator<Book> by comparatorFunction {
+enum class BookComparator(private val comparatorFunction: Comparator<Book>) : Comparator<Book> by comparatorFunction {
 
   ByLastPlayed(
     compareByDescending {
diff --git a/data/src/main/kotlin/voice/data/Bookmark.kt b/data/src/main/kotlin/voice/data/Bookmark.kt
index 4fa1f36b07..37dbe7b36d 100644
--- a/data/src/main/kotlin/voice/data/Bookmark.kt
+++ b/data/src/main/kotlin/voice/data/Bookmark.kt
@@ -1,6 +1,5 @@
 package voice.data
 
-import android.os.Bundle
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import voice.common.BookId
@@ -25,15 +24,3 @@ data class Bookmark(
     }
   }
 }
-
-fun Bundle.putBookmarkId(
-  key: String,
-  value: Bookmark.Id,
-) {
-  putString(key, value.value.toString())
-}
-
-fun Bundle.getBookmarkId(key: String): Bookmark.Id? {
-  val value = getString(key) ?: return null
-  return Bookmark.Id(UUID.fromString(value))
-}
diff --git a/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt b/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt
index 9ee4ed41d0..4e37946e1e 100644
--- a/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt
+++ b/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt
@@ -18,9 +18,7 @@ import javax.inject.Singleton
 
 @Singleton
 class BookContentRepo
-@Inject constructor(
-  private val dao: BookContentDao,
-) {
+@Inject constructor(private val dao: BookContentDao) {
 
   private val cacheMutex = Mutex()
   private var cacheFilled = false
diff --git a/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt b/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt
index 663808dff8..be4b7f015d 100644
--- a/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt
+++ b/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt
@@ -10,9 +10,7 @@ import javax.inject.Singleton
 
 @Singleton
 class ChapterRepo
-@Inject constructor(
-  private val dao: ChapterDao,
-) {
+@Inject constructor(private val dao: ChapterDao) {
 
   private val cache = mutableMapOf<ChapterId, Chapter?>()
 
diff --git a/data/src/main/kotlin/voice/data/repo/internals/migrations/Migration32to34.kt b/data/src/main/kotlin/voice/data/repo/internals/migrations/Migration32to34.kt
index 1110fdb9aa..2a91750880 100644
--- a/data/src/main/kotlin/voice/data/repo/internals/migrations/Migration32to34.kt
+++ b/data/src/main/kotlin/voice/data/repo/internals/migrations/Migration32to34.kt
@@ -71,5 +71,9 @@ class Migration32to34
     }
   }
 
-  private data class Holder(val path: String, val title: String, val time: Long)
+  private data class Holder(
+    val path: String,
+    val title: String,
+    val time: Long,
+  )
 }
diff --git a/data/src/test/kotlin/voice/data/ChapterTest.kt b/data/src/test/kotlin/voice/data/ChapterTest.kt
index 7cd398a6dd..87e51caada 100644
--- a/data/src/test/kotlin/voice/data/ChapterTest.kt
+++ b/data/src/test/kotlin/voice/data/ChapterTest.kt
@@ -128,5 +128,8 @@ class ChapterTest {
     positions.shouldContainInOrder(expected)
   }
 
-  data class MarkPosition(val start: Long, val end: Long)
+  data class MarkPosition(
+    val start: Long,
+    val end: Long,
+  )
 }
diff --git a/data/src/test/kotlin/voice/data/TestComponent.kt b/data/src/test/kotlin/voice/data/TestComponent.kt
index dc89522eca..d1c71413cb 100644
--- a/data/src/test/kotlin/voice/data/TestComponent.kt
+++ b/data/src/test/kotlin/voice/data/TestComponent.kt
@@ -3,10 +3,10 @@ package voice.data
 import androidx.room.migration.Migration
 import com.squareup.anvil.annotations.MergeComponent
 import dagger.BindsInstance
-import de.paulwoitaschek.flowpref.Pref
-import de.paulwoitaschek.flowpref.inmemory.InMemoryPref
 import voice.common.AppScope
 import voice.common.pref.PrefKeys
+import voice.pref.Pref
+import voice.pref.inmemory.InMemoryPref
 import javax.inject.Named
 import javax.inject.Singleton
 
diff --git a/data/src/test/kotlin/voice/data/repo/internals/DataBaseMigratorTest.kt b/data/src/test/kotlin/voice/data/repo/internals/DataBaseMigratorTest.kt
index da04c07e23..5e0213d847 100644
--- a/data/src/test/kotlin/voice/data/repo/internals/DataBaseMigratorTest.kt
+++ b/data/src/test/kotlin/voice/data/repo/internals/DataBaseMigratorTest.kt
@@ -47,8 +47,15 @@ class DataBaseMigratorTest {
     val dbName = "testDb"
     val db = helper.createDatabase(dbName, 44)
 
-    data class BookSetting(val id: String, val currentFile: String, val positionInChapter: Int)
-    data class Chapter(val file: String, val bookId: String)
+    data class BookSetting(
+      val id: String,
+      val currentFile: String,
+      val positionInChapter: Int,
+    )
+    data class Chapter(
+      val file: String,
+      val bookId: String,
+    )
 
     fun insertBookSettings(settings: BookSetting) {
       db.execSQL(
diff --git a/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt b/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt
index 1e96c62704..fbf90a4c4c 100644
--- a/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt
+++ b/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt
@@ -5,9 +5,7 @@ import androidx.core.net.toFile
 import androidx.core.net.toUri
 import java.io.File
 
-data class FileBasedDocumentFile(
-  private val file: File,
-) : CachedDocumentFile {
+data class FileBasedDocumentFile(private val file: File) : CachedDocumentFile {
 
   override val children: List<CachedDocumentFile> get() = file.listFiles()?.map { FileBasedDocumentFile(it) } ?: emptyList()
   override val name: String? get() = file.name
diff --git a/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt b/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt
index 742d9262e5..6c040004ca 100644
--- a/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt
+++ b/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt
@@ -8,9 +8,7 @@ import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class RealCachedDocumentFileFactory
-@Inject constructor(
-  private val context: Context,
-) : CachedDocumentFileFactory {
+@Inject constructor(private val context: Context) : CachedDocumentFileFactory {
   override fun create(uri: Uri): CachedDocumentFile {
     return RealCachedDocumentFile(context = context, uri = uri, preFilledContent = null)
   }
diff --git a/folderPicker/build.gradle.kts b/folderPicker/build.gradle.kts
index 1ba4f00f8e..c5311d5488 100644
--- a/folderPicker/build.gradle.kts
+++ b/folderPicker/build.gradle.kts
@@ -17,10 +17,10 @@ dependencies {
   implementation(projects.data)
   implementation(projects.sleepTimer)
   implementation(projects.documentfile)
+  implementation(projects.pref)
 
   implementation(libs.datastore)
   implementation(libs.coil)
-  implementation(libs.prefs.core)
   implementation(libs.materialDialog.core)
   implementation(libs.androidxCore)
   implementation(libs.documentFile)
diff --git a/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt b/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt
index 9be1aabdcf..f4a4400d69 100644
--- a/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt
+++ b/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt
@@ -3,9 +3,7 @@ package voice.folderPicker.folderPicker
 import android.net.Uri
 import voice.data.folders.FolderType
 
-data class FolderPickerViewState(
-  val items: List<Item>,
-) {
+data class FolderPickerViewState(val items: List<Item>) {
 
   data class Item(
     val name: String,
diff --git a/folderPicker/src/main/kotlin/voice/folderPicker/selectType/FolderModeSelectionCard.kt b/folderPicker/src/main/kotlin/voice/folderPicker/selectType/FolderModeSelectionCard.kt
index 185bd0087c..a6e4d232af 100644
--- a/folderPicker/src/main/kotlin/voice/folderPicker/selectType/FolderModeSelectionCard.kt
+++ b/folderPicker/src/main/kotlin/voice/folderPicker/selectType/FolderModeSelectionCard.kt
@@ -25,7 +25,7 @@ import voice.strings.R as StringsR
 
 @Composable
 internal fun FolderModeSelectionCard(
-  onFolderModeSelected: (FolderMode) -> Unit,
+  onFolderModeSelect: (FolderMode) -> Unit,
   selectedFolderMode: FolderMode,
 ) {
   Card(
@@ -38,7 +38,7 @@ internal fun FolderModeSelectionCard(
       verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
       FolderMode.entries.forEach { folderMode ->
-        val selectFolder = { onFolderModeSelected(folderMode) }
+        val selectFolder = { onFolderModeSelect(folderMode) }
         FolderModeColumn(selectFolder = selectFolder, selectedFolderMode = selectedFolderMode, folderMode = folderMode)
       }
     }
@@ -92,7 +92,7 @@ private fun FolderMode.title(): Int {
 private fun FolderModeSelectionCardPreview() {
   VoiceTheme {
     FolderModeSelectionCard(
-      onFolderModeSelected = {},
+      onFolderModeSelect = {},
       selectedFolderMode = FolderMode.Audiobooks,
     )
   }
diff --git a/folderPicker/src/main/kotlin/voice/folderPicker/selectType/SelectFolderType.kt b/folderPicker/src/main/kotlin/voice/folderPicker/selectType/SelectFolderType.kt
index f252807b7b..aa814d8bb7 100644
--- a/folderPicker/src/main/kotlin/voice/folderPicker/selectType/SelectFolderType.kt
+++ b/folderPicker/src/main/kotlin/voice/folderPicker/selectType/SelectFolderType.kt
@@ -60,7 +60,7 @@ fun SelectFolderType(
   }
   SelectFolderType(
     viewState = viewModel.viewState(),
-    onFolderModeSelected = viewModel::setFolderMode,
+    onFolderModeSelect = viewModel::setFolderMode,
     onAddClick = viewModel::add,
     onBackClick = viewModel::onCloseClick,
   )
@@ -69,7 +69,7 @@ fun SelectFolderType(
 @Composable
 private fun SelectFolderType(
   viewState: SelectFolderTypeViewState,
-  onFolderModeSelected: (FolderMode) -> Unit,
+  onFolderModeSelect: (FolderMode) -> Unit,
   onAddClick: () -> Unit,
   onBackClick: () -> Unit,
 ) {
@@ -85,7 +85,7 @@ private fun SelectFolderType(
   ) { contentPadding ->
     Content(
       contentPadding = contentPadding,
-      onFolderModeSelected = onFolderModeSelected,
+      onFolderModeSelect = onFolderModeSelect,
       viewState = viewState,
     )
   }
@@ -95,7 +95,7 @@ private fun SelectFolderType(
 private fun Content(
   contentPadding: PaddingValues,
   viewState: SelectFolderTypeViewState,
-  onFolderModeSelected: (FolderMode) -> Unit,
+  onFolderModeSelect: (FolderMode) -> Unit,
 ) {
   LazyVerticalGrid(
     columns = GridCells.Adaptive(150.dp),
@@ -107,7 +107,7 @@ private fun Content(
       span = { GridItemSpan(maxLineSpan) },
     ) {
       FolderModeSelectionCard(
-        onFolderModeSelected = onFolderModeSelected,
+        onFolderModeSelect = onFolderModeSelect,
         selectedFolderMode = viewState.selectedFolderMode,
       )
     }
@@ -186,7 +186,7 @@ private fun AppBar(
 private fun SelectFolderTypePreview() {
   SelectFolderType(
     onBackClick = {},
-    onFolderModeSelected = {},
+    onFolderModeSelect = {},
     viewState = SelectFolderTypeViewState(
       books = listOf(
         SelectFolderTypeViewState.Book("Cats", 42),
diff --git a/gradle.properties b/gradle.properties
index 5eb040f3d7..089dcf6411 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,6 +10,6 @@ android.uniquePackageNames=true
 android.useAndroidX=true
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.unsafe.configuration-cache=true
+org.gradle.configuration-cache=true
 kotlin.daemon.useFallbackStrategy=false
 org.gradle.kotlin.dsl.allWarningsAsErrors=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f68ee7349c..134ceeb3bc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,21 +3,20 @@ leakcanary = "2.14"
 versionCode = "3603035"
 versionName = "8.2.4"
 
-sdk-compile = "34"
+sdk-compile = "35"
 sdk-min = "26"
 sdk-target = "34"
 
-coroutines = "1.8.1"
+coroutines = "1.10.1"
 room = "2.6.1"
 prefs = "1.0.1"
 materialDialog = "3.3.0"
-dagger = "2.51.1"
-kotlin = "1.9.24"
-compose-compiler = "1.5.14"
-media3 = "1.3.1"
-agp = "8.4.1"
-ktlint-core = "1.2.1"
-ktlint-gradlePlugin = "0.9.0"
+dagger = "2.55"
+kotlin = "2.1.0"
+media3 = "1.5.1"
+agp = "8.8.0"
+ktlint-core = "1.5.0"
+ktlint-gradlePlugin = "0.10.0"
 retrofit = "2.11.0"
 
 [libraries]
@@ -27,68 +26,57 @@ leakcanary-plumber = { module = "com.squareup.leakcanary:plumber-android-startup
 material = "com.google.android.material:material:1.12.0"
 ffmpeg = "com.arthenica:ffmpeg-kit-audio:6.0-2"
 junit = "junit:junit:4.13.2"
-mockk = "io.mockk:mockk:1.13.11"
-paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.0"
-paging-compose = "androidx.paging:paging-compose:3.3.0"
+mockk = "io.mockk:mockk:1.13.16"
+paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.5"
+paging-compose = "androidx.paging:paging-compose:3.3.5"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }
 retrofit-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }
-robolectric = "org.robolectric:robolectric:4.12.2"
-coil = "io.coil-kt:coil-compose:2.6.0"
-appCompat = "androidx.appcompat:appcompat:1.6.1"
-constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"
-recyclerView = "androidx.recyclerview:recyclerview:1.3.2"
-androidxCore = "androidx.core:core-ktx:1.13.1"
+robolectric = "org.robolectric:robolectric:4.14.1"
+coil = "io.coil-kt:coil-compose:2.7.0"
+appCompat = "androidx.appcompat:appcompat:1.7.0"
+androidxCore = "androidx.core:core-ktx:1.15.0"
 kotlin-pluginForGradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
-desugar = "com.android.tools:desugar_jdk_libs:2.0.4"
+desugar = "com.android.tools:desugar_jdk_libs:2.1.4"
 documentFile = "androidx.documentfile:documentfile:1.0.1"
-koTest-assert = "io.kotest:kotest-assertions-core:5.9.0"
+koTest-assert = "io.kotest:kotest-assertions-core:5.9.1"
 datastore = "androidx.datastore:datastore-preferences:1.1.1"
 seismic = "com.squareup:seismic:1.0.3"
 viewBinding = { module = "androidx.databinding:viewbinding", version.ref = "agp" }
-appStartup = "androidx.startup:startup-runtime:1.1.1"
-turbine = "app.cash.turbine:turbine:1.1.0"
-molecule = "app.cash.molecule:molecule-runtime:1.4.3"
-immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
+appStartup = "androidx.startup:startup-runtime:1.2.0"
+turbine = "app.cash.turbine:turbine:1.2.0"
+molecule = "app.cash.molecule:molecule-runtime:2.0.0"
+immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"
 uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
-review = "com.google.android.play:review-ktx:2.0.1"
-lottie = "com.airbnb.android:lottie-compose:6.4.0"
-clikt = "com.github.ajalt.clikt:clikt:4.4.0"
+review = "com.google.android.play:review-ktx:2.0.2"
+lottie = "com.airbnb.android:lottie-compose:6.6.2"
+clikt = "com.github.ajalt.clikt:clikt:5.0.2"
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version.ref = "coroutines" }
 coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 
-firebase-bom = "com.google.firebase:firebase-bom:33.0.0"
-firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" }
-firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" }
-firebase-remoteconfig = { module = "com.google.firebase:firebase-config-ktx" }
-
-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
+serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
 
 room-runtime = { module = "androidx.room:room-ktx", version.ref = "room" }
 room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 room-testing = { module = "androidx.room:room-testing", version.ref = "room" }
 
-androidX-test-runner = "androidx.test:runner:1.5.2"
-androidX-test-junit = "androidx.test.ext:junit:1.1.5"
-androidX-test-core = "androidx.test:core-ktx:1.5.0"
+androidX-test-runner = "androidx.test:runner:1.6.2"
+androidX-test-junit = "androidx.test.ext:junit:1.2.1"
+androidX-test-core = "androidx.test:core-ktx:1.6.1"
 
-androidTest-orchestrator = "androidx.test:orchestrator:1.4.2"
-androidTest-services-testServices = "androidx.test.services:test-services:1.4.2"
-androidTest-services-storage = "androidx.test.services:storage:1.4.2"
-androidTest-espresso = "androidx.test.espresso:espresso-core:3.5.1"
-androidTest-rules = "androidx.test:rules:1.5.0"
+androidTest-orchestrator = "androidx.test:orchestrator:1.5.1"
+androidTest-services-testServices = "androidx.test.services:test-services:1.5.0"
+androidTest-services-storage = "androidx.test.services:storage:1.5.0"
+androidTest-espresso = "androidx.test.espresso:espresso-core:3.6.1"
+androidTest-rules = "androidx.test:rules:1.6.1"
 
 conductor = "com.bluelinelabs:conductor:4.0.0-preview-4"
 
-prefs-core = { module = "com.github.PaulWoitaschek.FlowPref:core", version.ref = "prefs" }
-prefs-android = { module = "com.github.PaulWoitaschek.FlowPref:android", version.ref = "prefs" }
-prefs-inMemory = { module = "com.github.PaulWoitaschek.FlowPref:in-memory", version.ref = "prefs" }
-
 materialDialog-core = { module = "com.afollestad.material-dialogs:core", version.ref = "materialDialog" }
 materialDialog-input = { module = "com.afollestad.material-dialogs:input", version.ref = "materialDialog" }
 
@@ -100,9 +88,9 @@ media3-session = { module = "androidx.media3:media3-session", version.ref = "med
 media3-testUtils-core = { module = "androidx.media3:media3-test-utils", version.ref = "media3" }
 media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-robolectric", version.ref = "media3" }
 
-lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.0"
+lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
 
-compose-bom = "androidx.compose:compose-bom:2024.05.00"
+compose-bom = "androidx.compose:compose-bom:2024.12.01"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-tooling-core = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
@@ -116,13 +104,12 @@ compose-material-icons-extended = { module = "androidx.compose.material:material
 compose-animation-graphics = { module = "androidx.compose.animation:animation-graphics" }
 compose-animation-animation = { module = "androidx.compose.animation:animation" }
 compose-material3 = { module = "androidx.compose.material3:material3" }
-compose-activity = "androidx.activity:activity-compose:1.9.0"
+compose-activity = "androidx.activity:activity-compose:1.9.3"
 compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }
 ktlint-gradlePlugin = { module = "io.github.usefulness:ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.1"
+ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.22"
 
 [bundles]
 compose = [
@@ -162,11 +149,10 @@ retrofit = [
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-anvil = { id = "com.squareup.anvil", version = "2.4.9-1-8" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+anvil = { id = "com.squareup.anvil", version = "2.5.0" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "1.9.24-1.0.20" }
-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.1" }
-googleServices = { id = "com.google.gms.google-services", version = "4.4.1" }
-playPublish = { id = "com.github.triplet.play", version = "3.9.1" }
+ksp = { id = "com.google.devtools.ksp", version = "2.1.0-1.0.29" }
+playPublish = { id = "com.github.triplet.play", version = "3.12.1" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e6441136f3..a4b76b9530 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e7646dead0..e0fd02028b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a4269..f3b75f3b0d 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 7101f8e467..9b42019c79 100755
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/lint.xml b/lint.xml
index dad4d05afb..1d98677c6c 100644
--- a/lint.xml
+++ b/lint.xml
@@ -3,9 +3,11 @@
   <issue id="Typos" severity="informational" />
   <issue id="TypographyEllipsis" severity="informational" />
   <issue id="MissingTranslation" severity="informational" />
+  <!-- https://github.com/WeblateOrg/weblate/issues/7520 -->
   <issue id="MissingQuantity">
     <ignore regexp=".*?French.*?many" />
     <ignore regexp=".*?Slovak.*?many" />
+    <ignore regexp=".*?Czech.*?many" />
   </issue>
   <issue id="Overdraw" severity="informational" />
   <issue id="RestrictedApi" severity="informational" />
diff --git a/logging/crashlytics/build.gradle.kts b/logging/crashlytics/build.gradle.kts
deleted file mode 100644
index 683225baa4..0000000000
--- a/logging/crashlytics/build.gradle.kts
+++ /dev/null
@@ -1,8 +0,0 @@
-plugins {
-  id("voice.library")
-}
-
-dependencies {
-  implementation(libs.appStartup)
-  implementation(libs.firebase.crashlytics)
-}
diff --git a/logging/crashlytics/src/main/AndroidManifest.xml b/logging/crashlytics/src/main/AndroidManifest.xml
deleted file mode 100644
index 605842fefc..0000000000
--- a/logging/crashlytics/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<manifest xmlns:tools="http://schemas.android.com/tools"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <application>
-
-    <provider
-      android:name="androidx.startup.InitializationProvider"
-      android:authorities="${applicationId}.androidx-startup"
-      android:exported="false"
-      tools:node="merge">
-
-      <meta-data
-        android:name="voice.logging.crashlytics.CrashlyticsLogWriterInitializer"
-        android:value="androidx.startup" />
-    </provider>
-
-  </application>
-</manifest>
diff --git a/logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriter.kt b/logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriter.kt
deleted file mode 100644
index 57c4a38e9b..0000000000
--- a/logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriter.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package voice.logging.crashlytics
-
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import voice.logging.core.LogWriter
-import voice.logging.core.Logger
-
-internal class CrashlyticsLogWriter : LogWriter {
-
-  private val crashlytics: FirebaseCrashlytics get() = FirebaseCrashlytics.getInstance()
-
-  override fun log(
-    severity: Logger.Severity,
-    message: String,
-    throwable: Throwable?,
-  ) {
-    if (severity <= Logger.Severity.Verbose) {
-      return
-    }
-
-    crashlytics.log(message)
-    if (severity >= Logger.Severity.Error) {
-      crashlytics.recordException(throwable ?: AssertionError(message))
-    }
-  }
-}
diff --git a/logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriterInitializer.kt b/logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriterInitializer.kt
deleted file mode 100644
index 3bc8787fb6..0000000000
--- a/logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriterInitializer.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package voice.logging.crashlytics
-
-import android.content.Context
-import androidx.startup.Initializer
-import voice.logging.core.Logger
-
-@Suppress("unused")
-class CrashlyticsLogWriterInitializer : Initializer<Unit> {
-
-  override fun create(context: Context) {
-    Logger.install(CrashlyticsLogWriter())
-  }
-
-  override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()
-}
diff --git a/migration/build.gradle.kts b/migration/build.gradle.kts
index 1c51d3d3be..842c1d2368 100644
--- a/migration/build.gradle.kts
+++ b/migration/build.gradle.kts
@@ -15,10 +15,10 @@ dependencies {
   implementation(projects.data)
   implementation(projects.sleepTimer)
   implementation(projects.scanner)
+  implementation(projects.pref)
 
   implementation(libs.dagger.core)
   implementation(libs.datastore)
-  implementation(libs.prefs.core)
 
   testImplementation(libs.bundles.testing.jvm)
 }
diff --git a/migration/src/main/kotlin/voice/migration/MigrationViewModel.kt b/migration/src/main/kotlin/voice/migration/MigrationViewModel.kt
index 03a95182f6..d856d5419d 100644
--- a/migration/src/main/kotlin/voice/migration/MigrationViewModel.kt
+++ b/migration/src/main/kotlin/voice/migration/MigrationViewModel.kt
@@ -36,17 +36,17 @@ class MigrationViewModel
     var showDeletionConfirmationDialog by remember {
       mutableStateOf(false)
     }
-    val onDeleteClicked = {
+    val onDeleteClick = {
       showDeletionConfirmationDialog = true
     }
-    val onDeletionAborted = {
+    val onDeletionAbort = {
       showDeletionConfirmationDialog = false
     }
     var items by remember {
       mutableStateOf(listOf<MigrationViewState.Item>())
     }
     val scope = rememberCoroutineScope()
-    val onDeletionConfirmed: () -> Unit = {
+    val onDeletionConfirm: () -> Unit = {
       showDeletionConfirmationDialog = false
       scope.launch {
         dao.deleteAll()
@@ -59,10 +59,10 @@ class MigrationViewModel
 
     return MigrationViewState(
       items = items,
-      onDeleteClicked = onDeleteClicked,
+      onDeleteClick = onDeleteClick,
       showDeletionConfirmationDialog = showDeletionConfirmationDialog,
-      onDeletionConfirmed = onDeletionConfirmed,
-      onDeletionAborted = onDeletionAborted,
+      onDeletionConfirm = onDeletionConfirm,
+      onDeletionAbort = onDeletionAbort,
     )
   }
 
diff --git a/migration/src/main/kotlin/voice/migration/views/Migration.kt b/migration/src/main/kotlin/voice/migration/views/Migration.kt
index e7ca555f48..ee4db3d359 100644
--- a/migration/src/main/kotlin/voice/migration/views/Migration.kt
+++ b/migration/src/main/kotlin/voice/migration/views/Migration.kt
@@ -55,7 +55,7 @@ fun Migration() {
   val viewState = viewModel.viewState()
   Migration(
     viewState = viewState,
-    onCloseClicked = {
+    onCloseClick = {
       viewModel.onCloseClick()
     },
   )
@@ -64,7 +64,7 @@ fun Migration() {
 @Composable
 internal fun Migration(
   viewState: MigrationViewState,
-  onCloseClicked: () -> Unit,
+  onCloseClick: () -> Unit,
 ) {
   val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
   Scaffold(
@@ -77,7 +77,7 @@ internal fun Migration(
         },
         navigationIcon = {
           IconButton(
-            onClick = onCloseClicked,
+            onClick = onCloseClick,
           ) {
             Icon(
               imageVector = Icons.Outlined.Close,
@@ -88,7 +88,7 @@ internal fun Migration(
       )
     },
     floatingActionButton = {
-      FloatingActionButton(onClick = viewState.onDeleteClicked) {
+      FloatingActionButton(onClick = viewState.onDeleteClick) {
         Icon(
           imageVector = Icons.Outlined.Delete,
           contentDescription = stringResource(id = StringsR.string.delete),
@@ -106,8 +106,8 @@ internal fun Migration(
     }
     if (viewState.showDeletionConfirmationDialog) {
       DeletionConfirmationDialog(
-        onCancel = viewState.onDeletionAborted,
-        onConfirm = viewState.onDeletionConfirmed,
+        onCancel = viewState.onDeletionAbort,
+        onConfirm = viewState.onDeletionConfirm,
       )
     }
   }
@@ -236,7 +236,7 @@ private fun MigrationPreview(
   viewState: MigrationViewState,
 ) {
   VoiceTheme {
-    Migration(viewState, onCloseClicked = {})
+    Migration(viewState, onCloseClick = {})
   }
 }
 
@@ -272,10 +272,10 @@ internal class MigrationViewStatePreviewProvider : PreviewParameterProvider<Migr
       yield(
         MigrationViewState(
           items = listOf(item(), item()),
-          onDeleteClicked = {},
+          onDeleteClick = {},
           showDeletionConfirmationDialog = false,
-          onDeletionConfirmed = {},
-          onDeletionAborted = {},
+          onDeletionConfirm = {},
+          onDeletionAbort = {},
         ),
       )
     }
diff --git a/migration/src/main/kotlin/voice/migration/views/MigrationViewState.kt b/migration/src/main/kotlin/voice/migration/views/MigrationViewState.kt
index 862111fba4..2193480004 100644
--- a/migration/src/main/kotlin/voice/migration/views/MigrationViewState.kt
+++ b/migration/src/main/kotlin/voice/migration/views/MigrationViewState.kt
@@ -4,10 +4,10 @@ import java.time.Instant
 
 internal data class MigrationViewState(
   val items: List<Item>,
-  val onDeleteClicked: () -> Unit,
+  val onDeleteClick: () -> Unit,
   val showDeletionConfirmationDialog: Boolean,
-  val onDeletionConfirmed: () -> Unit,
-  val onDeletionAborted: () -> Unit,
+  val onDeletionConfirm: () -> Unit,
+  val onDeletionAbort: () -> Unit,
 ) {
   data class Item(
     val name: String,
diff --git a/playback/build.gradle.kts b/playback/build.gradle.kts
index 281b45db1d..43b96717b8 100644
--- a/playback/build.gradle.kts
+++ b/playback/build.gradle.kts
@@ -18,9 +18,9 @@ dependencies {
   implementation(projects.common)
   implementation(projects.strings)
   implementation(projects.data)
+  implementation(projects.pref)
 
   implementation(libs.androidxCore)
-  implementation(libs.prefs.core)
   implementation(libs.datastore)
   implementation(libs.coil)
   implementation(libs.coroutines.guava)
@@ -31,7 +31,6 @@ dependencies {
   implementation(libs.media3.session)
 
   testImplementation(libs.bundles.testing.jvm)
-  testImplementation(libs.prefs.inMemory)
   testImplementation(libs.media3.testUtils.core)
   testImplementation(libs.media3.testUtils.robolectric)
 }
diff --git a/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt b/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt
index c75235dcfd..b412a2b995 100644
--- a/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt
+++ b/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt
@@ -97,9 +97,7 @@ class VolumeGainSetter
 
 @Singleton
 class VolumeGain
-@Inject constructor(
-  private val volumeGainSetter: VolumeGainSetter,
-) {
+@Inject constructor(private val volumeGainSetter: VolumeGainSetter) {
 
   var gain: Decibel by Delegates.observable(Decibel(0F)) { _, _, _ -> updateLoudnessEnhancer() }
   var audioSessionId: Int? by Delegates.observable(null) { _, _, _ -> updateLoudnessEnhancer() }
diff --git a/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt b/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt
index 0a2dc3b72d..be0d206e88 100644
--- a/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt
+++ b/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt
@@ -10,9 +10,7 @@ import voice.playback.session.toMediaIdOrNull
 import javax.inject.Inject
 
 class DurationInconsistenciesUpdater
-@Inject constructor(
-  private val chapterRepo: ChapterRepo,
-) : Player.Listener {
+@Inject constructor(private val chapterRepo: ChapterRepo) : Player.Listener {
 
   private lateinit var player: Player
 
diff --git a/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt b/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt
index d37dda8606..aefca2bc75 100644
--- a/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt
+++ b/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt
@@ -12,9 +12,7 @@ import androidx.media3.exoplayer.video.VideoRendererEventListener
 import javax.inject.Inject
 
 class OnlyAudioRenderersFactory
-@Inject constructor(
-  context: Context,
-) : DefaultRenderersFactory(context) {
+@Inject constructor(context: Context) : DefaultRenderersFactory(context) {
 
   override fun buildVideoRenderers(
     context: Context,
diff --git a/playback/src/main/kotlin/voice/playback/player/VoicePlayer.kt b/playback/src/main/kotlin/voice/playback/player/VoicePlayer.kt
index aa0c51af38..40492fff26 100644
--- a/playback/src/main/kotlin/voice/playback/player/VoicePlayer.kt
+++ b/playback/src/main/kotlin/voice/playback/player/VoicePlayer.kt
@@ -6,7 +6,6 @@ import androidx.media3.common.ForwardingPlayer
 import androidx.media3.common.MediaItem
 import androidx.media3.common.Player
 import androidx.media3.exoplayer.ExoPlayer
-import de.paulwoitaschek.flowpref.Pref
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
@@ -24,6 +23,7 @@ import voice.playback.misc.VolumeGain
 import voice.playback.session.MediaId
 import voice.playback.session.MediaItemProvider
 import voice.playback.session.toMediaIdOrNull
+import voice.pref.Pref
 import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Named
diff --git a/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt b/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt
index 3951d5fea0..8b670de9f0 100644
--- a/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt
+++ b/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt
@@ -4,9 +4,7 @@ import androidx.media3.common.Player
 import javax.inject.Inject
 
 class PlayStateDelegatingListener
-@Inject constructor(
-  private val playStateManager: PlayStateManager,
-) : Player.Listener {
+@Inject constructor(private val playStateManager: PlayStateManager) : Player.Listener {
 
   private lateinit var player: Player
 
diff --git a/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt b/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt
index 8964deffcf..0db8fcca61 100644
--- a/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt
+++ b/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt
@@ -8,9 +8,7 @@ import java.io.File
 import javax.inject.Inject
 
 class ImageFileProvider
-@Inject constructor(
-  private val application: Application,
-) {
+@Inject constructor(private val application: Application) {
 
   internal fun uri(file: File): Uri {
     return FileProvider
diff --git a/playback/src/main/kotlin/voice/playback/session/LibrarySessionCallback.kt b/playback/src/main/kotlin/voice/playback/session/LibrarySessionCallback.kt
index 7a19891db4..42967ef1fa 100644
--- a/playback/src/main/kotlin/voice/playback/session/LibrarySessionCallback.kt
+++ b/playback/src/main/kotlin/voice/playback/session/LibrarySessionCallback.kt
@@ -13,6 +13,7 @@ import androidx.media3.session.MediaSession.ConnectionResult
 import androidx.media3.session.MediaSession.ControllerInfo
 import androidx.media3.session.MediaSession.MediaItemsWithStartPosition
 import androidx.media3.session.SessionCommand
+import androidx.media3.session.SessionError
 import androidx.media3.session.SessionResult
 import com.google.common.collect.ImmutableList
 import com.google.common.util.concurrent.Futures
@@ -117,7 +118,7 @@ class LibrarySessionCallback
     if (item != null) {
       LibraryResult.ofItem(item, null)
     } else {
-      LibraryResult.ofError(LibraryResult.RESULT_ERROR_BAD_VALUE)
+      LibraryResult.ofError(SessionError.ERROR_BAD_VALUE)
     }
   }
 
@@ -134,7 +135,7 @@ class LibrarySessionCallback
     if (children != null) {
       LibraryResult.ofItemList(children, params)
     } else {
-      LibraryResult.ofError(LibraryResult.RESULT_ERROR_BAD_VALUE)
+      LibraryResult.ofError(SessionError.ERROR_BAD_VALUE)
     }
   }
 
diff --git a/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt b/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt
index 5c0cf1ebe1..c7125e5a03 100644
--- a/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt
+++ b/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt
@@ -8,9 +8,7 @@ import javax.inject.Inject
 import voice.strings.R as StringsR
 
 class SleepTimerCommandUpdater
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   fun update(
     session: MediaSession,
diff --git a/playback/src/test/kotlin/voice/playback/player/VoicePlayerTest.kt b/playback/src/test/kotlin/voice/playback/player/VoicePlayerTest.kt
index fb6c0e08d1..33072e873b 100644
--- a/playback/src/test/kotlin/voice/playback/player/VoicePlayerTest.kt
+++ b/playback/src/test/kotlin/voice/playback/player/VoicePlayerTest.kt
@@ -9,7 +9,6 @@ import androidx.media3.test.utils.TestExoPlayerBuilder
 import androidx.media3.test.utils.robolectric.TestPlayerRunHelper
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import de.paulwoitaschek.flowpref.inmemory.InMemoryPref
 import io.kotest.matchers.MatcherResult
 import io.kotest.matchers.should
 import io.mockk.Runs
@@ -37,6 +36,7 @@ import voice.playback.session.MediaId
 import voice.playback.session.MediaItemProvider
 import voice.playback.session.search.book
 import voice.playback.session.toMediaIdOrNull
+import voice.pref.inmemory.InMemoryPref
 import java.time.Instant
 import java.util.UUID
 import java.util.concurrent.TimeUnit
diff --git a/playbackScreen/build.gradle.kts b/playbackScreen/build.gradle.kts
index f49726de51..aa485168fb 100644
--- a/playbackScreen/build.gradle.kts
+++ b/playbackScreen/build.gradle.kts
@@ -21,17 +21,16 @@ dependencies {
   implementation(projects.data)
   implementation(projects.datastore)
   implementation(projects.sleepTimer)
+  implementation(projects.pref)
 
   implementation(libs.datastore)
   implementation(libs.coil)
   implementation(libs.androidxCore)
-  implementation(libs.prefs.core)
   implementation(libs.materialDialog.core)
   implementation(libs.androidxCore)
   implementation(libs.material)
 
   implementation(libs.dagger.core)
 
-  testImplementation(libs.prefs.inMemory)
   testImplementation(libs.turbine)
 }
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt
index c85a8e5fca..896e26062a 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt
@@ -70,16 +70,16 @@ class BookPlayController(bundle: Bundle) : ComposeController(bundle) {
       onFastForwardClick = viewModel::fastForward,
       onRewindClick = viewModel::rewind,
       onSeek = viewModel::seekTo,
-      onBookmarkClick = viewModel::onBookmarkClicked,
-      onBookmarkLongClick = viewModel::onBookmarkLongClicked,
+      onBookmarkClick = viewModel::onBookmarkClick,
+      onBookmarkLongClick = viewModel::onBookmarkLongClick,
       onSkipSilenceClick = viewModel::toggleSkipSilence,
       onSleepTimerClick = viewModel::toggleSleepTimer,
-      onVolumeBoostClick = viewModel::onVolumeGainIconClicked,
-      onSpeedChangeClick = viewModel::onPlaybackSpeedIconClicked,
+      onVolumeBoostClick = viewModel::onVolumeGainIconClick,
+      onSpeedChangeClick = viewModel::onPlaybackSpeedIconClick,
       onCloseClick = { router.popController(this@BookPlayController) },
       onSkipToNext = viewModel::next,
       onSkipToPrevious = viewModel::previous,
-      onCurrentChapterClick = viewModel::onCurrentChapterClicked,
+      onCurrentChapterClick = viewModel::onCurrentChapterClick,
       useLandscapeLayout = LocalConfiguration.current.orientation == ORIENTATION_LANDSCAPE,
       snackbarHostState = snackbarHostState,
     )
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt
index d01e55aee7..460c6a72ad 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt
@@ -11,7 +11,6 @@ import androidx.datastore.core.DataStore
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import de.paulwoitaschek.flowpref.Pref
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.Flow
@@ -35,6 +34,7 @@ import voice.playback.misc.Decibel
 import voice.playback.misc.VolumeGain
 import voice.playback.playstate.PlayStateManager
 import voice.playbackScreen.batteryOptimization.BatteryOptimization
+import voice.pref.Pref
 import voice.sleepTimer.SleepTimer
 import voice.sleepTimer.SleepTimerViewState
 import javax.inject.Named
@@ -193,7 +193,7 @@ class BookPlayViewModel
     player.fastForward()
   }
 
-  fun onCurrentChapterClicked() {
+  fun onCurrentChapterClick() {
     scope.launch {
       val book = bookRepository.get(bookId) ?: return@launch
       val chapterMarks = book.chapters.flatMap {
@@ -207,7 +207,7 @@ class BookPlayViewModel
     }
   }
 
-  fun onChapterClicked(index: Int) {
+  fun onChapterClick(index: Int) {
     scope.launch {
       val book = bookRepository.get(bookId) ?: return@launch
       var currentIndex = -1
@@ -224,7 +224,7 @@ class BookPlayViewModel
     }
   }
 
-  fun onPlaybackSpeedIconClicked() {
+  fun onPlaybackSpeedIconClick() {
     scope.launch {
       val playbackSpeed = bookRepository.get(bookId)?.content?.playbackSpeed
       if (playbackSpeed != null) {
@@ -233,7 +233,7 @@ class BookPlayViewModel
     }
   }
 
-  fun onVolumeGainIconClicked() {
+  fun onVolumeGainIconClick() {
     scope.launch {
       val content = bookRepository.get(bookId)?.content
       if (content != null) {
@@ -250,11 +250,11 @@ class BookPlayViewModel
     )
   }
 
-  fun onBookmarkClicked() {
+  fun onBookmarkClick() {
     navigator.goTo(Destination.Bookmarks(bookId))
   }
 
-  fun onBookmarkLongClicked() {
+  fun onBookmarkLongClick() {
     scope.launch {
       val book = bookRepository.get(bookId) ?: return@launch
       bookmarkRepository.addBookmarkAtBookPosition(
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt
index fb0a550b61..cf44031126 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt
@@ -28,9 +28,7 @@ data class BookPlayViewState(
 }
 
 internal sealed interface BookPlayDialogViewState {
-  data class SpeedDialog(
-    val speed: Float,
-  ) : BookPlayDialogViewState {
+  data class SpeedDialog(val speed: Float) : BookPlayDialogViewState {
 
     val maxSpeed: Float get() = if (speed < 2F) 2F else 3.5F
   }
@@ -47,7 +45,5 @@ internal sealed interface BookPlayDialogViewState {
   ) : BookPlayDialogViewState
 
   @JvmInline
-  value class SleepTimer(
-    val viewState: SleepTimerViewState,
-  ) : BookPlayDialogViewState
+  value class SleepTimer(val viewState: SleepTimerViewState) : BookPlayDialogViewState
 }
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt
index c786fc1db7..4f2995b1c3 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt
@@ -9,9 +9,11 @@ import androidx.compose.material.icons.outlined.Equalizer
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import voice.strings.R as StringsR
 
@@ -29,8 +31,9 @@ internal fun SelectChapterDialog(
         content = {
           itemsIndexed(dialogState.chapters) { index, chapter ->
             ListItem(
+              colors = ListItemDefaults.colors(containerColor = Color.Transparent),
               modifier = Modifier.clickable {
-                viewModel.onChapterClicked(index)
+                viewModel.onChapterClick(index)
               },
               headlineContent = {
                 Text(text = chapter.name ?: "")
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt
index 1d7fa5ba47..9fa7ad297b 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt
@@ -13,9 +13,7 @@ fun interface IsIgnoringBatteryOptimizations {
 
 @ContributesBinding(AppScope::class)
 class IsIgnoringBatteryOptimizationsImpl
-@Inject constructor(
-  private val context: Application,
-) : IsIgnoringBatteryOptimizations {
+@Inject constructor(private val context: Application) : IsIgnoringBatteryOptimizations {
   override fun invoke(): Boolean {
     val powerManager = context.getSystemService<PowerManager>()
       ?: return true
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/AppBarTitle.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/AppBarTitle.kt
index 874e41815e..07d0a547b4 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/AppBarTitle.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/AppBarTitle.kt
@@ -1,9 +1,14 @@
 package voice.playbackScreen.view
 
+import androidx.compose.foundation.basicMarquee
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 
 @Composable
 internal fun AppBarTitle(title: String) {
-  Text(text = title)
+  Text(
+    text = title,
+    modifier = Modifier.basicMarquee(),
+  )
 }
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/BookPlayAppBar.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/BookPlayAppBar.kt
index f4aff9a15d..6954d055eb 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/BookPlayAppBar.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/BookPlayAppBar.kt
@@ -10,11 +10,11 @@ import androidx.compose.material.icons.outlined.Bedtime
 import androidx.compose.material.icons.outlined.BedtimeOff
 import androidx.compose.material.icons.outlined.CollectionsBookmark
 import androidx.compose.material.icons.outlined.Speed
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LargeTopAppBar
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -54,7 +54,7 @@ internal fun BookPlayAppBar(
         .combinedClickable(
           onClick = onBookmarkClick,
           onLongClick = onBookmarkLongClick,
-          indication = rememberRipple(bounded = false, radius = 20.dp),
+          indication = ripple(bounded = false, radius = 20.dp),
           interactionSource = remember { MutableInteractionSource() },
         ),
       contentAlignment = Alignment.Center,
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/OverflowMenu.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/OverflowMenu.kt
index 0c7222fe83..b2be6671be 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/OverflowMenu.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/OverflowMenu.kt
@@ -1,21 +1,19 @@
 package voice.playbackScreen.view
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.MoreVert
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.ListItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import voice.strings.R
 
@@ -41,17 +39,15 @@ internal fun OverflowMenu(
       expanded = expanded,
       onDismissRequest = { expanded = false },
     ) {
-      ListItem(
-        modifier = Modifier.clickable(
-          onClick = {
-            expanded = false
-            onSkipSilenceClick()
-          },
-        ),
-        headlineContent = {
+      DropdownMenuItem(
+        onClick = {
+          expanded = false
+          onSkipSilenceClick()
+        },
+        text = {
           Text(text = stringResource(id = R.string.skip_silence))
         },
-        trailingContent = {
+        trailingIcon = {
           Checkbox(
             checked = skipSilence,
             onCheckedChange = {
@@ -61,14 +57,12 @@ internal fun OverflowMenu(
           )
         },
       )
-      ListItem(
-        modifier = Modifier.clickable(
-          onClick = {
-            expanded = false
-            onVolumeBoostClick()
-          },
-        ),
-        headlineContent = {
+      DropdownMenuItem(
+        onClick = {
+          expanded = false
+          onVolumeBoostClick()
+        },
+        text = {
           Text(text = stringResource(id = R.string.volume_boost))
         },
       )
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/SkipButton.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/SkipButton.kt
index 53798638bd..b12ec28d11 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/SkipButton.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/SkipButton.kt
@@ -5,8 +5,8 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Undo
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.Icon
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -24,10 +24,10 @@ internal fun SkipButton(
     modifier = Modifier
       .clickable(
         interactionSource = remember { MutableInteractionSource() },
-        indication = rememberRipple(bounded = false),
+        indication = ripple(bounded = false),
         onClick = onClick,
       )
-      .size(50.dp)
+      .size(48.dp)
       .scale(scaleX = if (forward) -1f else 1F, scaleY = 1f),
     imageVector = Icons.AutoMirrored.Filled.Undo,
     contentDescription = stringResource(
diff --git a/playbackScreen/src/test/kotlin/voice/playbackScreen/BookPlayViewModelTest.kt b/playbackScreen/src/test/kotlin/voice/playbackScreen/BookPlayViewModelTest.kt
index cd01f0cad4..c747df7bd3 100644
--- a/playbackScreen/src/test/kotlin/voice/playbackScreen/BookPlayViewModelTest.kt
+++ b/playbackScreen/src/test/kotlin/voice/playbackScreen/BookPlayViewModelTest.kt
@@ -1,6 +1,5 @@
 package voice.playbackScreen
 
-import de.paulwoitaschek.flowpref.inmemory.InMemoryPref
 import io.kotest.matchers.shouldBe
 import io.mockk.coEvery
 import io.mockk.every
@@ -17,6 +16,7 @@ import voice.data.BookContent
 import voice.data.Bookmark
 import voice.data.Chapter
 import voice.data.ChapterId
+import voice.pref.inmemory.InMemoryPref
 import voice.sleepTimer.SleepTimer
 import voice.sleepTimer.SleepTimerViewState
 import java.time.Instant
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
index 41885afedc..ccf8d46cfa 100644
--- a/plugins/build.gradle.kts
+++ b/plugins/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 dependencies {
   implementation(libs.androidPluginForGradle)
   implementation(libs.kotlin.pluginForGradle)
-  implementation(libs.kotlin.compilerEmbeddable)
+  compileOnly(libs.kotlin.compilerEmbeddable)
   implementation(libs.ktlint.gradlePlugin)
 }
 
@@ -32,6 +32,6 @@ gradlePlugin {
 
 kotlin {
   jvmToolchain {
-    (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(17))
+    languageVersion.set(JavaLanguageVersion.of(17))
   }
 }
diff --git a/plugins/settings.gradle.kts b/plugins/settings.gradle.kts
index 1bc45ceaa3..940e1b78e3 100644
--- a/plugins/settings.gradle.kts
+++ b/plugins/settings.gradle.kts
@@ -5,7 +5,7 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 rootProject.name = "plugins"
 
 plugins {
-  id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
+  id("org.gradle.toolchains.foojay-resolver-convention") version ("0.9.0")
 }
 
 dependencyResolutionManagement {
diff --git a/plugins/src/main/kotlin/ComposePlugin.kt b/plugins/src/main/kotlin/ComposePlugin.kt
index d52dbd8e3a..0b739c26e5 100644
--- a/plugins/src/main/kotlin/ComposePlugin.kt
+++ b/plugins/src/main/kotlin/ComposePlugin.kt
@@ -1,5 +1,3 @@
-@file:Suppress("UnstableApiUsage")
-
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.dsl.LibraryExtension
@@ -29,20 +27,18 @@ class ComposePlugin : Plugin<Project> {
     val libs = target.extensions.getByType(VersionCatalogsExtension::class.java).named("libs")
     target.dependencies.add("implementation", libs.findBundle("compose").get())
     target.dependencies.add("debugImplementation", libs.findLibrary("compose-ui-tooling-core").get())
+    target.plugins.apply("org.jetbrains.kotlin.plugin.compose")
     extension.buildFeatures.compose = true
-    extension.composeOptions {
-      kotlinCompilerExtensionVersion = libs.findVersion("compose-compiler").get().requiredVersion
-    }
     target.tasks.withType<KotlinCompile> {
-      kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
+      compilerOptions {
+        optIn.addAll(
           "androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi",
           "androidx.compose.material3.ExperimentalMaterial3Api",
           "androidx.compose.foundation.ExperimentalFoundationApi",
           "androidx.compose.ui.ExperimentalComposeUiApi",
           "androidx.compose.animation.ExperimentalAnimationApi",
           "androidx.compose.foundation.layout.ExperimentalLayoutApi",
-        ).map { "-opt-in=$it" }
+        )
       }
     }
   }
diff --git a/plugins/src/main/kotlin/baseSetup.kt b/plugins/src/main/kotlin/baseSetup.kt
index 0561b1536a..b5d0059921 100644
--- a/plugins/src/main/kotlin/baseSetup.kt
+++ b/plugins/src/main/kotlin/baseSetup.kt
@@ -6,25 +6,28 @@ import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 fun Project.baseSetup() {
   val libs: VersionCatalog = extensions.getByType(VersionCatalogsExtension::class.java).named("libs")
   tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-      languageVersion = "1.9"
-      jvmTarget = JavaVersion.VERSION_11.toString()
-      val optIns = listOf(
-        "kotlin.RequiresOptIn",
-        "kotlin.ExperimentalStdlibApi",
-        "kotlin.contracts.ExperimentalContracts",
-        "kotlin.time.ExperimentalTime",
-        "kotlinx.coroutines.ExperimentalCoroutinesApi",
-        "kotlinx.coroutines.FlowPreview",
+    compilerOptions {
+      languageVersion.set(KotlinVersion.KOTLIN_1_9)
+      jvmTarget.set(JvmTarget.JVM_11)
+      optIn.addAll(
+        listOf(
+          "kotlin.RequiresOptIn",
+          "kotlin.ExperimentalStdlibApi",
+          "kotlin.contracts.ExperimentalContracts",
+          "kotlin.time.ExperimentalTime",
+          "kotlinx.coroutines.ExperimentalCoroutinesApi",
+          "kotlinx.coroutines.FlowPreview",
+        ),
       )
-      freeCompilerArgs = (freeCompilerArgs + listOf("-progressive") + optIns.map { "-opt-in=$it" })
-      allWarningsAsErrors = true
+      allWarningsAsErrors.set(true)
     }
   }
   extensions.configure<KotlinProjectExtension> {
@@ -57,9 +60,6 @@ fun Project.baseSetup() {
       add("implementation", project(":logging:core"))
     }
     add("implementation", platform(libs.findLibrary("compose-bom").get()))
-    if (System.getenv("VOICE_USE_PROPRIETARY_LIBRARIES") == "true") {
-      add("implementation", platform(libs.findLibrary("firebase-bom").get()))
-    }
     add("androidTestImplementation", platform(libs.findLibrary("compose-bom").get()))
 
     listOf(
diff --git a/pref/build.gradle.kts b/pref/build.gradle.kts
new file mode 100644
index 0000000000..c0f55d5bdb
--- /dev/null
+++ b/pref/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+  id("voice.library")
+}
+
+dependencies {
+  implementation(libs.androidxCore)
+
+  testImplementation(libs.junit)
+  testImplementation(libs.robolectric)
+  testImplementation(libs.koTest.assert)
+}
diff --git a/pref/src/main/kotlin/voice/pref/AndroidPreferences.kt b/pref/src/main/kotlin/voice/pref/AndroidPreferences.kt
new file mode 100644
index 0000000000..3f05387b58
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/AndroidPreferences.kt
@@ -0,0 +1,40 @@
+package voice.pref
+
+import android.content.SharedPreferences
+import voice.pref.internal.AndroidPref
+import voice.pref.internal.DelegatingPrefAdapter
+import voice.pref.internal.InternalPrefAdapter
+import java.util.concurrent.CopyOnWriteArrayList
+
+class AndroidPreferences(private val sharedPrefs: SharedPreferences) {
+
+  private val registered = CopyOnWriteArrayList<AndroidPref<*>>()
+
+  @Suppress("unused")
+  fun <T> create(
+    key: String,
+    default: T,
+    adapter: PrefAdapter<T>,
+  ): Pref<T> {
+    return create(key, default, DelegatingPrefAdapter(adapter))
+  }
+
+  internal fun <T> create(
+    key: String,
+    default: T,
+    adapter: InternalPrefAdapter<T>,
+  ): Pref<T> {
+    return AndroidPref(
+      sharedPrefs,
+      adapter,
+      key,
+      default,
+    ).also {
+      registered += it
+    }
+  }
+
+  fun clear(commit: Boolean = false) {
+    registered.forEach { it.delete(commit = commit) }
+  }
+}
diff --git a/pref/src/main/kotlin/voice/pref/Pref.kt b/pref/src/main/kotlin/voice/pref/Pref.kt
new file mode 100644
index 0000000000..e34549000f
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/Pref.kt
@@ -0,0 +1,21 @@
+package voice.pref
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlin.properties.ReadWriteProperty
+
+abstract class Pref<T> : ReadWriteProperty<Any, T> {
+
+  @Suppress("LeakingThis")
+  var value: T by this
+
+  abstract fun setAndCommit(value: T)
+
+  abstract val flow: Flow<T>
+
+  abstract fun delete(commit: Boolean = false)
+}
+
+@Suppress("unused")
+val <T : Any> Pref<T?>.flowNotNull: Flow<T>
+  get() = flow.filterNotNull()
diff --git a/pref/src/main/kotlin/voice/pref/PrefAdapter.kt b/pref/src/main/kotlin/voice/pref/PrefAdapter.kt
new file mode 100644
index 0000000000..c36f07557e
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/PrefAdapter.kt
@@ -0,0 +1,7 @@
+package voice.pref
+
+interface PrefAdapter<T> {
+
+  fun toString(value: T): String
+  fun fromString(string: String): T
+}
diff --git a/pref/src/main/kotlin/voice/pref/builtins.kt b/pref/src/main/kotlin/voice/pref/builtins.kt
new file mode 100644
index 0000000000..549478a0a2
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/builtins.kt
@@ -0,0 +1,63 @@
+package voice.pref
+
+import voice.pref.internal.adapter.BooleanAdapter
+import voice.pref.internal.adapter.EnumAdapter
+import voice.pref.internal.adapter.IntAdapter
+import voice.pref.internal.adapter.LongAdapter
+import voice.pref.internal.adapter.StringAdapter
+import voice.pref.internal.adapter.StringSetAdapter
+
+@Suppress("unused")
+fun AndroidPreferences.boolean(
+  key: String,
+  default: Boolean,
+): Pref<Boolean> {
+  return create(key, default, BooleanAdapter)
+}
+
+fun <E : Enum<E>> AndroidPreferences.enum(
+  key: String,
+  default: E,
+  clazz: Class<E>,
+): Pref<E> {
+  return create(key, default, EnumAdapter(clazz))
+}
+
+@Suppress("unused")
+inline fun <reified E : Enum<E>> AndroidPreferences.enum(
+  key: String,
+  default: E,
+): Pref<E> {
+  return enum(key, default, E::class.java)
+}
+
+@Suppress("unused")
+fun AndroidPreferences.int(
+  key: String,
+  default: Int,
+): Pref<Int> {
+  return create(key, default, IntAdapter)
+}
+
+@Suppress("unused")
+fun AndroidPreferences.long(
+  key: String,
+  default: Long,
+): Pref<Long> {
+  return create(key, default, LongAdapter)
+}
+
+fun AndroidPreferences.string(
+  key: String,
+  default: String,
+): Pref<String> {
+  return create(key, default, StringAdapter)
+}
+
+@Suppress("unused")
+fun AndroidPreferences.stringSet(
+  key: String,
+  default: Set<String>,
+): Pref<Set<String>> {
+  return create(key, default, StringSetAdapter)
+}
diff --git a/pref/src/main/kotlin/voice/pref/inmemory/InMemoryPref.kt b/pref/src/main/kotlin/voice/pref/inmemory/InMemoryPref.kt
new file mode 100644
index 0000000000..a83c1ef715
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/inmemory/InMemoryPref.kt
@@ -0,0 +1,36 @@
+package voice.pref.inmemory
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import voice.pref.Pref
+import kotlin.reflect.KProperty
+
+class InMemoryPref<T>(private val default: T) : Pref<T>() {
+
+  private val channel = MutableStateFlow(default)
+
+  override fun setAndCommit(value: T) {
+    channel.tryEmit(value)
+  }
+
+  override val flow: Flow<T> = channel
+
+  override fun delete(commit: Boolean) {
+    channel.tryEmit(default)
+  }
+
+  override fun getValue(
+    thisRef: Any,
+    property: KProperty<*>,
+  ): T {
+    return channel.value
+  }
+
+  override fun setValue(
+    thisRef: Any,
+    property: KProperty<*>,
+    value: T,
+  ) {
+    channel.tryEmit(value)
+  }
+}
diff --git a/pref/src/main/kotlin/voice/pref/internal/AndroidPref.kt b/pref/src/main/kotlin/voice/pref/internal/AndroidPref.kt
new file mode 100644
index 0000000000..f5d6c34fbf
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/internal/AndroidPref.kt
@@ -0,0 +1,58 @@
+package voice.pref.internal
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import voice.pref.Pref
+import kotlin.reflect.KProperty
+
+internal class AndroidPref<T>(
+  private val prefs: SharedPreferences,
+  private val adapter: InternalPrefAdapter<T>,
+  val key: String,
+  private val default: T,
+) : Pref<T>() {
+
+  private val channel = MutableStateFlow(valueFromPrefOrDefault())
+
+  private fun valueFromPrefOrDefault(): T {
+    return if (prefs.contains(key)) {
+      adapter.get(key, prefs)
+    } else {
+      default
+    }
+  }
+
+  override val flow: Flow<T> = channel
+
+  override fun getValue(
+    thisRef: Any,
+    property: KProperty<*>,
+  ): T = channel.value
+
+  override fun setValue(
+    thisRef: Any,
+    property: KProperty<*>,
+    value: T,
+  ) {
+    set(value, commit = false)
+  }
+
+  override fun setAndCommit(value: T) {
+    set(value, commit = true)
+  }
+
+  private fun set(
+    value: T,
+    commit: Boolean,
+  ) {
+    adapter.set(key, prefs, value, commit = commit)
+    channel.value = value
+  }
+
+  override fun delete(commit: Boolean) {
+    prefs.edit(commit = commit) { remove(key) }
+    channel.value = default
+  }
+}
diff --git a/pref/src/main/kotlin/voice/pref/internal/InternalPrefAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/InternalPrefAdapter.kt
new file mode 100644
index 0000000000..ba1edcfa9b
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/internal/InternalPrefAdapter.kt
@@ -0,0 +1,18 @@
+package voice.pref.internal
+
+import android.content.SharedPreferences
+
+internal interface InternalPrefAdapter<T> {
+
+  fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): T
+
+  fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: T,
+    commit: Boolean = false,
+  )
+}
diff --git a/pref/src/main/kotlin/voice/pref/internal/PrefAdapterToInternal.kt b/pref/src/main/kotlin/voice/pref/internal/PrefAdapterToInternal.kt
new file mode 100644
index 0000000000..8d6150e583
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/internal/PrefAdapterToInternal.kt
@@ -0,0 +1,28 @@
+package voice.pref.internal
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import voice.pref.PrefAdapter
+
+internal class DelegatingPrefAdapter<T>(private val delegate: PrefAdapter<T>) : InternalPrefAdapter<T> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): T {
+    val stringValue = prefs.getString(key, null)!!
+    return delegate.fromString(stringValue)
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: T,
+    commit: Boolean,
+  ) {
+    val stringValue = delegate.toString(value)
+    prefs.edit(commit = commit) {
+      putString(key, stringValue)
+    }
+  }
+}
diff --git a/pref/src/main/kotlin/voice/pref/internal/adapter/BooleanAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/adapter/BooleanAdapter.kt
new file mode 100644
index 0000000000..f98b5bc000
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/internal/adapter/BooleanAdapter.kt
@@ -0,0 +1,24 @@
+package voice.pref.internal.adapter
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import voice.pref.internal.InternalPrefAdapter
+
+internal object BooleanAdapter : InternalPrefAdapter<Boolean> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): Boolean {
+    return prefs.getBoolean(key, false)
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: Boolean,
+    commit: Boolean,
+  ) {
+    prefs.edit(commit = commit) { putBoolean(key, value) }
+  }
+}
diff --git a/pref/src/main/kotlin/voice/pref/internal/adapter/EnumAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/adapter/EnumAdapter.kt
new file mode 100644
index 0000000000..c09a7c0e4f
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/internal/adapter/EnumAdapter.kt
@@ -0,0 +1,25 @@
+package voice.pref.internal.adapter
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import voice.pref.internal.InternalPrefAdapter
+
+internal class EnumAdapter<E : Enum<E>>(private val clazz: Class<E>) : InternalPrefAdapter<E> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): E {
+    val stringValue = prefs.getString(key, "")!!
+    return java.lang.Enum.valueOf(clazz, stringValue)
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: E,
+    commit: Boolean,
+  ) {
+    prefs.edit(commit = commit) { putString(key, value.name) }
+  }
+}
diff --git a/pref/src/main/kotlin/voice/pref/internal/adapter/IntAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/adapter/IntAdapter.kt
new file mode 100644
index 0000000000..a12fea9955
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/internal/adapter/IntAdapter.kt
@@ -0,0 +1,24 @@
+package voice.pref.internal.adapter
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import voice.pref.internal.InternalPrefAdapter
+
+internal object IntAdapter : InternalPrefAdapter<Int> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): Int {
+    return prefs.getInt(key, 0)
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: Int,
+    commit: Boolean,
+  ) {
+    prefs.edit(commit = commit) { putInt(key, value) }
+  }
+}
diff --git a/pref/src/main/kotlin/voice/pref/internal/adapter/LongAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/adapter/LongAdapter.kt
new file mode 100644
index 0000000000..3bf0832b14
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/internal/adapter/LongAdapter.kt
@@ -0,0 +1,24 @@
+package voice.pref.internal.adapter
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import voice.pref.internal.InternalPrefAdapter
+
+internal object LongAdapter : InternalPrefAdapter<Long> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): Long {
+    return prefs.getLong(key, 0)
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: Long,
+    commit: Boolean,
+  ) {
+    prefs.edit(commit = commit) { putLong(key, value) }
+  }
+}
diff --git a/pref/src/main/kotlin/voice/pref/internal/adapter/StringAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/adapter/StringAdapter.kt
new file mode 100644
index 0000000000..d844f228a9
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/internal/adapter/StringAdapter.kt
@@ -0,0 +1,26 @@
+package voice.pref.internal.adapter
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import voice.pref.internal.InternalPrefAdapter
+
+internal object StringAdapter : InternalPrefAdapter<String> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): String {
+    return prefs.getString(key, null)!!
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: String,
+    commit: Boolean,
+  ) {
+    prefs.edit(commit = commit) {
+      putString(key, value)
+    }
+  }
+}
diff --git a/pref/src/main/kotlin/voice/pref/internal/adapter/StringSetAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/adapter/StringSetAdapter.kt
new file mode 100644
index 0000000000..8b8d9b5dcb
--- /dev/null
+++ b/pref/src/main/kotlin/voice/pref/internal/adapter/StringSetAdapter.kt
@@ -0,0 +1,24 @@
+package voice.pref.internal.adapter
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import voice.pref.internal.InternalPrefAdapter
+
+internal object StringSetAdapter : InternalPrefAdapter<Set<String>> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): Set<String> {
+    return prefs.getStringSet(key, emptySet())!!
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: Set<String>,
+    commit: Boolean,
+  ) {
+    prefs.edit(commit = commit) { putStringSet(key, value) }
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/pref/android/AndroidPreferencesTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/AndroidPreferencesTest.kt
new file mode 100644
index 0000000000..8577a449b2
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/AndroidPreferencesTest.kt
@@ -0,0 +1,168 @@
+package de.paulwoitaschek.pref.android
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import app.cash.turbine.test
+import app.cash.turbine.turbineScope
+import io.kotest.matchers.shouldBe
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.junit.runner.RunWith
+import voice.pref.AndroidPreferences
+import voice.pref.Pref
+import voice.pref.int
+import voice.pref.string
+
+private const val DEFAULT_KEY = "key"
+
+@RunWith(AndroidJUnit4::class)
+class AndroidPreferencesTest {
+
+  private val prefs: AndroidPreferences
+  private val sharedPrefs: SharedPreferences
+
+  init {
+    val context = ApplicationProvider.getApplicationContext<Context>()
+    sharedPrefs = context.getSharedPreferences("testPrefs", Context.MODE_PRIVATE)
+    prefs = AndroidPreferences(sharedPrefs)
+  }
+
+  @Test
+  fun clearWithCommit() {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+    pref.setAndCommit("Alice")
+    prefs.clear(commit = true)
+    assertSharedPrefValue(null)
+    pref.value shouldBe "Bob"
+  }
+
+  @Test
+  fun clearWithoutCommit() {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+    pref.setAndCommit("Alice")
+    prefs.clear(commit = true)
+    assertSharedPrefValue(null)
+    pref.value shouldBe "Bob"
+  }
+
+  @Test
+  fun flow() = runTest {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+    pref.flow.test {
+      awaitItem() shouldBe "Bob"
+
+      pref.value = "1"
+      awaitItem() shouldBe "1"
+
+      pref.setAndCommit("2")
+      awaitItem() shouldBe "2"
+
+      pref.delete(commit = true)
+      awaitItem() shouldBe "Bob"
+
+      pref.setAndCommit("John")
+      awaitItem() shouldBe "John"
+
+      pref.delete(commit = false)
+      awaitItem() shouldBe "Bob"
+
+      pref.value = "Alice"
+      awaitItem() shouldBe "Alice"
+
+      prefs.clear(commit = false)
+      awaitItem() shouldBe "Bob"
+    }
+  }
+
+  @Test
+  fun setWithCommit() {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+
+    assertSharedPrefValue(null)
+    pref.assertValue("Bob")
+
+    pref.setAndCommit("Alice")
+    pref.assertValue("Alice")
+    assertSharedPrefValue("Alice")
+
+    pref.setAndCommit("John")
+    pref.assertValue("John")
+    assertSharedPrefValue("John")
+  }
+
+  @Test
+  fun setWithoutCommit() {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+
+    assertSharedPrefValue(null)
+    pref.assertValue("Bob")
+
+    pref.value = "Alice"
+    pref.assertValue("Alice")
+    assertSharedPrefValue("Alice")
+
+    pref.value = "John"
+    pref.assertValue("John")
+    assertSharedPrefValue("John")
+  }
+
+  @Test
+  fun deleteWithCommit() {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+    assertSharedPrefValue(null)
+    pref.setAndCommit("Alice")
+    pref.delete(commit = true)
+    pref.assertValue("Bob")
+    assertSharedPrefValue(null)
+  }
+
+  @Test
+  fun deleteWithoutCommit() {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+    assertSharedPrefValue(null)
+    pref.setAndCommit("Alice")
+    pref.delete(commit = false)
+    pref.assertValue("Bob")
+    assertSharedPrefValue(null)
+  }
+
+  private fun <T> Pref<T>.assertValue(value: T?) {
+    this.value shouldBe value
+  }
+
+  private fun assertSharedPrefValue(value: String?) {
+    sharedPrefs.getString(DEFAULT_KEY, null) shouldBe value
+  }
+
+  @Test
+  fun onlyChangedFlowTriggers() = runTest {
+    turbineScope {
+      val prefA = prefs.int("preA", 42)
+      val prefB = prefs.int("prefB", 42)
+
+      val aTurbine = prefA.flow.testIn(this)
+      val bTurbine = prefB.flow.testIn(this)
+
+      aTurbine.awaitItem() shouldBe 42
+      bTurbine.awaitItem() shouldBe 42
+
+      prefA.setAndCommit(1)
+
+      aTurbine.awaitItem() shouldBe 1
+
+      prefA.setAndCommit(2)
+      aTurbine.awaitItem() shouldBe 2
+
+      prefB.setAndCommit(1)
+      bTurbine.awaitItem() shouldBe 1
+
+      aTurbine.expectNoEvents()
+      bTurbine.expectNoEvents()
+
+      aTurbine.cancel()
+      bTurbine.cancel()
+    }
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/AdapterTester.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/AdapterTester.kt
new file mode 100644
index 0000000000..affd454c0b
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/AdapterTester.kt
@@ -0,0 +1,20 @@
+package de.paulwoitaschek.pref.android.internal.adapter
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.test.core.app.ApplicationProvider
+import io.kotest.matchers.shouldBe
+import voice.pref.internal.InternalPrefAdapter
+
+internal class AdapterTester<T>(private val adapter: InternalPrefAdapter<T>) {
+
+  private val key = System.nanoTime().toString()
+
+  private val prefs: SharedPreferences = ApplicationProvider.getApplicationContext<Context>()
+    .getSharedPreferences(key, Context.MODE_PRIVATE)
+
+  fun test(value: T) {
+    adapter.set(key, prefs, value)
+    adapter.get(key, prefs) shouldBe value
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/BooleanAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/BooleanAdapterTest.kt
new file mode 100644
index 0000000000..1f97517a88
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/BooleanAdapterTest.kt
@@ -0,0 +1,19 @@
+package de.paulwoitaschek.pref.android.internal.adapter
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import voice.pref.internal.adapter.BooleanAdapter
+
+@RunWith(AndroidJUnit4::class)
+class BooleanAdapterTest {
+
+  @Test
+  fun test() {
+    AdapterTester(BooleanAdapter).apply {
+      test(true)
+      test(false)
+      test(true)
+    }
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/EnumAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/EnumAdapterTest.kt
new file mode 100644
index 0000000000..e1950398dc
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/EnumAdapterTest.kt
@@ -0,0 +1,26 @@
+package de.paulwoitaschek.pref.android.internal.adapter
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import voice.pref.internal.adapter.EnumAdapter
+
+@RunWith(AndroidJUnit4::class)
+class EnumAdapterTest {
+
+  @Test
+  fun test() {
+    AdapterTester(EnumAdapter(RPS::class.java)).apply {
+      test(RPS.Rock)
+      test(RPS.Paper)
+      test(RPS.Scissors)
+      test(RPS.Rock)
+    }
+  }
+
+  private enum class RPS {
+    Rock,
+    Paper,
+    Scissors,
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/IntAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/IntAdapterTest.kt
new file mode 100644
index 0000000000..68a64a84b0
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/IntAdapterTest.kt
@@ -0,0 +1,21 @@
+package de.paulwoitaschek.pref.android.internal.adapter
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import voice.pref.internal.adapter.IntAdapter
+
+@RunWith(AndroidJUnit4::class)
+class IntAdapterTest {
+
+  @Test
+  fun test() {
+    AdapterTester(IntAdapter).apply {
+      test(0)
+      test(1)
+      test(2)
+      test(Int.MAX_VALUE)
+      test(Int.MIN_VALUE)
+    }
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/LongAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/LongAdapterTest.kt
new file mode 100644
index 0000000000..b3de7d66cd
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/LongAdapterTest.kt
@@ -0,0 +1,21 @@
+package de.paulwoitaschek.pref.android.internal.adapter
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import voice.pref.internal.adapter.LongAdapter
+
+@RunWith(AndroidJUnit4::class)
+class LongAdapterTest {
+
+  @Test
+  fun test() {
+    AdapterTester(LongAdapter).apply {
+      test(0)
+      test(1)
+      test(2)
+      test(Long.MAX_VALUE)
+      test(Long.MIN_VALUE)
+    }
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/StringAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/StringAdapterTest.kt
new file mode 100644
index 0000000000..54ad7028d0
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/StringAdapterTest.kt
@@ -0,0 +1,20 @@
+package de.paulwoitaschek.pref.android.internal.adapter
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import voice.pref.internal.adapter.StringAdapter
+
+@RunWith(AndroidJUnit4::class)
+class StringAdapterTest {
+
+  @Test
+  fun test() {
+    AdapterTester(StringAdapter).apply {
+      test("")
+      test("hello")
+      test("bye")
+      test("")
+    }
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/StringSetAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/StringSetAdapterTest.kt
new file mode 100644
index 0000000000..7a71e5aa38
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/StringSetAdapterTest.kt
@@ -0,0 +1,20 @@
+package de.paulwoitaschek.pref.android.internal.adapter
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import voice.pref.internal.adapter.StringSetAdapter
+
+@RunWith(AndroidJUnit4::class)
+class StringSetAdapterTest {
+
+  @Test
+  fun test() {
+    AdapterTester(StringSetAdapter).apply {
+      test(emptySet())
+      test(setOf("Hello"))
+      test(setOf("Apple", "Candy"))
+      test(emptySet())
+    }
+  }
+}
diff --git a/renovate.json b/renovate.json
index e6883d6bf4..08b384acfd 100644
--- a/renovate.json
+++ b/renovate.json
@@ -14,20 +14,19 @@
       ]
     },
     {
-      "groupName": "Kotlin, Compose, KSP",
-      "matchPackagePrefixes": [
-        "androidx.compose.compiler:compiler",
-        "org.jetbrains.kotlin:",
-        "org.jetbrains.kotlin.",
-        "com.google.devtools.ksp"
+      "groupName": "Kotlin, KSP",
+      "matchPackageNames": [
+        "org.jetbrains.kotlin:{/,}**",
+        "org.jetbrains.kotlin.{/,}**",
+        "com.google.devtools.ksp{/,}**"
       ]
     },
     {
       "groupName": "Ktlint",
-      "matchPackagePrefixes": [
-        "com.pinterest.ktlint",
-        "io.nlopez.compose.rules",
-        "io.github.usefulness"
+      "matchPackageNames": [
+        "com.pinterest.ktlint{/,}**",
+        "io.nlopez.compose.rules{/,}**",
+        "io.github.usefulness{/,}**"
       ]
     },
     {
@@ -37,8 +36,8 @@
       "registryUrls": [
         "https://jitpack.io/"
       ],
-      "matchPackagePrefixes": [
-        "com.github.PaulWoitaschek"
+      "matchPackageNames": [
+        "com.github.PaulWoitaschek{/,}**"
       ]
     },
     {
diff --git a/review/play/build.gradle.kts b/review/play/build.gradle.kts
index 6f13c6a585..80e86be3fc 100644
--- a/review/play/build.gradle.kts
+++ b/review/play/build.gradle.kts
@@ -23,5 +23,4 @@ dependencies {
   api(libs.review)
   implementation(libs.lottie)
   implementation(libs.dagger.core)
-  implementation(libs.firebase.remoteconfig)
 }
diff --git a/review/play/src/main/kotlin/voice/review/AskForReviewDialog.kt b/review/play/src/main/kotlin/voice/review/AskForReviewDialog.kt
index de91af2d8c..7d13e74e06 100644
--- a/review/play/src/main/kotlin/voice/review/AskForReviewDialog.kt
+++ b/review/play/src/main/kotlin/voice/review/AskForReviewDialog.kt
@@ -28,8 +28,8 @@ import voice.strings.R as StringsR
 
 @Composable
 internal fun AskForReviewDialog(
-  onReviewed: (Int) -> Unit,
-  onReviewDenied: () -> Unit,
+  onReview: (Int) -> Unit,
+  onReviewDeny: () -> Unit,
   onDismiss: () -> Unit,
 ) {
   var selectedStars by remember { mutableIntStateOf(5) }
@@ -70,14 +70,14 @@ internal fun AskForReviewDialog(
       }
     },
     dismissButton = {
-      TextButton(onClick = onReviewDenied) {
+      TextButton(onClick = onReviewDeny) {
         Text(stringResource(StringsR.string.review_request_button_no))
       }
     },
     confirmButton = {
       TextButton(
         onClick = {
-          onReviewed(selectedStars)
+          onReview(selectedStars)
         },
       ) {
         Text(stringResource(StringsR.string.review_request_button_yes))
@@ -90,8 +90,8 @@ internal fun AskForReviewDialog(
 @Preview
 private fun AskForReviewDialogPreview() {
   AskForReviewDialog(
-    onReviewed = {},
-    onReviewDenied = {},
+    onReview = {},
+    onReviewDeny = {},
     onDismiss = {},
   )
 }
diff --git a/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt b/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt
index da5b3dbc67..a1ca0a3a08 100644
--- a/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt
+++ b/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt
@@ -7,9 +7,7 @@ import java.time.Instant
 import javax.inject.Inject
 
 class InstallationTimeProvider
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   internal fun installationTime(): Instant {
     val packageManager = context.packageManager
diff --git a/review/play/src/main/kotlin/voice/review/ReviewFeature.kt b/review/play/src/main/kotlin/voice/review/ReviewFeature.kt
index 993ea95044..6a377a8d93 100644
--- a/review/play/src/main/kotlin/voice/review/ReviewFeature.kt
+++ b/review/play/src/main/kotlin/voice/review/ReviewFeature.kt
@@ -51,7 +51,7 @@ fun ReviewFeature() {
     val reviewManager = reviewComponent.reviewManager
     val activity = LocalContext.current.findActivity() ?: return
     AskForReviewDialog(
-      onReviewed = { stars ->
+      onReview = { stars ->
         Logger.d("User rated $stars")
         scope.launch {
           shouldShowReviewDialog.setShown()
@@ -67,7 +67,7 @@ fun ReviewFeature() {
           showReviewDialog = false
         }
       },
-      onReviewDenied = {
+      onReviewDeny = {
         showReviewDialog = false
         scope.launch {
           shouldShowReviewDialog.setShown()
diff --git a/review/play/src/main/kotlin/voice/review/ReviewModule.kt b/review/play/src/main/kotlin/voice/review/ReviewModule.kt
index 174f0b9920..c61a825113 100644
--- a/review/play/src/main/kotlin/voice/review/ReviewModule.kt
+++ b/review/play/src/main/kotlin/voice/review/ReviewModule.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import androidx.datastore.core.DataStore
 import com.google.android.play.core.review.ReviewManager
 import com.google.android.play.core.review.ReviewManagerFactory
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
@@ -29,11 +28,6 @@ object ReviewModule {
   fun reviewManager(context: Context): ReviewManager {
     return ReviewManagerFactory.create(context)
   }
-
-  @Provides
-  fun remoteConfig(): FirebaseRemoteConfig {
-    return FirebaseRemoteConfig.getInstance()
-  }
 }
 
 @Qualifier
diff --git a/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt b/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt
index 41d4037093..54741ca3c9 100644
--- a/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt
+++ b/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt
@@ -4,9 +4,7 @@ import android.content.Context
 import javax.inject.Inject
 
 class ReviewTranslated
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   fun translated(): Boolean {
     val language = context.resources.configuration.locales[0].language.lowercase()
diff --git a/review/play/src/main/kotlin/voice/review/ShouldShowReviewDialog.kt b/review/play/src/main/kotlin/voice/review/ShouldShowReviewDialog.kt
index 4bf21e9b6b..32c13f2e1b 100644
--- a/review/play/src/main/kotlin/voice/review/ShouldShowReviewDialog.kt
+++ b/review/play/src/main/kotlin/voice/review/ShouldShowReviewDialog.kt
@@ -1,7 +1,6 @@
 package voice.review
 
 import androidx.datastore.core.DataStore
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import kotlinx.coroutines.flow.first
 import voice.data.repo.BookRepository
 import voice.playback.playstate.PlayStateManager
@@ -22,12 +21,10 @@ class ShouldShowReviewDialog
   private val bookRepository: BookRepository,
   private val playStateManager: PlayStateManager,
   private val reviewTranslated: ReviewTranslated,
-  private val remoteConfig: FirebaseRemoteConfig,
 ) {
 
   internal suspend fun shouldShow(): Boolean {
-    return enabledInRemoteConfig() &&
-      reviewTranslated.translated() &&
+    return reviewTranslated.translated() &&
       isNotPlaying() &&
       enoughTimeElapsedSinceInstallation() &&
       reviewDialogNotShown() &&
@@ -38,10 +35,6 @@ class ShouldShowReviewDialog
     reviewDialogShown.updateData { true }
   }
 
-  private fun enabledInRemoteConfig(): Boolean {
-    return remoteConfig.getBoolean("review_enabled")
-  }
-
   private fun enoughTimeElapsedSinceInstallation(): Boolean {
     val timeSinceInstallation = ChronoUnit.MINUTES.between(
       installationTimeProvider.installationTime(),
diff --git a/review/play/src/test/kotlin/voice/review/ShouldShowReviewDialogTest.kt b/review/play/src/test/kotlin/voice/review/ShouldShowReviewDialogTest.kt
index 436971d4c6..a464b0c107 100644
--- a/review/play/src/test/kotlin/voice/review/ShouldShowReviewDialogTest.kt
+++ b/review/play/src/test/kotlin/voice/review/ShouldShowReviewDialogTest.kt
@@ -102,9 +102,6 @@ class ShouldShowReviewDialogTest {
       reviewTranslated = mockk {
         every { translated() } returns true
       },
-      remoteConfig = mockk {
-        every { getBoolean("review_enabled") } returns true
-      },
     )
     val showsReviewDialog = runBlocking {
       shouldShowReviewDialog.shouldShow()
diff --git a/scanner/build.gradle.kts b/scanner/build.gradle.kts
index 358957820a..927858ad73 100644
--- a/scanner/build.gradle.kts
+++ b/scanner/build.gradle.kts
@@ -13,7 +13,8 @@ dependencies {
   implementation(projects.ffmpeg)
   implementation(projects.data)
   implementation(projects.common)
-  implementation(libs.prefs.core)
+  implementation(projects.pref)
+
   implementation(libs.appCompat)
   implementation(libs.dagger.core)
   implementation(libs.serialization.json)
diff --git a/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt b/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt
index f4c5a3b706..da33e8a01b 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt
@@ -13,9 +13,7 @@ import javax.inject.Singleton
 
 @Singleton
 class DeviceHasStoragePermissionBug
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   private val _hasBug = MutableStateFlow(false)
   val hasBug: StateFlow<Boolean> get() = _hasBug
diff --git a/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt b/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt
index f629c878b8..05a1f0262b 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt
@@ -9,9 +9,7 @@ import voice.logging.core.Logger
 import javax.inject.Inject
 
 class FFProbeAnalyze
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   private val json = Json {
     ignoreUnknownKeys = true
diff --git a/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt b/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt
index 53d5950fe3..d3c1ca62aa 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt
@@ -8,9 +8,7 @@ import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
 
 class MediaAnalyzer
-@Inject constructor(
-  private val ffProbeAnalyze: FFProbeAnalyze,
-) {
+@Inject constructor(private val ffProbeAnalyze: FFProbeAnalyze) {
 
   suspend fun analyze(file: CachedDocumentFile): Metadata? {
     val result = ffProbeAnalyze.analyze(file) ?: return null
diff --git a/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt b/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt
index 234cbfd2d3..846256f5b1 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt
@@ -41,9 +41,7 @@ internal fun Map<String, String>.find(tagType: TagType): String? {
 }
 
 @Serializable
-internal data class MetaDataStream(
-  val tags: Map<String, String>? = null,
-)
+internal data class MetaDataStream(val tags: Map<String, String>? = null)
 
 @Serializable
 internal data class MetaDataChapter(
diff --git a/scripts/build.gradle.kts b/scripts/build.gradle.kts
index 051feb3896..350b60b87f 100644
--- a/scripts/build.gradle.kts
+++ b/scripts/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   alias(libs.plugins.kotlin.jvm)
+  id("voice.ktlint")
   application
 }
 
@@ -10,3 +11,9 @@ application {
 dependencies {
   implementation(libs.clikt)
 }
+
+kotlin {
+  jvmToolchain {
+    languageVersion.set(JavaLanguageVersion.of(17))
+  }
+}
diff --git a/scripts/src/main/kotlin/voice/scripts/NewFeatureModule.kt b/scripts/src/main/kotlin/voice/scripts/NewFeatureModule.kt
index f15ce6d0af..2ee0894f2a 100644
--- a/scripts/src/main/kotlin/voice/scripts/NewFeatureModule.kt
+++ b/scripts/src/main/kotlin/voice/scripts/NewFeatureModule.kt
@@ -1,11 +1,12 @@
 package voice.scripts
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.arguments.validate
 import java.io.File
 
-class NewFeatureModule : CliktCommand(help = "Creates a new feature module") {
+class NewFeatureModule : CliktCommand() {
 
   private val name: String by argument("The new module name, i.e. :unicorn:wings")
     .validate { name ->
@@ -18,6 +19,7 @@ class NewFeatureModule : CliktCommand(help = "Creates a new feature module") {
     name.removePrefix(":").split(":")
   }
 
+  override fun help(context: Context): String = "Creates a new feature module"
   override fun run() {
     val moduleRoot = File(components.joinToString(separator = "/"))
 
diff --git a/scripts/src/main/kotlin/voice/scripts/PopulateTestFiles.kt b/scripts/src/main/kotlin/voice/scripts/PopulateTestFiles.kt
index 2bbf9c607e..e6ec0646f3 100644
--- a/scripts/src/main/kotlin/voice/scripts/PopulateTestFiles.kt
+++ b/scripts/src/main/kotlin/voice/scripts/PopulateTestFiles.kt
@@ -1,9 +1,10 @@
 package voice.scripts
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import java.io.File
 
-class PopulateTestFiles : CliktCommand(help = "Populates test files using adb") {
+class PopulateTestFiles : CliktCommand() {
 
   private val testFilesRoot = File("build/testfiles/")
 
@@ -17,6 +18,8 @@ class PopulateTestFiles : CliktCommand(help = "Populates test files using adb")
     pushToAdb()
   }
 
+  override fun help(context: Context): String = "Populates test files using adb"
+
   private fun pushToAdb() {
     println("Pushing to adb")
     runCommand("adb", "shell", "rm", "-rf", "/sdcard/testfiles")
diff --git a/scripts/src/main/kotlin/voice/scripts/Script.kt b/scripts/src/main/kotlin/voice/scripts/Script.kt
index bc654103bc..06b2b75f66 100644
--- a/scripts/src/main/kotlin/voice/scripts/Script.kt
+++ b/scripts/src/main/kotlin/voice/scripts/Script.kt
@@ -1,6 +1,7 @@
 package voice.scripts
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.main
 import com.github.ajalt.clikt.core.subcommands
 
 class Script : CliktCommand() {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 99635e3223..7d3cb16cac 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -31,8 +31,8 @@ dependencyResolutionManagement {
 }
 
 plugins {
-  id("com.gradle.develocity") version "3.17.4"
-  id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
+  id("com.gradle.develocity") version "3.19"
+  id("org.gradle.toolchains.foojay-resolver-convention") version ("0.9.0")
 }
 
 develocity {
@@ -45,6 +45,7 @@ develocity {
 include(":app")
 include(":strings")
 include(":common")
+include(":bookmark")
 include(":data")
 include(":playback")
 include(":ffmpeg")
@@ -59,10 +60,10 @@ include(":folderPicker")
 include(":bookOverview")
 include(":migration")
 include(":scripts")
+include(":pref")
 include(":logging:core")
 include(":logging:debug")
 include(":documentfile")
 include(":onboarding")
-include(":logging:crashlytics")
 include(":review:play")
 include(":review:noop")
diff --git a/settings/build.gradle.kts b/settings/build.gradle.kts
index 4bbd38e207..d10935abb8 100644
--- a/settings/build.gradle.kts
+++ b/settings/build.gradle.kts
@@ -13,12 +13,11 @@ dependencies {
   implementation(projects.strings)
   implementation(projects.playback)
   implementation(projects.data)
+  implementation(projects.pref)
 
   implementation(libs.androidxCore)
-  implementation(libs.prefs.core)
   implementation(libs.materialDialog.core)
   implementation(libs.androidxCore)
-  implementation(libs.constraintLayout)
   implementation(libs.material)
 
   implementation(libs.dagger.core)
diff --git a/settings/src/main/kotlin/voice/settings/SettingsListener.kt b/settings/src/main/kotlin/voice/settings/SettingsListener.kt
index d87a907d0c..16e705898c 100644
--- a/settings/src/main/kotlin/voice/settings/SettingsListener.kt
+++ b/settings/src/main/kotlin/voice/settings/SettingsListener.kt
@@ -5,9 +5,9 @@ interface SettingsListener {
   fun toggleDarkTheme()
   fun toggleGrid()
   fun seekAmountChanged(seconds: Int)
-  fun onSeekAmountRowClicked()
-  fun autoRewindAmountChanged(seconds: Int)
-  fun onAutoRewindRowClicked()
+  fun onSeekAmountRowClick()
+  fun autoRewindAmountChang(seconds: Int)
+  fun onAutoRewindRowClick()
   fun dismissDialog()
   fun getSupport()
   fun suggestIdea()
diff --git a/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt b/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt
index d1c22de7cc..77bf131725 100644
--- a/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt
+++ b/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt
@@ -7,7 +7,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.core.net.toUri
-import de.paulwoitaschek.flowpref.Pref
 import voice.common.AppInfoProvider
 import voice.common.DARK_THEME_SETTABLE
 import voice.common.grid.GridCount
@@ -15,6 +14,7 @@ import voice.common.grid.GridMode
 import voice.common.navigation.Destination
 import voice.common.navigation.Navigator
 import voice.common.pref.PrefKeys
+import voice.pref.Pref
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -80,15 +80,15 @@ class SettingsViewModel
     seekTimePref.value = seconds
   }
 
-  override fun onSeekAmountRowClicked() {
+  override fun onSeekAmountRowClick() {
     dialog.value = SettingsViewState.Dialog.SeekTime
   }
 
-  override fun autoRewindAmountChanged(seconds: Int) {
+  override fun autoRewindAmountChang(seconds: Int) {
     autoRewindAmountPref.value = seconds
   }
 
-  override fun onAutoRewindRowClicked() {
+  override fun onAutoRewindRowClick() {
     dialog.value = SettingsViewState.Dialog.AutoRewindAmount
   }
 
diff --git a/settings/src/main/kotlin/voice/settings/views/AutoRewindRow.kt b/settings/src/main/kotlin/voice/settings/views/AutoRewindRow.kt
index a2dde50283..59ebff00be 100644
--- a/settings/src/main/kotlin/voice/settings/views/AutoRewindRow.kt
+++ b/settings/src/main/kotlin/voice/settings/views/AutoRewindRow.kt
@@ -48,7 +48,7 @@ internal fun AutoRewindRow(
 @Composable
 internal fun AutoRewindAmountDialog(
   currentSeconds: Int,
-  onSecondsConfirmed: (Int) -> Unit,
+  onSecondsConfirm: (Int) -> Unit,
   onDismiss: () -> Unit,
 ) {
   TimeSettingDialog(
@@ -57,7 +57,7 @@ internal fun AutoRewindAmountDialog(
     minSeconds = 0,
     maxSeconds = 20,
     textPluralRes = StringsR.plurals.seconds,
-    onSecondsConfirmed = onSecondsConfirmed,
+    onSecondsConfirm = onSecondsConfirm,
     onDismiss = onDismiss,
   )
 }
diff --git a/settings/src/main/kotlin/voice/settings/views/SeekTimeRow.kt b/settings/src/main/kotlin/voice/settings/views/SeekTimeRow.kt
index 725f655e63..438ea4be21 100644
--- a/settings/src/main/kotlin/voice/settings/views/SeekTimeRow.kt
+++ b/settings/src/main/kotlin/voice/settings/views/SeekTimeRow.kt
@@ -48,7 +48,7 @@ internal fun SeekTimeRow(
 @Composable
 internal fun SeekAmountDialog(
   currentSeconds: Int,
-  onSecondsConfirmed: (Int) -> Unit,
+  onSecondsConfirm: (Int) -> Unit,
   onDismiss: () -> Unit,
 ) {
   TimeSettingDialog(
@@ -57,7 +57,7 @@ internal fun SeekAmountDialog(
     minSeconds = 3,
     maxSeconds = 60,
     textPluralRes = StringsR.plurals.seconds,
-    onSecondsConfirmed = onSecondsConfirmed,
+    onSecondsConfirm = onSecondsConfirm,
     onDismiss = onDismiss,
   )
 }
diff --git a/settings/src/main/kotlin/voice/settings/views/Settings.kt b/settings/src/main/kotlin/voice/settings/views/Settings.kt
index b6bcc34d78..2f80e52740 100644
--- a/settings/src/main/kotlin/voice/settings/views/Settings.kt
+++ b/settings/src/main/kotlin/voice/settings/views/Settings.kt
@@ -57,9 +57,9 @@ private fun SettingsPreview() {
         override fun close() {}
         override fun toggleDarkTheme() {}
         override fun seekAmountChanged(seconds: Int) {}
-        override fun onSeekAmountRowClicked() {}
-        override fun autoRewindAmountChanged(seconds: Int) {}
-        override fun onAutoRewindRowClicked() {}
+        override fun onSeekAmountRowClick() {}
+        override fun autoRewindAmountChang(seconds: Int) {}
+        override fun onAutoRewindRowClick() {}
         override fun dismissDialog() {}
         override fun openTranslations() {}
         override fun getSupport() {}
@@ -131,10 +131,10 @@ private fun Settings(
           },
         )
         SeekTimeRow(viewState.seekTimeInSeconds) {
-          listener.onSeekAmountRowClicked()
+          listener.onSeekAmountRowClick()
         }
         AutoRewindRow(viewState.autoRewindInSeconds) {
-          listener.onAutoRewindRowClicked()
+          listener.onAutoRewindRowClick()
         }
         ListItem(
           modifier = Modifier.clickable { listener.suggestIdea() },
@@ -185,14 +185,14 @@ private fun Dialog(
     SettingsViewState.Dialog.AutoRewindAmount -> {
       AutoRewindAmountDialog(
         currentSeconds = viewState.autoRewindInSeconds,
-        onSecondsConfirmed = listener::autoRewindAmountChanged,
+        onSecondsConfirm = listener::autoRewindAmountChang,
         onDismiss = listener::dismissDialog,
       )
     }
     SettingsViewState.Dialog.SeekTime -> {
       SeekAmountDialog(
         currentSeconds = viewState.seekTimeInSeconds,
-        onSecondsConfirmed = listener::seekAmountChanged,
+        onSecondsConfirm = listener::seekAmountChanged,
         onDismiss = listener::dismissDialog,
       )
     }
diff --git a/settings/src/main/kotlin/voice/settings/views/TimeSettingDialog.kt b/settings/src/main/kotlin/voice/settings/views/TimeSettingDialog.kt
index 376b333991..ab6e4f4640 100644
--- a/settings/src/main/kotlin/voice/settings/views/TimeSettingDialog.kt
+++ b/settings/src/main/kotlin/voice/settings/views/TimeSettingDialog.kt
@@ -23,7 +23,7 @@ fun TimeSettingDialog(
   @PluralsRes textPluralRes: Int,
   minSeconds: Int,
   maxSeconds: Int,
-  onSecondsConfirmed: (Int) -> Unit,
+  onSecondsConfirm: (Int) -> Unit,
   onDismiss: () -> Unit,
 ) {
   var sliderValue by remember { mutableFloatStateOf(currentSeconds.toFloat()) }
@@ -53,7 +53,7 @@ fun TimeSettingDialog(
     confirmButton = {
       TextButton(
         onClick = {
-          onSecondsConfirmed(sliderValue.roundToInt())
+          onSecondsConfirm(sliderValue.roundToInt())
           onDismiss()
         },
       ) {
diff --git a/sleepTimer/build.gradle.kts b/sleepTimer/build.gradle.kts
index b852ea3a13..dc8db31313 100644
--- a/sleepTimer/build.gradle.kts
+++ b/sleepTimer/build.gradle.kts
@@ -13,16 +13,13 @@ dependencies {
   implementation(projects.strings)
   implementation(projects.playback)
   implementation(projects.data)
+  implementation(projects.pref)
 
   implementation(libs.androidxCore)
-  implementation(libs.prefs.core)
   implementation(libs.materialDialog.core)
   implementation(libs.androidxCore)
-  implementation(libs.constraintLayout)
   implementation(libs.material)
   implementation(libs.seismic)
 
   implementation(libs.dagger.core)
-
-  testImplementation(libs.prefs.inMemory)
 }
diff --git a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimer.kt b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimer.kt
index 8680e8f405..5cbe945b45 100644
--- a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimer.kt
+++ b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimer.kt
@@ -2,7 +2,6 @@ package voice.sleepTimer
 
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import com.squareup.anvil.annotations.ContributesBinding
-import de.paulwoitaschek.flowpref.Pref
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
@@ -18,6 +17,7 @@ import voice.logging.core.Logger
 import voice.playback.PlayerController
 import voice.playback.playstate.PlayStateManager
 import voice.playback.playstate.PlayStateManager.PlayState.Playing
+import voice.pref.Pref
 import javax.inject.Inject
 import javax.inject.Named
 import javax.inject.Singleton
diff --git a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerDialog.kt b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerDialog.kt
index c3567d57e3..2a7f04d63e 100644
--- a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerDialog.kt
+++ b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerDialog.kt
@@ -13,6 +13,7 @@ import androidx.compose.material.icons.outlined.Remove
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
@@ -20,6 +21,7 @@ import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
@@ -55,6 +57,7 @@ fun SleepTimerDialog(
           modifier = Modifier.clickable {
             onAcceptSleepTime(time)
           },
+          colors = ListItemDefaults.colors(containerColor = Color.Transparent),
           headlineContent = {
             Text(text = minutes(minutes = time))
           },
@@ -64,6 +67,7 @@ fun SleepTimerDialog(
         modifier = Modifier.clickable {
           onAcceptSleepTime(viewState.customSleepTime)
         },
+        colors = ListItemDefaults.colors(containerColor = Color.Transparent),
         headlineContent = {
           Text(text = minutes(minutes = viewState.customSleepTime))
         },
diff --git a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt
index eb1db71bc9..8dbe08c962 100644
--- a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt
+++ b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt
@@ -1,5 +1,3 @@
 package voice.sleepTimer
 
-data class SleepTimerViewState(
-  val customSleepTime: Int,
-)
+data class SleepTimerViewState(val customSleepTime: Int)
diff --git a/strings/src/main/res/values-ar/strings.xml b/strings/src/main/res/values-ar/strings.xml
index 6661c62f3a..09c24907d0 100644
--- a/strings/src/main/res/values-ar/strings.xml
+++ b/strings/src/main/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" tools:locale="ar">
-    <string name="cover">الغطاء</string>
+    <string name="cover">الغلاف</string>
     <string name="play_pause">شغّل/ ألبث</string>
     <string name="action_sleep">مؤقت النوم</string>
     <string name="rewind">أرجع</string>
@@ -132,4 +132,4 @@
     <string name="sleep_timer.title">أحلام سعيدة! 🌙</string>
     <string name="sleep_timer.button.increment">أطول</string>
     <string name="sleep_timer.button.decrement">أقصر</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-cs/strings.xml b/strings/src/main/res/values-cs/strings.xml
index 02acec6a55..c739902b5c 100644
--- a/strings/src/main/res/values-cs/strings.xml
+++ b/strings/src/main/res/values-cs/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cover">Obal</string>
     <string name="play_pause">Přehrát / Pozastavit</string>
@@ -18,27 +18,119 @@
     <string name="pick_book_cover">Obal ze souborového systému</string>
     <string name="edit_book_title">Upravit knihu</string>
     <string name="mark_as_completed">Označit jako dokončené</string>
-    <string name="mark_as_current">Označit jako aktualní</string>
+    <string name="mark_as_current">Označit jako aktuální</string>
     <string name="mark_as_not_started">Označit jako dosud nezahájené</string>
-    <string name="audiobook_folders_title">Adresáře s audioknihami</string>
+    <string name="audiobook_folders_title">Složky s audioknihami</string>
     <string name="playback_speed">Rychlost přehrávání</string>
     <string name="bookmark">Záložka</string>
     <string name="bookmark_edit_title">Upravit záložku</string>
-    <string name="bookmark_edit_hint">Jméno záložky</string>
+    <string name="bookmark_edit_hint">Název záložky</string>
     <string name="bookmark_added">Záložka přidána</string>
     <string name="action_settings">Nastavení</string>
     <plurals name="seconds">
         <item quantity="one">%d sekunda</item>
-        <item quantity="few">%dsekundy </item>
-        <item quantity="many">%dsekund </item>
-        <item quantity="other">%dsekund </item>
+        <item quantity="few">%d sekundy</item>
+        <item quantity="other">%d sekund</item>
     </plurals>
     <string name="pref_seek_time">Přeskočit o</string>
     <string name="pref_auto_rewind_title">Automaticky přetočit</string>
     <string name="popup_edit">Upravit</string>
-    <string name="remove">Smazat</string>
+    <string name="remove">Odstranit</string>
     <string name="play_current">Přehrát aktuální</string>
     <string name="book_header_current">Aktuální</string>
     <string name="book_header_not_started">Doposud nespuštěno</string>
     <string name="book_header_completed">Dokončeno</string>
-</resources>
+    <string name="pref_get_support">Získat podporu</string>
+    <string name="delete">Smazat</string>
+    <string name="add">Přidat</string>
+    <string name="folder_mode_root">Režim řazení knih: Podsložky jsou knihy</string>
+    <string name="folder_type_title">Jak jsou vaše audioknihy logicky rozmístěné?</string>
+    <string name="bookmark_just_now">Právě teď</string>
+    <string name="migration_hint_title">Zpřístupnění starých pozic knih</string>
+    <string name="select_folder_type_folder">Složka</string>
+    <string name="notification_sleep_timer_disable">Vypnout časovač vypnutí</string>
+    <string name="select_folder_title_default">Přidejte své audoknihy</string>
+    <string name="select_folder_type_file">Soubor</string>
+    <string name="select_folder_subtitle">Chcete přidat jeden soubor jako knihu nebo jako složku?</string>
+    <string name="onboarding_welcome_title">Vítejte ve Voice!</string>
+    <string name="onboarding_welcome_subtitle">Váš osobní kapesní přehrávač audioknih. Pojďme ho nastavit.</string>
+    <string name="onboarding.explanation.subtitle">Pomocí aplikace Voice můžete přidávat knihy jako jednotlivé soubory nebo je organizovat do složek. Je to na vás!</string>
+    <string name="onboarding.completion.subtitle">Vaše první audiokniha je připravena k přehrání. Užijte si svou cestu s Voice!</string>
+    <string name="review.request.content">Vaše zpětná vazba je pro nás důležitá! Pokud máte chvilku, ohodnoťte nás a podělte se o své zkušenosti. Pomáhá nám to vylepšovat a nabízet lepší zážitek z poslechu.</string>
+    <string name="folder_type_no_books">Voice nenalezl žádné knihy. Jsou ve složkách opravdu zvukové soubory?</string>
+    <string name="migration_detail_content_name">Název</string>
+    <string name="migration_detail_content_bookmarks">Záložky</string>
+    <string name="migration_detail_title">Staré pozice knih</string>
+    <string name="migration_hint_confirm">Rozumím</string>
+    <string name="migration_detail_content_added_at">Přidáno v</string>
+    <string name="migration_delete_dialog_title">Odstranit pozice</string>
+    <string name="migration_hint_content">Vzhledem ke změnám v novějších verzích Androidu, je potřeba vybrat hlavní složku audioknih pomocí systémového výběru.
+\n
+\nkliknutím na ikonu výše zobrazíte pozice svých starých knih.</string>
+    <string name="migration_delete_dialog_content">Jakmile odstraníte staré pozice, nebudete moci obnovit své staré pozice přehrávání.</string>
+    <string name="delete_book_bottom_sheet_title">Odstranit knihu</string>
+    <string name="delete_book_dialog_title">Odstranit knihu</string>
+    <string name="delete_book_dialog_deletion_confirmation">Odstranit mé soubory</string>
+    <string name="cover_search_template_with_author">%1$s obal audioknihy od %2$s</string>
+    <string name="sleep_timer.title">Sladké sny! 🌙</string>
+    <string name="sleep_timer.button.decrement">Zkrátit</string>
+    <string name="sleep_timer.button.increment">Prodloužit</string>
+    <plurals name="minutes">
+        <item quantity="one">%d minuta</item>
+        <item quantity="few">%d minuty</item>
+        <item quantity="other">%d minut</item>
+    </plurals>
+    <string name="search_hint">Co hledáte?</string>
+    <string name="folder_mode_single">Režim řazení knih: Jedna složka = Jedna kniha</string>
+    <string name="folder_mode_author">Režim řazení knih: Podsložky jsou autoři, podsložky podložek jsou knihy</string>
+    <plurals name="folder_type_file_count">
+        <item quantity="one">%d zvukový soubor</item>
+        <item quantity="few">%d zvukové soubory</item>
+        <item quantity="other">%d zvukových souborů</item>
+    </plurals>
+    <string name="voice_intro_first_book">Pojďme přidat vaši složku s audioknihami ať můžete začít poslouchat!</string>
+    <string name="migration_detail_content_position">Pozice</string>
+    <string name="notification_sleep_timer_enable">Zapnout časovač vypnutí</string>
+    <string name="storage_bug_title">Vyžadováno povolení</string>
+    <string name="storage_bug_subtitle">U některých zařízení chybí systémové aplikaci potřebná oprávnění pro přístup k externímu úložišti. Tento přístup je nezbytný, aby Voice mohl číst vaše audioknihy.</string>
+    <string name="storage_bug_button">Udělit oprávnění</string>
+    <string name="pref_report_issue">Nahlásit problém</string>
+    <string name="pref_help_translating">Pomozte přeložit Voice</string>
+    <string name="close">Zavřít</string>
+    <string name="folder_type_book_example_header">Povede k nalezení následujících knih</string>
+    <string name="migration_detail_content_root">Kořenová složka</string>
+    <string name="migration_delete_dialog_action_delete">Odstranit</string>
+    <string name="delete_book_dialog_content">Toto odstraní soubory z vašeho zařízení.</string>
+    <string name="onboarding.button_next">Další</string>
+    <string name="onboarding.explanation.title">Vaše knihovna, váš způsob</string>
+    <string name="onboarding.completion.title">Vše je připraveno!</string>
+    <string name="onboarding.completion.next_button">Začít poslouchat</string>
+    <string name="review.request.title">Spokojeni s Voice?</string>
+    <string name="review.request.button.yes">Ohodnotit nyní</string>
+    <string name="review.request.button.no">Ne, děkuji</string>
+    <string name="review.feedback.title">To je nám líto!</string>
+    <string name="review.feedback.content">Můžete nám sdělit, co se pokazilo? Vážíme si vaší zpětné vazby a pomáhá nám zlepšovat uživatelskou zkušenost.</string>
+    <string name="review.feedback.button.yes">Odeslat zpětnou vazbu</string>
+    <string name="review.feedback.button.no">Zrušit</string>
+    <string name="cover_search_template_no_author">%s obal audioknihy</string>
+    <string name="pref_suggest_idea">Navrhnout nápad</string>
+    <string name="generic_error_message">Něco se pokazilo 😢</string>
+    <string name="generic_error_retry">Znovu</string>
+    <string name="play">Přehrát</string>
+    <string name="pause">Pozastavit</string>
+    <string name="migration_delete_dialog_action_keep">Ponechat</string>
+    <string name="cover_search.icon_recent">Nedávné hledání</string>
+    <string name="cover_search.author">Autor</string>
+    <string name="pref_theme_dark">Tmavé téma</string>
+    <string name="pref_use_grid">Použít rozložení mřížky</string>
+    <string name="pref_app_version">Verze aplikace</string>
+    <string name="migration_detail_content_position_current_file_position">Pozice v souboru</string>
+    <string name="migration_detail_content_position_current_file_title">Aktuální soubor</string>
+    <string name="migration_detail_content_position_current_chapter_position">Pozice v kapitole</string>
+    <string name="migration_detail_content_position_current_chapter_title">Současná kapitola</string>
+    <string name="media_session_root">Všechny audoknihy</string>
+    <string name="media_session_recent">Nedávné</string>
+    <string name="battery_optimization_rationale">Kvůli nastavení omezení spotřeby může docházet k přerušování přehrávání.</string>
+    <string name="battery_optimization_action">Aktualizovat</string>
+    <string name="select_folder_title_onboarding">Přidejte svou první audioknihu</string>
+</resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-de/strings.xml b/strings/src/main/res/values-de/strings.xml
index 3ff4aaf81b..6832fcb964 100644
--- a/strings/src/main/res/values-de/strings.xml
+++ b/strings/src/main/res/values-de/strings.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="cover">Cover</string>
-    <string name="play_pause">Play / Pause</string>
+    <string name="cover">Titelbild</string>
+    <string name="play_pause">Abspielen / Pausieren</string>
     <string name="action_sleep">Einschlaf-Timer</string>
     <string name="rewind">Zurückspulen</string>
     <string name="fast_forward">Vorspulen</string>
     <string name="previous_track">Vorheriger Track</string>
-    <string name="next_track">Nächster Track</string>
+    <string name="next_track">Nächster Titel</string>
     <string name="skip_silence">Stille überspringen</string>
-    <string name="volume_boost">Lautstärke Boost</string>
+    <string name="volume_boost">Lautstärke erhöhen</string>
     <string name="more">Mehr</string>
     <string name="dialog_confirm">Okay</string>
     <string name="dialog_cancel">Abbrechen</string>
-    <string name="content_cover">Zeigt aktuelles Cover an</string>
+    <string name="content_cover">Zeigt aktuelles Titelbild an</string>
     <string name="change_book_name">Name</string>
-    <string name="download_book_cover">Cover (Internet)</string>
-    <string name="pick_book_cover">Cover (Lokal)</string>
+    <string name="download_book_cover">Titelbild aus dem Internet</string>
+    <string name="pick_book_cover">Titelbild aus dem Dateisystem</string>
     <string name="edit_book_title">Buch bearbeiten</string>
     <string name="mark_as_completed">Als \"Abgeschlossen\" markieren</string>
     <string name="mark_as_current">Als \"Aktuelles\" markieren</string>
     <string name="mark_as_not_started">Als \"Neu\" markieren</string>
     <string name="audiobook_folders_title">Hörbuch Ordner</string>
-    <string name="playback_speed">Geschwindigkeit</string>
+    <string name="playback_speed">Abspielgeschwindigkeit</string>
     <string name="bookmark">Lesezeichen</string>
     <string name="bookmark_edit_title">Lesezeichen bearbeiten</string>
     <string name="bookmark_edit_hint">Lesezeichenname</string>
@@ -41,7 +41,7 @@
     <string name="pref_get_support">Erhalte Unterstützung</string>
     <string name="pref_app_version">App Version</string>
     <string name="popup_edit">Bearbeiten</string>
-    <string name="remove">Löschen</string>
+    <string name="remove">Entfernen</string>
     <string name="play_current">Spiel aktuelles</string>
     <string name="book_header_current">Aktuelles</string>
     <string name="book_header_not_started">Neu</string>
@@ -90,12 +90,12 @@
     <string name="media_session_recent">Kürzlich</string>
     <string name="notification_sleep_timer_enable">Einschlaftimer einschalten</string>
     <string name="notification_sleep_timer_disable">Einschlaftimer ausschalten</string>
-    <string name="play">Play</string>
+    <string name="play">Abspielen</string>
     <string name="pause">Pause</string>
     <string name="generic_error_message">Etwas ist schief gelaufen 😢</string>
     <string name="generic_error_retry">Erneut versuchen</string>
-    <string name="cover_search_template_with_author">%1$s von %2$s Hörbuch cover</string>
-    <string name="cover_search_template_no_author">%s Hörbuch cover</string>
+    <string name="cover_search_template_with_author">%1$s von %2$s Hörbuch Titelbild</string>
+    <string name="cover_search_template_no_author">%s Hörbuch Titelbild</string>
     <string name="storage_bug_title">Berechtigung benötigt</string>
     <string name="storage_bug_subtitle">Für bestimmte Geräte fehlt einer System-App die notwendige Berechtigung, auf den externen Speicher zuzugreifen. Dieser Zugriff ist jedoch für Voice essentiell, um Ihre Hörbücher lesen zu können.</string>
     <string name="storage_bug_button">Berechtigung erteilen</string>
@@ -130,4 +130,4 @@
         <item quantity="one">%d Minute</item>
         <item quantity="other">%d Minuten</item>
     </plurals>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-fa-rIR/strings.xml b/strings/src/main/res/values-fa-rIR/strings.xml
index 376623b30f..0381ac67b4 100644
--- a/strings/src/main/res/values-fa-rIR/strings.xml
+++ b/strings/src/main/res/values-fa-rIR/strings.xml
@@ -91,7 +91,7 @@
     <string name="storage_bug_button">اعطا مجوز</string>
     <string name="review.request.button.no">نه، متشکرم</string>
     <string name="review.feedback.button.yes">فرستادن بازخورد</string>
-    <string name="cover_search_template_with_author">%1$s به وسیله %2$s کاور کتاب صوتی</string>
+    <string name="cover_search_template_with_author">%1$s توسط %2$s کاور کتاب صوتی</string>
     <string name="cover_search_template_no_author">%s کاور کتاب صوتی</string>
     <string name="pref_help_translating">کمک برای ترجمه Voice</string>
     <string name="generic_error_message">مشکلی پیش آمد 😢</string>
@@ -129,6 +129,5 @@
     <string name="onboarding.button_next">بعدی</string>
     <string name="migration_hint_content">با توجه به تغییرات نسخه های جدیدتر اندروید، لازم است پوشه کتاب صوتی خود را با استفاده از انتخابگر سیستم انتخاب کنید.
 \n
-\n
 \nبرای مشاهده موقعیت های کتاب قدیمی خود روی آیکن بالا کلیک کنید.</string>
 </resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-fi/strings.xml b/strings/src/main/res/values-fi/strings.xml
new file mode 100644
index 0000000000..9b22b1b7a4
--- /dev/null
+++ b/strings/src/main/res/values-fi/strings.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pause">Tauko</string>
+    <string name="play_pause">Toisto / Tauko</string>
+    <string name="play">Toisto</string>
+    <string name="action_sleep">Uni-ajastin</string>
+    <string name="rewind">Takaisinkelaus</string>
+    <string name="cover_search.author">Tekijä</string>
+    <string name="edit_book_title">Muokkaa kirjaa</string>
+    <string name="mark_as_completed">Merkitse valmiiksi</string>
+    <string name="mark_as_current">Merkitse nykyseksi</string>
+    <string name="mark_as_not_started">Merkitse ei vielä aloitetuksi</string>
+    <string name="audiobook_folders_title">Äänikirjakansiot</string>
+    <string name="fast_forward">Pikakelaus</string>
+    <string name="previous_track">Edellinen ääniraita</string>
+    <string name="next_track">Seuraava ääniraita</string>
+    <string name="skip_silence">Ohita Hiljaisuus</string>
+    <string name="volume_boost">Äänenvoimakkuuden tehostus</string>
+    <string name="dialog_confirm">Aseta</string>
+    <string name="playback_speed">Toiston nopeus</string>
+    <string name="bookmark">Kirjanmerkki</string>
+    <string name="bookmark_edit_title">Muokkaa kirjanmerkkiä</string>
+    <string name="action_settings">Asetukset</string>
+    <plurals name="seconds">
+        <item quantity="one">%d sekuntti</item>
+        <item quantity="other">%d sekunttia</item>
+    </plurals>
+    <string name="pref_theme_dark">Tumma teema</string>
+    <string name="add">Lisää</string>
+    <string name="cover_search.icon_recent">Viimeisin haku</string>
+    <string name="generic_error_message">Jotakin meni pieleen 😢</string>
+    <string name="generic_error_retry">Yritä uudelleen</string>
+    <string name="storage_bug_title">Käyttöoikeus tarvitaan</string>
+    <string name="storage_bug_subtitle">Eräillä laitteilla joltakin järjestelmän sovellukselta puuttuu tarvittava käyttöoikeus ulkoiseen tallennustilaan. Tämä oikeus on välttämätön jotta Voice voi lukea äänikirjojasi.</string>
+    <string name="select_folder_subtitle">Haluaisitko lisätä yksittäisen tietoston kirjana vai kansiona?</string>
+    <string name="cover">Kansi</string>
+    <string name="more">Enemmän</string>
+    <string name="change_book_name">Nimi</string>
+    <string name="download_book_cover">Kansi internetistä</string>
+    <string name="bookmark_edit_hint">Kirjanmerkin nimi</string>
+    <string name="pick_book_cover">Kansi tiedostojärjestelmästä</string>
+    <string name="dialog_cancel">Peruuta</string>
+    <string name="bookmark_added">Kirjanmerkki lisätty</string>
+    <string name="battery_optimization_action">Päivitä</string>
+    <string name="media_session_recent">Viimeisin</string>
+    <string name="media_session_root">Kaikki äänikirjat</string>
+    <string name="select_folder_type_folder">Kansio</string>
+    <string name="storage_bug_button">Anna käyttöoikeus</string>
+    <string name="select_folder_title_onboarding">Lisää ensimmäinen äänikirjasi</string>
+    <string name="select_folder_title_default">Lisää äänikirjasi</string>
+    <string name="select_folder_type_file">Tiedosto</string>
+    <string name="content_cover">Näyttää kannen jonka valita</string>
+    <string name="book_header_completed">Valmiina</string>
+    <string name="close">Sulje</string>
+    <string name="delete">Poista</string>
+    <string name="book_header_current">Nykyinen</string>
+    <string name="book_header_not_started">Ei vielä aloitettu</string>
+    <string name="cover_search_template_no_author">%s äänikirjan kansi</string>
+    <string name="cover_search_template_with_author">Tekijän %2$s äänikirjan kansi %1$s</string>
+    <string name="onboarding.button_next">Seuraava</string>
+    <string name="onboarding.explanation.title">Sinun kirjastosi, sinun tavallasi</string>
+    <string name="battery_optimization_rationale">Laitteesi virtarajoitusten takija äänentoisto voi katkeilla.</string>
+    <string name="delete_book_bottom_sheet_title">Poista kirja</string>
+    <string name="delete_book_dialog_title">Poista kirja</string>
+    <string name="delete_book_dialog_deletion_confirmation">Poista tiedostoni</string>
+    <string name="delete_book_dialog_content">Tämä poistaa tiedostot laitteeltasi.</string>
+    <string name="search_hint">Mitä etsit?</string>
+    <string name="bookmark_just_now">Juuri äskettäin</string>
+    <string name="migration_hint_title">Vanhojen kirjan paikkohin pääsy</string>
+    <string name="onboarding.explanation.subtitle">Voicella voit lisätä kirjoja yksittäisinä tiedostoina tai järjestellä ne kansioissa. Sinä saat valita!</string>
+    <string name="onboarding.completion.title">Olet valmiina!</string>
+    <string name="onboarding.completion.subtitle">Ensimmäinen äänikirjasi on valmiina kuunneltavaksi. Nauti matkastasi Voicen kanssa!</string>
+    <string name="onboarding.completion.next_button">Aloita kuuntelemaan</string>
+    <string name="review.request.title">Pidätkö Voicesta?</string>
+    <string name="review.request.content">Palautteesi on tärkeätä meille! Jos sinulla on hetki aikaa, arvioi meidät ja jaa kokemuksesi. Se auttaa meitä tekemään parannuksia sovellukseen ja tarjoamaan paremman kuuntelukokemuksen.</string>
+    <string name="review.request.button.yes">Arvioi nyt</string>
+    <string name="review.request.button.no">Ei kiitos</string>
+    <string name="review.feedback.title">Tämäpä on harmillista kuulla!</string>
+    <string name="review.feedback.content">Voisitko kertoa meille mikä meni väärin? Arvostaisimme palautettasi ja se auttaa meitä parantamaan käyttökokemustasi.</string>
+    <string name="review.feedback.button.yes">Lähetä palautetta</string>
+    <string name="review.feedback.button.no">Peruuta</string>
+    <string name="sleep_timer.title">Hyviä unia! 🌙</string>
+    <string name="sleep_timer.button.increment">Pidempään</string>
+    <string name="sleep_timer.button.decrement">Lyhyempään</string>
+    <plurals name="minutes">
+        <item quantity="one">1 minuutti</item>
+        <item quantity="other">%d minuuttia</item>
+    </plurals>
+    <string name="onboarding_welcome_title">Tervetuloa Voiceen!</string>
+    <string name="voice_intro_first_book">Lisätään äänikirjakansiosi jotta voit aloittaa kuuntelemisen!</string>
+    <string name="folder_mode_author">Tekijä-Kirja-tila: Alikansiot ovat tekijöitä, ali-alikansiot ovat kirjoja.</string>
+    <plurals name="folder_type_file_count">
+        <item quantity="one">%d äänitiedosto</item>
+        <item quantity="other">%d äänitiedostoa</item>
+    </plurals>
+    <string name="folder_type_book_example_header">Tämä johtaisi seuraavien kirjojen havaitsemiseen</string>
+    <string name="folder_type_no_books">Voice ei havainnut mitään kirjoja. Onko äänitiedostoja olemassa?</string>
+    <string name="folder_mode_root">Ylätasokirjatila: Alikansiot ovat kirjoja</string>
+    <string name="folder_mode_single">Yksittäisten kirjojen tila: Yksi kansio on yhtä kuin yksi kirja.</string>
+    <string name="pref_report_issue">Ilmoita ongelmasta</string>
+    <string name="pref_help_translating">Auta kääntämään Voicea</string>
+    <string name="pref_get_support">Hanki tukea</string>
+    <string name="pref_app_version">Sovelluksen versio</string>
+    <string name="popup_edit">Muokkaa</string>
+    <string name="remove">Poista</string>
+    <string name="play_current">Toista nykyinen</string>
+    <string name="pref_seek_time">Ohita määrä</string>
+    <string name="pref_auto_rewind_title">Automaattinen takaisinkelaus</string>
+    <string name="pref_suggest_idea">Ehdota ideaa</string>
+    <string name="pref_use_grid">Käytä ruudukkoasettelua</string>
+    <string name="onboarding_welcome_subtitle">Henkilökohtainen taskuäänikirjasoittimesi. Laitetaanpas homma rullaamaan.</string>
+    <string name="migration_detail_content_position">Sijainti</string>
+    <string name="migration_detail_content_bookmarks">Kirjanmerkit</string>
+    <string name="migration_detail_content_added_at">Lisätty aikaan</string>
+    <string name="migration_detail_content_position_current_file_title">Nykyinen tiedosto</string>
+    <string name="migration_detail_content_position_current_file_position">Sijainti tiedostossa</string>
+    <string name="migration_detail_content_position_current_chapter_title">Nykyinen luku</string>
+    <string name="migration_detail_content_position_current_chapter_position">Sijainti luvussa</string>
+    <string name="migration_delete_dialog_title">Poista sijainnit</string>
+    <string name="migration_delete_dialog_content">Poistettaessasi vanhat sijainnit et enää voi saada takaisin vanhoja sijaintejasi.</string>
+    <string name="migration_delete_dialog_action_delete">Poista</string>
+    <string name="migration_delete_dialog_action_keep">Säilytä</string>
+    <string name="folder_type_title">Miten tiedostosi ovat järjestelty?</string>
+    <string name="migration_hint_content">Johtuen muutoksista uusimmissa Android-versioissa, äänikirjakansiosi täytyy valita järjestelmän valitsimella
+\n
+\nPaina yllä olevaa kuvaketta nähdäksesi vanhat sijaintisi kirjassa.</string>
+    <string name="migration_hint_confirm">Ymmärretty</string>
+    <string name="migration_detail_title">Vanhat sijainnit kirjoissa</string>
+    <string name="migration_detail_content_name">Nimi</string>
+    <string name="migration_detail_content_root">Juurikansio</string>
+    <string name="notification_sleep_timer_disable">Laita uniajastin pois päältä</string>
+    <string name="notification_sleep_timer_enable">Laita uniajastin päälle</string>
+</resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-fr/strings.xml b/strings/src/main/res/values-fr/strings.xml
index 0f7e67d4fb..37cfa806b6 100644
--- a/strings/src/main/res/values-fr/strings.xml
+++ b/strings/src/main/res/values-fr/strings.xml
@@ -2,13 +2,13 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" tools:locale="fr">
     <string name="cover">Couverture</string>
     <string name="play_pause">Lecture / Pause</string>
-    <string name="action_sleep">Minuteur</string>
-    <string name="rewind">Rembobiner</string>
+    <string name="action_sleep">Minuterie de mise en veille</string>
+    <string name="rewind">Revenir en arrière</string>
     <string name="fast_forward">Avance rapide</string>
     <string name="previous_track">Piste précédente</string>
     <string name="next_track">Piste suivante</string>
     <string name="skip_silence">Sauter les silences</string>
-    <string name="volume_boost">Hausser le volume </string>
+    <string name="volume_boost">Augmentation du volume</string>
     <string name="more">Plus</string>
     <string name="dialog_confirm">Définir</string>
     <string name="dialog_cancel">Annuler</string>
@@ -46,12 +46,12 @@
     <string name="play_current">Lire l\'actuel</string>
     <string name="book_header_current">En cours</string>
     <string name="book_header_not_started">Pas encore commencé</string>
-    <string name="book_header_completed">Complété</string>
+    <string name="book_header_completed">Terminé</string>
     <string name="close">Fermer</string>
     <string name="delete">Supprimer</string>
     <string name="add">Ajouter</string>
-    <string name="folder_mode_root">Dossier racine des livres audio. Un sous-dossier = un livre.</string>
-    <string name="folder_mode_single">Dossier de livre audio unique </string>
+    <string name="folder_mode_root">Mode livres : chaque sous-dossier est un livre</string>
+    <string name="folder_mode_single">Mode livre unique : un dossier est un livre.</string>
     <plurals name="folder_type_file_count">
         <item quantity="one">%d fichier audio</item>
         <item quantity="many">%d fichiers audio</item>
@@ -88,6 +88,47 @@
     <string name="battery_optimization_action">Mise à jour</string>
     <string name="media_session_root">Tous les livres audio</string>
     <string name="media_session_recent">Récent</string>
-    <string name="notification_sleep_timer_enable">Activer la minuterie de sommeil</string>
-    <string name="notification_sleep_timer_disable">Désactiver la minuterie de sommeil</string>
-</resources>
+    <string name="notification_sleep_timer_enable">Activer la minuterie de mise en veille</string>
+    <string name="notification_sleep_timer_disable">Désactiver la minuterie de mise en veille</string>
+    <string name="onboarding_welcome_title">Bienvenue dans Voice !</string>
+    <string name="sleep_timer.title">Bonne nuit ! 🌙</string>
+    <string name="sleep_timer.button.increment">Plus long</string>
+    <string name="folder_mode_author">Mode auteurs : chaque sous-dossier est un auteur, dont chaque sous-dossier est un livre.</string>
+    <string name="generic_error_message">Quelque chose s\'est mal passé 😢</string>
+    <string name="generic_error_retry">Réessayer</string>
+    <string name="storage_bug_subtitle">Sur certains appareils, il manque les permissions nécessaires à une application système pour accéder au stockage externe. Cet accès est essentiel pour que Voice puisse lire les livres audio.</string>
+    <string name="storage_bug_button">Accorder la permission</string>
+    <string name="onboarding.explanation.title">Votre bibliothèque sur mesure</string>
+    <string name="review.request.title">Vous aimez Voice ?</string>
+    <string name="review.request.button.yes">Évaluer</string>
+    <string name="review.request.button.no">Non merci</string>
+    <string name="review.feedback.title">Désolé de l\'apprendre !</string>
+    <string name="review.feedback.content">Pourriez-vous nous indiquer ce qui s\'est mal passé ? Nous apprécions vos retours, ils nous aident à améliorer votre expérience.</string>
+    <string name="sleep_timer.button.decrement">Moins long</string>
+    <plurals name="minutes">
+        <item quantity="one">%d minute</item>
+        <item quantity="many">%d minutes</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <string name="cover_search_template_no_author">%s couverture livre audio</string>
+    <string name="cover_search_template_with_author">%1$s par %2$s couverture livre audio</string>
+    <string name="onboarding.button_next">Suivant</string>
+    <string name="onboarding.explanation.subtitle">Avec Voice, vous pouvez ajouter des livres comme des fichiers individuels, ou les organiser en dossier. Comme vous préférez !</string>
+    <string name="onboarding.completion.title">Tout est en ordre !</string>
+    <string name="review.feedback.button.yes">Donnez votre avis</string>
+    <string name="onboarding.completion.subtitle">Votre premier livre audio est prêt à être lu. Profitez de votre voyage avec Voice !</string>
+    <string name="onboarding.completion.next_button">Commencer à écouter</string>
+    <string name="review.request.content">Vos retours comptent pour nous ! Si vous avez un peu de temps, partagez votre expérience. Ça nous aide à améliorer Voice et à vous offrir un plus grand confort d\'écoute.</string>
+    <string name="review.feedback.button.no">Annuler</string>
+    <string name="onboarding_welcome_subtitle">Votre lecteur de livres audio personnel. Configurons votre application.</string>
+    <string name="play">Lecture</string>
+    <string name="pause">Pause</string>
+    <string name="cover_search.icon_recent">Recherche récente</string>
+    <string name="cover_search.author">Auteur</string>
+    <string name="storage_bug_title">Permission requise</string>
+    <string name="select_folder_title_onboarding">Ajoutez votre premier livre audio</string>
+    <string name="select_folder_title_default">Ajoutez vos livres audio</string>
+    <string name="select_folder_type_file">Fichier</string>
+    <string name="select_folder_type_folder">Dossier</string>
+    <string name="select_folder_subtitle">Les livres sont-ils des fichiers ou des dossiers ?</string>
+</resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-ga/strings.xml b/strings/src/main/res/values-ga/strings.xml
index b2a40f2af0..0b6f6fb2be 100644
--- a/strings/src/main/res/values-ga/strings.xml
+++ b/strings/src/main/res/values-ga/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cover">Clúdach</string>
     <string name="play_pause">Seinn / Tabhair sos</string>
@@ -8,7 +8,7 @@
     <string name="dialog_confirm">Socraigh</string>
     <string name="dialog_cancel">Cealaigh</string>
     <string name="change_book_name">Ainm</string>
-    <string name="download_book_cover">Clúdach ón idirlín</string>
+    <string name="download_book_cover">Clúdach ón Idirlíon</string>
     <string name="edit_book_title">Athraigh an closleabhar</string>
     <string name="audiobook_folders_title">Fillteáin na closleabhar</string>
     <string name="playback_speed">Luas an seinntora</string>
@@ -21,4 +21,122 @@
     <string name="remove">Bain de</string>
     <string name="book_header_not_started">Níl tosnaithe go fóill</string>
     <string name="book_header_completed">Críochnaithe</string>
-</resources>
+    <string name="rewind">Athchasadh</string>
+    <string name="pick_book_cover">Clúdach ón gcóras comhad</string>
+    <string name="pref_report_issue">Tuairiscigh fadhb</string>
+    <string name="pref_theme_dark">Téama Dorcha</string>
+    <string name="folder_type_title">Cén struchtúr atá ar do chuid comhad?</string>
+    <string name="migration_detail_content_added_at">Curtha leis ag</string>
+    <string name="migration_detail_content_position_current_chapter_position">Seasamh sa chaibidil</string>
+    <string name="migration_delete_dialog_title">Scrios Poist</string>
+    <string name="search_hint">Cad atá tú ag féachaint faoi?</string>
+    <string name="battery_optimization_rationale">Mar gheall ar do shrianta Cumhachta, d\'fhéadfadh go gcuirfí isteach ar athsheinm.</string>
+    <plurals name="minutes">
+        <item quantity="one">%d nóiméad</item>
+        <item quantity="two">%d nóiméad</item>
+        <item quantity="few">%d nóiméad</item>
+        <item quantity="many">%d nóiméad</item>
+        <item quantity="other">%d nóiméad</item>
+    </plurals>
+    <string name="migration_detail_content_name">Ainm</string>
+    <string name="migration_detail_title">Seasamh leabhar sean</string>
+    <string name="review.feedback.button.yes">Seol Aiseolas</string>
+    <string name="storage_bug_title">Cead ag teastáil</string>
+    <string name="select_folder_subtitle">Ar mhaith leat comhad amháin a chur leis mar leabhar nó mar fhillteán?</string>
+    <string name="onboarding.completion.title">Tá tú Socraithe go léir!</string>
+    <string name="onboarding.completion.next_button">Tosaigh Éisteacht</string>
+    <string name="sleep_timer.title">Codladh sámh! 🌙</string>
+    <string name="sleep_timer.button.increment">Níos faide</string>
+    <string name="cover_search_template_no_author">%s clúdach fuaime</string>
+    <string name="pref_seek_time">Scipeáil méid</string>
+    <string name="pref_auto_rewind_title">Athchasadh uathoibríoch</string>
+    <string name="generic_error_retry">Bain triail eile as</string>
+    <string name="play">Imirt</string>
+    <string name="pause">Sos</string>
+    <string name="fast_forward">Aghaidh go tapa</string>
+    <string name="skip_silence">Scipeáil ar Chiúin</string>
+    <string name="volume_boost">Treisiú toirte</string>
+    <string name="more">Tuilleadh</string>
+    <string name="content_cover">Taispeáin clúdach a roghnú</string>
+    <string name="cover_search.icon_recent">Ceist le déanaí</string>
+    <string name="cover_search.author">Údar</string>
+    <string name="mark_as_current">Marcáil mar Reatha</string>
+    <string name="mark_as_not_started">Marcáil mar Gan Tosú fós</string>
+    <plurals name="seconds">
+        <item quantity="one">%d soicind</item>
+        <item quantity="two">%d soicindí</item>
+        <item quantity="few">%d soicindí</item>
+        <item quantity="many">%d soicindí</item>
+        <item quantity="other">%d soicindí</item>
+    </plurals>
+    <string name="pref_use_grid">Bain úsáid as leagan amach na greille</string>
+    <string name="select_folder_type_file">Comhad</string>
+    <string name="migration_delete_dialog_action_keep">Coinnigh</string>
+    <string name="onboarding.button_next">Ar aghaidh</string>
+    <string name="onboarding.explanation.title">Do Leabharlann, Do Bhealach Féin</string>
+    <string name="onboarding.explanation.subtitle">Le Guth, is féidir leat leabhair a chur leis mar chomhaid aonair nó iad a eagrú i bhfillteáin. Roghnaíonn tú!</string>
+    <string name="cover_search_template_with_author">%1$s le %2$s clúdach fuaime</string>
+    <string name="pref_get_support">Faigh tacaíocht</string>
+    <string name="mark_as_completed">Marcáil mar Críochnaithe</string>
+    <string name="pref_suggest_idea">Mol smaoineamh</string>
+    <string name="pref_help_translating">Cabhrú le Guth a aistriú</string>
+    <string name="pref_app_version">Leagan aip</string>
+    <string name="play_current">Seinn reatha</string>
+    <string name="migration_delete_dialog_content">Nuair a scriosann tú na seanphoist ní bheidh tú in ann do sheansuímh athsheinm a ghnóthú.</string>
+    <string name="book_header_current">Reatha</string>
+    <string name="delete">Scrios</string>
+    <string name="folder_mode_single">Mód Leabhar Aonair: Is ionann fillteán amháin agus leabhar amháin.</string>
+    <string name="close">Dún</string>
+    <string name="add">Cuir</string>
+    <string name="folder_mode_root">Mód Leabhar Barrleibhéil: Is leabhair iad fofhillteáin</string>
+    <string name="folder_mode_author">Mód Údair-Leabhar: Is údair iad fofhillteáin, is leabhair iad fo-fhillteáin.</string>
+    <plurals name="folder_type_file_count">
+        <item quantity="one">%d comhad fuaime</item>
+        <item quantity="two">%d comhaid fuaime</item>
+        <item quantity="few">%d comhaid fuaime</item>
+        <item quantity="many">%d comhaid fuaime</item>
+        <item quantity="other">%d comhaid fuaime</item>
+    </plurals>
+    <string name="folder_type_book_example_header">D’fhágfadh sin go mbraithfí na leabhair seo a leanas</string>
+    <string name="folder_type_no_books">Níorbh fhéidir le Voice aon leabhar a bhrath. An bhfuil aon chomhaid fuaime ann?</string>
+    <string name="bookmark_just_now">Anois féin</string>
+    <string name="voice_intro_first_book">Cuirimis d’fhillteán closleabhar leis ionas gur féidir leat tosú ag éisteacht!</string>
+    <string name="migration_hint_title">Teacht ar phoist na Seanleabhar</string>
+    <string name="migration_hint_content">De bharr athruithe ar Leaganacha Android níos nuaí, ní mór d’fhillteán closleabhar a roghnú ag baint úsáide as an roghnóir córais.
+\n
+\nCliceáil ar an deilbhín thuas chun féachaint ar do sheanleabhair.</string>
+    <string name="migration_hint_confirm">Tuigeadh</string>
+    <string name="migration_detail_content_position_current_file_title">Comhad reatha</string>
+    <string name="migration_detail_content_root">Fillteán fréimhe</string>
+    <string name="migration_detail_content_position">Post</string>
+    <string name="migration_detail_content_position_current_file_position">Seasamh sa chomhad</string>
+    <string name="migration_detail_content_position_current_chapter_title">Caibidil reatha</string>
+    <string name="migration_detail_content_bookmarks">Leabharmharcanna</string>
+    <string name="media_session_root">Gach closleabhair</string>
+    <string name="notification_sleep_timer_enable">Cumasaigh Uaineadóir Codlata</string>
+    <string name="onboarding_welcome_subtitle">Seinnteoir fuaime do phóca pearsanta. A ligean ar a fháil tú a shocrú.</string>
+    <string name="migration_delete_dialog_action_delete">Scrios</string>
+    <string name="delete_book_bottom_sheet_title">Scrios Leabhar</string>
+    <string name="storage_bug_subtitle">I gcás feistí áirithe, tá an cead riachtanach chun rochtain a fháil ar an stóras seachtrach in easnamh ar aip córais. Tá an rochtain seo riachtanach do Voice chun do chlosleabhair a léamh.</string>
+    <string name="onboarding_welcome_title">Fáilte go Guth!</string>
+    <string name="delete_book_dialog_title">Scrios Leabhar</string>
+    <string name="delete_book_dialog_content">Scriosfaidh sé seo na comhaid ar do ghléas.</string>
+    <string name="battery_optimization_action">Nuashonrú</string>
+    <string name="notification_sleep_timer_disable">Díchumasaigh an lasc ama codlata</string>
+    <string name="generic_error_message">Chuaigh rud éigin mícheart 😢</string>
+    <string name="delete_book_dialog_deletion_confirmation">Scrios mo chomhaid</string>
+    <string name="storage_bug_button">Cead a dheonú</string>
+    <string name="media_session_recent">le déanaí</string>
+    <string name="select_folder_title_onboarding">Cuir Do Chéad Leabhar Closleabhar leis</string>
+    <string name="select_folder_title_default">Cuir do Closleabhair leis</string>
+    <string name="select_folder_type_folder">Fillteán</string>
+    <string name="onboarding.completion.subtitle">Tá do chéad chlosleabhar réidh le himirt. Bain sult as do thuras le Voice!</string>
+    <string name="review.request.title">Taitneamh a bhaint as Guth?</string>
+    <string name="review.request.content">Tá d\'aiseolas tábhachtach dúinn! Má tá nóiméad agat, déan rátáil orainn agus roinn do thaithí. Cuidíonn sé linn feabhsúcháin a dhéanamh agus eispéireas éisteachta níos fearr a thairiscint.</string>
+    <string name="review.request.button.yes">Ráta Anois</string>
+    <string name="review.request.button.no">Níl sé uaim go raibh maith agat</string>
+    <string name="review.feedback.title">Tá brón orainn é sin a chloisteáil!</string>
+    <string name="review.feedback.button.no">Cealaigh</string>
+    <string name="review.feedback.content">An bhféadfá a insint dúinn cad a chuaigh mícheart? Is mór againn d’aiseolas agus cabhraíonn sé linn d’eispéireas a fheabhsú.</string>
+    <string name="sleep_timer.button.decrement">Níos giorra</string>
+</resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-hi/strings.xml b/strings/src/main/res/values-hi/strings.xml
index e339e0f002..913758a7be 100644
--- a/strings/src/main/res/values-hi/strings.xml
+++ b/strings/src/main/res/values-hi/strings.xml
@@ -8,22 +8,22 @@
     <string name="previous_track">पिछला ट्रैक</string>
     <string name="next_track">अगला ट्रैक</string>
     <string name="skip_silence">मौन भाग छोड़ें</string>
-    <string name="volume_boost">आवाज बूस्ट करें</string>
+    <string name="volume_boost">आवाज बढ़ाएँ</string>
     <string name="more">अधिक</string>
-    <string name="dialog_confirm">सेट करें</string>
-    <string name="dialog_cancel">रद्द करें</string>
+    <string name="dialog_confirm">निर्धारित</string>
+    <string name="dialog_cancel">रद्द</string>
     <string name="content_cover">चुनने के लिए कवर दिखाएँ</string>
     <string name="change_book_name">नाम</string>
     <string name="download_book_cover">इंटरनेट से कवर</string>
-    <string name="pick_book_cover">फ़ाइल सिस्टम से कवर</string>
-    <string name="edit_book_title">पुस्तक संपादित करें</string>
-    <string name="mark_as_completed">पूर्ण के रूप में चिह्नित करें</string>
-    <string name="mark_as_current">वर्तमान के रूप में चिह्नित करें</string>
-    <string name="mark_as_not_started">प्रारंभ नहीं हुआ के रूप में चिह्नित करें</string>
+    <string name="pick_book_cover">फाइल सिस्टम से कवर</string>
+    <string name="edit_book_title">पुस्तक संपादन</string>
+    <string name="mark_as_completed">पूर्ण चिह्नित करें</string>
+    <string name="mark_as_current">वर्तमान चिह्नित करें</string>
+    <string name="mark_as_not_started">अभी प्रारंभ नहीं चिह्नित करें</string>
     <string name="audiobook_folders_title">ऑडिओबुक के फोल्डर</string>
     <string name="playback_speed">प्लेबैक की गति</string>
     <string name="bookmark">बुकमार्क</string>
-    <string name="bookmark_edit_title">बुकमार्क सम्पादित करें</string>
+    <string name="bookmark_edit_title">बुकमार्क संपादन</string>
     <string name="bookmark_edit_hint">बुकमार्क का नाम</string>
     <string name="bookmark_added">बुकमार्क जोड़ा गया</string>
     <string name="action_settings">प्राथमिकताएँ</string>
@@ -35,24 +35,24 @@
     <string name="pref_theme_dark">गहरी थीम</string>
     <string name="pref_auto_rewind_title">ऑटो रिवाइंड</string>
     <string name="pref_suggest_idea">विचार सुझाएं</string>
-    <string name="pref_use_grid">ग्रिड लेआउट का प्रयोग करें</string>
+    <string name="pref_use_grid">ग्रिड लेआउट का प्रयोग</string>
     <string name="pref_report_issue">समस्या की रिपोर्ट करें</string>
     <string name="pref_help_translating">Voice का अनुवाद करने में मदद करें</string>
     <string name="pref_get_support">सहायता प्राप्त करें</string>
     <string name="pref_app_version">ऐप संस्करण</string>
-    <string name="popup_edit">संपादित करें</string>
+    <string name="popup_edit">संपादन</string>
     <string name="remove">हटाएं</string>
     <string name="play_current">वर्तामन चलायें</string>
     <string name="book_header_current">वर्तमान </string>
-    <string name="book_header_not_started">अभी प्रारंभ नही किया</string>
+    <string name="book_header_not_started">अभी प्रारंभ नही</string>
     <string name="book_header_completed">पूर्ण</string>
     <string name="close">बंद </string>
     <string name="delete">हटाएँ </string>
     <string name="add">जोड़ें</string>
-    <string name="folder_mode_root">शीर्ष-स्तरीय पुस्तक मोड: सबफ़ोल्डर पुस्तकें हैं</string>
-    <string name="folder_mode_single">एकल पुस्तक मोड: एक फ़ोल्डर एक पुस्तक के बराबर है।</string>
+    <string name="folder_mode_root">शीर्ष-स्तरीय पुस्तक मोड: सबफोल्डर पुस्तकें हैं</string>
+    <string name="folder_mode_single">एकल पुस्तक मोड: एक फोल्डर एक पुस्तक के बराबर है।</string>
     <plurals name="folder_type_file_count">
-        <item quantity="one">%dऑडियो फाइल</item>
+        <item quantity="one">%d ऑडियो फाइल</item>
         <item quantity="other">%d ऑडियो फाइलें</item>
     </plurals>
     <string name="folder_type_book_example_header">इससे निम्नलिखित पुस्तकों का पता चलेगा</string>
@@ -61,18 +61,18 @@
     <string name="bookmark_just_now">बस अभी </string>
     <string name="voice_intro_first_book">चलिए आपका ऑडियोबुक फोल्डर जोड़ते हैं ताकि आप सुनना शुरू कर सकें!</string>
     <string name="migration_hint_title">पुरानी पुस्तक स्थितियों तक पहुँचना</string>
-    <string name="migration_hint_content">नए Android संस्करणों में परिवर्तनों के कारण, सिस्टम पिकर का उपयोग करके अपने ऑडियोबुक फ़ोल्डर का चयन करना आवश्यक है।
+    <string name="migration_hint_content">नए Android संस्करणों में परिवर्तनों के कारण, सिस्टम पिकर का उपयोग करके अपने ऑडियोबुक फोल्डर का चयन करना आवश्यक है।
 \n
 \nअपनी पुरानी पुस्तक स्थिति देखने के लिए ऊपर दिए गए आइकन पर क्लिक करें।</string>
-    <string name="migration_hint_confirm">समझा</string>
+    <string name="migration_hint_confirm">समझ गया</string>
     <string name="migration_detail_title">पुरानी पुस्तक की स्थिति </string>
     <string name="migration_detail_content_name">नाम </string>
     <string name="migration_detail_content_root">रूट फोल्डर </string>
     <string name="migration_detail_content_position">स्थान </string>
     <string name="migration_detail_content_bookmarks">बुकमार्क्स </string>
     <string name="migration_detail_content_added_at">बजे जोड़ा गया</string>
-    <string name="migration_detail_content_position_current_file_title">वर्तमान फ़ाइल</string>
-    <string name="migration_detail_content_position_current_file_position">फ़ाइल में स्थिति</string>
+    <string name="migration_detail_content_position_current_file_title">वर्तमान फाइल</string>
+    <string name="migration_detail_content_position_current_file_position">फाइल में स्थिति</string>
     <string name="migration_detail_content_position_current_chapter_title">वर्तमान अध्याय</string>
     <string name="migration_detail_content_position_current_chapter_position">अध्याय में स्थिति</string>
     <string name="migration_delete_dialog_title">स्थान हटाएं</string>
@@ -81,8 +81,8 @@
     <string name="migration_delete_dialog_action_keep">रखें</string>
     <string name="delete_book_bottom_sheet_title">पुस्तक हटाएँ </string>
     <string name="delete_book_dialog_title">पुस्तक हटाएँ </string>
-    <string name="delete_book_dialog_deletion_confirmation">मेरी फ़ाइलें हटाएं</string>
-    <string name="delete_book_dialog_content">इससे आपके डिवाइस पर फ़ाइलें हटा दी जाएंगी।</string>
+    <string name="delete_book_dialog_deletion_confirmation">मेरी फाइलें हटाएं</string>
+    <string name="delete_book_dialog_content">इससे आपके डिवाइस पर फाइलें हटा दी जाएंगी।</string>
     <string name="search_hint">आप क्या ढूंढ रहे हैं?</string>
     <string name="battery_optimization_rationale">आपके पावर प्रतिबंधों के कारण, प्लेबैक रुकावट हो सकती है।</string>
     <string name="battery_optimization_action">अपडेट </string>
@@ -90,7 +90,7 @@
     <string name="media_session_recent">हालिया</string>
     <string name="notification_sleep_timer_enable">स्लीप टाइमर चालू करें</string>
     <string name="notification_sleep_timer_disable">स्लीप टाइमर बंद करें</string>
-    <string name="folder_mode_author">लेखक-पुस्तक मोड: सबफ़ोल्डर लेखक हैं, उप-सबफ़ोल्डर पुस्तकें हैं।</string>
+    <string name="folder_mode_author">लेखक-पुस्तक मोड: सबफोल्डर लेखक हैं, उप-सबफोल्डर पुस्तकें हैं।</string>
     <string name="generic_error_message">कुछ गलत हो गया 😢</string>
     <string name="storage_bug_title">अनुमति आवश्यक है</string>
     <string name="cover_search_template_no_author">%s ऑडियोबुक कवर</string>
@@ -102,14 +102,14 @@
     <string name="cover_search.author">लेखक</string>
     <string name="storage_bug_button">अनुमति प्रदान करें</string>
     <string name="select_folder_type_folder">फोल्डर</string>
-    <string name="select_folder_subtitle">क्या आप एक फ़ाइल को पुस्तक या फ़ोल्डर के रूप में जोड़ना चाहेंगे?</string>
+    <string name="select_folder_subtitle">क्या आप एक फाइल को पुस्तक या फोल्डर के रूप में जोड़ना चाहेंगे?</string>
     <string name="onboarding_welcome_title">Voice में आपका स्वागत है!</string>
     <string name="onboarding.button_next">अगला</string>
     <string name="onboarding.explanation.title">आपकी लाइब्रेरी, आपका तरीका</string>
     <string name="review.request.title">Voice का आनंद ले रहे हैं?</string>
     <string name="review.request.button.yes">अभी रेट करें</string>
     <string name="select_folder_title_onboarding">अपनी पहली ऑडियोबुक जोड़ें</string>
-    <string name="onboarding.explanation.subtitle">Voice के साथ, आप पुस्तकों को अलग-अलग फ़ाइलों के रूप में जोड़ सकते हैं या उन्हें फ़ोल्डरों में व्यवस्थित कर सकते हैं। आप चुनें!</string>
+    <string name="onboarding.explanation.subtitle">Voice के साथ, आप पुस्तकों को अलग-अलग फाइलों के रूप में जोड़ सकते हैं या उन्हें फोल्डरों में व्यवस्थित कर सकते हैं। आप चुनें!</string>
     <string name="onboarding.completion.title">आप पूरी तरह तैयार हैं!</string>
     <string name="onboarding.completion.subtitle">आपकी पहली ऑडियोबुक चलने के लिए तैयार है। Voice के साथ अपनी यात्रा का आनंद लें!</string>
     <string name="onboarding.completion.next_button">सुनना शुरू करें</string>
diff --git a/strings/src/main/res/values-in/strings.xml b/strings/src/main/res/values-in/strings.xml
index 8f7df27b46..37fd023b4b 100644
--- a/strings/src/main/res/values-in/strings.xml
+++ b/strings/src/main/res/values-in/strings.xml
@@ -72,4 +72,15 @@
     <string name="migration_hint_content">Karena adanya perubahan pada Versi Android yang lebih baru, Anda perlu memilih folder buku audio Anda menggunakan pemilih sistem.
 \n
 \nKlik ikon di atas untuk melihat posisi buku lama Anda.</string>
+    <string name="migration_detail_content_position">Posisi</string>
+    <string name="migration_detail_content_added_at">Ditambahkan di</string>
+    <string name="migration_detail_content_bookmarks">Markah</string>
+    <string name="migration_detail_content_position_current_file_title">File saat ini</string>
+    <string name="migration_detail_content_position_current_chapter_title">Bab saat ini</string>
+    <string name="migration_delete_dialog_action_delete">Hapus</string>
+    <string name="migration_detail_content_root">Folder root</string>
+    <string name="migration_detail_content_position_current_file_position">Posisi dalam file</string>
+    <string name="migration_delete_dialog_content">Setelah Anda menghapus posisi lama, Anda tidak akan dapat memulihkan posisi pemutaran lama Anda.</string>
+    <string name="migration_detail_content_position_current_chapter_position">Posisi dalam bab</string>
+    <string name="migration_delete_dialog_title">Hapus Posisi</string>
 </resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-ko/strings.xml b/strings/src/main/res/values-ko/strings.xml
index b94f12e94b..2681c9ffa3 100644
--- a/strings/src/main/res/values-ko/strings.xml
+++ b/strings/src/main/res/values-ko/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cover">책표지</string>
     <string name="play_pause">재생 / 일시정지</string>
@@ -33,4 +33,7 @@
     <string name="book_header_current">현재</string>
     <string name="book_header_not_started">아직 재생 안 됨</string>
     <string name="book_header_completed">완료됨</string>
-</resources>
+    <string name="cover_search_template_no_author">%s 오디오북 커버</string>
+    <string name="pause">일시정지</string>
+    <string name="play">재생</string>
+</resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-nb-rNO/strings.xml b/strings/src/main/res/values-nb-rNO/strings.xml
index 16db38049e..d576a103d4 100644
--- a/strings/src/main/res/values-nb-rNO/strings.xml
+++ b/strings/src/main/res/values-nb-rNO/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="fast_forward">Hurtigspoling</string>
+    <string name="fast_forward">Spol raskt framover</string>
     <string name="skip_silence">Hopp over stillhet</string>
     <string name="volume_boost">Lydstyrkeforsterkning</string>
     <string name="more">Mer</string>
@@ -8,33 +8,33 @@
     <string name="playback_speed">Avspillingshastighet</string>
     <string name="bookmark">Bokmerke</string>
     <string name="bookmark_edit_hint">Bokmerkenavn</string>
-    <string name="pref_seek_time">Hopp over mengde</string>
-    <string name="pref_use_grid">Bruk rutenettsoppsett</string>
+    <string name="pref_seek_time">Hoppintervall</string>
+    <string name="pref_use_grid">Bruk rutenett</string>
     <string name="pref_help_translating">Bistå oversettelsen</string>
     <string name="pref_get_support">Få støtte</string>
     <string name="book_header_current">Nåværende</string>
     <string name="book_header_completed">Fullført</string>
-    <string name="folder_mode_root">Rot-lydboksmappe. Én lydbok = én bok.</string>
-    <string name="folder_mode_single">Enkelt lydboksmappe</string>
+    <string name="folder_mode_root">Samlet lydboksmappe: hver undermappe er én bok</string>
+    <string name="folder_mode_single">Enkelvis lydboksmappe: denne mappen er én bok.</string>
     <string name="folder_type_title">Hvilken struktur har filene dine\?</string>
     <string name="migration_detail_content_bookmarks">Bokmerker</string>
-    <string name="voice_intro_first_book">Legg til lydboksmappen din for å begynne å lytte.</string>
+    <string name="voice_intro_first_book">Legg til lydbokmappen din så du kan begynne å lytte!</string>
     <string name="migration_hint_confirm">Skjønner</string>
     <string name="migration_detail_title">Gamle bokposisjoner</string>
     <string name="migration_detail_content_name">Navn</string>
-    <string name="migration_hint_content">Siden du har nylig Android må du velge lydboksmappe med systemfilvelgeren.
+    <string name="migration_hint_content">På grunn av endringer i nyere Android-versjoner er det nødvendig å velge lydbokmappen din ved hjelp av systemvelgeren.
 \n
 \nKlikk på ikonet ovenfor for å vise dine gamle bokposisjoner.</string>
     <string name="migration_detail_content_position_current_chapter_title">Nåværende kapittel</string>
     <string name="migration_delete_dialog_content">Når du sletter de gamle posisjonene vil du ikke kunne gjenopprette dine gamle avspillingsposisjoner.</string>
     <string name="search_hint">Hva leter du etter\?</string>
-    <string name="delete_book_dialog_content">Sletter filene på enheten din.</string>
+    <string name="delete_book_dialog_content">Dette sletter filene på enheten din.</string>
     <string name="media_session_root">Alle lydbøker</string>
     <string name="media_session_recent">Nylig</string>
     <string name="battery_optimization_action">Gjenoppfrisk</string>
     <string name="cover">Omslag</string>
     <string name="play_pause">Spill/pause</string>
-    <string name="action_sleep">Søvntidsur</string>
+    <string name="action_sleep">Innsovningstidsur</string>
     <string name="rewind">Spol tilbake</string>
     <string name="previous_track">Forrige spor</string>
     <string name="next_track">Neste spor</string>
@@ -44,12 +44,12 @@
     <string name="change_book_name">Navn</string>
     <string name="download_book_cover">Omslag fra Internett</string>
     <string name="mark_as_completed">Marker som fullført</string>
-    <string name="audiobook_folders_title">Lydboksmapper</string>
+    <string name="audiobook_folders_title">Lydbokmapper</string>
     <string name="edit_book_title">Rediger bok</string>
     <string name="mark_as_current">Marker som pågående</string>
     <string name="mark_as_not_started">Marker som ikke startet enda</string>
     <string name="bookmark_edit_title">Rediger bokmerke</string>
-    <string name="bookmark_added">Bokmerket</string>
+    <string name="bookmark_added">Bokmerke lagt til</string>
     <string name="action_settings">Innstillinger</string>
     <string name="pref_report_issue">Rapporter problem</string>
     <string name="bookmark_just_now">Akkurat nå</string>
@@ -68,7 +68,7 @@
     <string name="play_current">Spill nåværende</string>
     <string name="close">Lukk</string>
     <string name="add">Legg til</string>
-    <string name="folder_type_book_example_header">Følgende bøker vil bli lagt til</string>
+    <string name="folder_type_book_example_header">Dette vil føre til at følgende bøker oppdages</string>
     <plurals name="folder_type_file_count">
         <item quantity="one">%d lydfil</item>
         <item quantity="other">%d lydfiler</item>
@@ -79,17 +79,17 @@
     <string name="migration_delete_dialog_action_keep">Behold</string>
     <string name="delete_book_dialog_deletion_confirmation">Slett filene mine</string>
     <string name="migration_detail_content_position_current_file_title">Nåværende fil</string>
-    <string name="notification_sleep_timer_enable">Skru på søvntidsur</string>
-    <string name="notification_sleep_timer_disable">Skru av søvntidsur</string>
-    <string name="migration_detail_content_added_at">Tillagt</string>
+    <string name="notification_sleep_timer_enable">Slå på innsovningstidsur</string>
+    <string name="notification_sleep_timer_disable">Slå av innsovningstidsur</string>
+    <string name="migration_detail_content_added_at">Lagt til på</string>
     <string name="migration_detail_content_position_current_chapter_position">Posisjon i kapittel</string>
-    <string name="folder_type_no_books">Fant ingen lydbøker. Finnes de\?</string>
+    <string name="folder_type_no_books">Voice klarte ikke å finne noen bøker. Finnes det noen lydfiler?</string>
     <string name="migration_detail_content_position_current_file_position">Posisjon i filen</string>
     <string name="migration_detail_content_root">Rot-mappe</string>
     <string name="migration_delete_dialog_title">Slett posisjoner</string>
     <string name="migration_detail_content_position">Posisjon</string>
     <string name="migration_hint_title">Tilgang til gamle bokposisjoner</string>
-    <string name="battery_optimization_rationale">Som følge av strømsparing kan avspillingen bli forstyrret.</string>
+    <string name="battery_optimization_rationale">På grunn av strømsparingsinnstillinger kan det forekomme avbrudd i avspillingen.</string>
     <string name="generic_error_retry">Prøv igjen</string>
     <string name="generic_error_message">Noe gikk galt 😢</string>
     <string name="play">Spill</string>
@@ -101,4 +101,33 @@
     <string name="select_folder_title_onboarding">Legg til din første lydbok</string>
     <string name="select_folder_type_folder">Mappe</string>
     <string name="onboarding.button_next">Neste</string>
-</resources>
+    <string name="storage_bug_title">Tillatelse kreves</string>
+    <string name="storage_bug_subtitle">På enkelte enheter mangler en systemapp den nødvendige tillatelsen for å få tilgang til det eksterne lagringsmediet. Denne tilgangen er avgjørende for at Voice skal kunne lese lydbøkene dine.</string>
+    <string name="storage_bug_button">Innvilg tillatelse</string>
+    <string name="select_folder_title_default">Legg til dine lydbøker</string>
+    <string name="cover_search_template_no_author">%s lydbokomslag</string>
+    <string name="folder_mode_author">Samlet forfatter/kategori-modus: undermapper er forfattere, hver mappe under er én bok.</string>
+    <string name="cover_search.icon_recent">Siste søk</string>
+    <string name="cover_search.author">Forfatter</string>
+    <string name="select_folder_type_file">Fil</string>
+    <string name="cover_search_template_with_author">%1$s av %2$s lydbokomslag</string>
+    <string name="review.feedback.content">Kan du fortelle oss hva som gikk galt? Vi setter pris på tilbakemeldingen din, og det hjelper oss med å forbedre opplevelsen din.</string>
+    <string name="sleep_timer.title">Sov godt! 🌙</string>
+    <string name="sleep_timer.button.decrement">Kortere</string>
+    <string name="sleep_timer.button.increment">Lengre</string>
+    <string name="onboarding.completion.next_button">Start lytting</string>
+    <string name="review.request.title">Liker du Voice?</string>
+    <string name="review.request.button.yes">Vurder nå</string>
+    <string name="review.request.button.no">Nei takk</string>
+    <string name="review.feedback.title">Det var leit å høre!</string>
+    <string name="review.feedback.button.yes">Send tilbakemelding</string>
+    <string name="review.feedback.button.no">Avbryt</string>
+    <string name="select_folder_subtitle">Vil du legge til en enkelt fil som en bok eller en mappe?</string>
+    <string name="onboarding.explanation.subtitle">Med Voice kan du legge til bøker som individuelle filer, eller organisere dem i mapper.</string>
+    <string name="onboarding.completion.title">Du er ferdig!</string>
+    <string name="onboarding_welcome_title">Velkommen til Voice!</string>
+    <string name="onboarding.completion.subtitle">Din første lydbok er klar til å spilles av. Nyt din reise med Voice!</string>
+    <string name="onboarding_welcome_subtitle">Din personlige lydbokspiller. La oss gjøre deg klar.</string>
+    <string name="onboarding.explanation.title">Ditt bibliotek, ditt opplegg</string>
+    <string name="review.request.content">Din tilbakemelding er viktig for oss! Hvis du har tid, kan du rangere oss og dele din opplevelse. Det hjelper oss med å gjøre forbedringer og tilby en bedre lytteopplevelse.</string>
+</resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-nl-rNL/strings.xml b/strings/src/main/res/values-nl-rNL/strings.xml
index 24c078e065..13788dbac7 100644
--- a/strings/src/main/res/values-nl-rNL/strings.xml
+++ b/strings/src/main/res/values-nl-rNL/strings.xml
@@ -49,8 +49,8 @@
     <string name="close">Sluiten</string>
     <string name="delete">Verwijderen</string>
     <string name="add">Toevoegen</string>
-    <string name="folder_mode_root">De hoofdmap met luisterboeken. Eén onderliggende map = één boek.</string>
-    <string name="folder_mode_single">Losse luisterboekmap</string>
+    <string name="folder_mode_root">De hoofdmap met luisterboeken. Subfolders bevatten boeken.</string>
+    <string name="folder_mode_single">Losse luisterboekmap: één folder bevat één boek.</string>
     <plurals name="folder_type_file_count">
         <item quantity="one">%d audiobestand</item>
         <item quantity="other">%d audiobestanden</item>
@@ -94,4 +94,35 @@
     <string name="pause">Pauzeren</string>
     <string name="cover_search_template_no_author">%s audioboek omslag</string>
     <string name="cover_search_template_with_author">%1$s door %2$s audioboekomslag</string>
-</resources>
+    <string name="select_folder_type_file">Bestand</string>
+    <string name="select_folder_title_default">Voeg Audioboek(en) toe</string>
+    <string name="folder_mode_author">Auteur-boek mode: Subfolders zijn auteurs, sub-subfolders bevatten boeken.</string>
+    <string name="storage_bug_subtitle">Voor sommige toestellen mist een systeem applicatie toegang tot de externe opslag. Deze toegang is essentieel voor Voice om de je audioboeken te kunnen lezen.</string>
+    <string name="storage_bug_title">Toegang vereist</string>
+    <string name="storage_bug_button">Toegang geven</string>
+    <string name="select_folder_title_onboarding">Voeg je eerste audiobook toe</string>
+    <string name="review.request.title">Tevreden met Voice?</string>
+    <string name="review.request.button.yes">Beoordeeld Nu</string>
+    <string name="review.request.button.no">Nee, bedankt</string>
+    <string name="review.feedback.title">Het spijt ons dit te horen!</string>
+    <string name="review.feedback.content">Kan je ons vertellen wat misliep? We appreciëren jou mening en dit help ons je ervaring te verbeteren.</string>
+    <string name="review.feedback.button.no">Annuleer</string>
+    <string name="sleep_timer.title">Slaapwel! 🌙</string>
+    <string name="sleep_timer.button.increment">Langer</string>
+    <string name="sleep_timer.button.decrement">Korter</string>
+    <plurals name="minutes">
+        <item quantity="one">minuut</item>
+        <item quantity="other">minuten</item>
+    </plurals>
+    <string name="cover_search.author">Auteur</string>
+    <string name="onboarding_welcome_title">Welkom bij Voice!</string>
+    <string name="onboarding.button_next">Volgende</string>
+    <string name="select_folder_type_folder">Map</string>
+    <string name="onboarding.explanation.subtitle">Met Voice kan je individuele boeken toevoegen of ze organiseren in folders. Jij kiest!</string>
+    <string name="onboarding.explanation.title">Jouw bibliotheek, jouw manier</string>
+    <string name="onboarding.completion.next_button">Begin te luisteren</string>
+    <string name="cover_search.icon_recent">Recente zoekopdracht</string>
+    <string name="select_folder_subtitle">Wil je een enkel bestand toevoegen als een boek of een folder?</string>
+    <string name="onboarding.completion.subtitle">Je eerste audioboek is klaar om af te spelen. Geniet van je ervaring met Voice!</string>
+    <string name="review.request.content">Je menig is van belang voor ons. Neem even de tijd, beoordeeld ons en deel je ervaring. Dit helpt ons verbeteringen aan te brengen en een betere ervaring aan te bieden.</string>
+</resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-pl/strings.xml b/strings/src/main/res/values-pl/strings.xml
index d5e5210bd9..fba1ebf7fc 100644
--- a/strings/src/main/res/values-pl/strings.xml
+++ b/strings/src/main/res/values-pl/strings.xml
@@ -109,7 +109,7 @@
     <string name="storage_bug_title">Wymagany dostęp</string>
     <string name="storage_bug_subtitle">W przypadku niektórych urządzeń aplikacja systemowa nie ma uprawnień niezbędnych do uzyskania dostępu do pamięci zewnętrznej. Dostęp ten jest niezbędny, aby aplikacja Voice mogła odczytywać książki audio.</string>
     <string name="review.feedback.title">Przykro nam to słyszeć!</string>
-    <string name="onboarding.explanation.title">Twoja biblioteka, Twoja Wybór</string>
+    <string name="onboarding.explanation.title">Twoja Biblioteka, Twój Wybór</string>
     <string name="review.request.button.yes">Oceń Teraz</string>
     <string name="select_folder_type_file">Plik</string>
     <string name="onboarding_welcome_title">Witamy w Voice!</string>
diff --git a/strings/src/main/res/values-pt-rBR/strings.xml b/strings/src/main/res/values-pt-rBR/strings.xml
index e16f1a1db0..b6159c8cf6 100644
--- a/strings/src/main/res/values-pt-rBR/strings.xml
+++ b/strings/src/main/res/values-pt-rBR/strings.xml
@@ -4,90 +4,90 @@
     <string name="play_pause">Tocar / Pausar</string>
     <string name="action_sleep">Desligamento automático</string>
     <string name="rewind">Retroceder</string>
-    <string name="fast_forward">Avançar</string>
-    <string name="previous_track">Capitulo anterior</string>
-    <string name="next_track">Próximo capitulo</string>
-    <string name="skip_silence">Pular Silêncio</string>
+    <string name="fast_forward">Avanço rápido</string>
+    <string name="previous_track">Capítulo anterior</string>
+    <string name="next_track">Próximo capítulo</string>
+    <string name="skip_silence">Pular silêncio</string>
     <string name="dialog_confirm">Definir</string>
     <string name="dialog_cancel">Cancelar</string>
-    <string name="content_cover">Mostrar capa para escolher</string>
-    <string name="change_book_name">Nome</string>
+    <string name="content_cover">Mostra capas para escolher</string>
+    <string name="change_book_name">Título</string>
     <string name="download_book_cover">Capa da internet</string>
-    <string name="pick_book_cover">Capa do arquivo de sistema</string>
+    <string name="pick_book_cover">Capa do sistema de ficheiros</string>
     <string name="edit_book_title">Editar livro</string>
-    <string name="audiobook_folders_title">Pastas de Audiolivros</string>
+    <string name="audiobook_folders_title">Pastas de audiolivros</string>
     <string name="playback_speed">Velocidade de reprodução</string>
-    <string name="bookmark">Marcador de páginas</string>
-    <string name="bookmark_edit_title">Editar marcador de páginas</string>
-    <string name="bookmark_edit_hint">Nome do marcador de páginas</string>
-    <string name="bookmark_added">Marcador de páginas adicionado</string>
+    <string name="bookmark">Marcador</string>
+    <string name="bookmark_edit_title">Editar marcador</string>
+    <string name="bookmark_edit_hint">Título do marcador</string>
+    <string name="bookmark_added">Marcador adicionado</string>
     <string name="action_settings">Preferências</string>
     <plurals name="seconds">
         <item quantity="one">%d segundo</item>
         <item quantity="many">%d segundos</item>
         <item quantity="other">%d segundos</item>
     </plurals>
-    <string name="pref_seek_time">Pular para</string>
-    <string name="pref_theme_dark">Tema escuro</string>
-    <string name="pref_auto_rewind_title">Retornar automaticamente</string>
+    <string name="pref_seek_time">Quantidade de Salto</string>
+    <string name="pref_theme_dark">Tema Escuro</string>
+    <string name="pref_auto_rewind_title">Rebobin automaticamente</string>
     <string name="popup_edit">Editar</string>
     <string name="remove">Remover</string>
-    <string name="play_current">Reproduzir o atual</string>
-    <string name="book_header_current">Atual</string>
+    <string name="play_current">Reproduzir atual</string>
+    <string name="book_header_current">Actual</string>
     <string name="book_header_not_started">Não iniciado ainda</string>
-    <string name="book_header_completed">Completo</string>
-    <string name="mark_as_completed">Marcar como completo</string>
-    <string name="mark_as_current">Marcar como atual</string>
-    <string name="mark_as_not_started">Marcar como não-começado</string>
+    <string name="book_header_completed">Concluído</string>
+    <string name="mark_as_completed">Marcar como Concluído</string>
+    <string name="mark_as_current">Marca com Actual</string>
+    <string name="mark_as_not_started">Marca como não iniciado</string>
     <string name="pref_suggest_idea">Sugerir uma ideia</string>
-    <string name="pref_use_grid">Usar modo em grade</string>
+    <string name="pref_use_grid">Utilizar a disposição da grelha</string>
     <string name="pref_report_issue">Reportar um problema</string>
-    <string name="pref_help_translating">Ajude a traduzir o Voice</string>
-    <string name="pref_get_support">Obtenha ajuda</string>
-    <string name="pref_app_version">Versão do Aplicativo</string>
+    <string name="pref_help_translating">Ajuda traduzindo Voice</string>
+    <string name="pref_get_support">Obter apoio</string>
+    <string name="pref_app_version">Versão</string>
     <string name="close">Fechar</string>
-    <string name="delete">Deletar</string>
+    <string name="delete">Apagar</string>
     <string name="add">Adicionar</string>
-    <string name="folder_mode_root">Pasta de Audiolivro padrão. Cada subpasta representa um livro/volume.</string>
-    <string name="folder_mode_single">Pasta única de Audiolivro</string>
+    <string name="folder_mode_root">Pasta de Audiobook padrão. Cada subpasta representa um livro/volume diferente.</string>
+    <string name="folder_mode_single">Pasta única de Audiobook. Cada pasta representa um único livro.</string>
     <plurals name="folder_type_file_count">
-        <item quantity="one">%d arquivo de áudio</item>
-        <item quantity="many">%d arquivos de áudio</item>
-        <item quantity="other">%d arquivos de áudio</item>
+        <item quantity="one">%d ficheiro de áudio</item>
+        <item quantity="many">%d ficheiros de áudio</item>
+        <item quantity="other">%d ficheiros de áudio</item>
     </plurals>
-    <string name="folder_type_book_example_header">Isso fará com que os respectivos livros sejam reconhecidos</string>
-    <string name="folder_type_no_books">Voice não conseguiu encontrar nenhum livro. O arquivo está no formato certo\?</string>
-    <string name="folder_type_title">Como estão organizados seus arquivos\?</string>
+    <string name="folder_type_book_example_header">Isto fará com que os respectivos livros sejam reconhecidos</string>
+    <string name="folder_type_no_books">Voice não conseguiu encontrar nenhum livro. O ficheiro está no formato certo?</string>
+    <string name="folder_type_title">Como os seus ficheiros estão organizados?</string>
     <string name="bookmark_just_now">Nesse exato momento</string>
-    <string name="voice_intro_first_book">Vamos adicionar uma pasta de Audiolivros para você começar a ouvir!</string>
-    <string name="migration_hint_title">Acessar posições de livros antigos</string>
-    <string name="migration_hint_content">Devido alterações na versão do Android, é necessário selecionar a pasta de Audiolivros manualmente no seu dispositivo.
+    <string name="voice_intro_first_book">Vamos adicionar uma pasta de Audiolivros para começar a ouvir!</string>
+    <string name="migration_hint_title">Aceder posições de livros antigos</string>
+    <string name="migration_hint_content">Devido alterações na versão do Android, é necessário selecionar a pasta de Audiolivros manualmente no seu aparelho.
 \n
 \nClique no ícone acima para ver a localização antiga dos livros.</string>
-    <string name="migration_hint_confirm">Entendido</string>
+    <string name="migration_hint_confirm">Percebido</string>
     <string name="migration_detail_title">Posições antigas de livro</string>
     <string name="migration_detail_content_name">Nome</string>
     <string name="migration_detail_content_root">Pasta raiz</string>
     <string name="migration_detail_content_position">Posição</string>
     <string name="migration_detail_content_bookmarks">Marcadores de página</string>
     <string name="migration_detail_content_added_at">Adicionado em</string>
-    <string name="migration_detail_content_position_current_file_title">Arquivo atual</string>
-    <string name="migration_detail_content_position_current_file_position">Posição no arquivo</string>
+    <string name="migration_detail_content_position_current_file_title">Ficheiro atual</string>
+    <string name="migration_detail_content_position_current_file_position">Posição no ficheiro</string>
     <string name="migration_detail_content_position_current_chapter_title">Capítulo atual</string>
     <string name="migration_detail_content_position_current_chapter_position">Posição no capítulo</string>
     <string name="migration_delete_dialog_title">Deletar posições</string>
     <string name="delete_book_bottom_sheet_title">Deletar livro</string>
     <string name="delete_book_dialog_title">Deletar livro</string>
-    <string name="migration_delete_dialog_content">Assim que você deletar posições antigas, você não poderá recupera-las.</string>
+    <string name="migration_delete_dialog_content">Assim que deletar posições antigas, não poderá recupera-las.</string>
     <string name="migration_delete_dialog_action_delete">Deletar</string>
-    <string name="delete_book_dialog_deletion_confirmation">Deletar meus arquivos</string>
+    <string name="delete_book_dialog_deletion_confirmation">Deletar os meus ficheiros</string>
     <string name="migration_delete_dialog_action_keep">Manter</string>
-    <string name="delete_book_dialog_content">Isso deletará os arquivos em seu aparelho.</string>
-    <string name="search_hint">O que você está buscando\?</string>
+    <string name="delete_book_dialog_content">Isto apagará os ficheiros no seu aparelho.</string>
+    <string name="search_hint">O que procura?</string>
     <string name="battery_optimization_rationale">Devido à restrições de energia, podem haver interrupções durante a reprodução do livro.</string>
     <string name="battery_optimization_action">Atualizar</string>
     <string name="pause">Parar</string>
-    <string name="volume_boost">Aumentar volume</string>
+    <string name="volume_boost">Aumento de volume</string>
     <string name="more">Mais</string>
     <string name="play">Play</string>
     <string name="media_session_root">Audiolivros</string>
@@ -96,4 +96,41 @@
     <string name="notification_sleep_timer_disable">Desativar desligamento automático</string>
     <string name="generic_error_message">Algo deu errado 😢</string>
     <string name="generic_error_retry">Tentar novamente</string>
-</resources>
+    <string name="onboarding.explanation.title">Sua Livraria, do Seu Jeito</string>
+    <string name="onboarding.button_next">Próximo</string>
+    <string name="sleep_timer.title">Bons sonhos! 🌙</string>
+    <plurals name="minutes">
+        <item quantity="one">%d minuto</item>
+        <item quantity="many">%d minutos</item>
+        <item quantity="other">%d minutos</item>
+    </plurals>
+    <string name="folder_mode_author">Modo Autor de Livro: Subpastas são autores, sub-subpasta são livros.</string>
+    <string name="review.request.title">Está gostando de Voice?</string>
+    <string name="review.request.content">O seu feedback é importante para nós! Se você tiver um momento, nos avalie e compartilhe a sua experiência. Ele ajuda a gente a melhorar ainda mais as suas lidas.</string>
+    <string name="cover_search_template_no_author">Capa do audiobook %s</string>
+    <string name="storage_bug_subtitle">Em certos dispositivos, o aplicativo pode exigir permissões para acessar o armazenamento externo. Esse acesso é essencial para Voice ler os seus audiobooks.</string>
+    <string name="onboarding_welcome_subtitle">Seu tocador de bolso pessoal de audiobook. Bora nos arrumar para isso.</string>
+    <string name="onboarding.completion.title">Está tudo pronto!</string>
+    <string name="onboarding.explanation.subtitle">Com Voice, você pode adicionar livros como arquivos individuais ou organizar eles em pastas. Você decide como!</string>
+    <string name="onboarding.completion.subtitle">O seu primeiro audiobook está pronto para rodar. Aprecie a sua jornada com Voice!</string>
+    <string name="review.feedback.button.yes">Enviar Feedback</string>
+    <string name="review.feedback.button.no">Cancelar</string>
+    <string name="sleep_timer.button.increment">Mais longo</string>
+    <string name="sleep_timer.button.decrement">Mais curto</string>
+    <string name="review.feedback.content">Poderia nos dizer o que errado? A gente valoriza o seu feedback e com ele sabemos como melhorar a sua experiência.</string>
+    <string name="storage_bug_title">Permissão necessária</string>
+    <string name="storage_bug_button">Conceder permissão</string>
+    <string name="select_folder_title_onboarding">Adicione o Seu Primeiro Audiobook</string>
+    <string name="review.request.button.yes">Avalie agora</string>
+    <string name="review.request.button.no">Não, obrigado</string>
+    <string name="review.feedback.title">A gente sente muito por isso!</string>
+    <string name="cover_search_template_with_author">Capa do audiobook %1$s, feito por %2$s</string>
+    <string name="cover_search.icon_recent">Pesquisa recente</string>
+    <string name="cover_search.author">Autor</string>
+    <string name="select_folder_title_default">Adicionar seus Audiobook(s)</string>
+    <string name="select_folder_type_file">Ficheiro</string>
+    <string name="select_folder_type_folder">Pasta</string>
+    <string name="select_folder_subtitle">Gostaria de adicionar um único arquivo como um livro ou pasta?</string>
+    <string name="onboarding_welcome_title">Seja bem vindo ao Voice!</string>
+    <string name="onboarding.completion.next_button">Começar a ouvir</string>
+</resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-pt/strings.xml b/strings/src/main/res/values-pt/strings.xml
index 7f534101ef..b5ee3c0f67 100644
--- a/strings/src/main/res/values-pt/strings.xml
+++ b/strings/src/main/res/values-pt/strings.xml
@@ -1,16 +1,135 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="play_pause">Reproduzir / Pausar</string>
-    <string name="next_track">Faixa seguinte</string>
-    <string name="pause">Pausa</string>
-    <string name="fast_forward">Avançar</string>
+    <string name="play_pause">Tocar / Pausar</string>
+    <string name="next_track">Próximo capítulo</string>
+    <string name="pause">Parar</string>
+    <string name="fast_forward">Avanço rápido</string>
     <string name="cover">Capa</string>
-    <string name="skip_silence">Saltar silencio</string>
-    <string name="previous_track">Faixa anterior</string>
+    <string name="skip_silence">Pular silêncio</string>
+    <string name="previous_track">Capítulo anterior</string>
     <string name="more">Mais</string>
     <string name="dialog_confirm">Definir</string>
     <string name="dialog_cancel">Cancelar</string>
     <string name="play">Reproduzir</string>
-    <string name="action_sleep">Temporizador</string>
-    <string name="volume_boost">Aumentar volume</string>
+    <string name="action_sleep">Desligamento automático</string>
+    <string name="volume_boost">Aumento de volume</string>
+    <string name="download_book_cover">Capa da internet</string>
+    <string name="onboarding.completion.subtitle">Seu primeiro audiolivro está pronto para ser reproduzido. Aproveite sua jornada com o Voice!</string>
+    <string name="rewind">Retroceder</string>
+    <string name="change_book_name">Título</string>
+    <string name="pick_book_cover">Capa do sistema de ficheiros</string>
+    <string name="generic_error_message">Algo deu errado 😢</string>
+    <string name="storage_bug_title">Permissão necessária</string>
+    <string name="onboarding_welcome_subtitle">O seu reprodutor de bolso pessoal de audiobook. Vamos preparar-nos para isso.</string>
+    <string name="review.feedback.button.no">Cancelar</string>
+    <string name="review.feedback.button.yes">Enviar Feedback</string>
+    <string name="book_header_not_started">Não iniciado ainda</string>
+    <string name="book_header_completed">Concluído</string>
+    <string name="close">Fechar</string>
+    <string name="delete">Apagar</string>
+    <string name="add">Adicionar</string>
+    <string name="folder_mode_author">Modo Autor de Livro: Subpastas são autores, sub-subpasta são livros.</string>
+    <string name="migration_detail_content_name">Nome</string>
+    <string name="battery_optimization_action">Atualizar</string>
+    <string name="storage_bug_subtitle">Em certos dispositivos, a app do sistema pode exigir permissões para aceder o armazenamento externo. Esse acesso é essencial para Voice ler os seus audiobooks.</string>
+    <string name="select_folder_title_onboarding">Adicione o Seu Primeiro Audiobook</string>
+    <string name="select_folder_title_default">Adicionar os seus Audiobook(s)</string>
+    <string name="onboarding.button_next">Próximo</string>
+    <string name="onboarding.completion.next_button">Começar a ouvir</string>
+    <string name="onboarding.explanation.title">A sua Livraria, do Seu Jeito</string>
+    <string name="onboarding.explanation.subtitle">Com Voice, pode adicionar livros como ficheiros individuais ou organizar eles em pastas. Voçê decide como!</string>
+    <string name="edit_book_title">Editar livro</string>
+    <string name="mark_as_completed">Marcar como Concluído</string>
+    <string name="mark_as_current">Marca com Actual</string>
+    <string name="mark_as_not_started">Marca como não iniciado</string>
+    <string name="audiobook_folders_title">Pastas de audiolivros</string>
+    <string name="playback_speed">Velocidade de reprodução</string>
+    <string name="bookmark">Marcador</string>
+    <string name="bookmark_edit_title">Editar marcador</string>
+    <string name="bookmark_edit_hint">Título do marcador</string>
+    <string name="bookmark_added">Marcador adicionado</string>
+    <string name="action_settings">Preferências</string>
+    <plurals name="seconds">
+        <item quantity="one">%d segundo</item>
+        <item quantity="many">%d segundos</item>
+        <item quantity="other">%d segundos</item>
+    </plurals>
+    <string name="pref_seek_time">Quantidade de Salto</string>
+    <string name="pref_theme_dark">Tema Escuro</string>
+    <string name="pref_auto_rewind_title">Rebobin automaticamente</string>
+    <string name="pref_suggest_idea">Sugerir uma ideia</string>
+    <string name="pref_use_grid">Utilizar a disposição da grelha</string>
+    <string name="pref_report_issue">Reportar um problema</string>
+    <string name="pref_help_translating">Ajuda traduzindo Voice</string>
+    <string name="pref_get_support">Obter apoio</string>
+    <string name="pref_app_version">Versão</string>
+    <string name="popup_edit">Editar</string>
+    <string name="remove">Remover</string>
+    <string name="play_current">Reproduzir atual</string>
+    <string name="book_header_current">Actual</string>
+    <plurals name="folder_type_file_count">
+        <item quantity="one">%d ficheiro de áudio</item>
+        <item quantity="many">%d ficheiros de áudio</item>
+        <item quantity="other">%d ficheiros de áudio</item>
+    </plurals>
+    <string name="folder_type_book_example_header">Isto fará com que os respectivos livros sejam reconhecidos</string>
+    <string name="folder_type_no_books">Voice não conseguiu encontrar nenhum livro. O ficheiro está no formato certo?</string>
+    <string name="folder_type_title">Como os seus ficheiros estão organizados?</string>
+    <string name="bookmark_just_now">Nesse exato momento</string>
+    <string name="voice_intro_first_book">Vamos adicionar uma pasta de Audiolivros para começar a ouvir!</string>
+    <string name="migration_hint_title">Aceder posições de livros antigos</string>
+    <string name="migration_hint_content">Devido alterações na versão do Android, é necessário selecionar a pasta de Audiolivros manualmente no seu aparelho.
+\n
+\nClique no ícone acima para ver a localização antiga dos livros.</string>
+    <string name="migration_hint_confirm">Percebido</string>
+    <string name="migration_detail_title">Posições antigas de livro</string>
+    <string name="migration_detail_content_root">Pasta raiz</string>
+    <string name="migration_detail_content_position">Posição</string>
+    <string name="migration_detail_content_bookmarks">Marcadores de página</string>
+    <string name="migration_detail_content_added_at">Adicionado em</string>
+    <string name="migration_detail_content_position_current_file_title">Ficheiro atual</string>
+    <string name="migration_detail_content_position_current_file_position">Posição no ficheiro</string>
+    <string name="migration_detail_content_position_current_chapter_title">Capítulo atual</string>
+    <string name="migration_detail_content_position_current_chapter_position">Posição no capítulo</string>
+    <string name="migration_delete_dialog_title">Deletar posições</string>
+    <string name="migration_delete_dialog_content">Assim que deletar posições antigas, não poderá recupera-las.</string>
+    <string name="migration_delete_dialog_action_delete">Deletar</string>
+    <string name="migration_delete_dialog_action_keep">Manter</string>
+    <string name="delete_book_bottom_sheet_title">Deletar livro</string>
+    <string name="delete_book_dialog_title">Deletar livro</string>
+    <string name="delete_book_dialog_deletion_confirmation">Deletar os meus ficheiros</string>
+    <string name="delete_book_dialog_content">Isto apagará os ficheiros no seu aparelho.</string>
+    <string name="search_hint">O que procura?</string>
+    <string name="battery_optimization_rationale">Devido à restrições de energia, podem haver interrupções durante a reprodução do livro.</string>
+    <string name="media_session_root">Audiolivros</string>
+    <string name="media_session_recent">Recente</string>
+    <string name="notification_sleep_timer_enable">Ativar desligamento automático</string>
+    <string name="notification_sleep_timer_disable">Desativar desligamento automático</string>
+    <string name="generic_error_retry">Tentar novamente</string>
+    <string name="storage_bug_button">Conceder permissão</string>
+    <string name="select_folder_type_file">Ficheiro</string>
+    <string name="select_folder_type_folder">Pasta</string>
+    <string name="review.request.button.yes">Avalie agora</string>
+    <string name="review.request.button.no">Não, obrigado</string>
+    <string name="select_folder_subtitle">Gostaria de adicionar um único ficheiro como um livro ou pasta?</string>
+    <string name="onboarding_welcome_title">Seja bem vindo ao Voice!</string>
+    <string name="onboarding.completion.title">Está tudo pronto!</string>
+    <string name="review.request.title">Gosta de Voice?</string>
+    <string name="review.request.content">O seu feedback é importante para nós! Se tiver um momento, avalie-nos e partilhe a sua experiência. Ele ajuda a gente a melhorar ainda mais as suas lidas.</string>
+    <string name="review.feedback.title">Sentimos muito por isso!</string>
+    <string name="review.feedback.content">Poderia nos dizer o que errado? Valorizamos o seu feedback e com ele sabemos como melhorar a sua experiência.</string>
+    <string name="sleep_timer.title">Bons sonhos! 🌙</string>
+    <string name="sleep_timer.button.increment">Mais longo</string>
+    <string name="sleep_timer.button.decrement">Mais curto</string>
+    <plurals name="minutes">
+        <item quantity="one">%d minuto</item>
+        <item quantity="many">%d minutos</item>
+        <item quantity="other">%d minutos</item>
+    </plurals>
+    <string name="folder_mode_single">Pasta única de Audiobook. Cada pasta representa um único livro.</string>
+    <string name="cover_search_template_no_author">Capa do audiobook %s</string>
+    <string name="cover_search_template_with_author">Capa do audiobook %1$s, feito por %2$s</string>
+    <string name="cover_search.icon_recent">Pesquisa recente</string>
+    <string name="content_cover">Mostra capas para escolher</string>
+    <string name="cover_search.author">Autor</string>
 </resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-sv/strings.xml b/strings/src/main/res/values-sv/strings.xml
index d30c99b813..556c262efd 100644
--- a/strings/src/main/res/values-sv/strings.xml
+++ b/strings/src/main/res/values-sv/strings.xml
@@ -44,7 +44,7 @@
     <string name="remove">Ta bort</string>
     <string name="play_current">Spela aktuell</string>
     <string name="book_header_current">Aktuella</string>
-    <string name="book_header_not_started">Inte påbörjad ännu</string>
+    <string name="book_header_not_started">Inte påbörjade ännu</string>
     <string name="book_header_completed">Avslutad</string>
     <string name="close">Stäng</string>
     <string name="delete">Ta bort</string>
@@ -128,4 +128,4 @@
         <item quantity="one">%d minut</item>
         <item quantity="other">%d minuter</item>
     </plurals>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/strings/src/main/res/values-sw/strings.xml b/strings/src/main/res/values-sw/strings.xml
index 46661132ca..4f9251daf2 100644
--- a/strings/src/main/res/values-sw/strings.xml
+++ b/strings/src/main/res/values-sw/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cover">Jalada</string>
     <string name="play_pause">Cheza / Sitisha</string>
@@ -29,4 +29,6 @@
     <string name="book_header_current">iliyopo</string>
     <string name="book_header_not_started">Ambayo Haija Anzwa</string>
     <string name="book_header_completed">Iliyo malizwa</string>
-</resources>
+    <string name="play">Cheza</string>
+    <string name="pause">Sitisha</string>
+</resources>
\ No newline at end of file