diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0aa7c870..6506b89b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -15,8 +15,12 @@ plugins {
     id("org.jmailen.kotlinter")
     id("io.gitlab.arturbosch.detekt")
     id("com.google.devtools.ksp") version "2.0.0-1.0.22" apply true
+    id("de.mannodermaus.android-junit5") version "1.11.2.0"
 }
+
 val kotlinVersion by extra("2.0.0")
+val junit5Version by extra("5.11.2")
+val mockkVersion by extra("1.13.13")
 
 android {
     compileSdk = 34
@@ -114,6 +118,11 @@ dependencies {
     implementation("androidx.recyclerview:recyclerview:1.3.2")
     implementation("androidx.cardview:cardview:1.0.0")
     implementation("androidx.viewpager2:viewpager2:1.1.0")
+    implementation("com.google.android.play:core:1.10.0")
+
+    testImplementation("org.junit.jupiter:junit-jupiter-api:$junit5Version")
+    testImplementation("io.mockk:mockk:$mockkVersion")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit5Version")
 
     api("joda-time:joda-time:2.10.13")
     api("com.github.tibbi:RecyclerView-FastScroller:e7d3e150c4")
diff --git a/app/src/main/java/be/scri/activities/BaseSimpleActivity.kt b/app/src/main/java/be/scri/activities/BaseSimpleActivity.kt
index 4a9fdaab..5277982b 100644
--- a/app/src/main/java/be/scri/activities/BaseSimpleActivity.kt
+++ b/app/src/main/java/be/scri/activities/BaseSimpleActivity.kt
@@ -16,20 +16,14 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.DocumentsContract
 import android.provider.MediaStore
-import android.provider.Settings
 import android.telecom.TelecomManager
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.WindowManager
-import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ActivityCompat
 import be.scri.R
-import be.scri.dialogs.ConfirmationDialog
-import be.scri.dialogs.WritePermissionDialog
-import be.scri.dialogs.WritePermissionDialog.Mode
 import be.scri.extensions.addBit
 import be.scri.extensions.baseConfig
 import be.scri.extensions.buildDocumentUriSdk30
@@ -41,21 +35,13 @@ import be.scri.extensions.getColoredDrawableWithColor
 import be.scri.extensions.getContrastColor
 import be.scri.extensions.getFirstParentLevel
 import be.scri.extensions.getFirstParentPath
-import be.scri.extensions.getPermissionString
 import be.scri.extensions.getProperStatusBarColor
 import be.scri.extensions.getProperTextColor
 import be.scri.extensions.getThemeId
-import be.scri.extensions.hasPermission
 import be.scri.extensions.hideKeyboard
 import be.scri.extensions.humanizePath
-import be.scri.extensions.isAppInstalledOnSDCard
 import be.scri.extensions.isPathOnOTG
 import be.scri.extensions.isPathOnSD
-import be.scri.extensions.isShowingAndroidSAFDialog
-import be.scri.extensions.isShowingOTGDialog
-import be.scri.extensions.isShowingSAFCreateDocumentDialogSdk30
-import be.scri.extensions.isShowingSAFDialog
-import be.scri.extensions.isShowingSAFDialogSdk30
 import be.scri.extensions.removeBit
 import be.scri.extensions.showErrorToast
 import be.scri.extensions.storeAndroidTreeUri
@@ -282,16 +268,6 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
     }
 
     override fun onActivityResult(
-    requestCode: Int,
-    resultCode: Int,
-    resultData: Intent?,
-) {
-    super.onActivityResult(requestCode, resultCode, resultData)
-    val partition = try {
-        checkedDocumentPath.substring(9, 18)
-    } catch (e: Exception) {
-        ""
-    }
 
     val sdOtgPattern = Pattern.compile(SD_OTG_SHORT)
 
@@ -358,8 +334,12 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
 
                         try {
                             startActivityForResult(this, requestCode)
-                        } catch (e: Exception) {
-                            showErrorToast(e)
+                        } catch (e: ActivityNotFoundException) {
+                            showErrorToast("No application found to handle this request.")
+                        } catch (e: SecurityException) {
+                            showErrorToast("Security exception: ${e.message}")
+                        } catch (e: IllegalArgumentException) {
+                            showErrorToast("Invalid argument provided: ${e.message}")
                         }
                     }
                 }
@@ -460,82 +440,6 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
     }
 
     @RequiresApi(Build.VERSION_CODES.O)
-    fun launchCustomizeNotificationsIntent() {
-        Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
-            putExtra(Settings.EXTRA_APP_PACKAGE, packageName)
-            startActivity(this)
-        }
-    }
-
-    // synchronous return value determines only if we are showing the SAF dialog, callback result tells if the SD or OTG permission has been granted
-    fun handleSAFDialog(
-        path: String,
-        callback: (success: Boolean) -> Unit,
-    ): Boolean {
-        hideKeyboard()
-        return if (!packageName.startsWith("be.scri")) {
-            callback(true)
-            false
-        } else if (isShowingSAFDialog(path) || isShowingOTGDialog(path)) {
-            funAfterSAFPermission = callback
-            true
-        } else {
-            callback(true)
-            false
-        }
-    }
-
-    fun handleSAFDialogSdk30(
-        path: String,
-        callback: (success: Boolean) -> Unit,
-    ): Boolean {
-        hideKeyboard()
-        return if (!packageName.startsWith("be.scri")) {
-            callback(true)
-            false
-        } else if (isShowingSAFDialogSdk30(path)) {
-            funAfterSdk30Action = callback
-            true
-        } else {
-            callback(true)
-            false
-        }
-    }
-
-    fun handleSAFCreateDocumentDialogSdk30(
-        path: String,
-        callback: (success: Boolean) -> Unit,
-    ): Boolean {
-        hideKeyboard()
-        return if (!packageName.startsWith("be.scri")) {
-            callback(true)
-            false
-        } else if (isShowingSAFCreateDocumentDialogSdk30(path)) {
-            funAfterSdk30Action = callback
-            true
-        } else {
-            callback(true)
-            false
-        }
-    }
-
-    fun handleAndroidSAFDialog(
-        path: String,
-        callback: (success: Boolean) -> Unit,
-    ): Boolean {
-        hideKeyboard()
-        return if (!packageName.startsWith("be.scri")) {
-            callback(true)
-            false
-        } else if (isShowingAndroidSAFDialog(path)) {
-            funAfterSAFPermission = callback
-            true
-        } else {
-            callback(true)
-            false
-        }
-    }
-
     fun handleOTGPermission(callback: (success: Boolean) -> Unit) {
         hideKeyboard()
         if (baseConfig.otgTreeUri.isNotEmpty()) {
@@ -544,24 +448,6 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
         }
 
         funAfterSAFPermission = callback
-        WritePermissionDialog(this, Mode.Otg) {
-            Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                try {
-                    startActivityForResult(this, OPEN_DOCUMENT_TREE_OTG)
-                    return@apply
-                } catch (e: Exception) {
-                    type = "*/*"
-                }
-
-                try {
-                    startActivityForResult(this, OPEN_DOCUMENT_TREE_OTG)
-                } catch (e: ActivityNotFoundException) {
-                    toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
-                } catch (e: Exception) {
-                    toast(R.string.unknown_error_occurred)
-                }
-            }
-        }
     }
 
     @SuppressLint("NewApi")
@@ -575,8 +461,10 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
             try {
                 val deleteRequest = MediaStore.createDeleteRequest(contentResolver, uris).intentSender
                 startIntentSenderForResult(deleteRequest, Companion.DELETE_FILE_SDK_30_HANDLER, null, 0, 0, 0)
-            } catch (e: Exception) {
-                showErrorToast(e)
+            } catch (e: SecurityException) {
+                showErrorToast("Security exception: ${e.message}")
+            } catch (e: IllegalArgumentException) {
+                showErrorToast("Illegal argument: ${e.message}")
             }
         } else {
             callback(false)
@@ -594,8 +482,10 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
             try {
                 val writeRequest = MediaStore.createWriteRequest(contentResolver, uris).intentSender
                 startIntentSenderForResult(writeRequest, Companion.UPDATE_FILE_SDK_30_HANDLER, null, 0, 0, 0)
-            } catch (e: Exception) {
-                showErrorToast(e)
+            } catch (e: SecurityException) {
+                showErrorToast("Security exception: ${e.message}")
+            } catch (e: IllegalArgumentException) {
+                showErrorToast("Illegal argument: ${e.message}")
             }
         } else {
             callback(false)
@@ -618,20 +508,6 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
         }
     }
 
-    fun handlePermission(
-        permissionId: Int,
-        callback: (granted: Boolean) -> Unit,
-    ) {
-        actionOnPermission = null
-        if (hasPermission(permissionId)) {
-            callback(true)
-        } else {
-            isAskingPermissions = true
-            actionOnPermission = callback
-            ActivityCompat.requestPermissions(this, arrayOf(getPermissionString(permissionId)), Companion.GENERIC_PERM_HANDLER)
-        }
-    }
-
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<String>,
@@ -644,13 +520,6 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
         }
     }
 
-    fun checkAppOnSDCard() {
-        if (!baseConfig.wasAppOnSDShown && isAppInstalledOnSDCard()) {
-            baseConfig.wasAppOnSDShown = true
-            ConfirmationDialog(this, "", R.string.app_on_sd_card, R.string.ok, 0) {}
-        }
-    }
-
     @SuppressLint("InlinedApi")
     protected fun launchSetDefaultDialerIntent() {
         if (isQPlus()) {
@@ -665,8 +534,6 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
                     startActivityForResult(this, REQUEST_CODE_SET_DEFAULT_DIALER)
                 } catch (e: ActivityNotFoundException) {
                     toast(R.string.no_app_found)
-                } catch (e: Exception) {
-                    showErrorToast(e)
                 }
             }
         }
diff --git a/app/src/main/java/be/scri/activities/BaseSplashActivity.kt b/app/src/main/java/be/scri/activities/BaseSplashActivity.kt
index f6ac64a7..6177d6aa 100644
--- a/app/src/main/java/be/scri/activities/BaseSplashActivity.kt
+++ b/app/src/main/java/be/scri/activities/BaseSplashActivity.kt
@@ -5,14 +5,9 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import be.scri.R
 import be.scri.extensions.baseConfig
-import be.scri.extensions.checkAppIconColor
-import be.scri.extensions.checkAppSideloading
 import be.scri.extensions.getSharedTheme
 import be.scri.extensions.isThankYouInstalled
 import be.scri.extensions.isUsingSystemDarkTheme
-import be.scri.extensions.showSideloadingDialog
-import be.scri.helpers.SIDELOADING_TRUE
-import be.scri.helpers.SIDELOADING_UNCHECKED
 
 abstract class BaseSplashActivity : AppCompatActivity() {
     abstract fun initActivity()
@@ -20,15 +15,6 @@ abstract class BaseSplashActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        if (baseConfig.appSideloadingStatus == SIDELOADING_UNCHECKED) {
-            if (checkAppSideloading()) {
-                return
-            }
-        } else if (baseConfig.appSideloadingStatus == SIDELOADING_TRUE) {
-            showSideloadingDialog()
-            return
-        }
-
         baseConfig.apply {
             if (isUsingAutoTheme) {
                 val isUsingSystemDarkTheme = isUsingSystemDarkTheme()
@@ -53,11 +39,6 @@ abstract class BaseSplashActivity : AppCompatActivity() {
                         navigationBarColor = it.navigationBarColor
                         accentColor = it.accentColor
                     }
-
-                    if (baseConfig.appIconColor != it.appIconColor) {
-                        baseConfig.appIconColor = it.appIconColor
-                        checkAppIconColor()
-                    }
                 }
                 initActivity()
             }
diff --git a/app/src/main/java/be/scri/activities/MainActivity.kt b/app/src/main/java/be/scri/activities/MainActivity.kt
index 172933d8..c76df508 100644
--- a/app/src/main/java/be/scri/activities/MainActivity.kt
+++ b/app/src/main/java/be/scri/activities/MainActivity.kt
@@ -3,6 +3,7 @@ package be.scri.activities
 import android.app.UiModeManager
 import android.content.Context
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
@@ -183,4 +184,38 @@ class MainActivity : SimpleActivity() {
         val uiModeManager = context.getSystemService(UI_MODE_SERVICE) as UiModeManager
         return uiModeManager.nightMode == UiModeManager.MODE_NIGHT_YES
     }
+
+    fun showHint(
+        sharedPrefsKey: String,
+        hintMessageResId: Int,
+    ) {
+        val sharedPref = getSharedPreferences("app_preferences", Context.MODE_PRIVATE)
+        val allEntries = sharedPref.all
+        for ((key, value) in allEntries) {
+            Log.i("hint", "$key = $value")
+        }
+        val isHintShown = sharedPref.getBoolean(sharedPrefsKey, false)
+        Log.i("hint", isHintShown.toString())
+        if (!isHintShown) {
+            val hintLayout = findViewById<View>(R.id.hint_layout)
+            val hintText = findViewById<TextView>(R.id.hint_text)
+            hintText.text = getString(hintMessageResId)
+
+            hintLayout.visibility = View.VISIBLE
+
+            val okButton = findViewById<Button>(R.id.hint_ok_button)
+            okButton.setOnClickListener {
+                with(sharedPref.edit()) {
+                    putBoolean(sharedPrefsKey, true)
+                    apply()
+                }
+                hideHint()
+            }
+        }
+    }
+
+    fun hideHint() {
+        val hintLayout = findViewById<View>(R.id.hint_layout)
+        hintLayout.visibility = View.GONE
+    }
 }
diff --git a/app/src/main/java/be/scri/dialogs/AppSideloadedDialog.kt b/app/src/main/java/be/scri/dialogs/AppSideloadedDialog.kt
deleted file mode 100644
index 3060a447..00000000
--- a/app/src/main/java/be/scri/dialogs/AppSideloadedDialog.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package be.scri.dialogs
-
-import android.app.Activity
-import android.text.Html
-import android.text.method.LinkMovementMethod
-import androidx.appcompat.app.AlertDialog
-import be.scri.R
-import be.scri.databinding.DialogTextviewBinding
-import be.scri.extensions.getStringsPackageName
-import be.scri.extensions.launchViewIntent
-import be.scri.extensions.setupDialogStuff
-
-class AppSideloadedDialog(
-    val activity: Activity,
-    val callback: () -> Unit,
-) {
-    private var dialog: AlertDialog
-    private val url = "https://play.google.com/store/apps/details?id=${activity.getStringsPackageName()}"
-    private var binding: DialogTextviewBinding = DialogTextviewBinding.inflate(activity.layoutInflater)
-
-    init {
-        val view =
-            binding.root.apply {
-                val text = String.format(activity.getString(R.string.sideloaded_app), url)
-                binding.textView.text = Html.fromHtml(text)
-                binding.textView.movementMethod = LinkMovementMethod.getInstance()
-            }
-
-        dialog =
-            AlertDialog
-                .Builder(activity)
-                .setNegativeButton(R.string.cancel) { dialog, which -> negativePressed() }
-                .setPositiveButton(R.string.download, null)
-                .setOnCancelListener { negativePressed() }
-                .create()
-                .apply {
-                    activity.setupDialogStuff(view, this)
-                    getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
-                        downloadApp()
-                    }
-                }
-    }
-
-    private fun downloadApp() {
-        activity.launchViewIntent(url)
-    }
-
-    private fun negativePressed() {
-        dialog.dismiss()
-        callback()
-    }
-}
diff --git a/app/src/main/java/be/scri/dialogs/ConfirmationAdvancedDialog.kt b/app/src/main/java/be/scri/dialogs/ConfirmationAdvancedDialog.kt
deleted file mode 100644
index 02860355..00000000
--- a/app/src/main/java/be/scri/dialogs/ConfirmationAdvancedDialog.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package be.scri.dialogs
-
-import android.app.Activity
-import androidx.appcompat.app.AlertDialog
-import be.scri.R
-import be.scri.databinding.DialogMessageBinding
-import be.scri.extensions.setupDialogStuff
-
-// similar fo ConfirmationDialog, but has a callback for negative button too
-class ConfirmationAdvancedDialog(
-    activity: Activity,
-    message: String = "",
-    messageId: Int = R.string.proceed_with_deletion,
-    positive: Int = R.string.yes,
-    negative: Int,
-    val callback: (result: Boolean) -> Unit,
-) {
-    var dialog: AlertDialog
-    private var binding: DialogMessageBinding = DialogMessageBinding.inflate(activity.layoutInflater)
-
-    init {
-        val view = binding.root
-        binding.message.text =
-            if (message.isEmpty()) activity.resources.getString(messageId) else message
-
-        val builder =
-            AlertDialog
-                .Builder(activity)
-                .setPositiveButton(positive) { dialog, which -> positivePressed() }
-
-        if (negative != 0) {
-            builder.setNegativeButton(negative) { dialog, which -> negativePressed() }
-        }
-
-        dialog =
-            builder.create().apply {
-                activity.setupDialogStuff(view, this)
-            }
-    }
-
-    private fun positivePressed() {
-        dialog.dismiss()
-        callback(true)
-    }
-
-    private fun negativePressed() {
-        dialog.dismiss()
-        callback(false)
-    }
-}
diff --git a/app/src/main/java/be/scri/dialogs/ConfirmationDialog.kt b/app/src/main/java/be/scri/dialogs/ConfirmationDialog.kt
deleted file mode 100644
index 3739c95b..00000000
--- a/app/src/main/java/be/scri/dialogs/ConfirmationDialog.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package be.scri.dialogs
-
-import android.app.Activity
-import androidx.appcompat.app.AlertDialog
-import be.scri.R
-import be.scri.databinding.DialogMessageBinding
-import be.scri.extensions.setupDialogStuff
-
-/**
- * A simple dialog without any view, just a messageId, a positive button and optionally a negative button
- *
- * @param activity has to be activity context to avoid some Theme.AppCompat issues
- * @param message the dialogs message, can be any String. If empty, messageId is used
- * @param messageId the dialogs messageId ID. Used only if message is empty
- * @param positive positive buttons text ID
- * @param negative negative buttons text ID (optional)
- * @param callback an anonymous function
- */
-class ConfirmationDialog(
-    activity: Activity,
-    message: String = "",
-    messageId: Int = R.string.proceed_with_deletion,
-    positive: Int = R.string.yes,
-    negative: Int = R.string.no,
-    val cancelOnTouchOutside: Boolean = true,
-    val callback: () -> Unit,
-) {
-    var dialog: AlertDialog
-    private var binding: DialogMessageBinding = DialogMessageBinding.inflate(activity.layoutInflater)
-
-    init {
-        val view = binding.root
-        binding.message.text = if (message.isEmpty()) activity.resources.getString(messageId) else message
-
-        val builder =
-            AlertDialog
-                .Builder(activity)
-                .setPositiveButton(positive) { dialog, which -> dialogConfirmed() }
-
-        if (negative != 0) {
-            builder.setNegativeButton(negative, null)
-        }
-
-        dialog =
-            builder.create().apply {
-                activity.setupDialogStuff(view, this, cancelOnTouchOutside = cancelOnTouchOutside)
-            }
-    }
-
-    private fun dialogConfirmed() {
-        dialog.dismiss()
-        callback()
-    }
-}
diff --git a/app/src/main/java/be/scri/dialogs/CustomIntervalPickerDialog.kt b/app/src/main/java/be/scri/dialogs/CustomIntervalPickerDialog.kt
deleted file mode 100644
index 4bb2ed55..00000000
--- a/app/src/main/java/be/scri/dialogs/CustomIntervalPickerDialog.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package be.scri.dialogs
-
-import android.app.Activity
-import androidx.appcompat.app.AlertDialog
-import be.scri.R
-import be.scri.databinding.DialogCustomIntervalPickerBinding
-import be.scri.extensions.beVisibleIf
-import be.scri.extensions.hideKeyboard
-import be.scri.extensions.setupDialogStuff
-import be.scri.extensions.showKeyboard
-import be.scri.extensions.value
-import be.scri.helpers.DAY_SECONDS
-import be.scri.helpers.HOUR_SECONDS
-import be.scri.helpers.MINUTE_SECONDS
-
-class CustomIntervalPickerDialog(
-    val activity: Activity,
-    val selectedSeconds: Int = 0,
-    val showSeconds: Boolean = false,
-    val callback: (minutes: Int) -> Unit,
-) {
-    var dialog: AlertDialog
-    private var binding: DialogCustomIntervalPickerBinding = DialogCustomIntervalPickerBinding.inflate(activity.layoutInflater)
-    var view = binding.root
-
-    init {
-        view.apply {
-            binding.apply {
-                dialogRadioSeconds.beVisibleIf(showSeconds)
-                when {
-                    selectedSeconds == 0 -> dialogRadioView.check(R.id.dialog_radio_minutes)
-                    selectedSeconds % DAY_SECONDS == 0 -> {
-                        dialogRadioView.check(R.id.dialog_radio_days)
-                        dialogCustomIntervalValue.setText((selectedSeconds / DAY_SECONDS).toString())
-                    }
-
-                    selectedSeconds % HOUR_SECONDS == 0 -> {
-                        dialogRadioView.check(R.id.dialog_radio_hours)
-                        dialogCustomIntervalValue.setText((selectedSeconds / HOUR_SECONDS).toString())
-                    }
-
-                    selectedSeconds % MINUTE_SECONDS == 0 -> {
-                        dialogRadioView.check(R.id.dialog_radio_minutes)
-                        dialogCustomIntervalValue.setText((selectedSeconds / MINUTE_SECONDS).toString())
-                    }
-
-                    else -> {
-                        dialogRadioView.check(R.id.dialog_radio_seconds)
-                        dialogCustomIntervalValue.setText(selectedSeconds.toString())
-                    }
-                }
-            }
-        }
-
-        dialog =
-            AlertDialog
-                .Builder(activity)
-                .setPositiveButton(R.string.ok) { dialogInterface, i -> confirmReminder() }
-                .setNegativeButton(R.string.cancel, null)
-                .create()
-                .apply {
-                    activity.setupDialogStuff(view, this) {
-                        showKeyboard(binding.dialogCustomIntervalValue)
-                    }
-                }
-    }
-
-    private fun confirmReminder() {
-        val value = binding.dialogCustomIntervalValue.value
-        val multiplier = getMultiplier(binding.dialogRadioView.checkedRadioButtonId)
-        val minutes = Integer.valueOf(if (value.isEmpty()) "0" else value)
-        callback(minutes * multiplier)
-        activity.hideKeyboard()
-        dialog.dismiss()
-    }
-
-    private fun getMultiplier(id: Int) =
-        when (id) {
-            R.id.dialog_radio_days -> DAY_SECONDS
-            R.id.dialog_radio_hours -> HOUR_SECONDS
-            R.id.dialog_radio_minutes -> MINUTE_SECONDS
-            else -> 1
-        }
-}
diff --git a/app/src/main/java/be/scri/dialogs/RadioGroupDialog.kt b/app/src/main/java/be/scri/dialogs/RadioGroupDialog.kt
deleted file mode 100644
index 0b6479d4..00000000
--- a/app/src/main/java/be/scri/dialogs/RadioGroupDialog.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package be.scri.dialogs
-
-import android.app.Activity
-import android.view.View
-import android.view.ViewGroup
-import android.widget.RadioButton
-import android.widget.RadioGroup
-import androidx.appcompat.app.AlertDialog
-import be.scri.R
-import be.scri.databinding.DialogRadioGroupBinding
-import be.scri.extensions.onGlobalLayout
-import be.scri.extensions.setupDialogStuff
-import be.scri.models.RadioItem
-
-class RadioGroupDialog(
-    val activity: Activity,
-    val items: ArrayList<RadioItem>,
-    val checkedItemId: Int = -1,
-    val titleId: Int = 0,
-    showOKButton: Boolean = false,
-    val cancelCallback: (() -> Unit)? = null,
-    val callback: (newValue: Any) -> Unit,
-) {
-    private val dialog: AlertDialog
-    private var wasInit = false
-    private var selectedItemId = -1
-
-    private var binding: DialogRadioGroupBinding = DialogRadioGroupBinding.inflate(activity.layoutInflater)
-
-    init {
-        val view = binding.root
-        binding.dialogRadioGroup.apply {
-            for (i in 0 until items.size) {
-                val radioButton =
-                    (activity.layoutInflater.inflate(R.layout.radio_button, null) as RadioButton).apply {
-                        text = items[i].title
-                        isChecked = items[i].id == checkedItemId
-                        id = i
-                        setOnClickListener { itemSelected(i) }
-                    }
-
-                if (items[i].id == checkedItemId) {
-                    selectedItemId = i
-                }
-
-                addView(radioButton, RadioGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT))
-            }
-        }
-
-        val builder =
-            AlertDialog
-                .Builder(activity)
-                .setOnCancelListener { cancelCallback?.invoke() }
-
-        if (selectedItemId != -1 && showOKButton) {
-            builder.setPositiveButton(R.string.ok) { dialog, which -> itemSelected(selectedItemId) }
-        }
-
-        dialog =
-            builder.create().apply {
-                activity.setupDialogStuff(view, this, titleId)
-            }
-
-        if (selectedItemId != -1) {
-            binding.dialogRadioHolder.apply {
-                onGlobalLayout {
-                    scrollY = binding.dialogRadioGroup.findViewById<View>(selectedItemId).bottom - height
-                }
-            }
-        }
-
-        wasInit = true
-    }
-
-    private fun itemSelected(checkedId: Int) {
-        if (wasInit) {
-            callback(items[checkedId].value)
-            dialog.dismiss()
-        }
-    }
-}
diff --git a/app/src/main/java/be/scri/dialogs/WritePermissionDialog.kt b/app/src/main/java/be/scri/dialogs/WritePermissionDialog.kt
deleted file mode 100644
index a0299773..00000000
--- a/app/src/main/java/be/scri/dialogs/WritePermissionDialog.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-package be.scri.dialogs
-
-import android.app.Activity
-import android.text.Html
-import androidx.appcompat.app.AlertDialog
-import be.scri.R
-import be.scri.activities.BaseSimpleActivity
-import be.scri.databinding.DialogWritePermissionBinding
-import be.scri.databinding.DialogWritePermissionOtgBinding
-import be.scri.extensions.humanizePath
-import be.scri.extensions.setupDialogStuff
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
-
-class WritePermissionDialog(
-    activity: Activity,
-    val mode: Mode,
-    val callback: () -> Unit,
-) {
-    sealed class Mode {
-        object Otg : Mode()
-
-        object SdCard : Mode()
-
-        data class OpenDocumentTreeSDK30(
-            val path: String,
-        ) : Mode()
-
-        object CreateDocumentSDK30 : Mode()
-    }
-
-    private lateinit var otgBinding: DialogWritePermissionOtgBinding
-    private lateinit var binding: DialogWritePermissionBinding
-
-    var dialog: AlertDialog
-
-    init {
-        val view = if (mode == Mode.SdCard) binding.root else otgBinding.root
-
-        val glide = Glide.with(activity)
-        val crossFade = DrawableTransitionOptions.withCrossFade()
-        when (mode) {
-            Mode.Otg -> {
-                otgBinding.writePermissionsDialogOtgText.setText(R.string.confirm_usb_storage_access_text)
-                glide.load(R.drawable.img_write_storage_otg).transition(crossFade).into(otgBinding.writePermissionsDialogOtgImage)
-            }
-            Mode.SdCard -> {
-                glide.load(R.drawable.img_write_storage).transition(crossFade).into(binding.writePermissionsDialogImage)
-                glide.load(R.drawable.img_write_storage_sd).transition(crossFade).into(binding.writePermissionsDialogImageSd)
-            }
-            is Mode.OpenDocumentTreeSDK30 -> {
-                val humanizedPath = activity.humanizePath(mode.path)
-                otgBinding.writePermissionsDialogOtgText.text =
-                    Html.fromHtml(activity.getString(R.string.confirm_storage_access_android_text_specific, humanizedPath))
-                glide.load(R.drawable.img_write_storage_sdk_30).transition(crossFade).into(otgBinding.writePermissionsDialogOtgImage)
-
-                otgBinding.writePermissionsDialogOtgImage.setOnClickListener {
-                    dialogConfirmed()
-                }
-            }
-            Mode.CreateDocumentSDK30 -> {
-                otgBinding.writePermissionsDialogOtgText.text = Html.fromHtml(activity.getString(R.string.confirm_create_doc_for_new_folder_text))
-                glide.load(R.drawable.img_write_storage_create_doc_sdk_30).transition(crossFade).into(otgBinding.writePermissionsDialogOtgImage)
-
-                otgBinding.writePermissionsDialogOtgImage.setOnClickListener {
-                    dialogConfirmed()
-                }
-            }
-        }
-
-        dialog =
-            AlertDialog
-                .Builder(activity)
-                .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() }
-                .setOnCancelListener {
-                    BaseSimpleActivity.funAfterSAFPermission?.invoke(false)
-                    BaseSimpleActivity.funAfterSAFPermission = null
-                }.create()
-                .apply {
-                    activity.setupDialogStuff(view, this, R.string.confirm_storage_access_title)
-                }
-    }
-
-    private fun dialogConfirmed() {
-        dialog.dismiss()
-        callback()
-    }
-}
diff --git a/app/src/main/java/be/scri/extensions/Activity.kt b/app/src/main/java/be/scri/extensions/Activity.kt
index 982e174d..ed620d01 100644
--- a/app/src/main/java/be/scri/extensions/Activity.kt
+++ b/app/src/main/java/be/scri/extensions/Activity.kt
@@ -1,90 +1,23 @@
 package be.scri.extensions
 
-import android.annotation.SuppressLint
 import android.app.Activity
-import android.app.TimePickerDialog
-import android.content.ActivityNotFoundException
-import android.content.ComponentName
-import android.content.ContentValues
 import android.content.Context
-import android.content.Intent
-import android.content.Intent.EXTRA_STREAM
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
-import android.media.RingtoneManager
-import android.net.Uri
-import android.os.Environment
 import android.os.Handler
 import android.os.Looper
-import android.os.TransactionTooLargeException
-import android.provider.ContactsContract
-import android.provider.DocumentsContract
-import android.provider.MediaStore
-import android.telecom.PhoneAccountHandle
-import android.telecom.TelecomManager
 import android.text.Html
 import android.view.View
-import android.view.ViewGroup
-import android.view.Window
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
-import android.widget.EditText
-import android.widget.TextView
-import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import androidx.biometric.BiometricPrompt
-import androidx.biometric.auth.AuthPromptCallback
-import androidx.biometric.auth.AuthPromptHost
-import androidx.biometric.auth.Class2BiometricAuthPrompt
 import androidx.documentfile.provider.DocumentFile
-import androidx.fragment.app.FragmentActivity
 import be.scri.R
 import be.scri.activities.BaseSimpleActivity
-import be.scri.databinding.DialogTitleBinding
-import be.scri.dialogs.AppSideloadedDialog
-import be.scri.dialogs.ConfirmationAdvancedDialog
-import be.scri.dialogs.CustomIntervalPickerDialog
-import be.scri.dialogs.RadioGroupDialog
-import be.scri.dialogs.WritePermissionDialog
-import be.scri.dialogs.WritePermissionDialog.Mode
-import be.scri.helpers.CREATE_DOCUMENT_SDK_30
-import be.scri.helpers.EXTRA_SHOW_ADVANCED
-import be.scri.helpers.INVALID_NAVIGATION_BAR_COLOR
-import be.scri.helpers.IS_FROM_GALLERY
-import be.scri.helpers.MINUTE_SECONDS
-import be.scri.helpers.MyContentProvider
-import be.scri.helpers.OPEN_DOCUMENT_TREE_FOR_ANDROID_DATA_OR_OBB
-import be.scri.helpers.OPEN_DOCUMENT_TREE_FOR_SDK_30
-import be.scri.helpers.OPEN_DOCUMENT_TREE_OTG
-import be.scri.helpers.OPEN_DOCUMENT_TREE_SD
-import be.scri.helpers.PERMISSION_CALL_PHONE
-import be.scri.helpers.PERMISSION_READ_STORAGE
-import be.scri.helpers.PROTECTION_FINGERPRINT
-import be.scri.helpers.REAL_FILE_PATH
-import be.scri.helpers.REQUEST_EDIT_IMAGE
-import be.scri.helpers.REQUEST_SET_AS
-import be.scri.helpers.SIDELOADING_FALSE
-import be.scri.helpers.SIDELOADING_TRUE
-import be.scri.helpers.SILENT
-import be.scri.helpers.STORE_URL
-import be.scri.helpers.ensureBackgroundThread
-import be.scri.helpers.isMarshmallowPlus
 import be.scri.helpers.isOnMainThread
-import be.scri.helpers.isRPlus
-import be.scri.models.AlarmSound
-import be.scri.models.Android30RenameFormat
-import be.scri.models.FileDirItem
-import be.scri.models.RadioItem
-import be.scri.models.SharedTheme
-import be.scri.views.MyTextView
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.FileOutputStream
+import java.io.IOException
 import java.io.OutputStream
-import java.util.TreeSet
-
-private lateinit var binding: DialogTitleBinding
 
 fun AppCompatActivity.updateActionBarTitle(
     text: String,
@@ -100,1087 +33,6 @@ fun AppCompatActivity.updateActionBarTitle(
     supportActionBar?.title = Html.fromHtml("<font color='${colorToUse.toHex()}'>$text</font>")
 }
 
-fun AppCompatActivity.updateActionBarSubtitle(text: String) {
-    val colorToUse =
-        if (baseConfig.isUsingSystemTheme) {
-            getProperTextColor()
-        } else {
-            baseConfig.primaryColor.getContrastColor()
-        }
-
-    supportActionBar?.subtitle = Html.fromHtml("<font color='${colorToUse.toHex()}'>$text</font>")
-}
-
-fun Activity.appLaunched(appId: String) {
-    baseConfig.internalStoragePath = getInternalStoragePath()
-    updateSDCardPath()
-    baseConfig.appId = appId
-    if (baseConfig.appRunCount == 0) {
-        baseConfig.wasOrangeIconChecked = true
-        checkAppIconColor()
-    } else if (!baseConfig.wasOrangeIconChecked) {
-        baseConfig.wasOrangeIconChecked = true
-        val primaryColor = resources.getColor(R.color.you_background_color)
-        if (baseConfig.appIconColor != primaryColor) {
-            getAppIconColors().forEachIndexed { index, color ->
-                toggleAppIconColor(appId, index, color, false)
-            }
-
-            val defaultClassName = "${baseConfig.appId.removeSuffix(".debug")}.activities.SplashActivity"
-            packageManager.setComponentEnabledSetting(
-                ComponentName(baseConfig.appId, defaultClassName),
-                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
-                PackageManager.DONT_KILL_APP,
-            )
-
-            val orangeClassName = "${baseConfig.appId.removeSuffix(".debug")}.activities.SplashActivity.Orange"
-            packageManager.setComponentEnabledSetting(
-                ComponentName(baseConfig.appId, orangeClassName),
-                PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
-                PackageManager.DONT_KILL_APP,
-            )
-
-            baseConfig.appIconColor = primaryColor
-            baseConfig.lastIconColor = primaryColor
-        }
-    }
-
-    if (baseConfig.navigationBarColor == INVALID_NAVIGATION_BAR_COLOR && (window.attributes.flags and WindowManager.LayoutParams.FLAG_FULLSCREEN == 0)) {
-        baseConfig.defaultNavigationBarColor = window.navigationBarColor
-        baseConfig.navigationBarColor = window.navigationBarColor
-    }
-}
-
-fun Activity.isAppInstalledOnSDCard(): Boolean =
-    try {
-        val applicationInfo = packageManager.getPackageInfo(packageName, 0).applicationInfo
-        (applicationInfo.flags and ApplicationInfo.FLAG_EXTERNAL_STORAGE) == ApplicationInfo.FLAG_EXTERNAL_STORAGE
-    } catch (e: Exception) {
-        false
-    }
-
-fun BaseSimpleActivity.isShowingSAFDialog(path: String): Boolean {
-    return if ((!isRPlus() && isPathOnSD(path) && !isSDCardSetAsDefaultStorage() && (baseConfig.sdTreeUri.isEmpty() || !hasProperStoredTreeUri(false)))) {
-        runOnUiThread {
-            if (!isDestroyed && !isFinishing) {
-                WritePermissionDialog(this, Mode.SdCard) {
-                    Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                        putExtra(EXTRA_SHOW_ADVANCED, true)
-                        try {
-                            startActivityForResult(this, OPEN_DOCUMENT_TREE_SD)
-                            checkedDocumentPath = path
-                            return@apply
-                        } catch (e: Exception) {
-                            type = "*/*"
-                        }
-
-                        try {
-                            startActivityForResult(this, OPEN_DOCUMENT_TREE_SD)
-                            checkedDocumentPath = path
-                        } catch (e: ActivityNotFoundException) {
-                            toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
-                        } catch (e: Exception) {
-                            toast(R.string.unknown_error_occurred)
-                        }
-                    }
-                }
-            }
-        }
-        true
-    } else {
-        false
-    }
-}
-
-@SuppressLint("InlinedApi")
-fun BaseSimpleActivity.isShowingSAFDialogSdk30(path: String): Boolean {
-    return if (isAccessibleWithSAFSdk30(path) && !hasProperStoredFirstParentUri(path)) {
-        runOnUiThread {
-            if (!isDestroyed && !isFinishing) {
-                val level = getFirstParentLevel(path)
-                WritePermissionDialog(this, Mode.OpenDocumentTreeSDK30(path.getFirstParentPath(this, level))) {
-                    Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                        putExtra(EXTRA_SHOW_ADVANCED, true)
-                        putExtra(DocumentsContract.EXTRA_INITIAL_URI, createFirstParentTreeUriUsingRootTree(path))
-                        try {
-                            startActivityForResult(this, OPEN_DOCUMENT_TREE_FOR_SDK_30)
-                            checkedDocumentPath = path
-                            return@apply
-                        } catch (e: Exception) {
-                            type = "*/*"
-                        }
-
-                        try {
-                            startActivityForResult(this, OPEN_DOCUMENT_TREE_FOR_SDK_30)
-                            checkedDocumentPath = path
-                        } catch (e: ActivityNotFoundException) {
-                            toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
-                        } catch (e: Exception) {
-                            toast(R.string.unknown_error_occurred)
-                        }
-                    }
-                }
-            }
-        }
-        true
-    } else {
-        false
-    }
-}
-
-@SuppressLint("InlinedApi")
-fun BaseSimpleActivity.isShowingSAFCreateDocumentDialogSdk30(path: String): Boolean {
-    return if (!hasProperStoredDocumentUriSdk30(path)) {
-        runOnUiThread {
-            if (!isDestroyed && !isFinishing) {
-                WritePermissionDialog(this, Mode.CreateDocumentSDK30) {
-                    Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
-                        type = DocumentsContract.Document.MIME_TYPE_DIR
-                        putExtra(EXTRA_SHOW_ADVANCED, true)
-                        addCategory(Intent.CATEGORY_OPENABLE)
-                        putExtra(DocumentsContract.EXTRA_INITIAL_URI, buildDocumentUriSdk30(path.getParentPath()))
-                        putExtra(Intent.EXTRA_TITLE, path.getFilenameFromPath())
-                        try {
-                            startActivityForResult(this, CREATE_DOCUMENT_SDK_30)
-                            checkedDocumentPath = path
-                            return@apply
-                        } catch (e: Exception) {
-                            type = "*/*"
-                        }
-
-                        try {
-                            startActivityForResult(this, CREATE_DOCUMENT_SDK_30)
-                            checkedDocumentPath = path
-                        } catch (e: ActivityNotFoundException) {
-                            toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
-                        } catch (e: Exception) {
-                            toast(R.string.unknown_error_occurred)
-                        }
-                    }
-                }
-            }
-        }
-        true
-    } else {
-        false
-    }
-}
-
-fun BaseSimpleActivity.isShowingAndroidSAFDialog(path: String): Boolean {
-    return if (isRestrictedSAFOnlyRoot(path) && (getAndroidTreeUri(path).isEmpty() || !hasProperStoredAndroidTreeUri(path))) {
-        runOnUiThread {
-            if (!isDestroyed && !isFinishing) {
-                ConfirmationAdvancedDialog(this, "", R.string.confirm_storage_access_android_text, R.string.ok, R.string.cancel) { success ->
-                    if (success) {
-                        Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                            putExtra(EXTRA_SHOW_ADVANCED, true)
-                            putExtra(DocumentsContract.EXTRA_INITIAL_URI, createAndroidDataOrObbUri(path))
-                            try {
-                                startActivityForResult(this, OPEN_DOCUMENT_TREE_FOR_ANDROID_DATA_OR_OBB)
-                                checkedDocumentPath = path
-                                return@apply
-                            } catch (e: Exception) {
-                                type = "*/*"
-                            }
-
-                            try {
-                                startActivityForResult(this, OPEN_DOCUMENT_TREE_FOR_ANDROID_DATA_OR_OBB)
-                                checkedDocumentPath = path
-                            } catch (e: ActivityNotFoundException) {
-                                toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
-                            } catch (e: Exception) {
-                                toast(R.string.unknown_error_occurred)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        true
-    } else {
-        false
-    }
-}
-
-fun BaseSimpleActivity.isShowingOTGDialog(path: String): Boolean =
-    if (!isRPlus() && isPathOnOTG(path) && (baseConfig.otgTreeUri.isEmpty() || !hasProperStoredTreeUri(true))) {
-        showOTGPermissionDialog(path)
-        true
-    } else {
-        false
-    }
-
-fun BaseSimpleActivity.showOTGPermissionDialog(path: String) {
-    runOnUiThread {
-        if (!isDestroyed && !isFinishing) {
-            WritePermissionDialog(this, Mode.Otg) {
-                Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                    try {
-                        startActivityForResult(this, OPEN_DOCUMENT_TREE_OTG)
-                        checkedDocumentPath = path
-                        return@apply
-                    } catch (e: Exception) {
-                        type = "*/*"
-                    }
-
-                    try {
-                        startActivityForResult(this, OPEN_DOCUMENT_TREE_OTG)
-                        checkedDocumentPath = path
-                    } catch (e: ActivityNotFoundException) {
-                        toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
-                    } catch (e: Exception) {
-                        toast(R.string.unknown_error_occurred)
-                    }
-                }
-            }
-        }
-    }
-}
-
-fun Activity.launchPurchaseThankYouIntent() {
-    try {
-        launchViewIntent("market://details?id=com.simplemobiletools.thankyou")
-    } catch (ignored: Exception) {
-        launchViewIntent(getString(R.string.thank_you_url))
-    }
-}
-
-fun Activity.launchUpgradeToProIntent() {
-    try {
-        launchViewIntent("market://details?id=${baseConfig.appId.removeSuffix(".debug")}.pro")
-    } catch (ignored: Exception) {
-        launchViewIntent(STORE_URL)
-    }
-}
-
-fun Activity.launchViewIntent(id: Int) = launchViewIntent(getString(id))
-
-fun Activity.launchViewIntent(url: String) {
-    ensureBackgroundThread {
-        Intent(Intent.ACTION_VIEW, Uri.parse(url)).apply {
-            launchActivityIntent(this)
-        }
-    }
-}
-
-fun Activity.redirectToRateUs() {
-    try {
-        launchViewIntent("market://details?id=${packageName.removeSuffix(".debug")}")
-    } catch (ignored: ActivityNotFoundException) {
-        launchViewIntent(STORE_URL)
-    }
-}
-
-fun Activity.sharePathIntent(
-    path: String,
-    applicationId: String,
-) {
-    ensureBackgroundThread {
-        val newUri = getFinalUriFromPath(path, applicationId) ?: return@ensureBackgroundThread
-        Intent().apply {
-            action = Intent.ACTION_SEND
-            putExtra(EXTRA_STREAM, newUri)
-            type = getUriMimeType(path, newUri)
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-
-            try {
-                startActivity(Intent.createChooser(this, getString(R.string.share_via)))
-            } catch (e: ActivityNotFoundException) {
-                toast(R.string.no_app_found)
-            } catch (e: RuntimeException) {
-                if (e.cause is TransactionTooLargeException) {
-                    toast(R.string.maximum_share_reached)
-                } else {
-                    showErrorToast(e)
-                }
-            } catch (e: Exception) {
-                showErrorToast(e)
-            }
-        }
-    }
-}
-
-fun Activity.sharePathsIntent(
-    paths: List<String>,
-    applicationId: String,
-) {
-    ensureBackgroundThread {
-        if (paths.size == 1) {
-            sharePathIntent(paths.first(), applicationId)
-        } else {
-            val uriPaths = ArrayList<String>()
-            val newUris =
-                paths.map {
-                    val uri = getFinalUriFromPath(it, applicationId) ?: return@ensureBackgroundThread
-                    uriPaths.add(uri.path!!)
-                    uri
-                } as ArrayList<Uri>
-
-            var mimeType = uriPaths.getMimeType()
-            if (mimeType.isEmpty() || mimeType == "*/*") {
-                mimeType = paths.getMimeType()
-            }
-
-            Intent().apply {
-                action = Intent.ACTION_SEND_MULTIPLE
-                type = mimeType
-                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                putParcelableArrayListExtra(EXTRA_STREAM, newUris)
-
-                try {
-                    startActivity(Intent.createChooser(this, getString(R.string.share_via)))
-                } catch (e: ActivityNotFoundException) {
-                    toast(R.string.no_app_found)
-                } catch (e: RuntimeException) {
-                    if (e.cause is TransactionTooLargeException) {
-                        toast(R.string.maximum_share_reached)
-                    } else {
-                        showErrorToast(e)
-                    }
-                } catch (e: Exception) {
-                    showErrorToast(e)
-                }
-            }
-        }
-    }
-}
-
-fun Activity.shareTextIntent(text: String) {
-    ensureBackgroundThread {
-        Intent().apply {
-            action = Intent.ACTION_SEND
-            type = "text/plain"
-            putExtra(Intent.EXTRA_TEXT, text)
-
-            try {
-                startActivity(Intent.createChooser(this, getString(R.string.share_via)))
-            } catch (e: ActivityNotFoundException) {
-                toast(R.string.no_app_found)
-            } catch (e: RuntimeException) {
-                if (e.cause is TransactionTooLargeException) {
-                    toast(R.string.maximum_share_reached)
-                } else {
-                    showErrorToast(e)
-                }
-            } catch (e: Exception) {
-                showErrorToast(e)
-            }
-        }
-    }
-}
-
-fun Activity.setAsIntent(
-    path: String,
-    applicationId: String,
-) {
-    ensureBackgroundThread {
-        val newUri = getFinalUriFromPath(path, applicationId) ?: return@ensureBackgroundThread
-        Intent().apply {
-            action = Intent.ACTION_ATTACH_DATA
-            setDataAndType(newUri, getUriMimeType(path, newUri))
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            val chooser = Intent.createChooser(this, getString(R.string.set_as))
-
-            try {
-                startActivityForResult(chooser, REQUEST_SET_AS)
-            } catch (e: ActivityNotFoundException) {
-                toast(R.string.no_app_found)
-            } catch (e: Exception) {
-                showErrorToast(e)
-            }
-        }
-    }
-}
-
-fun Activity.openEditorIntent(
-    path: String,
-    forceChooser: Boolean,
-    applicationId: String,
-) {
-    ensureBackgroundThread {
-        val newUri = getFinalUriFromPath(path, applicationId) ?: return@ensureBackgroundThread
-        Intent().apply {
-            action = Intent.ACTION_EDIT
-            setDataAndType(newUri, getUriMimeType(path, newUri))
-            if (!isRPlus() || (isRPlus() && (hasProperStoredDocumentUriSdk30(path) || Environment.isExternalStorageManager()))) {
-                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            }
-
-            val parent = path.getParentPath()
-            val newFilename = "${path.getFilenameFromPath().substringBeforeLast('.')}_1"
-            val extension = path.getFilenameExtension()
-            val newFilePath = File(parent, "$newFilename.$extension")
-
-            val outputUri = if (isPathOnOTG(path)) newUri else getFinalUriFromPath("$newFilePath", applicationId)
-            if (!isRPlus()) {
-                val resInfoList = packageManager.queryIntentActivities(this, PackageManager.MATCH_DEFAULT_ONLY)
-                for (resolveInfo in resInfoList) {
-                    val packageName = resolveInfo.activityInfo.packageName
-                    grantUriPermission(packageName, outputUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                }
-            }
-
-            putExtra(MediaStore.EXTRA_OUTPUT, outputUri)
-            putExtra(REAL_FILE_PATH, path)
-
-            try {
-                val chooser = Intent.createChooser(this, getString(R.string.edit_with))
-                startActivityForResult(if (forceChooser) chooser else this, REQUEST_EDIT_IMAGE)
-            } catch (e: ActivityNotFoundException) {
-                toast(R.string.no_app_found)
-            } catch (e: Exception) {
-                showErrorToast(e)
-            }
-        }
-    }
-}
-
-fun Activity.openPathIntent(
-    path: String,
-    forceChooser: Boolean,
-    applicationId: String,
-    forceMimeType: String = "",
-    extras: HashMap<String, Boolean> = HashMap(),
-) {
-    ensureBackgroundThread {
-        val newUri = getFinalUriFromPath(path, applicationId) ?: return@ensureBackgroundThread
-        val mimeType = if (forceMimeType.isNotEmpty()) forceMimeType else getUriMimeType(path, newUri)
-        Intent().apply {
-            action = Intent.ACTION_VIEW
-            setDataAndType(newUri, mimeType)
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-
-            if (applicationId == "com.simplemobiletools.gallery.pro" || applicationId == "com.simplemobiletools.gallery.pro.debug") {
-                putExtra(IS_FROM_GALLERY, true)
-            }
-
-            for ((key, value) in extras) {
-                putExtra(key, value)
-            }
-
-            putExtra(REAL_FILE_PATH, path)
-
-            try {
-                val chooser = Intent.createChooser(this, getString(R.string.open_with))
-                startActivity(if (forceChooser) chooser else this)
-            } catch (e: ActivityNotFoundException) {
-                if (!tryGenericMimeType(this, mimeType, newUri)) {
-                    toast(R.string.no_app_found)
-                }
-            } catch (e: Exception) {
-                showErrorToast(e)
-            }
-        }
-    }
-}
-
-fun Activity.launchViewContactIntent(uri: Uri) {
-    Intent().apply {
-        action = ContactsContract.QuickContact.ACTION_QUICK_CONTACT
-        data = uri
-        launchActivityIntent(this)
-    }
-}
-
-fun BaseSimpleActivity.launchCallIntent(
-    recipient: String,
-    handle: PhoneAccountHandle? = null,
-) {
-    handlePermission(PERMISSION_CALL_PHONE) {
-        val action = if (it) Intent.ACTION_CALL else Intent.ACTION_DIAL
-        Intent(action).apply {
-            data = Uri.fromParts("tel", recipient, null)
-
-            if (isMarshmallowPlus() && handle != null) {
-                putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, handle)
-            }
-
-            launchActivityIntent(this)
-        }
-    }
-}
-
-fun Activity.launchSendSMSIntent(recipient: String) {
-    Intent(Intent.ACTION_SENDTO).apply {
-        data = Uri.fromParts("smsto", recipient, null)
-        launchActivityIntent(this)
-    }
-}
-
-fun Activity.showLocationOnMap(coordinates: String) {
-    val uriBegin = "geo:${coordinates.replace(" ", "")}"
-    val encodedQuery = Uri.encode(coordinates)
-    val uriString = "$uriBegin?q=$encodedQuery&z=16"
-    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(uriString))
-    launchActivityIntent(intent)
-}
-
-fun Activity.getFinalUriFromPath(
-    path: String,
-    applicationId: String,
-): Uri? {
-    val uri = try {
-        ensurePublicUri(path, applicationId)
-    } catch (e: Exception) {
-        showErrorToast(e)
-        null // Assign null if there's an exception
-    }
-
-    if (uri == null) {
-        toast(R.string.unknown_error_occurred)
-    }
-
-    return uri
-}
-
-fun Activity.tryGenericMimeType(
-    intent: Intent,
-    mimeType: String,
-    uri: Uri,
-): Boolean {
-    var genericMimeType = mimeType.getGenericMimeType()
-    if (genericMimeType.isEmpty()) {
-        genericMimeType = "*/*"
-    }
-
-    intent.setDataAndType(uri, genericMimeType)
-
-    return try {
-        startActivity(intent)
-        true
-    } catch (e: Exception) {
-        false
-    }
-}
-
-fun BaseSimpleActivity.deleteFoldersBg(
-    folders: List<FileDirItem>,
-    deleteMediaOnly: Boolean = true,
-    callback: ((wasSuccess: Boolean) -> Unit)? = null,
-) {
-    var wasSuccess = false
-    var needPermissionForPath = ""
-    for (folder in folders) {
-        if (needsStupidWritePermissions(folder.path) && baseConfig.sdTreeUri.isEmpty()) {
-            needPermissionForPath = folder.path
-            break
-        }
-    }
-
-    handleSAFDialog(needPermissionForPath) {
-        if (!it) {
-            return@handleSAFDialog
-        }
-
-        folders.forEachIndexed { index, folder ->
-            deleteFolderBg(folder, deleteMediaOnly) {
-                if (it) {
-                    wasSuccess = true
-                }
-
-                if (index == folders.size - 1) {
-                    runOnUiThread {
-                        callback?.invoke(wasSuccess)
-                    }
-                }
-            }
-        }
-    }
-}
-
-fun BaseSimpleActivity.deleteFolder(
-    folder: FileDirItem,
-    deleteMediaOnly: Boolean = true,
-    callback: ((wasSuccess: Boolean) -> Unit)? = null,
-) {
-    ensureBackgroundThread {
-        deleteFolderBg(folder, deleteMediaOnly, callback)
-    }
-}
-
-fun BaseSimpleActivity.deleteFolderBg(
-    fileDirItem: FileDirItem,
-    deleteMediaOnly: Boolean = true,
-    callback: ((wasSuccess: Boolean) -> Unit)? = null,
-) {
-    val folder = File(fileDirItem.path)
-    if (folder.exists()) {
-        val filesArr = folder.listFiles()
-        if (filesArr == null) {
-            runOnUiThread {
-                callback?.invoke(true)
-            }
-            return
-        }
-
-        val files = filesArr.toMutableList().filter { !deleteMediaOnly || it.isMediaFile() }
-        for (file in files) {
-            deleteFileBg(file.toFileDirItem(applicationContext), allowDeleteFolder = false, isDeletingMultipleFiles = false) { }
-        }
-
-        if (folder.listFiles()?.isEmpty() == true) {
-            deleteFileBg(fileDirItem, allowDeleteFolder = true, isDeletingMultipleFiles = false) { }
-        }
-    }
-    runOnUiThread {
-        callback?.invoke(true)
-    }
-}
-
-fun BaseSimpleActivity.deleteFile(
-    file: FileDirItem,
-    allowDeleteFolder: Boolean = false,
-    callback: ((wasSuccess: Boolean) -> Unit)? = null,
-) {
-    deleteFiles(arrayListOf(file), allowDeleteFolder, callback)
-}
-
-fun BaseSimpleActivity.deleteFiles(
-    files: List<FileDirItem>,
-    allowDeleteFolder: Boolean = false,
-    callback: ((wasSuccess: Boolean) -> Unit)? = null,
-) {
-    ensureBackgroundThread {
-        deleteFilesBg(files, allowDeleteFolder, callback)
-    }
-}
-
-fun BaseSimpleActivity.deleteFilesBg(
-    files: List<FileDirItem>,
-    allowDeleteFolder: Boolean = false,
-    callback: ((wasSuccess: Boolean) -> Unit)? = null,
-) {
-    if (files.isEmpty()) {
-        runOnUiThread {
-            callback?.invoke(true)
-        }
-        return
-    }
-
-    var wasSuccess = false
-    val firstFile = files.first()
-    handleSAFDialog(firstFile.path) {
-        if (!it) {
-            return@handleSAFDialog
-        }
-
-        handleSAFDialogSdk30(firstFile.path) {
-            if (!it) {
-                return@handleSAFDialogSdk30
-            }
-
-            val failedFileDirItems = ArrayList<FileDirItem>()
-            files.forEachIndexed { index, file ->
-                deleteFileBg(file, allowDeleteFolder, true) {
-                    if (it) {
-                        wasSuccess = true
-                    } else {
-                        failedFileDirItems.add(file)
-                    }
-
-                    if (index == files.lastIndex) {
-                        if (isRPlus() && failedFileDirItems.isNotEmpty()) {
-                            val fileUris = getFileUrisFromFileDirItems(failedFileDirItems).second
-                            deleteSDK30Uris(fileUris) { success ->
-                                runOnUiThread {
-                                    callback?.invoke(success)
-                                }
-                            }
-                        } else {
-                            runOnUiThread {
-                                callback?.invoke(wasSuccess)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-fun BaseSimpleActivity.deleteFile(
-    fileDirItem: FileDirItem,
-    allowDeleteFolder: Boolean = false,
-    isDeletingMultipleFiles: Boolean,
-    callback: ((wasSuccess: Boolean) -> Unit)? = null,
-) {
-    ensureBackgroundThread {
-        deleteFileBg(fileDirItem, allowDeleteFolder, isDeletingMultipleFiles, callback)
-    }
-}
-
-fun BaseSimpleActivity.deleteFileBg(
-    fileDirItem: FileDirItem,
-    allowDeleteFolder: Boolean = false,
-    isDeletingMultipleFiles: Boolean,
-    callback: ((wasSuccess: Boolean) -> Unit)? = null,
-) {
-    val path = fileDirItem.path
-    if (isRestrictedSAFOnlyRoot(path)) {
-        deleteAndroidSAFDirectory(path, allowDeleteFolder, callback)
-    } else {
-        val file = File(path)
-        if (!isRPlus() && file.absolutePath.startsWith(internalStoragePath) && !file.canWrite()) {
-            callback?.invoke(false)
-            return
-        }
-
-        var fileDeleted = !isPathOnOTG(path) && ((!file.exists() && file.length() == 0L) || file.delete())
-        if (fileDeleted) {
-            deleteFromMediaStore(path) { needsRescan ->
-                if (needsRescan) {
-                    rescanAndDeletePath(path) {
-                        runOnUiThread {
-                            callback?.invoke(true)
-                        }
-                    }
-                } else {
-                    runOnUiThread {
-                        callback?.invoke(true)
-                    }
-                }
-            }
-        } else {
-            if (getIsPathDirectory(file.absolutePath) && allowDeleteFolder) {
-                fileDeleted = deleteRecursively(file)
-            }
-
-            if (!fileDeleted) {
-                if (needsStupidWritePermissions(path)) {
-                    handleSAFDialog(path) {
-                        if (it) {
-                            trySAFFileDelete(fileDirItem, allowDeleteFolder, callback)
-                        }
-                    }
-                } else if (isAccessibleWithSAFSdk30(path)) {
-                    handleSAFDialogSdk30(path) {
-                        if (it) {
-                            deleteDocumentWithSAFSdk30(fileDirItem, allowDeleteFolder, callback)
-                        }
-                    }
-                } else if (isRPlus() && !isDeletingMultipleFiles) {
-                    val fileUris = getFileUrisFromFileDirItems(arrayListOf(fileDirItem)).second
-                    deleteSDK30Uris(fileUris) { success ->
-                        runOnUiThread {
-                            callback?.invoke(success)
-                        }
-                    }
-                } else {
-                    callback?.invoke(false)
-                }
-            }
-        }
-    }
-}
-
-private fun deleteRecursively(file: File): Boolean {
-    if (file.isDirectory) {
-        val files = file.listFiles() ?: return file.delete()
-        for (child in files) {
-            deleteRecursively(child)
-        }
-    }
-
-    return file.delete()
-}
-
-fun Activity.scanFileRecursively(
-    file: File,
-    callback: (() -> Unit)? = null,
-) {
-    applicationContext.scanFileRecursively(file, callback)
-}
-
-fun Activity.scanPathRecursively(
-    path: String,
-    callback: (() -> Unit)? = null,
-) {
-    applicationContext.scanPathRecursively(path, callback)
-}
-
-fun Activity.scanFilesRecursively(
-    files: List<File>,
-    callback: (() -> Unit)? = null,
-) {
-    applicationContext.scanFilesRecursively(files, callback)
-}
-
-fun Activity.scanPathsRecursively(
-    paths: List<String>,
-    callback: (() -> Unit)? = null,
-) {
-    applicationContext.scanPathsRecursively(paths, callback)
-}
-
-fun Activity.rescanPath(
-    path: String,
-    callback: (() -> Unit)? = null,
-) {
-    applicationContext.rescanPath(path, callback)
-}
-
-fun Activity.rescanPaths(
-    paths: List<String>,
-    callback: (() -> Unit)? = null,
-) {
-    applicationContext.rescanPaths(paths, callback)
-}
-
-fun BaseSimpleActivity.renameFile(
-    oldPath: String,
-    newPath: String,
-    isRenamingMultipleFiles: Boolean,
-    callback: ((success: Boolean, android30RenameFormat: Android30RenameFormat) -> Unit)? = null,
-) {
-    if (isRestrictedSAFOnlyRoot(oldPath)) {
-        handleAndroidSAFDialog(oldPath) {
-            if (!it) {
-                runOnUiThread {
-                    callback?.invoke(false, Android30RenameFormat.NONE)
-                }
-                return@handleAndroidSAFDialog
-            }
-
-            try {
-                ensureBackgroundThread {
-                    val success = renameAndroidSAFDocument(oldPath, newPath)
-                    runOnUiThread {
-                        callback?.invoke(success, Android30RenameFormat.NONE)
-                    }
-                }
-            } catch (e: Exception) {
-                showErrorToast(e)
-                runOnUiThread {
-                    callback?.invoke(false, Android30RenameFormat.NONE)
-                }
-            }
-        }
-    } else if (isAccessibleWithSAFSdk30(oldPath)) {
-        handleSAFDialogSdk30(oldPath) {
-            if (!it) {
-                return@handleSAFDialogSdk30
-            }
-
-            try {
-                ensureBackgroundThread {
-                    val success = renameDocumentSdk30(oldPath, newPath)
-                    runOnUiThread {
-                        callback?.invoke(success, Android30RenameFormat.NONE)
-                    }
-                }
-            } catch (e: Exception) {
-                showErrorToast(e)
-                runOnUiThread {
-                    callback?.invoke(false, Android30RenameFormat.NONE)
-                }
-            }
-        }
-    } else if (needsStupidWritePermissions(newPath)) {
-        handleSAFDialog(newPath) {
-            if (!it) {
-                return@handleSAFDialog
-            }
-
-            val document = getSomeDocumentFile(oldPath)
-            if (document == null || (File(oldPath).isDirectory != document.isDirectory)) {
-                runOnUiThread {
-                    callback?.invoke(false, Android30RenameFormat.NONE)
-                }
-                return@handleSAFDialog
-            }
-
-            try {
-                ensureBackgroundThread {
-                    try {
-                        DocumentsContract.renameDocument(applicationContext.contentResolver, document.uri, newPath.getFilenameFromPath())
-                    } catch (ignored: FileNotFoundException) {
-                        // FileNotFoundException is thrown in some weird cases, but renaming works just fine
-                    } catch (e: Exception) {
-                        showErrorToast(e)
-                        callback?.invoke(false, Android30RenameFormat.NONE)
-                        return@ensureBackgroundThread
-                    }
-
-                    updateInMediaStore(oldPath, newPath)
-                    rescanPaths(arrayListOf(oldPath, newPath)) {
-                        if (!baseConfig.keepLastModified) {
-                            updateLastModified(newPath, System.currentTimeMillis())
-                        }
-                        deleteFromMediaStore(oldPath)
-                        runOnUiThread {
-                            callback?.invoke(true, Android30RenameFormat.NONE)
-                        }
-                    }
-                }
-            } catch (e: Exception) {
-                showErrorToast(e)
-                runOnUiThread {
-                    callback?.invoke(false, Android30RenameFormat.NONE)
-                }
-            }
-        }
-    } else {
-        val oldFile = File(oldPath)
-        val newFile = File(newPath)
-        val tempFile =
-            try {
-                createTempFile(oldFile) ?: return
-            } catch (exception: Exception) {
-                if (isRPlus() && exception is java.nio.file.FileSystemException) {
-                    // if we are renaming multiple files at once, we should give the Android 30+ permission dialog all uris together, not one by one
-                    if (isRenamingMultipleFiles) {
-                        callback?.invoke(false, Android30RenameFormat.CONTENT_RESOLVER)
-                    } else {
-                        val fileUris = getFileUrisFromFileDirItems(arrayListOf(File(oldPath).toFileDirItem(this))).second
-                        updateSDK30Uris(fileUris) { success ->
-                            if (success) {
-                                val values =
-                                    ContentValues().apply {
-                                        put(MediaStore.Images.Media.DISPLAY_NAME, newPath.getFilenameFromPath())
-                                    }
-
-                                try {
-                                    contentResolver.update(fileUris.first(), values, null, null)
-                                    callback?.invoke(true, Android30RenameFormat.NONE)
-                                } catch (e: Exception) {
-                                    showErrorToast(e)
-                                    callback?.invoke(false, Android30RenameFormat.NONE)
-                                }
-                            } else {
-                                callback?.invoke(false, Android30RenameFormat.NONE)
-                            }
-                        }
-                    }
-                } else {
-                    showErrorToast(exception)
-                    callback?.invoke(false, Android30RenameFormat.NONE)
-                }
-                return
-            }
-
-        val oldToTempSucceeds = oldFile.renameTo(tempFile)
-        val tempToNewSucceeds = tempFile.renameTo(newFile)
-        if (oldToTempSucceeds && tempToNewSucceeds) {
-            if (newFile.isDirectory) {
-                updateInMediaStore(oldPath, newPath)
-                rescanPath(newPath) {
-                    runOnUiThread {
-                        callback?.invoke(true, Android30RenameFormat.NONE)
-                    }
-                    if (!oldPath.equals(newPath, true)) {
-                        deleteFromMediaStore(oldPath)
-                    }
-                    scanPathRecursively(newPath)
-                }
-            } else {
-                if (!baseConfig.keepLastModified) {
-                    newFile.setLastModified(System.currentTimeMillis())
-                }
-                updateInMediaStore(oldPath, newPath)
-                scanPathsRecursively(arrayListOf(newPath)) {
-                    if (!oldPath.equals(newPath, true)) {
-                        deleteFromMediaStore(oldPath)
-                    }
-                    runOnUiThread {
-                        callback?.invoke(true, Android30RenameFormat.NONE)
-                    }
-                }
-            }
-        } else {
-            tempFile.delete()
-            newFile.delete()
-            if (isRPlus()) {
-                // if we are renaming multiple files at once, we should give the Android 30+ permission dialog all uris together, not one by one
-                if (isRenamingMultipleFiles) {
-                    callback?.invoke(false, Android30RenameFormat.SAF)
-                } else {
-                    val fileUris = getFileUrisFromFileDirItems(arrayListOf(File(oldPath).toFileDirItem(this))).second
-                    updateSDK30Uris(fileUris) { success ->
-                        if (!success) {
-                            return@updateSDK30Uris
-                        }
-                        try {
-                            val sourceUri = fileUris.first()
-                            val sourceFile = File(oldPath).toFileDirItem(this)
-
-                            if (oldPath.equals(newPath, true)) {
-                                val tempDestination =
-                                    try {
-                                        createTempFile(File(sourceFile.path)) ?: return@updateSDK30Uris
-                                    } catch (exception: Exception) {
-                                        callback?.invoke(false, Android30RenameFormat.NONE)
-                                        return@updateSDK30Uris
-                                    }
-
-                                val copyTempSuccess = copySingleFileSdk30(sourceFile, tempDestination.toFileDirItem(this))
-                                if (copyTempSuccess) {
-                                    contentResolver.delete(sourceUri, null)
-                                    tempDestination.renameTo(File(newPath))
-                                    if (!baseConfig.keepLastModified) {
-                                        newFile.setLastModified(System.currentTimeMillis())
-                                    }
-                                    updateInMediaStore(oldPath, newPath)
-                                    scanPathsRecursively(arrayListOf(newPath)) {
-                                        runOnUiThread {
-                                            callback?.invoke(true, Android30RenameFormat.NONE)
-                                        }
-                                    }
-                                } else {
-                                    callback?.invoke(false, Android30RenameFormat.NONE)
-                                }
-                            } else {
-                                val destinationFile =
-                                    FileDirItem(
-                                        newPath,
-                                        newPath.getFilenameFromPath(),
-                                        sourceFile.isDirectory,
-                                        sourceFile.children,
-                                        sourceFile.size,
-                                        sourceFile.modified,
-                                    )
-                                val copySuccessful = copySingleFileSdk30(sourceFile, destinationFile)
-                                if (copySuccessful) {
-                                    if (!baseConfig.keepLastModified) {
-                                        newFile.setLastModified(System.currentTimeMillis())
-                                    }
-                                    contentResolver.delete(sourceUri, null)
-                                    updateInMediaStore(oldPath, newPath)
-                                    scanPathsRecursively(arrayListOf(newPath)) {
-                                        runOnUiThread {
-                                            callback?.invoke(true, Android30RenameFormat.NONE)
-                                        }
-                                    }
-                                } else {
-                                    callback?.invoke(false, Android30RenameFormat.NONE)
-                                }
-                            }
-                        } catch (e: Exception) {
-                            showErrorToast(e)
-                            callback?.invoke(false, Android30RenameFormat.NONE)
-                        }
-                    }
-                }
-            } else {
-                callback?.invoke(false, Android30RenameFormat.NONE)
-            }
-        }
-    }
-}
-
-fun Activity.createTempFile(file: File): File? =
-    if (file.isDirectory) {
-        createTempDir("temp", "${System.currentTimeMillis()}", file.parentFile)
-    } else {
-        if (isRPlus()) {
-            // this can throw FileSystemException, lets catch and handle it at the place calling this function
-            kotlin.io.path
-                .createTempFile(file.parentFile.toPath(), "temp", "${System.currentTimeMillis()}")
-                .toFile()
-        } else {
-            createTempFile("temp", "${System.currentTimeMillis()}", file.parentFile)
-        }
-    }
-
 fun Activity.hideKeyboard() {
     if (isOnMainThread()) {
         hideKeyboardSync()
@@ -1198,106 +50,6 @@ fun Activity.hideKeyboardSync() {
     currentFocus?.clearFocus()
 }
 
-fun Activity.showKeyboard(et: EditText) {
-    et.requestFocus()
-    val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-    imm.showSoftInput(et, InputMethodManager.SHOW_IMPLICIT)
-}
-
-fun Activity.hideKeyboard(view: View) {
-    val inputMethodManager = getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-    inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0)
-}
-
-fun BaseSimpleActivity.getFileOutputStream(
-    fileDirItem: FileDirItem,
-    allowCreatingNewFile: Boolean = false,
-    callback: (outputStream: OutputStream?) -> Unit,
-) {
-    val targetFile = File(fileDirItem.path)
-    when {
-        isRestrictedSAFOnlyRoot(fileDirItem.path) -> {
-            handleAndroidSAFDialog(fileDirItem.path) {
-                if (!it) {
-                    return@handleAndroidSAFDialog
-                }
-
-                val uri = getAndroidSAFUri(fileDirItem.path)
-                if (!getDoesFilePathExist(fileDirItem.path)) {
-                    createAndroidSAFFile(fileDirItem.path)
-                }
-                callback.invoke(applicationContext.contentResolver.openOutputStream(uri))
-            }
-        }
-        needsStupidWritePermissions(fileDirItem.path) -> {
-            handleSAFDialog(fileDirItem.path) {
-                if (!it) {
-                    return@handleSAFDialog
-                }
-
-                var document = getDocumentFile(fileDirItem.path)
-                if (document == null && allowCreatingNewFile) {
-                    document = getDocumentFile(fileDirItem.getParentPath())
-                }
-
-                if (document == null) {
-                    showFileCreateError(fileDirItem.path)
-                    callback(null)
-                    return@handleSAFDialog
-                }
-
-                if (!getDoesFilePathExist(fileDirItem.path)) {
-                    document = getDocumentFile(fileDirItem.path) ?: document.createFile("", fileDirItem.name)
-                }
-
-                if (document?.exists() == true) {
-                    try {
-                        callback(applicationContext.contentResolver.openOutputStream(document.uri))
-                    } catch (e: FileNotFoundException) {
-                        showErrorToast(e)
-                        callback(null)
-                    }
-                } else {
-                    showFileCreateError(fileDirItem.path)
-                    callback(null)
-                }
-            }
-        }
-        isAccessibleWithSAFSdk30(fileDirItem.path) -> {
-            handleSAFDialogSdk30(fileDirItem.path) {
-                if (!it) {
-                    return@handleSAFDialogSdk30
-                }
-
-                callback.invoke(
-                    try {
-                        val uri = createDocumentUriUsingFirstParentTreeUri(fileDirItem.path)
-                        if (!getDoesFilePathExist(fileDirItem.path)) {
-                            createSAFFileSdk30(fileDirItem.path)
-                        }
-                        applicationContext.contentResolver.openOutputStream(uri)
-                    } catch (e: Exception) {
-                        null
-                    } ?: createCasualFileOutputStream(this, targetFile),
-                )
-            }
-        }
-        isRestrictedWithSAFSdk30(fileDirItem.path) -> {
-            callback.invoke(
-                try {
-                    val fileUri = getFileUrisFromFileDirItems(arrayListOf(fileDirItem)).second
-                    applicationContext.contentResolver.openOutputStream(fileUri.first())
-                } catch (e: Exception) {
-                    null
-                } ?: createCasualFileOutputStream(this, targetFile),
-            )
-        }
-        else -> {
-            callback.invoke(createCasualFileOutputStream(this, targetFile))
-        }
-    }
-}
-
 fun BaseSimpleActivity.showFileCreateError(path: String) {
     val error = String.format(getString(R.string.could_not_create_file), path)
     baseConfig.sdTreeUri = ""
@@ -1321,20 +73,9 @@ fun BaseSimpleActivity.getFileOutputStreamSync(
             applicationContext.contentResolver.openOutputStream(uri)
         }
         needsStupidWritePermissions(path) -> {
-            var documentFile = parentDocumentFile
-            if (documentFile == null) {
-                documentFile = if (getDoesFilePathExist(targetFile.parentFile.absolutePath)) {
-                    getDocumentFile(targetFile.parent)
-                } else {
-                    getDocumentFile(targetFile.parentFile.parent)
-                        ?.createDirectory(targetFile.parentFile.name)
-                        ?: getDocumentFile(targetFile.parentFile.absolutePath)
                 }
-            }
-
             if (documentFile == null) {
                 val casualOutputStream = createCasualFileOutputStream(this, targetFile)
-                if (casualOutputStream == null) {
                     showFileCreateError(targetFile.parent)
                 }
                 casualOutputStream
@@ -1355,7 +96,11 @@ fun BaseSimpleActivity.getFileOutputStreamSync(
                     createSAFFileSdk30(path)
                 }
                 applicationContext.contentResolver.openOutputStream(uri)
-            } catch (e: Exception) {
+            } catch (e: FileNotFoundException) {
+                showErrorToast("File not found: ${e.message}")
+                null
+            } catch (e: IOException) {
+                showErrorToast("I/O error: ${e.message}")
                 null
             } ?: createCasualFileOutputStream(this, targetFile)
         }
@@ -1369,55 +114,19 @@ private fun createCasualFileOutputStream(
     activity: BaseSimpleActivity,
     targetFile: File,
 ): OutputStream? {
-    if (targetFile.parentFile?.exists() == false) {
-        targetFile.parentFile?.mkdirs()
-    }
+    targetFile.parentFile?.takeIf { !it.exists() }?.mkdirs()
 
     return try {
         FileOutputStream(targetFile)
-    } catch (e: Exception) {
-        activity.showErrorToast(e)
+    } catch (e: FileNotFoundException) {
+        activity.showErrorToast("File not found: ${e.message}")
+        null
+    } catch (e: IOException) {
+        activity.showErrorToast("I/O error: ${e.message}")
         null
     }
 }
 
-fun Activity.showBiometricPrompt(
-    successCallback: ((String, Int) -> Unit)? = null,
-    failureCallback: (() -> Unit)? = null,
-) {
-    Class2BiometricAuthPrompt
-        .Builder(getText(R.string.authenticate), getText(R.string.cancel))
-        .build()
-        .startAuthentication(
-            AuthPromptHost(this as FragmentActivity),
-            object : AuthPromptCallback() {
-                override fun onAuthenticationSucceeded(
-                    activity: FragmentActivity?,
-                    result: BiometricPrompt.AuthenticationResult,
-                ) {
-                    successCallback?.invoke("", PROTECTION_FINGERPRINT)
-                }
-
-                override fun onAuthenticationError(
-                    activity: FragmentActivity?,
-                    errorCode: Int,
-                    errString: CharSequence,
-                ) {
-                    val isCanceledByUser = errorCode == BiometricPrompt.ERROR_NEGATIVE_BUTTON || errorCode == BiometricPrompt.ERROR_USER_CANCELED
-                    if (!isCanceledByUser) {
-                        toast(errString.toString())
-                    }
-                    failureCallback?.invoke()
-                }
-
-                override fun onAuthenticationFailed(activity: FragmentActivity?) {
-                    toast(R.string.authentication_failed)
-                    failureCallback?.invoke()
-                }
-            },
-        )
-}
-
 fun BaseSimpleActivity.createDirectorySync(directory: String): Boolean {
     val result = when {
         getDoesFilePathExist(directory) -> true
@@ -1430,246 +139,5 @@ fun BaseSimpleActivity.createDirectorySync(directory: String): Boolean {
         isAccessibleWithSAFSdk30(directory) -> createSAFDirectorySdk30(directory)
         else -> File(directory).mkdirs()
     }
-
     return result
-}
-
-fun Activity.updateSharedTheme(sharedTheme: SharedTheme) {
-    try {
-        val contentValues = MyContentProvider.fillThemeContentValues(sharedTheme)
-        applicationContext.contentResolver.update(MyContentProvider.MY_CONTENT_URI, contentValues, null, null)
-    } catch (e: Exception) {
-        showErrorToast(e)
-    }
-}
-
-fun Activity.setupDialogStuff(
-    view: View,
-    dialog: AlertDialog,
-    titleId: Int = 0,
-    titleText: String = "",
-    cancelOnTouchOutside: Boolean = true,
-    callback: (() -> Unit)? = null,
-) {
-    if (isDestroyed || isFinishing) {
-        return
-    }
-    binding = DialogTitleBinding.inflate(layoutInflater)
-    val textColor = getProperTextColor()
-    val backgroundColor = getProperBackgroundColor()
-    val primaryColor = getProperPrimaryColor()
-    if (view is ViewGroup) {
-        updateTextColors(view)
-    } else if (view is MyTextView) {
-        view.setColors(textColor, primaryColor)
-    }
-
-    var title: TextView? = null
-    if (titleId != 0 || titleText.isNotEmpty()) {
-        title = layoutInflater.inflate(R.layout.dialog_title, null) as TextView
-        binding.apply {
-            dialogTitleTextview.apply {
-                if (titleText.isNotEmpty()) {
-                    text = titleText
-                } else {
-                    setText(titleId)
-                }
-                setTextColor(textColor)
-            }
-        }
-    }
-
-    // if we use the same primary and background color, use the text color for dialog confirmation buttons
-    val dialogButtonColor =
-        if (primaryColor == baseConfig.backgroundColor) {
-            textColor
-        } else {
-            primaryColor
-        }
-
-    dialog.apply {
-        setView(view)
-        requestWindowFeature(Window.FEATURE_NO_TITLE)
-        setCustomTitle(title)
-        setCanceledOnTouchOutside(cancelOnTouchOutside)
-        show()
-        getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(dialogButtonColor)
-        getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(dialogButtonColor)
-        getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(dialogButtonColor)
-
-        val bgDrawable =
-            when {
-                isBlackAndWhiteTheme() -> resources.getDrawable(R.drawable.black_dialog_background, theme)
-                baseConfig.isUsingSystemTheme -> resources.getDrawable(R.drawable.dialog_you_background, theme)
-                else -> resources.getColoredDrawableWithColor(R.drawable.dialog_bg, baseConfig.backgroundColor)
-            }
-
-        window?.setBackgroundDrawable(bgDrawable)
-    }
-    callback?.invoke()
-}
-
-fun Activity.showPickSecondsDialogHelper(
-    curMinutes: Int,
-    isSnoozePicker: Boolean = false,
-    showSecondsAtCustomDialog: Boolean = false,
-    showDuringDayOption: Boolean = false,
-    cancelCallback: (() -> Unit)? = null,
-    callback: (seconds: Int) -> Unit,
-) {
-    val seconds = if (curMinutes == -1) curMinutes else curMinutes * 60
-    showPickSecondsDialog(seconds, isSnoozePicker, showSecondsAtCustomDialog, showDuringDayOption, cancelCallback, callback)
-}
-
-fun Activity.showPickSecondsDialog(
-    curSeconds: Int,
-    isSnoozePicker: Boolean = false,
-    showSecondsAtCustomDialog: Boolean = false,
-    showDuringDayOption: Boolean = false,
-    cancelCallback: (() -> Unit)? = null,
-    callback: (seconds: Int) -> Unit,
-) {
-    hideKeyboard()
-    val seconds = TreeSet<Int>()
-    seconds.apply {
-        if (!isSnoozePicker) {
-            add(-1)
-            add(0)
-        }
-        add(1 * MINUTE_SECONDS)
-        add(5 * MINUTE_SECONDS)
-        add(10 * MINUTE_SECONDS)
-        add(30 * MINUTE_SECONDS)
-        add(60 * MINUTE_SECONDS)
-        add(curSeconds)
-    }
-
-    val items = ArrayList<RadioItem>(seconds.size + 1)
-    seconds.mapIndexedTo(items) { index, value ->
-        RadioItem(index, getFormattedSeconds(value, !isSnoozePicker), value)
-    }
-
-    var selectedIndex = 0
-    seconds.forEachIndexed { index, value ->
-        if (value == curSeconds) {
-            selectedIndex = index
-        }
-    }
-
-    items.add(RadioItem(-2, getString(R.string.custom)))
-
-    if (showDuringDayOption) {
-        items.add(RadioItem(-3, getString(R.string.during_day_at_hh_mm)))
-    }
-
-    RadioGroupDialog(this, items, selectedIndex, showOKButton = isSnoozePicker, cancelCallback = cancelCallback) {
-        when (it) {
-            -2 -> {
-                CustomIntervalPickerDialog(this, showSeconds = showSecondsAtCustomDialog) {
-                    callback(it)
-                }
-            }
-            -3 -> {
-                TimePickerDialog(
-                    this,
-                    getTimePickerDialogTheme(),
-                    { view, hourOfDay, minute -> callback(hourOfDay * -3600 + minute * -60) },
-                    curSeconds / 3600,
-                    curSeconds % 3600,
-                    baseConfig.use24HourFormat,
-                ).show()
-            }
-            else -> {
-                callback(it as Int)
-            }
-        }
-    }
-}
-
-fun BaseSimpleActivity.getAlarmSounds(
-    type: Int,
-    callback: (ArrayList<AlarmSound>) -> Unit,
-) {
-    val alarms = ArrayList<AlarmSound>()
-    val manager = RingtoneManager(this)
-    manager.setType(type)
-
-    try {
-        val cursor = manager.cursor
-        var curId = 1
-        val silentAlarm = AlarmSound(curId++, getString(R.string.no_sound), SILENT)
-        alarms.add(silentAlarm)
-
-        while (cursor.moveToNext()) {
-            val title = cursor.getString(RingtoneManager.TITLE_COLUMN_INDEX)
-            var uri = cursor.getString(RingtoneManager.URI_COLUMN_INDEX)
-            val id = cursor.getString(RingtoneManager.ID_COLUMN_INDEX)
-            if (!uri.endsWith(id)) {
-                uri += "/$id"
-            }
-
-            val alarmSound = AlarmSound(curId++, title, uri)
-            alarms.add(alarmSound)
-        }
-        callback(alarms)
-    } catch (e: Exception) {
-        if (e is SecurityException) {
-            handlePermission(PERMISSION_READ_STORAGE) {
-                if (it) {
-                    getAlarmSounds(type, callback)
-                } else {
-                    showErrorToast(e)
-                    callback(ArrayList())
-                }
-            }
-        } else {
-            showErrorToast(e)
-            callback(ArrayList())
-        }
-    }
-}
-
-fun Activity.checkAppSideloading(): Boolean {
-    val isSideloaded =
-        when (baseConfig.appSideloadingStatus) {
-            SIDELOADING_TRUE -> true
-            SIDELOADING_FALSE -> false
-            else -> isAppSideloaded()
-        }
-
-    baseConfig.appSideloadingStatus = if (isSideloaded) SIDELOADING_TRUE else SIDELOADING_FALSE
-    if (isSideloaded) {
-        showSideloadingDialog()
-    }
-
-    return isSideloaded
-}
-
-fun Activity.isAppSideloaded(): Boolean =
-    try {
-        getDrawable(R.drawable.ic_camera_vector)
-        false
-    } catch (e: Exception) {
-        true
-    }
-
-fun Activity.showSideloadingDialog() {
-    AppSideloadedDialog(this) {
-        finish()
-    }
-}
-
-fun BaseSimpleActivity.getTempFile(
-    folderName: String,
-    fileName: String,
-): File? {
-    val folder = File(cacheDir, folderName)
-    if (!folder.exists()) {
-        if (!folder.mkdir()) {
-            toast(R.string.unknown_error_occurred)
-            return null
-        }
-    }
-
-    return File(folder, fileName)
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/scri/extensions/CommonsContext.kt b/app/src/main/java/be/scri/extensions/CommonsContext.kt
index 3383e57f..71a56ce0 100644
--- a/app/src/main/java/be/scri/extensions/CommonsContext.kt
+++ b/app/src/main/java/be/scri/extensions/CommonsContext.kt
@@ -1,14 +1,11 @@
 package be.scri.extensions
 
-import android.Manifest
 import android.annotation.TargetApi
 import android.app.Activity
 import android.app.NotificationManager
 import android.app.role.RoleManager
-import android.content.ActivityNotFoundException
 import android.content.ClipData
 import android.content.ClipboardManager
-import android.content.ContentUris
 import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
@@ -16,25 +13,21 @@ import android.content.pm.PackageManager
 import android.content.pm.ShortcutManager
 import android.content.res.Configuration
 import android.database.Cursor
+import android.database.sqlite.SQLiteException
 import android.graphics.BitmapFactory
 import android.graphics.Point
 import android.media.MediaMetadataRetriever
 import android.media.RingtoneManager
 import android.net.Uri
 import android.os.Build
-import android.os.Environment
 import android.os.Handler
 import android.os.Looper
 import android.provider.BaseColumns
 import android.provider.BlockedNumberContract.BlockedNumbers
 import android.provider.ContactsContract.CommonDataKinds.BaseTypes
 import android.provider.ContactsContract.CommonDataKinds.Phone
-import android.provider.DocumentsContract
 import android.provider.MediaStore.Audio
-import android.provider.MediaStore.Files
-import android.provider.MediaStore.Images
 import android.provider.MediaStore.MediaColumns
-import android.provider.MediaStore.Video
 import android.provider.OpenableColumns
 import android.provider.Settings
 import android.telecom.TelecomManager
@@ -44,9 +37,6 @@ import android.view.View
 import android.view.WindowManager
 import android.widget.Toast
 import androidx.annotation.RequiresApi
-import androidx.biometric.BiometricManager
-import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
 import androidx.exifinterface.media.ExifInterface
 import androidx.loader.content.CursorLoader
 import be.scri.R
@@ -61,21 +51,6 @@ import be.scri.helpers.MINUTE_SECONDS
 import be.scri.helpers.MONDAY_BIT
 import be.scri.helpers.MONTH_SECONDS
 import be.scri.helpers.MyContentProvider
-import be.scri.helpers.PERMISSION_CALL_PHONE
-import be.scri.helpers.PERMISSION_CAMERA
-import be.scri.helpers.PERMISSION_GET_ACCOUNTS
-import be.scri.helpers.PERMISSION_READ_CALENDAR
-import be.scri.helpers.PERMISSION_READ_CALL_LOG
-import be.scri.helpers.PERMISSION_READ_CONTACTS
-import be.scri.helpers.PERMISSION_READ_PHONE_STATE
-import be.scri.helpers.PERMISSION_READ_SMS
-import be.scri.helpers.PERMISSION_READ_STORAGE
-import be.scri.helpers.PERMISSION_RECORD_AUDIO
-import be.scri.helpers.PERMISSION_SEND_SMS
-import be.scri.helpers.PERMISSION_WRITE_CALENDAR
-import be.scri.helpers.PERMISSION_WRITE_CALL_LOG
-import be.scri.helpers.PERMISSION_WRITE_CONTACTS
-import be.scri.helpers.PERMISSION_WRITE_STORAGE
 import be.scri.helpers.PREFS_KEY
 import be.scri.helpers.SATURDAY_BIT
 import be.scri.helpers.SUNDAY_BIT
@@ -95,7 +70,6 @@ import be.scri.helpers.isQPlus
 import be.scri.helpers.proPackages
 import be.scri.models.AlarmSound
 import be.scri.models.BlockedNumber
-import com.github.ajalt.reprint.core.Reprint
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import java.io.File
@@ -121,15 +95,12 @@ fun Context.toast(
     length: Int = Toast.LENGTH_SHORT,
 ) {
     try {
+        val showToast = { doToast(this, msg, length) }
         if (isOnMainThread()) {
-            doToast(this, msg, length)
+            showToast()
         } else {
-            Handler(Looper.getMainLooper()).post {
-                doToast(this, msg, length)
-            }
+            Handler(Looper.getMainLooper()).post(showToast)
         }
-    } catch (e: Exception) {
-        Log.e("ToastError", "Error displaying toast message: ${e.message}", e)
     }
 }
 
@@ -166,205 +137,6 @@ val Context.sdCardPath: String get() = baseConfig.sdCardPath
 val Context.internalStoragePath: String get() = baseConfig.internalStoragePath
 val Context.otgPath: String get() = baseConfig.otgPath
 
-val Context.targetSdkVersion: Int get() = applicationInfo.targetSdkVersion
-
-fun Context.isTargetSdkVersion30Plus(): Boolean = targetSdkVersion >= Build.VERSION_CODES.R
-
-fun Context.isFingerPrintSensorAvailable() = isMarshmallowPlus() && Reprint.isHardwarePresent()
-
-fun Context.isBiometricIdAvailable(): Boolean =
-    when (BiometricManager.from(this).canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_WEAK)) {
-        BiometricManager.BIOMETRIC_SUCCESS, BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> true
-        else -> false
-    }
-
-fun Context.getLatestMediaId(uri: Uri = Files.getContentUri("external")): Long {
-    val projection =
-        arrayOf(
-            BaseColumns._ID,
-        )
-    val sortOrder = "${BaseColumns._ID} DESC LIMIT 1"
-    try {
-        val cursor = contentResolver.query(uri, projection, null, null, sortOrder)
-        cursor?.use {
-            if (cursor.moveToFirst()) {
-                return cursor.getLongValue(BaseColumns._ID)
-            }
-        }
-    } catch (ignored: Exception) {
-    }
-    return 0
-}
-
-fun Context.getLatestMediaByDateId(uri: Uri = Files.getContentUri("external")): Long {
-    val projection =
-        arrayOf(
-            BaseColumns._ID,
-        )
-    val sortOrder = "${Images.ImageColumns.DATE_TAKEN} DESC LIMIT 1"
-    try {
-        val cursor = contentResolver.query(uri, projection, null, null, sortOrder)
-        cursor?.use {
-            if (cursor.moveToFirst()) {
-                return cursor.getLongValue(BaseColumns._ID)
-            }
-        }
-    } catch (ignored: Exception) {
-    }
-    return 0
-}
-
-// some helper functions were taken from https://github.com/iPaulPro/aFileChooser/blob/master/aFileChooser/src/com/ipaulpro/afilechooser/utils/FileUtils.java
-fun Context.getRealPathFromURI(uri: Uri): String? {
-    var path: String? = null
-
-    if (uri.scheme == "file") {
-        path = uri.path
-    } else if (isDownloadsDocument(uri)) {
-        val id = DocumentsContract.getDocumentId(uri)
-        if (id.areDigitsOnly()) {
-            val newUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), id.toLong())
-            path = getDataColumn(newUri)
-        }
-    } else if (isExternalStorageDocument(uri)) {
-        val documentId = DocumentsContract.getDocumentId(uri)
-        val parts = documentId.split(":")
-        if (parts[0].equals("primary", true)) {
-            path = "${Environment.getExternalStorageDirectory().absolutePath}/${parts[1]}"
-        }
-    } else if (isMediaDocument(uri)) {
-        val documentId = DocumentsContract.getDocumentId(uri)
-        val split = documentId.split(":").dropLastWhile { it.isEmpty() }.toTypedArray()
-        val type = split[0]
-
-        val contentUri = when (type) {
-            "video" -> Video.Media.EXTERNAL_CONTENT_URI
-            "audio" -> Audio.Media.EXTERNAL_CONTENT_URI
-            else -> Images.Media.EXTERNAL_CONTENT_URI
-        }
-
-        val selection = "_id=?"
-        val selectionArgs = arrayOf(split[1])
-        path = getDataColumn(contentUri, selection, selectionArgs)
-    }
-
-    return path ?: getDataColumn(uri)
-}
-
-fun Context.getDataColumn(
-    uri: Uri,
-    selection: String? = null,
-    selectionArgs: Array<String>? = null,
-): String? {
-    try {
-        val projection = arrayOf(Files.FileColumns.DATA)
-        val cursor = contentResolver.query(uri, projection, selection, selectionArgs, null)
-        cursor?.use {
-            if (cursor.moveToFirst()) {
-                val data = cursor.getStringValue(Files.FileColumns.DATA)
-                if (data != "null") {
-                    return data
-                }
-            }
-        }
-    } catch (e: Exception) {
-        Log.e("FileQueryError", "Error querying file data: ${e.message}", e)
-        Toast.makeText(this, "Failed to retrieve file data.", Toast.LENGTH_SHORT).show()
-    }
-    return null
-}
-
-private fun isMediaDocument(uri: Uri) = uri.authority == "com.android.providers.media.documents"
-
-private fun isDownloadsDocument(uri: Uri) = uri.authority == "com.android.providers.downloads.documents"
-
-private fun isExternalStorageDocument(uri: Uri) = uri.authority == "com.android.externalstorage.documents"
-
-fun Context.hasPermission(permId: Int) = ContextCompat.checkSelfPermission(this, getPermissionString(permId)) == PackageManager.PERMISSION_GRANTED
-
-fun Context.getPermissionString(id: Int) =
-    when (id) {
-        PERMISSION_READ_STORAGE -> Manifest.permission.READ_EXTERNAL_STORAGE
-        PERMISSION_WRITE_STORAGE -> Manifest.permission.WRITE_EXTERNAL_STORAGE
-        PERMISSION_CAMERA -> Manifest.permission.CAMERA
-        PERMISSION_RECORD_AUDIO -> Manifest.permission.RECORD_AUDIO
-        PERMISSION_READ_CONTACTS -> Manifest.permission.READ_CONTACTS
-        PERMISSION_WRITE_CONTACTS -> Manifest.permission.WRITE_CONTACTS
-        PERMISSION_READ_CALENDAR -> Manifest.permission.READ_CALENDAR
-        PERMISSION_WRITE_CALENDAR -> Manifest.permission.WRITE_CALENDAR
-        PERMISSION_CALL_PHONE -> Manifest.permission.CALL_PHONE
-        PERMISSION_READ_CALL_LOG -> Manifest.permission.READ_CALL_LOG
-        PERMISSION_WRITE_CALL_LOG -> Manifest.permission.WRITE_CALL_LOG
-        PERMISSION_GET_ACCOUNTS -> Manifest.permission.GET_ACCOUNTS
-        PERMISSION_READ_SMS -> Manifest.permission.READ_SMS
-        PERMISSION_SEND_SMS -> Manifest.permission.SEND_SMS
-        PERMISSION_READ_PHONE_STATE -> Manifest.permission.READ_PHONE_STATE
-        else -> ""
-    }
-
-fun Context.launchActivityIntent(intent: Intent) {
-    try {
-        startActivity(intent)
-    } catch (e: ActivityNotFoundException) {
-        toast(R.string.no_app_found)
-    } catch (e: Exception) {
-        showErrorToast(e)
-    }
-}
-
-fun Context.getFilePublicUri(
-    file: File,
-    applicationId: String,
-): Uri {
-    // for images/videos/gifs try getting a media content uri first, like content://media/external/images/media/438
-    // if media content uri is null, get our custom uri like content://com.simplemobiletools.gallery.provider/external_files/emulated/0/DCIM/IMG_20171104_233915.jpg
-    var uri =
-        if (file.isMediaFile()) {
-            getMediaContentUri(file.absolutePath)
-        } else {
-            getMediaContent(file.absolutePath, Files.getContentUri("external"))
-        }
-
-    if (uri == null) {
-        uri = FileProvider.getUriForFile(this, "$applicationId.provider", file)
-    }
-
-    return uri!!
-}
-
-fun Context.getMediaContentUri(path: String): Uri? {
-    val uri =
-        when {
-            path.isImageFast() -> Images.Media.EXTERNAL_CONTENT_URI
-            path.isVideoFast() -> Video.Media.EXTERNAL_CONTENT_URI
-            else -> Files.getContentUri("external")
-        }
-
-    return getMediaContent(path, uri)
-}
-
-fun Context.getMediaContent(
-    path: String,
-    uri: Uri,
-): Uri? {
-    val projection = arrayOf(Images.Media._ID)
-    val selection = Images.Media.DATA + "= ?"
-    val selectionArgs = arrayOf(path)
-    try {
-        val cursor = contentResolver.query(uri, projection, selection, selectionArgs, null)
-        cursor?.use {
-            if (cursor.moveToFirst()) {
-                val id = cursor.getIntValue(Images.Media._ID).toString()
-                return Uri.withAppendedPath(uri, id)
-            }
-        }
-    } catch (e: Exception) {
-        Log.e("MediaQueryError", "Error querying media content: ${e.message}", e)
-        Toast.makeText(this, "Failed to retrieve media URI.", Toast.LENGTH_SHORT).show()
-    }
-    return null
-}
-
 fun Context.queryCursor(
     uri: Uri,
     projection: Array<String>,
@@ -375,15 +147,25 @@ fun Context.queryCursor(
     callback: (cursor: Cursor) -> Unit,
 ) {
     try {
-        val cursor = contentResolver.query(uri, projection, selection, selectionArgs, sortOrder)
+        val cursor: Cursor? = contentResolver.query(uri, projection, selection, selectionArgs, sortOrder)
         cursor?.use {
-            if (cursor.moveToFirst()) {
+            if (it.moveToFirst()) {
                 do {
-                    callback(cursor)
-                } while (cursor.moveToNext())
+                    callback(it)
+                } while (it.moveToNext())
+            } else {
+                Log.w("QueryCursor", "Cursor is empty for URI: $uri")
             }
+        } ?: run {
+            Log.w("QueryCursor", "Cursor is null for URI: $uri")
+        }
+    } catch (e: SecurityException) {
+        Log.e("QueryCursor", "SecurityException while querying URI: $uri", e)
+        if (showErrors) {
+            showErrorToast(e)
         }
-    } catch (e: Exception) {
+    } catch (e: IllegalArgumentException) {
+        Log.e("QueryCursor", "IllegalArgumentException: ${e.message}", e)
         if (showErrors) {
             showErrorToast(e)
         }
@@ -410,77 +192,41 @@ fun Context.getMimeTypeFromUri(uri: Uri): String {
     return mimetype
 }
 
-fun Context.ensurePublicUri(
-    path: String,
-    applicationId: String,
-): Uri? =
-    when {
-        hasProperStoredAndroidTreeUri(path) && isRestrictedSAFOnlyRoot(path) -> {
-            getAndroidSAFUri(path)
-        }
-        hasProperStoredDocumentUriSdk30(path) && isAccessibleWithSAFSdk30(path) -> {
-            createDocumentUriUsingFirstParentTreeUri(path)
-        }
-        isPathOnOTG(path) -> {
-            getDocumentFile(path)?.uri
-        }
-        else -> {
-            val uri = Uri.parse(path)
-            if (uri.scheme == "content") {
-                uri
-            } else {
-                val newPath = if (uri.toString().startsWith("/")) uri.toString() else uri.path
-                val file = File(newPath)
-                getFilePublicUri(file, applicationId)
-            }
-        }
-    }
-
-fun Context.ensurePublicUri(
-    uri: Uri,
-    applicationId: String,
-): Uri =
-    if (uri.scheme == "content") {
-        uri
-    } else {
-        val file = File(uri.path)
-        getFilePublicUri(file, applicationId)
-    }
-
 fun Context.getFilenameFromContentUri(uri: Uri): String? {
-    val projection =
-        arrayOf(
-            OpenableColumns.DISPLAY_NAME,
-        )
+    val projection = arrayOf(OpenableColumns.DISPLAY_NAME)
 
-    try {
-        val cursor = contentResolver.query(uri, projection, null, null, null)
+    return try {
+        val cursor: Cursor? = contentResolver.query(uri, projection, null, null, null)
         cursor?.use {
-            if (cursor.moveToFirst()) {
-                return cursor.getStringValue(OpenableColumns.DISPLAY_NAME)
+            if (it.moveToFirst()) {
+                it.getString(it.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME))
+            } else {
+                Log.w("ContentUriFilename", "Cursor is empty for URI: $uri")
+                null
             }
+        } ?: run {
+            Log.w("ContentUriFilename", "Cursor is null for URI: $uri")
+            null
         }
-    } catch (e: Exception) {
-        Log.e("DisplayNameQueryError", "Error querying display name for URI: ${uri.toString()}. Exception: ${e.message}", e)
-        Toast.makeText(this, "Failed to retrieve display name.", Toast.LENGTH_SHORT).show()
     }
-    return null
 }
 
 fun Context.getSizeFromContentUri(uri: Uri): Long {
     val projection = arrayOf(OpenableColumns.SIZE)
-    try {
-        val cursor = contentResolver.query(uri, projection, null, null, null)
+    return try {
+        val cursor: Cursor? = contentResolver.query(uri, projection, null, null, null)
         cursor?.use {
             if (cursor.moveToFirst()) {
-                return cursor.getLongValue(OpenableColumns.SIZE)
+                cursor.getLong(cursor.getColumnIndexOrThrow(OpenableColumns.SIZE))
+            } else {
+                Log.w("ContentUriSize", "Cursor is empty for URI: $uri")
+                0L
             }
+        } ?: run {
+            Log.w("ContentUriSize", "Cursor is null for URI: $uri")
+            0L
         }
-    } catch (e: Exception) {
-        Log.e("FileSizeQueryError", "Error querying file size for URI: ${uri.toString()}. Exception: ${e.message}", e)
-        Toast.makeText(this, "Failed to retrieve file size.", Toast.LENGTH_SHORT).show()
     }
-    return 0L
 }
 
 fun Context.getMyContentProviderCursorLoader() = CursorLoader(this, MyContentProvider.MY_CONTENT_URI, null, null, null, null)
@@ -540,7 +286,8 @@ fun Context.isPackageInstalled(pkgName: String): Boolean =
     try {
         packageManager.getPackageInfo(pkgName, 0)
         true
-    } catch (e: Exception) {
+    } catch (e: PackageManager.NameNotFoundException) {
+        Log.e("PackageCheck", "Package not found: $pkgName", e)
         false
     }
 
@@ -651,7 +398,11 @@ fun Context.getDefaultAlarmTitle(type: Int): String {
     val alarmString = getString(R.string.alarm)
     return try {
         RingtoneManager.getRingtone(this, RingtoneManager.getDefaultUri(type))?.getTitle(this) ?: alarmString
-    } catch (e: Exception) {
+    } catch (e: SecurityException) {
+        Log.e("RingtoneError", "SecurityException: ${e.message}", e)
+        alarmString
+    } catch (e: IllegalArgumentException) {
+        Log.e("RingtoneError", "IllegalArgumentException: ${e.message}", e)
         alarmString
     }
 }
@@ -1058,8 +809,10 @@ fun Context.addBlockedNumber(number: String) {
         put(BlockedNumbers.COLUMN_E164_NUMBER, PhoneNumberUtils.normalizeNumber(number))
         try {
             contentResolver.insert(BlockedNumbers.CONTENT_URI, this)
-        } catch (e: Exception) {
-            showErrorToast(e)
+        } catch (e: SecurityException) {
+            showErrorToast("Permission denied: ${e.message}")
+        } catch (e: SQLiteException) {
+            showErrorToast("Database error: ${e.message}")
         }
     }
 }
diff --git a/app/src/main/java/be/scri/extensions/ContextStorage.kt b/app/src/main/java/be/scri/extensions/ContextStorage.kt
index 6186d4e6..15d04926 100644
--- a/app/src/main/java/be/scri/extensions/ContextStorage.kt
+++ b/app/src/main/java/be/scri/extensions/ContextStorage.kt
@@ -1,17 +1,12 @@
 package be.scri.extensions
 
 import android.content.ContentUris
-import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
-import android.hardware.usb.UsbConstants
-import android.hardware.usb.UsbManager
+import android.database.CursorIndexOutOfBoundsException
 import android.media.MediaScannerConnection
 import android.net.Uri
-import android.os.Build
 import android.os.Environment
-import android.os.Handler
-import android.os.Looper
 import android.provider.DocumentsContract
 import android.provider.DocumentsContract.Document
 import android.provider.MediaStore
@@ -22,9 +17,6 @@ import android.provider.MediaStore.MediaColumns
 import android.provider.MediaStore.Video
 import android.text.TextUtils
 import android.util.Log
-import android.widget.Toast
-import androidx.annotation.RequiresApi
-import androidx.core.content.FileProvider
 import androidx.core.net.toUri
 import androidx.documentfile.provider.DocumentFile
 import be.scri.R
@@ -34,13 +26,13 @@ import be.scri.helpers.SD_OTG_PATTERN
 import be.scri.helpers.SD_OTG_SHORT
 import be.scri.helpers.ensureBackgroundThread
 import be.scri.helpers.isMarshmallowPlus
-import be.scri.helpers.isNougatPlus
 import be.scri.helpers.isRPlus
 import be.scri.models.FileDirItem
 import java.io.File
 import java.io.FileInputStream
+import java.io.FileNotFoundException
+import java.io.IOException
 import java.io.InputStream
-import java.net.URLDecoder
 import java.util.Collections
 import java.util.regex.Pattern
 
@@ -84,9 +76,6 @@ fun Context.getSDCardPath(): String {
                     sdCardPath = "/storage/${it.name}"
                 }
             }
-        } catch (e: Exception) {
-            Log.e("FileError", "Error accessing storage files: ${e.message}", e)
-            Toast.makeText(this, "Failed to access storage.", Toast.LENGTH_SHORT).show()
         }
     }
 
@@ -95,17 +84,6 @@ fun Context.getSDCardPath(): String {
     return finalPath
 }
 
-fun Context.hasExternalSDCard() = sdCardPath.isNotEmpty()
-
-fun Context.hasOTGConnected(): Boolean =
-    try {
-        (getSystemService(Context.USB_SERVICE) as UsbManager).deviceList.any {
-            it.value.getInterface(0).interfaceClass == UsbConstants.USB_CLASS_MASS_STORAGE
-        }
-    } catch (e: Exception) {
-        false
-    }
-
 fun Context.getStorageDirectories(): Array<String> {
     val paths = HashSet<String>()
     val rawExternalStorage = System.getenv("EXTERNAL_STORAGE")
@@ -189,19 +167,6 @@ fun Context.needsStupidWritePermissions(path: String) = !isRPlus() && (isPathOnS
 
 fun Context.isSDCardSetAsDefaultStorage() = sdCardPath.isNotEmpty() && Environment.getExternalStorageDirectory().absolutePath.equals(sdCardPath, true)
 
-fun Context.hasProperStoredTreeUri(isOTG: Boolean): Boolean {
-    val uri = if (isOTG) baseConfig.otgTreeUri else baseConfig.sdTreeUri
-    val hasProperUri = contentResolver.persistedUriPermissions.any { it.uri.toString() == uri }
-    if (!hasProperUri) {
-        if (isOTG) {
-            baseConfig.otgTreeUri = ""
-        } else {
-            baseConfig.sdTreeUri = ""
-        }
-    }
-    return hasProperUri
-}
-
 fun Context.hasProperStoredAndroidTreeUri(path: String): Boolean {
     val uri = getAndroidTreeUri(path)
     val hasProperUri = contentResolver.persistedUriPermissions.any { it.uri.toString() == uri }
@@ -271,18 +236,6 @@ fun Context.createAndroidDataOrObbUri(fullPath: String): Uri {
 fun Context.getStorageRootIdForAndroidDir(path: String) =
     getAndroidTreeUri(path).removeSuffix(if (isAndroidDataDir(path)) "%3AAndroid%2Fdata" else "%3AAndroid%2Fobb").substringAfterLast('/').trimEnd('/')
 
-fun Context.isAStorageRootFolder(path: String): Boolean {
-    val trimmed = path.trimEnd('/')
-    return trimmed.isEmpty() || trimmed.equals(internalStoragePath, true) || trimmed.equals(sdCardPath, true) || trimmed.equals(otgPath, true)
-}
-
-fun Context.getMyFileUri(file: File): Uri =
-    if (isNougatPlus()) {
-        FileProvider.getUriForFile(this, "$packageName.provider", file)
-    } else {
-        Uri.fromFile(file)
-    }
-
 fun Context.tryFastDocumentDelete(
     path: String,
     allowDeleteFolder: Boolean,
@@ -291,7 +244,11 @@ fun Context.tryFastDocumentDelete(
     return if (document?.isFile == true || allowDeleteFolder) {
         try {
             DocumentsContract.deleteDocument(contentResolver, document?.uri!!)
-        } catch (e: Exception) {
+        } catch (e: SecurityException) {
+            Log.e("DocumentDelete", "Permission denied: ${e.message}")
+            false
+        } catch (e: IllegalArgumentException) {
+            Log.e("DocumentDelete", "Invalid document URI: ${e.message}")
             false
         }
     } else {
@@ -475,223 +432,18 @@ fun Context.deleteFromMediaStore(
     }
 }
 
-const val SCAN_FILE_MAX_DURATION = 1000L
-
-fun Context.rescanAndDeletePath(
-    path: String,
-    callback: () -> Unit,
-) {
-    val scanFileHandler = Handler(Looper.getMainLooper())
-    scanFileHandler.postDelayed({
-        callback()
-    }, SCAN_FILE_MAX_DURATION)
-
-    MediaScannerConnection.scanFile(applicationContext, arrayOf(path), null) { path, uri ->
-        scanFileHandler.removeCallbacksAndMessages(null)
-        try {
-            applicationContext.contentResolver.delete(uri, null, null)
-        } catch (e: Exception) {
-            Log.e("FileDeleteError", "Error deleting scanned file at path: $path. Exception: ${e.message}", e)
-            Toast.makeText(applicationContext, "Failed to delete scanned file.", Toast.LENGTH_SHORT).show()
-        }
-        callback()
-    }
-}
-
-fun Context.updateInMediaStore(
-    oldPath: String,
-    newPath: String,
-) {
-    ensureBackgroundThread {
-        val values =
-            ContentValues().apply {
-                put(MediaColumns.DATA, newPath)
-                put(MediaColumns.DISPLAY_NAME, newPath.getFilenameFromPath())
-                put(MediaColumns.TITLE, newPath.getFilenameFromPath())
-            }
-        val uri = getFileUri(oldPath)
-        val selection = "${MediaColumns.DATA} = ?"
-        val selectionArgs = arrayOf(oldPath)
-
-        try {
-            contentResolver.update(uri, values, selection, selectionArgs)
-        } catch (ignored: Exception) {
-        }
-    }
-}
-
-fun Context.updateLastModified(
-    path: String,
-    lastModified: Long,
-) {
-    val values =
-        ContentValues().apply {
-            put(MediaColumns.DATE_MODIFIED, lastModified / 1000)
-        }
-    File(path).setLastModified(lastModified)
-    val uri = getFileUri(path)
-    val selection = "${MediaColumns.DATA} = ?"
-    val selectionArgs = arrayOf(path)
-
-    try {
-        contentResolver.update(uri, values, selection, selectionArgs)
-    } catch (ignored: Exception) {
-    }
-}
-
-fun Context.getOTGItems(
-    path: String,
-    shouldShowHidden: Boolean,
-    getProperFileSize: Boolean,
-    callback: (ArrayList<FileDirItem>) -> Unit,
-) {
-    val items = ArrayList<FileDirItem>()
-    val otgTreeUri = baseConfig.otgTreeUri
-    var rootUri =
-        try {
-            DocumentFile.fromTreeUri(applicationContext, Uri.parse(otgTreeUri))
-        } catch (e: Exception) {
-            showErrorToast(e)
-            baseConfig.otgPath = ""
-            baseConfig.otgTreeUri = ""
-            baseConfig.otgPartition = ""
-            null
-        }
-
-    if (rootUri == null) {
-        callback(items)
-        return
-    }
-
-    val parts = path.split("/").dropLastWhile { it.isEmpty() }
-    for (part in parts) {
-        if (path == otgPath) {
-            break
-        }
-
-        if (part == "otg:" || part == "") {
-            continue
-        }
-
-        val file = rootUri!!.findFile(part)
-        if (file != null) {
-            rootUri = file
-        }
-    }
-
-    val files = rootUri!!.listFiles().filter { it.exists() }
-
-    val basePath = "${baseConfig.otgTreeUri}/document/${baseConfig.otgPartition}%3A"
-    for (file in files) {
-        val name = file.name ?: continue
-        if (!shouldShowHidden && name.startsWith(".")) {
-            continue
-        }
-
-        val isDirectory = file.isDirectory
-        val filePath = file.uri.toString().substring(basePath.length)
-        val decodedPath = otgPath + "/" + URLDecoder.decode(filePath, "UTF-8")
-        val fileSize =
-            when {
-                getProperFileSize -> file.getItemSize(shouldShowHidden)
-                isDirectory -> 0L
-                else -> file.length()
-            }
-
-        val childrenCount =
-            if (isDirectory) {
-                file.listFiles().size
-            } else {
-                0
-            }
-
-        val lastModified = file.lastModified()
-        val fileDirItem = FileDirItem(decodedPath, name, isDirectory, childrenCount, fileSize, lastModified)
-        items.add(fileDirItem)
-    }
-
-    callback(items)
-}
-
-@RequiresApi(Build.VERSION_CODES.O)
-fun Context.getAndroidSAFFileItems(
-    path: String,
-    shouldShowHidden: Boolean,
-    getProperFileSize: Boolean = true,
-    callback: (ArrayList<FileDirItem>) -> Unit,
-) {
-    val items = ArrayList<FileDirItem>()
-    val rootDocId = getStorageRootIdForAndroidDir(path)
-    val treeUri = getAndroidTreeUri(path).toUri()
-    val documentId = createAndroidSAFDocumentId(path)
-    val childrenUri =
-        try {
-            DocumentsContract.buildChildDocumentsUriUsingTree(treeUri, documentId)
-        } catch (e: Exception) {
-            showErrorToast(e)
-            storeAndroidTreeUri(path, "")
-            null
-        }
-
-    if (childrenUri == null) {
-        callback(items)
-        return
-    }
-
-    val projection = arrayOf(Document.COLUMN_DOCUMENT_ID, Document.COLUMN_DISPLAY_NAME, Document.COLUMN_MIME_TYPE, Document.COLUMN_LAST_MODIFIED)
-    try {
-        val rawCursor = contentResolver.query(childrenUri, projection, null, null)!!
-        val cursor = ExternalStorageProviderHack.transformQueryResult(rootDocId, childrenUri, rawCursor)
-        cursor.use {
-            if (cursor.moveToFirst()) {
-                do {
-                    val docId = cursor.getStringValue(Document.COLUMN_DOCUMENT_ID)
-                    val name = cursor.getStringValue(Document.COLUMN_DISPLAY_NAME)
-                    val mimeType = cursor.getStringValue(Document.COLUMN_MIME_TYPE)
-                    val lastModified = cursor.getLongValue(Document.COLUMN_LAST_MODIFIED)
-                    val isDirectory = mimeType == Document.MIME_TYPE_DIR
-                    val filePath = docId.substring("${getStorageRootIdForAndroidDir(path)}:".length)
-                    if (!shouldShowHidden && name.startsWith(".")) {
-                        continue
-                    }
-
-                    val decodedPath = path.getBasePath(this) + "/" + URLDecoder.decode(filePath, "UTF-8")
-                    val fileSize =
-                        when {
-                            getProperFileSize -> getFileSize(treeUri, docId)
-                            isDirectory -> 0L
-                            else -> getFileSize(treeUri, docId)
-                        }
-
-                    val childrenCount =
-                        if (isDirectory) {
-                            getDirectChildrenCount(rootDocId, treeUri, docId, shouldShowHidden)
-                        } else {
-                            0
-                        }
-
-                    val fileDirItem = FileDirItem(decodedPath, name, isDirectory, childrenCount, fileSize, lastModified)
-                    items.add(fileDirItem)
-                } while (cursor.moveToNext())
-            }
-        }
-    } catch (e: Exception) {
-        showErrorToast(e)
-    }
-    callback(items)
-}
-
 fun Context.getDirectChildrenCount(
     rootDocId: String,
     treeUri: Uri,
     documentId: String,
     shouldShowHidden: Boolean,
-): Int =
-    try {
+): Int {
+    return try {
         val projection = arrayOf(Document.COLUMN_DOCUMENT_ID)
         val childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(treeUri, documentId)
-        val rawCursor = contentResolver.query(childrenUri, projection, null, null, null)!!
+        val rawCursor = contentResolver.query(childrenUri, projection, null, null, null) ?: return 0
         val cursor = ExternalStorageProviderHack.transformQueryResult(rootDocId, childrenUri, rawCursor)
+
         if (shouldShowHidden) {
             cursor.count
         } else {
@@ -706,9 +458,14 @@ fun Context.getDirectChildrenCount(
             }
             count
         }
-    } catch (e: Exception) {
+    } catch (e: SecurityException) {
+        Log.e("GetChildrenCount", "Permission denied: ${e.message}")
+        0
+    } catch (e: IllegalArgumentException) {
+        Log.e("GetChildrenCount", "Invalid argument: ${e.message}")
         0
     }
+}
 
 fun Context.getProperChildrenCount(
     rootDocId: String,
@@ -768,29 +525,6 @@ fun Context.getAndroidSAFUri(path: String): Uri {
     return DocumentsContract.buildDocumentUriUsingTree(treeUri, documentId)
 }
 
-fun Context.getAndroidSAFDocument(path: String): DocumentFile? {
-    val basePath = path.getBasePath(this)
-    val androidPath = File(basePath, "Android").path
-    var relativePath = path.substring(androidPath.length)
-    if (relativePath.startsWith(File.separator)) {
-        relativePath = relativePath.substring(1)
-    }
-
-    return try {
-        val treeUri = getAndroidTreeUri(path).toUri()
-        var document = DocumentFile.fromTreeUri(applicationContext, treeUri)
-        val parts = relativePath.split("/").filter { it.isNotEmpty() }
-        for (part in parts) {
-            document = document?.findFile(part)
-        }
-        document
-    } catch (ignored: Exception) {
-        null
-    }
-}
-
-fun Context.getSomeAndroidSAFDocument(path: String): DocumentFile? = getFastAndroidSAFDocument(path) ?: getAndroidSAFDocument(path)
-
 fun Context.getFastAndroidSAFDocument(path: String): DocumentFile? {
     val treeUri = getAndroidTreeUri(path)
     if (treeUri.isEmpty()) {
@@ -801,12 +535,6 @@ fun Context.getFastAndroidSAFDocument(path: String): DocumentFile? {
     return DocumentFile.fromSingleUri(this, uri)
 }
 
-fun Context.getAndroidSAFChildrenUri(path: String): Uri {
-    val treeUri = getAndroidTreeUri(path).toUri()
-    val documentId = createAndroidSAFDocumentId(path)
-    return DocumentsContract.buildChildDocumentsUriUsingTree(treeUri, documentId)
-}
-
 fun Context.createAndroidSAFDirectory(path: String): Boolean =
     try {
         val treeUri = getAndroidTreeUri(path).toUri()
@@ -838,20 +566,6 @@ fun Context.createAndroidSAFFile(path: String): Boolean =
         false
     }
 
-fun Context.renameAndroidSAFDocument(
-    oldPath: String,
-    newPath: String,
-): Boolean =
-    try {
-        val treeUri = getAndroidTreeUri(oldPath).toUri()
-        val documentId = createAndroidSAFDocumentId(oldPath)
-        val parentUri = DocumentsContract.buildDocumentUriUsingTree(treeUri, documentId)
-        DocumentsContract.renameDocument(contentResolver, parentUri, newPath.getFilenameFromPath()) != null
-    } catch (e: IllegalStateException) {
-        showErrorToast(e)
-        false
-    }
-
 fun Context.getAndroidSAFFileSize(path: String): Long {
     val treeUri = getAndroidTreeUri(path).toUri()
     val documentId = createAndroidSAFDocumentId(path)
@@ -904,68 +618,62 @@ fun Context.getAndroidSAFLastModified(path: String): Long {
     } ?: 0L
 }
 
-fun Context.deleteAndroidSAFDirectory(
-    path: String,
-    allowDeleteFolder: Boolean = false,
-    callback: ((wasSuccess: Boolean) -> Unit)? = null,
-) {
-    val treeUri = getAndroidTreeUri(path).toUri()
-    val documentId = createAndroidSAFDocumentId(path)
-    try {
-        val uri = DocumentsContract.buildDocumentUriUsingTree(treeUri, documentId)
-        val document = DocumentFile.fromSingleUri(this, uri)
-        val fileDeleted = (document!!.isFile || allowDeleteFolder) && DocumentsContract.deleteDocument(applicationContext.contentResolver, document.uri)
-        callback?.invoke(fileDeleted)
-    } catch (e: Exception) {
-        showErrorToast(e)
-        callback?.invoke(false)
-        storeAndroidTreeUri(path, "")
-    }
-}
-
-fun Context.trySAFFileDelete(
-    fileDirItem: FileDirItem,
-    allowDeleteFolder: Boolean = false,
-    callback: ((wasSuccess: Boolean) -> Unit)? = null,
-) {
-    var fileDeleted = tryFastDocumentDelete(fileDirItem.path, allowDeleteFolder)
-    if (!fileDeleted) {
-        val document = getDocumentFile(fileDirItem.path)
-        if (document != null && (fileDirItem.isDirectory == document.isDirectory)) {
-            try {
-                fileDeleted = (document.isFile || allowDeleteFolder) && DocumentsContract.deleteDocument(applicationContext.contentResolver, document.uri)
-            } catch (ignored: Exception) {
-                baseConfig.sdTreeUri = ""
-                baseConfig.sdCardPath = ""
-            }
-        }
-    }
-
-    if (fileDeleted) {
-        deleteFromMediaStore(fileDirItem.path)
-        callback?.invoke(true)
-    }
-}
-
 fun Context.getFileInputStreamSync(path: String): InputStream? =
     when {
         isRestrictedSAFOnlyRoot(path) -> {
             val uri = getAndroidSAFUri(path)
-            applicationContext.contentResolver.openInputStream(uri)
+            try {
+                applicationContext.contentResolver.openInputStream(uri)
+            } catch (e: FileNotFoundException) {
+                Log.e("GetFileInputStreamSync", "File not found: ${e.message}")
+                null
+            } catch (e: SecurityException) {
+                Log.e("GetFileInputStreamSync", "Permission denied: ${e.message}")
+                null
+            }
         }
         isAccessibleWithSAFSdk30(path) -> {
             try {
                 FileInputStream(File(path))
-            } catch (e: Exception) {
+            } catch (e: SecurityException) {
+                Log.e("GetFileInputStreamSync", "Permission denied: ${e.message}")
+                null
+            } catch (e: IOException) {
                 val uri = createDocumentUriUsingFirstParentTreeUri(path)
-                applicationContext.contentResolver.openInputStream(uri)
+                try {
+                    applicationContext.contentResolver.openInputStream(uri)
+                } catch (e: FileNotFoundException) {
+                    Log.e("GetFileInputStreamSync", "File not found: ${e.message}")
+                    null
+                } catch (e: SecurityException) {
+                    Log.e("GetFileInputStreamSync", "Permission denied: ${e.message}")
+                    null
+                }
             }
         }
         isPathOnOTG(path) -> {
             val fileDocument = getSomeDocumentFile(path)
-            applicationContext.contentResolver.openInputStream(fileDocument?.uri!!)
+            try {
+                applicationContext.contentResolver.openInputStream(fileDocument?.uri!!)
+            } catch (e: FileNotFoundException) {
+                Log.e("GetFileInputStreamSync", "File not found: ${e.message}")
+                null
+            } catch (e: SecurityException) {
+                Log.e("GetFileInputStreamSync", "Permission denied: ${e.message}")
+                null
+            }
+        }
+        else -> {
+            try {
+                FileInputStream(File(path))
+            } catch (e: FileNotFoundException) {
+                Log.e("GetFileInputStreamSync", "File not found: ${e.message}")
+                null
+            } catch (e: SecurityException) {
+                Log.e("GetFileInputStreamSync", "Permission denied: ${e.message}")
+                null
+            }
         }
-        else -> FileInputStream(File(path))
     }
 
 fun Context.updateOTGPathFromPartition() {
@@ -997,44 +705,6 @@ fun Context.getIsPathDirectory(path: String): Boolean =
         else -> File(path).isDirectory
     }
 
-fun Context.getFolderLastModifieds(folder: String): HashMap<String, Long> {
-    val lastModifieds = HashMap<String, Long>()
-    val projection =
-        arrayOf(
-            Images.Media.DISPLAY_NAME,
-            Images.Media.DATE_MODIFIED,
-        )
-
-    val uri = Files.getContentUri("external")
-    val selection = "${Images.Media.DATA} LIKE ? AND ${Images.Media.DATA} NOT LIKE ? AND ${Images.Media.MIME_TYPE} IS NOT NULL" // avoid selecting folders
-    val selectionArgs = arrayOf("$folder/%", "$folder/%/%")
-
-    try {
-        val cursor = contentResolver.query(uri, projection, selection, selectionArgs, null)
-        cursor?.use {
-            if (cursor.moveToFirst()) {
-                do {
-                    try {
-                        val lastModified = cursor.getLongValue(Images.Media.DATE_MODIFIED) * 1000
-                        if (lastModified != 0L) {
-                            val name = cursor.getStringValue(Images.Media.DISPLAY_NAME)
-                            lastModifieds["$folder/$name"] = lastModified
-                        }
-                    } catch (e: Exception) {
-                        Log.e("CursorError", "Error processing file data: ${e.message}", e)
-                    }
-                } while (cursor.moveToNext())
-            }
-        }
-    } catch (e: Exception) {
-        Log.e("QueryError", "Error querying media content: ${e.message}", e)
-        Toast.makeText(this, "Failed to retrieve media information.", Toast.LENGTH_SHORT).show()
-    }
-
-
-    return lastModifieds
-}
-
 // avoid these being set as SD card paths
 private val physicalPaths =
     arrayListOf(
@@ -1101,14 +771,6 @@ fun getMediaStoreIds(context: Context): HashMap<String, Long> {
                     val path = cursor.getStringValue(Images.Media.DATA)
                     ids[path] = id
                 }
-            } catch (e: Exception) {
-                Log.e("CursorProcessingError", "Error processing cursor data: ${e.message}", e)
-            }
-        }
-    } catch (e: Exception) {
-        Log.e("QueryError", "Error querying media content: ${e.message}", e)
     }
-
-
     return ids
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/scri/extensions/ContextStorageSdk30.kt b/app/src/main/java/be/scri/extensions/ContextStorageSdk30.kt
index 4006b92f..f15d01db 100644
--- a/app/src/main/java/be/scri/extensions/ContextStorageSdk30.kt
+++ b/app/src/main/java/be/scri/extensions/ContextStorageSdk30.kt
@@ -10,6 +10,7 @@ import be.scri.helpers.isRPlus
 import be.scri.helpers.isSPlus
 import be.scri.models.FileDirItem
 import java.io.File
+import java.io.IOException
 
 private const val DOWNLOAD_DIR = "Download"
 private const val ANDROID_DIR = "Android"
@@ -62,14 +63,6 @@ fun Context.isRestrictedWithSAFSdk30(path: String): Boolean {
     return isInvalidName || (isDirectory && isARestrictedDirectory)
 }
 
-fun Context.isInDownloadDir(path: String): Boolean {
-    if (path.startsWith(recycleBinPath)) {
-        return false
-    }
-    val firstParentDir = path.getFirstParentDirName(this, 0)
-    return firstParentDir.equals(DOWNLOAD_DIR, true)
-}
-
 fun Context.isInSubFolderInDownloadDir(path: String): Boolean {
     if (path.startsWith(recycleBinPath)) {
         return false
@@ -93,8 +86,6 @@ fun Context.isInAndroidDir(path: String): Boolean {
     return firstParentDir.equals(ANDROID_DIR, true)
 }
 
-fun isNotExternalStorageManager(): Boolean = isRPlus() && !Environment.isExternalStorageManager()
-
 fun isExternalStorageManager(): Boolean = isRPlus() && Environment.isExternalStorageManager()
 
 fun Context.createFirstParentTreeUriUsingRootTree(fullPath: String): Uri {
@@ -171,8 +162,6 @@ fun Context.getDoesFilePathExistSdk30(path: String): Boolean =
         else -> File(path).exists()
     }
 
-fun Context.getSomeDocumentSdk30(path: String): DocumentFile? = getFastDocumentSdk30(path) ?: getDocumentSdk30(path)
-
 fun Context.getFastDocumentSdk30(path: String): DocumentFile? {
     val uri = createDocumentUriUsingFirstParentTreeUri(path)
     return DocumentFile.fromSingleUri(this, uri)
@@ -215,9 +204,15 @@ fun Context.deleteDocumentWithSAFSdk30(
             deleteFromMediaStore(fileDirItem.path)
             callback?.invoke(true)
         }
-    } catch (e: Exception) {
+    } catch (e: SecurityException) {
         callback?.invoke(false)
-        showErrorToast(e)
+        showErrorToast("Permission denied: ${e.message}")
+    } catch (e: IllegalArgumentException) {
+        callback?.invoke(false)
+        showErrorToast("Invalid arguments: ${e.message}")
+    } catch (e: IOException) {
+        callback?.invoke(false)
+        showErrorToast("I/O error: ${e.message}")
     }
 }
 
@@ -252,8 +247,3 @@ fun Context.buildDocumentUriSdk30(fullPath: String): Uri {
     val documentId = "$storageId:$relativePath"
     return DocumentsContract.buildDocumentUri(EXTERNAL_STORAGE_PROVIDER_AUTHORITY, documentId)
 }
-
-fun Context.getPicturesDirectoryPath(fullPath: String): String {
-    val basePath = fullPath.getBasePath(this)
-    return File(basePath, Environment.DIRECTORY_PICTURES).absolutePath
-}
diff --git a/app/src/main/java/be/scri/extensions/ContextStyling.kt b/app/src/main/java/be/scri/extensions/ContextStyling.kt
index f982dca4..74aaa839 100644
--- a/app/src/main/java/be/scri/extensions/ContextStyling.kt
+++ b/app/src/main/java/be/scri/extensions/ContextStyling.kt
@@ -1,17 +1,16 @@
 package be.scri.extensions
 
-import android.content.ComponentName
 import android.content.Context
-import android.content.pm.PackageManager
 import android.content.res.Configuration
+import android.database.CursorIndexOutOfBoundsException
 import android.graphics.Color
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.loader.content.CursorLoader
 import be.scri.R
 import be.scri.helpers.DARK_GREY
 import be.scri.helpers.INVALID_NAVIGATION_BAR_COLOR
 import be.scri.helpers.MyContentProvider
-import be.scri.helpers.appIconColorStrings
 import be.scri.helpers.ensureBackgroundThread
 import be.scri.models.SharedTheme
 import be.scri.views.MyAppCompatCheckbox
@@ -133,44 +132,16 @@ fun Context.getSharedThemeSync(cursorLoader: CursorLoader): SharedTheme? {
                 val appIconColor = cursor.getIntValue(MyContentProvider.COL_APP_ICON_COLOR)
                 val navigationBarColor = cursor.getIntValueOrNull(MyContentProvider.COL_NAVIGATION_BAR_COLOR) ?: INVALID_NAVIGATION_BAR_COLOR
                 val lastUpdatedTS = cursor.getIntValue(MyContentProvider.COL_LAST_UPDATED_TS)
+
                 return SharedTheme(textColor, backgroundColor, primaryColor, appIconColor, navigationBarColor, lastUpdatedTS, accentColor)
-            } catch (e: Exception) {
+            } catch (e: IllegalArgumentException) {
+                Toast.makeText(this, "Invalid column index", Toast.LENGTH_SHORT).show()
+            } catch (e: CursorIndexOutOfBoundsException) {
+                Toast.makeText(this, "Cursor is not in a valid state", Toast.LENGTH_SHORT).show()
             }
         }
     }
     return null
 }
 
-fun Context.checkAppIconColor() {
-    val appId = baseConfig.appId
-    if (appId.isNotEmpty() && baseConfig.lastIconColor != baseConfig.appIconColor) {
-        getAppIconColors().forEachIndexed { index, color ->
-            toggleAppIconColor(appId, index, color, false)
-        }
-
-        getAppIconColors().forEachIndexed { index, color ->
-            if (baseConfig.appIconColor == color) {
-                toggleAppIconColor(appId, index, color, true)
-            }
-        }
-    }
-}
-
-fun Context.toggleAppIconColor(
-    appId: String,
-    colorIndex: Int,
-    color: Int,
-    enable: Boolean,
-) {
-    val className = "${appId.removeSuffix(".debug")}.activities.SplashActivity${appIconColorStrings[colorIndex]}"
-    val state = if (enable) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DISABLED
-    try {
-        packageManager.setComponentEnabledSetting(ComponentName(appId, className), state, PackageManager.DONT_KILL_APP)
-        if (enable) {
-            baseConfig.lastIconColor = color
-        }
-    } catch (e: Exception) {
-    }
-}
-
 fun Context.getAppIconColors() = resources.getIntArray(R.array.md_app_icon_colors).toCollection(ArrayList())
diff --git a/app/src/main/java/be/scri/extensions/File.kt b/app/src/main/java/be/scri/extensions/File.kt
index 010af159..4e58461e 100644
--- a/app/src/main/java/be/scri/extensions/File.kt
+++ b/app/src/main/java/be/scri/extensions/File.kt
@@ -9,6 +9,8 @@ import be.scri.helpers.rawExtensions
 import be.scri.helpers.videoExtensions
 import be.scri.models.FileDirItem
 import java.io.File
+import java.io.IOException
+import java.security.NoSuchAlgorithmException
 
 fun File.isMediaFile() = absolutePath.isMediaFile()
 
@@ -171,7 +173,9 @@ fun File.doesParentHaveNoMedia(): Boolean {
 fun File.getDigest(algorithm: String): String? =
     try {
         inputStream().getDigest(algorithm)
-    } catch (e: Exception) {
+    } catch (e: IOException) {
+        null
+    } catch (e: NoSuchAlgorithmException) {
         null
     }
 
diff --git a/app/src/main/java/be/scri/extensions/String.kt b/app/src/main/java/be/scri/extensions/String.kt
index 8c831a61..be838e20 100644
--- a/app/src/main/java/be/scri/extensions/String.kt
+++ b/app/src/main/java/be/scri/extensions/String.kt
@@ -1,34 +1,14 @@
 package be.scri.extensions
 
 import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.graphics.Point
-import android.os.StatFs
 import android.provider.MediaStore
-import android.telephony.PhoneNumberUtils
-import android.text.Spannable
-import android.text.SpannableString
-import android.text.TextUtils
-import android.text.style.ForegroundColorSpan
-import android.widget.TextView
 import be.scri.helpers.audioExtensions
-import be.scri.helpers.extensionsSupportingEXIF
-import be.scri.helpers.getDateFormats
 import be.scri.helpers.normalizeRegex
 import be.scri.helpers.photoExtensions
 import be.scri.helpers.rawExtensions
 import be.scri.helpers.videoExtensions
-import com.bumptech.glide.signature.ObjectKey
-import org.joda.time.DateTime
-import org.joda.time.Years
-import org.joda.time.format.DateTimeFormat
 import java.io.File
-import java.text.DateFormat
 import java.text.Normalizer
-import java.text.SimpleDateFormat
-import java.util.Locale
-import java.util.regex.Pattern
 
 fun String.getFilenameFromPath() = substring(lastIndexOf("/") + 1)
 
@@ -82,31 +62,10 @@ fun String.getFirstParentPath(
     }
 }
 
-fun String.isAValidFilename(): Boolean {
-    val illegalCharacters = charArrayOf('/', '\n', '\r', '\t', '\u0000', '`', '?', '*', '\\', '<', '>', '|', '\"', ':')
-    illegalCharacters.forEach {
-        if (contains(it)) {
-            return false
-        }
-    }
-    return true
-}
-
-fun String.getOTGPublicPath(context: Context) =
-    "${context.baseConfig.otgTreeUri}/document/${context.baseConfig.otgPartition}%3A${substring(context.baseConfig.otgPath.length).replace("/", "%2F")}"
-
 fun String.isMediaFile() = isImageFast() || isVideoFast() || isGif() || isRawFast() || isSvg() || isPortrait()
 
-fun String.isWebP() = endsWith(".webp", true)
-
 fun String.isGif() = endsWith(".gif", true)
 
-fun String.isPng() = endsWith(".png", true)
-
-fun String.isApng() = endsWith(".apng", true)
-
-fun String.isJpg() = endsWith(".jpg", true) or endsWith(".jpeg", true)
-
 fun String.isSvg() = endsWith(".svg", true)
 
 fun String.isPortrait() = getFilenameFromPath().contains("portrait", true) && File(this).parentFile?.name?.startsWith("img_", true) == true
@@ -144,19 +103,8 @@ fun String.isAudioSlow() =
                 .toString(),
         )
 
-fun String.canModifyEXIF() = extensionsSupportingEXIF.any { endsWith(it, true) }
-
-fun String.getCompressionFormat() =
-    when (getFilenameExtension().toLowerCase()) {
-        "png" -> Bitmap.CompressFormat.PNG
-        "webp" -> Bitmap.CompressFormat.WEBP
-        else -> Bitmap.CompressFormat.JPEG
-    }
-
 fun String.areDigitsOnly() = matches(Regex("[0-9]+"))
 
-fun String.areLettersOnly() = matches(Regex("[a-zA-Z]+"))
-
 fun String.getGenericMimeType(): String {
     if (!contains("/")) {
         return this
@@ -168,132 +116,6 @@ fun String.getGenericMimeType(): String {
 
 fun String.getParentPath() = removeSuffix("/${getFilenameFromPath()}")
 
-fun String.relativizeWith(path: String) = this.substring(path.length)
-
-fun String.containsNoMedia() = File(this).containsNoMedia()
-
-fun String.doesThisOrParentHaveNoMedia(
-    folderNoMediaStatuses: HashMap<String, Boolean>,
-    callback: ((path: String, hasNoMedia: Boolean) -> Unit)?,
-) = File(this).doesThisOrParentHaveNoMedia(folderNoMediaStatuses, callback)
-
-fun String.getImageResolution(context: Context): Point? {
-    val options = BitmapFactory.Options()
-    options.inJustDecodeBounds = true
-    if (context.isRestrictedSAFOnlyRoot(this)) {
-        BitmapFactory.decodeStream(context.contentResolver.openInputStream(context.getAndroidSAFUri(this)), null, options)
-    } else {
-        BitmapFactory.decodeFile(this, options)
-    }
-
-    val width = options.outWidth
-    val height = options.outHeight
-    return if (width > 0 && height > 0) {
-        Point(options.outWidth, options.outHeight)
-    } else {
-        null
-    }
-}
-
-fun String.getPublicUri(context: Context) = context.getDocumentFile(this)?.uri ?: ""
-
-fun String.substringTo(cnt: Int): String =
-    if (isEmpty()) {
-        ""
-    } else {
-        substring(0, Math.min(length, cnt))
-    }
-
-fun String.highlightTextPart(
-    textToHighlight: String,
-    color: Int,
-    highlightAll: Boolean = false,
-    ignoreCharsBetweenDigits: Boolean = false,
-): SpannableString {
-    val spannableString = SpannableString(this)
-    if (textToHighlight.isEmpty()) {
-        return spannableString
-    }
-
-    var startIndex = normalizeString().indexOf(textToHighlight, 0, true)
-    val indexes = ArrayList<Int>()
-    while (startIndex >= 0) {
-        indexes.add(startIndex)
-        startIndex = normalizeString().indexOf(textToHighlight, startIndex + textToHighlight.length, true)
-        if (!highlightAll) {
-            break
-        }
-    }
-
-    // handle cases when we search for 643, but in reality the string contains it like 6-43
-    if (ignoreCharsBetweenDigits && indexes.isEmpty()) {
-        try {
-            val regex = TextUtils.join("(\\D*)", textToHighlight.toCharArray().toTypedArray())
-            val pattern = Pattern.compile(regex)
-            val result = pattern.matcher(normalizeString())
-            if (result.find()) {
-                spannableString.setSpan(ForegroundColorSpan(color), result.start(), result.end(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE)
-            }
-        } catch (ignored: Exception) {
-            // Ignored exceptions
-        }
-    } else {
-        indexes.forEach {
-            val endIndex = Math.min(it + textToHighlight.length, length)
-            try {
-                spannableString.setSpan(ForegroundColorSpan(color), it, endIndex, Spannable.SPAN_EXCLUSIVE_INCLUSIVE)
-            } catch (ignored: IndexOutOfBoundsException) {
-                // Ignored exceptions
-            }
-        }
-    }
-
-    return spannableString
-}
-
-fun String.searchMatches(textToHighlight: String): ArrayList<Int> {
-    val indexes = arrayListOf<Int>()
-    var indexOf = indexOf(textToHighlight, 0, true)
-
-    var offset = 0
-    while (offset < length && indexOf != -1) {
-        indexOf = indexOf(textToHighlight, offset, true)
-
-        if (indexOf == -1) {
-            break
-        } else {
-            indexes.add(indexOf)
-        }
-
-        offset = indexOf + 1
-    }
-
-    return indexes
-}
-
-fun String.getFileSignature(lastModified: Long? = null) = ObjectKey(getFileKey(lastModified))
-
-fun String.getFileKey(lastModified: Long? = null): String {
-    val file = File(this)
-    val modified =
-        if (lastModified != null && lastModified > 0) {
-            lastModified
-        } else {
-            file.lastModified()
-        }
-
-    return "${file.absolutePath}$modified"
-}
-
-fun String.getAvailableStorageB(): Long =
-    try {
-        val stat = StatFs(this)
-        val bytesAvailable = stat.blockSizeLong * stat.availableBlocksLong
-        bytesAvailable
-    } catch (e: Exception) {
-        -1L
-    }
-
 // remove diacritics, for example č -> c
 fun String.normalizeString() =
     Normalizer.normalize(this, Normalizer.Form.NFD).replace(
@@ -308,66 +130,6 @@ fun String.trimToComparableNumber(): String {
     return normalizedNumber.substring(startIndex)
 }
 
-// get the contact names first letter at showing the placeholder without image
-fun String.getNameLetter() =
-    normalizeString()
-        .toCharArray()
-        .getOrNull(0)
-        ?.toString()
-        ?.toUpperCase(Locale.getDefault()) ?: "A"
-
-fun String.normalizePhoneNumber() = PhoneNumberUtils.normalizeNumber(this)
-
-fun String.highlightTextFromNumbers(
-    textToHighlight: String,
-    primaryColor: Int,
-): SpannableString {
-    val spannableString = SpannableString(this)
-    val digits = PhoneNumberUtils.convertKeypadLettersToDigits(this)
-    if (digits.contains(textToHighlight)) {
-        val startIndex = digits.indexOf(textToHighlight, 0, true)
-        val endIndex = Math.min(startIndex + textToHighlight.length, length)
-        try {
-            spannableString.setSpan(ForegroundColorSpan(primaryColor), startIndex, endIndex, Spannable.SPAN_EXCLUSIVE_INCLUSIVE)
-        } catch (ignored: IndexOutOfBoundsException) {
-        }
-    }
-
-    return spannableString
-}
-
-fun String.getDateTimeFromDateString(
-    showYearsSince: Boolean,
-    viewToUpdate: TextView? = null,
-): DateTime {
-    val dateFormats = getDateFormats()
-    var date = DateTime()
-    for (format in dateFormats) {
-        try {
-            date = DateTime.parse(this, DateTimeFormat.forPattern(format))
-
-            val formatter = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.getDefault())
-            var localPattern = (formatter as SimpleDateFormat).toLocalizedPattern()
-
-            val hasYear = format.contains("y")
-            if (!hasYear) {
-                localPattern = localPattern.replace("y", "").replace(",", "").trim()
-                date = date.withYear(DateTime().year)
-            }
-
-            var formattedString = date.toString(localPattern)
-            if (showYearsSince && hasYear) {
-                formattedString += " (${Years.yearsBetween(date, DateTime.now()).years})"
-            }
-
-            viewToUpdate?.text = formattedString
-            break
-        } catch (ignored: Exception) {
-        }
-    }
-    return date
-}
-
 fun String.getMimeType(): String {
     val typesMap =
         HashMap<String, String>().apply {
diff --git a/app/src/main/java/be/scri/fragments/AboutFragment.kt b/app/src/main/java/be/scri/fragments/AboutFragment.kt
index 98a343c9..09733f0a 100644
--- a/app/src/main/java/be/scri/fragments/AboutFragment.kt
+++ b/app/src/main/java/be/scri/fragments/AboutFragment.kt
@@ -1,19 +1,30 @@
 package be.scri.fragments
 
+import CustomDividerItemDecoration
+import android.content.ActivityNotFoundException
+import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.activity.addCallback
+import androidx.appcompat.content.res.AppCompatResources.getDrawable
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import be.scri.BuildConfig
 import be.scri.R
 import be.scri.activities.MainActivity
 import be.scri.databinding.FragmentAboutBinding
 import be.scri.helpers.CustomAdapter
+import be.scri.helpers.HintUtils
 import be.scri.models.ItemsViewModel
+import com.google.android.play.core.review.ReviewManagerFactory
 
 class AboutFragment : Fragment() {
     private lateinit var binding: FragmentAboutBinding
@@ -48,16 +59,34 @@ class AboutFragment : Fragment() {
         recyclerView1.layoutManager = LinearLayoutManager(context)
         recyclerView1.adapter = CustomAdapter(getFirstRecyclerViewData(), requireContext())
         recyclerView1.suppressLayout(true)
-
+        recyclerView1.apply {
+            addCustomItemDecoration()
+        }
         val recyclerView2 = binding.recycleView
         recyclerView2.layoutManager = LinearLayoutManager(context)
         recyclerView2.adapter = CustomAdapter(getSecondRecyclerViewData(), requireContext())
         recyclerView2.suppressLayout(true)
-
+        recyclerView2.apply {
+            addCustomItemDecoration()
+        }
         val recyclerView3 = binding.recycleView3
         recyclerView3.layoutManager = LinearLayoutManager(context)
         recyclerView3.adapter = CustomAdapter(getThirdRecyclerViewData(), requireContext())
         recyclerView3.suppressLayout(true)
+        recyclerView3.apply {
+            addCustomItemDecoration()
+        }
+    }
+
+    private fun RecyclerView.addCustomItemDecoration() {
+        val itemDecoration =
+            CustomDividerItemDecoration(
+                drawable = getDrawable(requireContext(), R.drawable.rv_divider)!!,
+                width = 1,
+                marginLeft = 50,
+                marginRight = 50,
+            )
+        addItemDecoration(itemDecoration)
     }
 
     private fun getFirstRecyclerViewData(): List<Any> =
@@ -104,15 +133,16 @@ class AboutFragment : Fragment() {
             ),
         )
 
-    private fun getSecondRecyclerViewData(): List<Any> =
-        listOf(
+    private fun getSecondRecyclerViewData(): List<Any> {
+        val context = requireContext()
+        return listOf(
             ItemsViewModel(
                 image = R.drawable.star,
                 text = ItemsViewModel.Text(R.string.app_about_feedback_rate_scribe),
                 image2 = R.drawable.external_link,
                 url = null,
                 activity = null,
-                action = null,
+                action = ::rateScribe,
             ),
             ItemsViewModel(
                 image = R.drawable.bug_report_icon,
@@ -144,9 +174,10 @@ class AboutFragment : Fragment() {
                 image2 = R.drawable.counter_clockwise_icon,
                 url = null,
                 activity = null,
-                action = null,
+                action = ::resetHints,
             ),
         )
+    }
 
     private fun getThirdRecyclerViewData(): List<ItemsViewModel> =
         listOf(
@@ -168,46 +199,126 @@ class AboutFragment : Fragment() {
             ),
         )
 
+    private fun resetHints() {
+        HintUtils.resetHints(requireContext())
+        (activity as MainActivity).showHint("hint_shown_about", R.string.app_about_app_hint)
+    }
+
     private fun shareScribe() {
-        val sharingIntent =
-            Intent(Intent.ACTION_SEND).apply {
-                type = "text/plain"
-                putExtra(Intent.EXTRA_TEXT, "https://github.com/scribe-org/Scribe-Android")
-            }
-        startActivity(Intent.createChooser(sharingIntent, "Share via"))
+        try {
+            val sharingIntent =
+                Intent(Intent.ACTION_SEND).apply {
+                    type = "text/plain"
+                    putExtra(Intent.EXTRA_TEXT, "https://github.com/scribe-org/Scribe-Android")
+                }
+            startActivity(Intent.createChooser(sharingIntent, "Share via"))
+        } catch (e: ActivityNotFoundException) {
+            Log.e("AboutFragment", "No application found to share content", e)
+        } catch (e: IllegalArgumentException) {
+            Log.e("AboutFragment", "Invalid argument for sharing", e)
+        }
     }
 
     private fun sendEmail() {
-        val intent =
-            Intent(Intent.ACTION_SEND).apply {
-                putExtra(Intent.EXTRA_EMAIL, arrayOf("team@scri.be"))
-                putExtra(Intent.EXTRA_SUBJECT, "Hey Scribe!")
-                type = "message/rfc822"
-            }
-        startActivity(Intent.createChooser(intent, "Choose an Email client:"))
+        try {
+            val intent =
+                Intent(Intent.ACTION_SEND).apply {
+                    putExtra(Intent.EXTRA_EMAIL, arrayOf("team@scri.be"))
+                    putExtra(Intent.EXTRA_SUBJECT, "Hey Scribe!")
+                    type = "message/rfc822"
+                }
+            startActivity(Intent.createChooser(intent, "Choose an Email client:"))
+        } catch (e: ActivityNotFoundException) {
+            Log.e("AboutFragment", "No email client found", e)
+        } catch (e: IllegalArgumentException) {
+            Log.e("AboutFragment", "Invalid argument for sending email", e)
+        }
     }
 
     private fun loadWikimediaScribeFragment() {
-        val fragment = WikimediaScribeFragment()
-        val fragmentTransaction = requireActivity().supportFragmentManager.beginTransaction()
-        fragmentTransaction.replace(R.id.fragment_container, fragment, "WikimediaScribePage")
-        fragmentTransaction.addToBackStack("WikimediaScribePage")
-        fragmentTransaction.commit()
+        try {
+            val fragment = WikimediaScribeFragment()
+            val fragmentTransaction = requireActivity().supportFragmentManager.beginTransaction()
+            fragmentTransaction.replace(R.id.fragment_container, fragment, "WikimediaScribePage")
+            fragmentTransaction.addToBackStack("WikimediaScribePage")
+            fragmentTransaction.commit()
+        } catch (e: IllegalStateException) {
+            Log.e("AboutFragment", "Failed to load fragment", e)
+        }
     }
 
     private fun loadPrivacyPolicyFragment() {
-        val fragment = PrivacyPolicyFragment()
-        val fragmentTransaction = requireActivity().supportFragmentManager.beginTransaction()
-        fragmentTransaction.replace(R.id.fragment_container, fragment)
-        fragmentTransaction.addToBackStack(null)
-        fragmentTransaction.commit()
+        try {
+            val fragment = PrivacyPolicyFragment()
+            val fragmentTransaction = requireActivity().supportFragmentManager.beginTransaction()
+            fragmentTransaction.replace(R.id.fragment_container, fragment)
+            fragmentTransaction.addToBackStack(null)
+            fragmentTransaction.commit()
+        } catch (e: IllegalStateException) {
+            Log.e("AboutFragment", "Failed to load fragment", e)
+        }
     }
 
     private fun loadThirdPartyLicensesFragment() {
-        val fragment = ThirdPartyFragment()
-        val fragmentTransaction = requireActivity().supportFragmentManager.beginTransaction()
-        fragmentTransaction.replace(R.id.fragment_container, fragment)
-        fragmentTransaction.addToBackStack(null)
-        fragmentTransaction.commit()
+        try {
+            val fragment = ThirdPartyFragment()
+            val fragmentTransaction = requireActivity().supportFragmentManager.beginTransaction()
+            fragmentTransaction.replace(R.id.fragment_container, fragment)
+            fragmentTransaction.addToBackStack(null)
+            fragmentTransaction.commit()
+        } catch (e: IllegalStateException) {
+            Log.e("AboutFragment", "Failed to load fragment", e)
+        }
+    }
+
+    private fun getInstallSource(context: Context): String? =
+        try {
+            val packageManager = context.packageManager
+            packageManager.getInstallerPackageName(context.packageName)
+        } catch (e: PackageManager.NameNotFoundException) {
+            null
+        }
+
+    private fun rateScribe() {
+        val context = requireContext()
+        var installSource = getInstallSource(context)
+
+        if (installSource == "com.android.vending") {
+            val reviewManager = ReviewManagerFactory.create(context)
+            val request = reviewManager.requestReviewFlow()
+
+            request.addOnCompleteListener { task ->
+                if (task.isSuccessful) {
+                    val reviewInfo = task.result
+                    val activity = requireActivity()
+                    reviewManager
+                        .launchReviewFlow(activity, reviewInfo)
+                        .addOnCompleteListener { _ ->
+                        }
+                } else {
+                    Toast.makeText(context, "Failed to launch review flow", Toast.LENGTH_SHORT).show()
+                }
+            }
+        } else if (installSource == "org.fdroid.fdroid") {
+            val url = "https://f-droid.org/packages/${context.packageName}"
+            val intent =
+                Intent(Intent.ACTION_VIEW)
+                    .apply {
+                        data = Uri.parse(url)
+                    }
+            context.startActivity(intent)
+        } else {
+            Toast.makeText(context, "Unknown installation source", Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        (activity as MainActivity).showHint("hint_shown_about", R.string.app_about_app_hint)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        (activity as MainActivity).hideHint()
     }
 }
diff --git a/app/src/main/java/be/scri/fragments/MainFragment.kt b/app/src/main/java/be/scri/fragments/MainFragment.kt
index 543e1ee3..d153144c 100644
--- a/app/src/main/java/be/scri/fragments/MainFragment.kt
+++ b/app/src/main/java/be/scri/fragments/MainFragment.kt
@@ -32,7 +32,6 @@ class MainFragment : Fragment() {
         binding.keyboardSettings.setOnClickListener {
             openKeyboardSettings()
         }
-
         (requireActivity() as MainActivity).unsetActionBarLayoutMargin()
         applyUserDarkModePreference()
         val callback =
@@ -83,4 +82,14 @@ class MainFragment : Fragment() {
         super.onDestroyView()
         _binding = null
     }
+
+    override fun onResume() {
+        super.onResume()
+        (activity as MainActivity).showHint("hint_shown_main", R.string.app_installation_app_hint)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        (activity as MainActivity).hideHint()
+    }
 }
diff --git a/app/src/main/java/be/scri/fragments/SettingsFragment.kt b/app/src/main/java/be/scri/fragments/SettingsFragment.kt
index a8b0dc0d..bb1bd915 100644
--- a/app/src/main/java/be/scri/fragments/SettingsFragment.kt
+++ b/app/src/main/java/be/scri/fragments/SettingsFragment.kt
@@ -1,5 +1,6 @@
 package be.scri.fragments
 
+import CustomDividerItemDecoration
 import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
@@ -16,6 +17,7 @@ import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.appcompat.content.res.AppCompatResources.getDrawable
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import be.scri.R
@@ -145,6 +147,16 @@ class SettingsFragment : Fragment() {
         recyclerView.layoutManager = LinearLayoutManager(requireContext())
         recyclerView.adapter = adapter
         recyclerView.suppressLayout(true)
+        recyclerView.apply {
+            val itemDecoration =
+                CustomDividerItemDecoration(
+                    drawable = getDrawable(requireContext(), R.drawable.rv_divider)!!,
+                    width = 1,
+                    marginLeft = 50,
+                    marginRight = 50,
+                )
+            addItemDecoration(itemDecoration)
+        }
     }
 
     private fun getRecyclerViewElements(): MutableList<TextItem> {
@@ -267,6 +279,12 @@ class SettingsFragment : Fragment() {
 
     override fun onResume() {
         super.onResume()
+        (activity as MainActivity).showHint("hint_shown_settings", R.string.app_settings_app_hint)
         setupRecyclerView2()
     }
+
+    override fun onPause() {
+        super.onPause()
+        (activity as MainActivity).hideHint()
+    }
 }
diff --git a/app/src/main/java/be/scri/helpers/HintUtils.kt b/app/src/main/java/be/scri/helpers/HintUtils.kt
new file mode 100644
index 00000000..1103e9d0
--- /dev/null
+++ b/app/src/main/java/be/scri/helpers/HintUtils.kt
@@ -0,0 +1,17 @@
+package be.scri.helpers
+
+import android.content.Context
+
+class HintUtils {
+    companion object {
+        fun resetHints(context: Context) {
+            val sharedPref = context.getSharedPreferences("app_preferences", Context.MODE_PRIVATE)
+            with(sharedPref.edit()) {
+                putBoolean("hint_shown_main", false)
+                putBoolean("hint_shown_settings", false)
+                putBoolean("hint_shown_about", false)
+                apply()
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/be/scri/helpers/MyKeyboard.kt b/app/src/main/java/be/scri/helpers/MyKeyboard.kt
index 9445d718..85dd27ea 100644
--- a/app/src/main/java/be/scri/helpers/MyKeyboard.kt
+++ b/app/src/main/java/be/scri/helpers/MyKeyboard.kt
@@ -6,12 +6,15 @@ import android.content.res.Resources
 import android.content.res.TypedArray
 import android.content.res.XmlResourceParser
 import android.graphics.drawable.Drawable
+import android.util.Log
 import android.util.TypedValue
 import android.util.Xml
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.EditorInfo.IME_ACTION_NONE
 import androidx.annotation.XmlRes
 import be.scri.R
+import org.xmlpull.v1.XmlPullParserException
+import java.io.IOException
 
 /**
  * Loads an XML description of a keyboard and stores the attributes of the keys. A keyboard consists of rows of keys.
@@ -389,7 +392,10 @@ class MyKeyboard {
                     }
                 }
             }
-        } catch (e: Exception) {
+        } catch (e: XmlPullParserException) {
+            Log.e("MyKeyboard", "XML Parsing error: ${e.message}")
+        } catch (e: IOException) {
+            Log.e("MyKeyboard", "I/O error: ${e.message}")
         }
         mHeight = y
     }
diff --git a/app/src/main/java/be/scri/models/FileDirItem.kt b/app/src/main/java/be/scri/models/FileDirItem.kt
index d20720fa..16ed504c 100644
--- a/app/src/main/java/be/scri/models/FileDirItem.kt
+++ b/app/src/main/java/be/scri/models/FileDirItem.kt
@@ -38,6 +38,8 @@ import be.scri.helpers.SORT_USE_NUMERIC_VALUE
 import be.scri.helpers.isNougatPlus
 import com.bumptech.glide.signature.ObjectKey
 import java.io.File
+import java.io.FileNotFoundException
+import java.io.IOException
 
 open class FileDirItem(
     val path: String,
@@ -121,7 +123,9 @@ open class FileDirItem(
                         .openInputStream(Uri.parse(path))
                         ?.available()
                         ?.toLong() ?: 0L
-                } catch (e: Exception) {
+                } catch (e: FileNotFoundException) {
+                    context.getSizeFromContentUri(Uri.parse(path))
+                } catch (e: IOException) {
                     context.getSizeFromContentUri(Uri.parse(path))
                 }
             }
diff --git a/app/src/main/java/be/scri/views/CustomDividerItemDecoration.kt b/app/src/main/java/be/scri/views/CustomDividerItemDecoration.kt
new file mode 100644
index 00000000..35c80c9a
--- /dev/null
+++ b/app/src/main/java/be/scri/views/CustomDividerItemDecoration.kt
@@ -0,0 +1,42 @@
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import android.view.View
+import androidx.annotation.NonNull
+import androidx.recyclerview.widget.RecyclerView
+
+class CustomDividerItemDecoration(
+    private val drawable: Drawable,
+    private val width: Int,
+    private val marginLeft: Int,
+    private val marginRight: Int,
+) : RecyclerView.ItemDecoration() {
+    override fun onDraw(
+        @NonNull canvas: Canvas,
+        @NonNull parent: RecyclerView,
+        @NonNull state: RecyclerView.State,
+    ) {
+        val left = parent.paddingLeft + marginLeft
+        val right = parent.width - parent.paddingRight - marginRight
+
+        val childCount = parent.childCount
+        for (i in 0 until childCount - 1) { // Exclude the last item
+            val child = parent.getChildAt(i)
+            val params = child.layoutParams as RecyclerView.LayoutParams
+            val top = child.bottom + params.bottomMargin
+            val bottom = top + width
+
+            drawable.setBounds(left, top, right, bottom)
+            drawable.draw(canvas)
+        }
+    }
+
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State,
+    ) {
+        outRect.set(0, 0, 0, width)
+    }
+}
diff --git a/app/src/main/res/drawable/rv_divider.xml b/app/src/main/res/drawable/rv_divider.xml
new file mode 100644
index 00000000..68649987
--- /dev/null
+++ b/app/src/main/res/drawable/rv_divider.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <size android:height="1dp" />
+    <corners android:radius="10dp" />
+    <solid android:color="@color/rv_divider" />
+</shape>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3714001f..5e622f3a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,6 +4,15 @@
     android:layout_width="match_parent"
     android:theme="@style/Theme.AppCompat.Light.NoActionBar"
     android:layout_height="match_parent">
+    <!-- Hint Container -->
+    <include
+        android:id="@+id/hint_layout"
+        layout="@layout/hint_layout"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/card_view_text.xml b/app/src/main/res/layout/card_view_text.xml
index 68493a60..e517b7c6 100644
--- a/app/src/main/res/layout/card_view_text.xml
+++ b/app/src/main/res/layout/card_view_text.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView 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:id="@+id/cvItem"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="8dp"
-    android:layout_marginRight="8dp"
-    app:cardCornerRadius="5dp"
-    app:cardElevation="1dp">
+
 
     <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -54,4 +48,3 @@
             android:textColor="@android:color/darker_gray"
             android:textStyle="normal" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/card_view_with_image.xml b/app/src/main/res/layout/card_view_with_image.xml
index b28b07a3..b7447138 100644
--- a/app/src/main/res/layout/card_view_with_image.xml
+++ b/app/src/main/res/layout/card_view_with_image.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView 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:id="@+id/cvItem"
-    android:layout_width="match_parent"
-    android:layout_height="50dp"
-    android:layout_marginLeft="8dp"
-    android:layout_marginRight="8dp"
-    app:cardCornerRadius="5dp"
-    app:cardElevation="1dp">
+
 
     <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -43,4 +36,3 @@
             tools:srcCompat="@tools:sample/avatars" />
 
     </LinearLayout>
-</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/card_view_with_switch.xml b/app/src/main/res/layout/card_view_with_switch.xml
index 7d9980b0..4aad215a 100644
--- a/app/src/main/res/layout/card_view_with_switch.xml
+++ b/app/src/main/res/layout/card_view_with_switch.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView 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:id="@+id/cvItem"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="8dp"
-    android:layout_marginRight="8dp"
-    app:cardCornerRadius="5dp"
-    app:cardElevation="1dp">
 
     <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -58,4 +51,3 @@
             android:textStyle="normal" />
 
     </LinearLayout>
-</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 2a7d2f0f..3d3b2bc8 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -27,6 +27,9 @@
                 android:id="@+id/recycleView2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:background="@drawable/rounded_all_corners"
                 android:layout_marginTop="10dp" />
 
             <TextView
@@ -44,6 +47,9 @@
                 android:id="@+id/recycleView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:background="@drawable/rounded_all_corners"
                 android:layout_marginTop="10dp" />
 
             <TextView
@@ -61,8 +67,9 @@
                 android:id="@+id/recycleView3"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="50dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:background="@drawable/rounded_all_corners"
                 android:layout_marginTop="10dp"/>
         </LinearLayout>
     </ScrollView>
-
diff --git a/app/src/main/res/layout/fragment_language_settings.xml b/app/src/main/res/layout/fragment_language_settings.xml
index e8bd3a35..6fd30a2b 100644
--- a/app/src/main/res/layout/fragment_language_settings.xml
+++ b/app/src/main/res/layout/fragment_language_settings.xml
@@ -29,6 +29,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="50dp"
         android:padding="12dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
@@ -61,6 +63,8 @@
         android:layout_marginTop="20dp"
         android:padding="12dp"
         app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/functionalityRecyclerView" />
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index d7c92236..69917089 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -31,6 +31,10 @@
                 android:id="@+id/recyclerViewSettings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:background="@drawable/rounded_all_corners"
+
                />
 
             <TextView
@@ -74,10 +78,12 @@
                     android:id="@+id/recyclerView2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:background="@drawable/rounded_all_corners"
+
                     />
             </RelativeLayout>
 
         </LinearLayout>
     </ScrollView>
-
-
diff --git a/app/src/main/res/layout/hint_layout.xml b/app/src/main/res/layout/hint_layout.xml
new file mode 100644
index 00000000..e23b60b4
--- /dev/null
+++ b/app/src/main/res/layout/hint_layout.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView
+    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="wrap_content"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="4dp"
+    android:background="@color/card_view_color"
+    app:cardBackgroundColor="@color/card_view_color">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <ImageView
+            android:contentDescription="Light bulb icon"
+            android:id="@+id/lightbulb_icon"
+            android:layout_width="38dp"
+            android:layout_height="38dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="16dp"
+            android:src="@drawable/light_bulb_icon"
+            app:tint="@color/hint_text_color"
+            />
+
+        <TextView
+            android:id="@+id/hint_text"
+            android:layout_width="0dp"
+            android:textColor="@color/app_text_color"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/hint_ok_button"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_gravity="center_vertical"
+            android:text="@string/hint_ok_button_text"
+            android:textColor="@android:color/white"
+            android:background="@drawable/button_background_rounded"
+            android:backgroundTint="@color/nav_bar_selected_color"
+            />
+
+    </LinearLayout>
+
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
index 35b85ccd..85702247 100644
--- a/app/src/main/res/values-night-v31/colors.xml
+++ b/app/src/main/res/values-night-v31/colors.xml
@@ -15,6 +15,7 @@
     <color name="corner_polygon_color">@color/dark_tutorial_button_color</color>
     <color name="button_outline_color">@color/dark_button_outline_color</color>
     <color name="button_text_color">#D17B0F</color>
+    <color name="rv_divider">#b2aeae</color>
     <color name="switch_thumb_selector_color_true">#D17B0F</color>
     <color name="switch_thumb_selector_color_false">@android:color/darker_gray</color>
     <color name="switch_selector_color">@color/corner_polygon_color</color>
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
index dcb0a535..ed30d14c 100644
--- a/app/src/main/res/values-v31/colors.xml
+++ b/app/src/main/res/values-v31/colors.xml
@@ -11,10 +11,12 @@
     <color name="text_color">#000</color>
     <color name="icon_color">#000</color>
     <color name="card_view_color">#FFF</color>
+    <color name="hint_text_color">#FDAD0D</color>
     <color name="menu_option_color">#878472</color>
     <color name="corner_polygon_color">@color/light_tutorial_button_color</color>
     <color name="button_outline_color">@color/light_tutorial_button_color</color>
     <color name="button_text_color">#000000</color>
+    <color name="rv_divider">#d7d7d9</color>
     <color name="switch_thumb_selector_color_true">#FDAD0D</color>
     <color name="switch_thumb_selector_color_false">@android:color/darker_gray</color>
     <color name="switch_selector_color">#FEDE9E</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2e6c9f1d..1aa2de4b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,8 +9,7 @@
 
     <string name="scribe_key">Scribe Key</string>
     <string name="command_bar">Command Bar</string>
-
-
+    <string name="hint_ok_button_text">OK</string>
     <!-- Clipboard -->
     <string name="manage_clipboard_items">Manage clipboard items</string>
     <string name="manage_clipboard_empty">Your clipboard is empty.</string>
diff --git a/app/src/test/kotlin/helpers/AlphanumericComparatorTest.kt b/app/src/test/kotlin/helpers/AlphanumericComparatorTest.kt
new file mode 100644
index 00000000..964f3c00
--- /dev/null
+++ b/app/src/test/kotlin/helpers/AlphanumericComparatorTest.kt
@@ -0,0 +1,18 @@
+package helpers
+
+import be.scri.helpers.AlphanumericComparator
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class AlphanumericComparatorTest {
+    private val subject = AlphanumericComparator()
+
+    @Test
+    fun testCompare() {
+        assertEquals(-1, subject.compare("IMG_10.png", "IMG_11.png"))
+
+        assertEquals(0, subject.compare("IMG_10.png", "IMG_10.png"))
+
+        assertEquals(1, subject.compare("IMG_11.png", "IMG_10.png"))
+    }
+}
diff --git a/detekt.yml b/detekt.yml
index a54cf76e..363b89cb 100644
--- a/detekt.yml
+++ b/detekt.yml
@@ -31,8 +31,6 @@ complexity:
         active: false
 
 exceptions:
-    TooGenericExceptionCaught:
-        active: false
     SwallowedException:
         active: false
     InstanceOfCheckForException: