From b55c88eb9fc3f98b5759499b4682d20b6b7cc15b Mon Sep 17 00:00:00 2001
From: PahaAkos <paha.akos@gmail.com>
Date: Fri, 26 Jul 2024 23:27:51 +0200
Subject: [PATCH 1/2] Debug Release 3.9.3 (393000)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🔧 New dependencies changes:
• Update Activity(-ktx) to 1.9.1
• Update Androidx-junit to 1.2.1
• Update Appcompat to 1.7.0
• Update Balloon to 1.6.5
• Update Gradle to 8.7.0-alpha03
• Update Gson to 2.11.0
• Update Espresso-core to 3.6.1
• Update Firebase-bom to 33.1.2
• Update Firebase-analytics(-ktx) to 22.0.2
• Update Fragment-ktx to 1.8.2
• Update GoogleServices to 4.4.2
• Update Kotlin to 2.0.0
• Update Libsu to 6.0.0
• Update Lifecycle-viewmodel-ktx to 2.8.4
• Update Ui-tooling to 1.6.8

🗂️ Others Changes:
• Update versionCode to 393000 (3.9.3)
• Update compileSdk & targetSdk to 35
• Update buildToolsVersion to 35.0.0
• Update Gradle to 8.9
• Update Workflow File
• Fix EdgeToEdge on Android 15
• Fix NavigationBar Color on all Android
• Fix About activity crash when first opened without internet
• Added Material3 Flag to flag activity
---
 .github/workflows/buildCi.yml                 |  4 +-
 .github/workflows/buildPro.yml                |  2 +-
 .github/workflows/buildRelease.yml            |  4 +-
 .github/workflows/deployToGoogle.yml          |  4 +-
 .github/workflows/pullRequest.yml             |  2 +-
 .idea/kotlinc.xml                             |  6 +-
 app/build.gradle.kts                          | 12 +--
 .../rboardthememanager/Application.kt         |  2 +-
 .../rboardthememanager/core/Shell.kt          |  2 +-
 .../rboardthememanager/core/String.kt         |  4 +-
 .../dialogs/NoRootDialog.kt                   | 11 +++
 .../rboardthememanager/dialogs/UsageDialog.kt | 11 +++
 .../rboardthememanager/preferences/About.kt   | 65 +++++++++++-----
 .../preferences/Settings.kt                   |  4 +-
 .../screens/InstallPackActivity.kt            | 24 ++++++
 .../rboardthememanager/screens/Logs.kt        | 13 ++++
 .../screens/MainActivity.kt                   | 13 +++-
 .../rboardthememanager/screens/ManageRepo.kt  | 26 +++++++
 .../screens/PreferencesActivity.kt            | 13 +++-
 .../screens/ReadMoreReadFast.kt               | 13 ++++
 .../rboardthememanager/screens/ShareFlags.kt  | 19 ++++-
 .../screens/ThemeChangerActivity.kt           | 27 ++++++-
 .../SwitchKeyboardWidgetConfigureActivity.kt  | 19 ++++-
 .../drawable/ic_baseline_outlined_flag_24.xml |  4 +-
 app/src/main/res/drawable/ic_emoji_clear.xml  | 32 ++++++++
 app/src/main/res/drawable/ic_logs.xml         | 13 ++++
 app/src/main/res/drawable/ic_patch.xml        |  1 -
 app/src/main/res/drawable/ic_person.xml       |  3 +-
 .../main/res/layout/activity_install_pack.xml | 76 ++++++++++++-------
 app/src/main/res/layout/activity_logs.xml     |  3 +-
 .../main/res/layout/activity_manage_repo.xml  | 23 ++++--
 .../main/res/layout/activity_preferences.xml  |  4 +-
 .../layout/activity_read_more_read_fast.xml   |  3 +-
 .../main/res/layout/activity_share_flags.xml  | 26 +++++--
 .../res/layout/activity_theme_changer.xml     | 67 ++++++++++------
 app/src/main/res/layout/dialog_no_root.xml    |  3 +-
 .../switch_keyboard_widget_configure.xml      |  6 +-
 app/src/main/res/layout/usage_dialog.xml      |  3 +-
 .../res/{values-id => values-in}/strings.xml  |  0
 app/src/main/res/values/themes.xml            | 10 +--
 build.gradle.kts                              |  2 +-
 colorutilsc                                   |  2 +-
 gradle/libs.versions.toml                     | 38 +++++-----
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 mathc                                         |  2 +-
 rboardcomponents                              |  2 +-
 46 files changed, 474 insertions(+), 153 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_emoji_clear.xml
 create mode 100644 app/src/main/res/drawable/ic_logs.xml
 rename app/src/main/res/{values-id => values-in}/strings.xml (100%)

diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml
index 9af64782..7c8ee6b1 100644
--- a/.github/workflows/buildCi.yml
+++ b/.github/workflows/buildCi.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r26d
+          ndk-version: r27
 
       - name: Get Commit Message
         id: commitMessage
@@ -85,7 +85,7 @@ jobs:
           signingKey: ${{ secrets.SIGNING_KEY }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
-          buildToolsVersion: '35.0.0-rc3'
+          buildToolsVersion: '35.0.0'
 
       - name: Delete old APK
         run: rm app/build/outputs/apk/debug/app-debug.apk
diff --git a/.github/workflows/buildPro.yml b/.github/workflows/buildPro.yml
index 7ffc56d3..65b26fa2 100644
--- a/.github/workflows/buildPro.yml
+++ b/.github/workflows/buildPro.yml
@@ -74,7 +74,7 @@ jobs:
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
-          buildToolsVersion: '35.0.0-rc3'
+          buildToolsVersion: '35.0.0'
 
       - name: List files
         run: ls app/build/outputs/apk/pro
diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml
index 986ae1b7..dc561d07 100644
--- a/.github/workflows/buildRelease.yml
+++ b/.github/workflows/buildRelease.yml
@@ -24,7 +24,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r26d
+          ndk-version: r27
 
       - name: Get Commit Message
         id: commitMessage
@@ -89,7 +89,7 @@ jobs:
           signingKey: ${{ secrets.SIGNING_KEY }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
-          buildToolsVersion: '35.0.0-rc3'
+          buildToolsVersion: '35.0.0'
 
       - name: List files
         run: ls app/build/outputs/apk/release
diff --git a/.github/workflows/deployToGoogle.yml b/.github/workflows/deployToGoogle.yml
index cf47e8cf..c373620a 100644
--- a/.github/workflows/deployToGoogle.yml
+++ b/.github/workflows/deployToGoogle.yml
@@ -25,7 +25,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r26d
+          ndk-version: r27
 
       - name: Setup JDK
         uses: actions/setup-java@v4
@@ -75,7 +75,7 @@ jobs:
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
-          buildToolsVersion: '35.0.0-rc3'
+          buildToolsVersion: '35.0.0'
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml
index c764fd91..fc5b8577 100644
--- a/.github/workflows/pullRequest.yml
+++ b/.github/workflows/pullRequest.yml
@@ -23,7 +23,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r26d
+          ndk-version: r27
 
       - name: Setup JDK
         uses: actions/setup-java@v4
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index e68ef862..485accd3 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -4,10 +4,10 @@
     <option name="jvmTarget" value="21" />
   </component>
   <component name="KotlinCommonCompilerArguments">
-    <option name="apiVersion" value="1.9" />
-    <option name="languageVersion" value="1.9" />
+    <option name="apiVersion" value="2.0" />
+    <option name="languageVersion" value="2.0" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.24" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 69705ccd..4ce3a8c6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,8 +13,8 @@ plugins {
 }
 
 android {
-    buildToolsVersion = "35.0.0 rc3"
-    compileSdkPreview = "VanillaIceCream"
+    buildToolsVersion = "35.0.0"
+    compileSdk = 35
     buildFeatures.dataBinding = true
     buildFeatures.viewBinding = true
     buildFeatures.buildConfig = true
@@ -24,16 +24,16 @@ android {
     defaultConfig {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 31
-        targetSdk = 34
-        versionCode = 392008
-        versionName = "3.9.2"
+        targetSdk = 35
+        versionCode = 393000
+        versionName = "3.9.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         resourceConfigurations += listOf(
             "ar", "cs", "da", "de",
             "el", "en", "es", "fi",
-            "fr", "hi", "hu", "id",
+            "fr", "hi", "hu", "in",
             "it", "ja", "nl", "no",
             "pl", "pt-rBR", "ro", "ru",
             "sv", "uk", "vi",
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/Application.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/Application.kt
index e0ac07dd..35e44b09 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/Application.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/Application.kt
@@ -54,7 +54,7 @@ class Application : Application() {
                 Config.RAW_PREFIX = Config.GITLAB_RAW_PREFIX
             }
             if (!URL("https://bin.utwitch.net").isReachable())
-                Logger.customBin = "hastebin.com"
+                Logger.customBin = "bin.dertyp.dev"
         }
         PreferenceManager.getDefaultSharedPreferences(this)
             .edit { putString("logMode", if (BuildConfig.DEBUG) "VERBOSE" else "ERROR") }
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/core/Shell.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/core/Shell.kt
index 9b269d1d..eab8356f 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/core/Shell.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/core/Shell.kt
@@ -15,7 +15,7 @@ fun hasRoot(): Boolean {
 
 @Suppress("DEPRECATION", "UNUSED_PARAMETER")
 fun hasRoot(activity: Activity): Boolean = try {
-    Shell.su().exec()
+    Shell.cmd().exec()
     hasRoot()
 } catch (_: Exception) {
     false
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/core/String.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/core/String.kt
index 8132652e..bed6f65a 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/core/String.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/core/String.kt
@@ -67,7 +67,7 @@ fun String.fontSize(relative: Float): CharSequence {
 
 @Suppress("DEPRECATION")
 fun String.runAsCommand(callback: (result: Array<String>) -> Unit = {}): Boolean {
-    return Shell.su(this).exec().apply {
+    return Shell.cmd(this).exec().apply {
         if (err.size > 0) Logger.log(
             Logger.Companion.Type.ERROR, "RUN COMMAND",
             err.toTypedArray().apply { callback(this) }.contentToString()
@@ -108,7 +108,7 @@ fun String.setSystemProperty(value: String = "", saveToModule: Boolean = false):
 
 @Suppress("DEPRECATION")
 fun List<String>.runAsCommand(callback: (result: Array<String>) -> Unit = {}): Boolean {
-    return Shell.su(*this.toTypedArray()).exec().apply {
+    return Shell.cmd(*this.toTypedArray()).exec().apply {
         if (err.size > 0) Logger.log(
             Logger.Companion.Type.ERROR, "RUN COMMAND",
             err.toTypedArray().apply { callback(this) }.contentToString()
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/dialogs/NoRootDialog.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/dialogs/NoRootDialog.kt
index 25ee5861..a8259a30 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/dialogs/NoRootDialog.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/dialogs/NoRootDialog.kt
@@ -2,10 +2,13 @@ package de.dertyp7214.rboardthememanager.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
+import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.activity.ComponentDialog
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentActivity
 import com.google.android.material.button.MaterialButton
@@ -41,6 +44,14 @@ class NoRootDialog : DialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+            activity?.enableEdgeToEdge(
+                statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+            )
+
+            dialog?.window?.setDecorFitsSystemWindows(false)
+
+            dialog?.window?.isNavigationBarContrastEnforced = false
+            dialog?.window?.navigationBarColor = Color.TRANSPARENT
 
         val getMagiskButton: MaterialButton = view.findViewById(R.id.magisk_button)
 
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/dialogs/UsageDialog.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/dialogs/UsageDialog.kt
index 2d25c794..e045aeb6 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/dialogs/UsageDialog.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/dialogs/UsageDialog.kt
@@ -1,11 +1,14 @@
 package de.dertyp7214.rboardthememanager.dialogs
 
 import android.app.Dialog
+import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.activity.ComponentDialog
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentActivity
 import com.google.android.material.card.MaterialCardView
@@ -47,6 +50,14 @@ class UsageDialog(
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        activity?.enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+        )
+
+        dialog?.window?.setDecorFitsSystemWindows(false)
+
+        dialog?.window?.isNavigationBarContrastEnforced = false
+        dialog?.window?.navigationBarColor = Color.TRANSPARENT
 
         val magiskCard: MaterialCardView = view.findViewById(R.id.cardMagisk)
         val gboardCard: MaterialCardView = view.findViewById(R.id.cardGboard)
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/About.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/About.kt
index a7cfc1c0..1dc878da 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/About.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/About.kt
@@ -5,6 +5,7 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
@@ -18,6 +19,8 @@ import de.Maxr1998.modernpreferences.helpers.pref
 import de.dertyp7214.rboardthememanager.R
 import de.dertyp7214.rboardthememanager.core.SafeJSON
 import de.dertyp7214.rboardthememanager.core.openUrl
+import de.dertyp7214.rboardthememanager.core.isReachable
+import java.net.URL
 
 class About(private val activity: AppCompatActivity, private val args: SafeJSON) :
     AbstractMenuPreference() {
@@ -45,11 +48,16 @@ class About(private val activity: AppCompatActivity, private val args: SafeJSON)
         builder.pref("rkbdi") {
             titleRes = R.string.rkbdi
             summaryRes = R.string.owner_themer
-            useTint = false
-            icon = glide
-                .load(activity.getString(R.string.rkbdi_image))
-                .apply(options)
-                .submit(100, 100).get()
+            if (!URL(activity.getString(R.string.rkbdi_image)).isReachable()) {
+                iconRes = R.drawable.ic_person
+            }
+            else{
+                useTint = false
+                icon = glide
+                    .load(activity.getString(R.string.rkbdi_image))
+                    .apply(options)
+                    .submit(100, 100).get()
+            }
             onClick {
                 activity.openUrl(activity.getString(R.string.rkbdi_github))
                 false
@@ -58,11 +66,16 @@ class About(private val activity: AppCompatActivity, private val args: SafeJSON)
         builder.pref("akos") {
             titleRes = R.string.akos_paha
             summaryRes = R.string.developer_themer
-            useTint = false
-            icon = glide
-                .load(activity.getString(R.string.akos_image))
-                .apply(options)
-                .submit(100, 100).get()
+            if (!URL(activity.getString(R.string.akos_image)).isReachable()) {
+                iconRes = R.drawable.ic_person
+            }
+            else{
+                useTint = false
+                icon = glide
+                    .load(activity.getString(R.string.akos_image))
+                    .apply(options)
+                    .submit(100, 100).get()
+            }
             onClick {
                 activity.openUrl(activity.getString(R.string.akos_github))
                 false
@@ -71,11 +84,16 @@ class About(private val activity: AppCompatActivity, private val args: SafeJSON)
         builder.pref("dertyp") {
             titleRes = R.string.dertyp
             summaryRes = R.string.developer
-            useTint = false
-            icon = glide
-                .load(activity.getString(R.string.dertyp_image))
-                .apply(options)
-                .submit(100, 100).get()
+            if (!URL(activity.getString(R.string.dertyp_image)).isReachable()) {
+                iconRes = R.drawable.ic_person
+            }
+            else{
+                useTint = false
+                icon = glide
+                    .load(activity.getString(R.string.dertyp_image))
+                    .apply(options)
+                    .submit(100, 100).get()
+            }
             onClick {
                 activity.openUrl(activity.getString(R.string.dertyp_github))
                 false
@@ -84,11 +102,16 @@ class About(private val activity: AppCompatActivity, private val args: SafeJSON)
         builder.pref("dan") {
             titleRes = R.string.dan
             summaryRes = R.string.moderator
-            useTint = false
-            icon = glide
-                .load(activity.getString(R.string.dan_image))
-                .apply(options)
-                .submit(100, 100).get()
+            if (!URL(activity.getString(R.string.dan_image)).isReachable()) {
+                iconRes = R.drawable.ic_person
+            }
+            else{
+                useTint = false
+                icon = glide
+                    .load(activity.getString(R.string.dan_image))
+                    .apply(options)
+                    .submit(100, 100).get()
+            }
             onClick {
                 activity.openUrl(activity.getString(R.string.dan_github))
                 false
@@ -181,4 +204,4 @@ class About(private val activity: AppCompatActivity, private val args: SafeJSON)
             iconRes = FlagKit.getResId(activity, "cn")
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt
index dcd71502..720b642c 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt
@@ -262,7 +262,7 @@ class Settings(private val activity: Activity, private val args: SafeJSON) : Abs
             "clear_recent_emojis",
             R.string.clear_recent_emojis,
             R.string.clear_recent_emojis_long,
-            R.drawable.ic_emoji,
+            R.drawable.ic_emoji_clear,
             "",
             TYPE.STRING,
             listOf(),
@@ -338,7 +338,7 @@ class Settings(private val activity: Activity, private val args: SafeJSON) : Abs
             "LOGS",
             R.string.logs,
             R.string.logs_long,
-            -1,
+            R.drawable.ic_logs,
             "",
             TYPE.STRING,
             listOf(),
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/InstallPackActivity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/InstallPackActivity.kt
index 4ef0f0d2..0e52d514 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/InstallPackActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/InstallPackActivity.kt
@@ -1,7 +1,11 @@
 package de.dertyp7214.rboardthememanager.screens
 
+import android.graphics.Color
 import android.os.Bundle
+import android.view.View
 import android.widget.Toast
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -20,6 +24,7 @@ import de.dertyp7214.rboardthememanager.core.resize
 import de.dertyp7214.rboardthememanager.core.screenWidth
 import de.dertyp7214.rboardthememanager.data.ThemeDataClass
 import de.dertyp7214.rboardthememanager.databinding.ActivityInstallPackBinding
+import dev.chrisbanes.insetter.applyInsetter
 import java.io.File
 import java.util.regex.Pattern
 
@@ -28,6 +33,13 @@ class InstallPackActivity : AppCompatActivity() {
     private lateinit var binding: ActivityInstallPackBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+        )
+        window.setDecorFitsSystemWindows(false)
+        val view: View = window.decorView
+        window.isNavigationBarContrastEnforced = false
+        window.navigationBarColor = Color.TRANSPARENT
         super.onCreate(savedInstanceState)
         binding = ActivityInstallPackBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -36,6 +48,18 @@ class InstallPackActivity : AppCompatActivity() {
         val toolbar = binding.toolbar
         val recyclerview = binding.recyclerview
 
+        toolbar.applyInsetter {
+            type(statusBars = true) {
+                margin()
+            }
+        }
+
+        recyclerview.applyInsetter {
+            type(navigationBars = true) {
+                margin()
+            }
+        }
+
         toolbar.title = getString(R.string.install_themes, "0")
 
         val themes = arrayListOf<ThemeDataClass>()
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/Logs.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/Logs.kt
index e0a76de4..097bcd7d 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/Logs.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/Logs.kt
@@ -1,7 +1,11 @@
 package de.dertyp7214.rboardthememanager.screens
 
+import android.graphics.Color
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.view.View
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import com.dertyp7214.logs.fragments.Logs
 import de.dertyp7214.rboardthememanager.R
@@ -10,6 +14,15 @@ class Logs : AppCompatActivity() {
 
     @SuppressLint("CommitTransaction")
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+        )
+
+        window.setDecorFitsSystemWindows(false)
+
+        val view: View = window.decorView
+        window.isNavigationBarContrastEnforced = false
+        window.navigationBarColor = Color.TRANSPARENT
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_logs)
 
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
index afa02fa6..35908e47 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
@@ -5,6 +5,7 @@ package de.dertyp7214.rboardthememanager.screens
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.Intent.ACTION_SEND
+import android.graphics.Color
 import android.graphics.RenderEffect
 import android.graphics.Shader
 import android.os.Build
@@ -17,6 +18,8 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
@@ -144,10 +147,18 @@ class MainActivity : AppCompatActivity() {
 
     @SuppressLint("NotifyDataSetChanged", "ShowToast")
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+        )
+
+        window.setDecorFitsSystemWindows(false)
+
+        val view: View = window.decorView
+        window.isNavigationBarContrastEnforced = false
+        window.navigationBarColor = Color.TRANSPARENT
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        window.setDecorFitsSystemWindows(false)
 
         instances.add(this)
 
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt
index 5e42f54e..031e174d 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt
@@ -4,7 +4,11 @@ package de.dertyp7214.rboardthememanager.screens
 
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
+import android.view.View
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.google.gson.Gson
@@ -17,6 +21,7 @@ import de.dertyp7214.rboardthememanager.core.safeParse
 import de.dertyp7214.rboardthememanager.data.ThemePack
 import de.dertyp7214.rboardthememanager.databinding.ActivityManageRepoBinding
 import de.dertyp7214.rboardthememanager.utils.TypeTokens
+import dev.chrisbanes.insetter.applyInsetter
 import org.json.JSONObject
 import java.net.URL
 
@@ -36,6 +41,15 @@ class ManageRepo : AppCompatActivity() {
 
     @SuppressLint("NotifyDataSetChanged")
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+        )
+
+        window.setDecorFitsSystemWindows(false)
+
+        val view: View = window.decorView
+        window.isNavigationBarContrastEnforced = false
+        window.navigationBarColor = Color.TRANSPARENT
         super.onCreate(savedInstanceState)
         binding = ActivityManageRepoBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -54,6 +68,18 @@ class ManageRepo : AppCompatActivity() {
         recyclerView.adapter = adapter
         recyclerView.setHasFixedSize(true)
 
+        toolbar.applyInsetter {
+            type(statusBars = true) {
+                margin()
+            }
+        }
+
+        recyclerView.applyInsetter {
+            type(navigationBars = true) {
+                margin()
+            }
+        }
+
         toolbar.title = getString(R.string.manage_repo)
 
         binding.address.text = key
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt
index b1e68aac..907b4132 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt
@@ -3,12 +3,15 @@
 package de.dertyp7214.rboardthememanager.screens
 
 import android.annotation.SuppressLint
+import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.activity.OnBackPressedCallback
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -46,9 +49,17 @@ class PreferencesActivity : AppCompatActivity() {
 
     @SuppressLint("NotifyDataSetChanged")
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+        )
+
+        window.setDecorFitsSystemWindows(false)
+
+        val view: View = window.decorView
+        window.isNavigationBarContrastEnforced = false
+        window.navigationBarColor = Color.TRANSPARENT
         super.onCreate(savedInstanceState)
         binding = ActivityPreferencesBinding.inflate(layoutInflater)
-        window.setDecorFitsSystemWindows(false)
         setContentView(binding.root)
 
         instances.add(this)
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ReadMoreReadFast.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ReadMoreReadFast.kt
index 68dfcaee..a7b93ea6 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ReadMoreReadFast.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ReadMoreReadFast.kt
@@ -1,11 +1,15 @@
 package de.dertyp7214.rboardthememanager.screens
 
 import android.annotation.SuppressLint
+import android.graphics.Color
 import android.os.Bundle
+import android.view.View
 import android.view.View.FOCUS_DOWN
 import android.widget.LinearLayout
 import android.widget.ScrollView
 import android.widget.TextView
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.button.MaterialButton
 import de.dertyp7214.rboardthememanager.R
@@ -17,6 +21,15 @@ import de.dertyp7214.rboardcomponents.utils.doAsync
 class ReadMoreReadFast : AppCompatActivity() {
     @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+        )
+
+        window.setDecorFitsSystemWindows(false)
+
+        val view: View = window.decorView
+        window.isNavigationBarContrastEnforced = false
+        window.navigationBarColor = Color.TRANSPARENT
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_read_more_read_fast)
 
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ShareFlags.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ShareFlags.kt
index adcd0149..58730bf4 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ShareFlags.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ShareFlags.kt
@@ -5,10 +5,14 @@ package de.dertyp7214.rboardthememanager.screens
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.Intent.ACTION_SEND
+import android.graphics.Color
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import androidx.activity.OnBackPressedCallback
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import de.dertyp7214.rboardcomponents.components.SearchBar
 import de.dertyp7214.rboardthememanager.R
@@ -38,9 +42,17 @@ class ShareFlags : AppCompatActivity() {
 
     @SuppressLint("NotifyDataSetChanged")
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+        )
+
+        window.setDecorFitsSystemWindows(false)
+
+        val view: View = window.decorView
+        window.isNavigationBarContrastEnforced = false
+        window.navigationBarColor = Color.TRANSPARENT
         super.onCreate(savedInstanceState)
         binding = ActivityShareFlagsBinding.inflate(layoutInflater)
-        window.setDecorFitsSystemWindows(false)
         setContentView(binding.root)
 
         import = intent.getBooleanExtra("import", false)
@@ -55,6 +67,11 @@ class ShareFlags : AppCompatActivity() {
                 margin()
             }
         }
+        recyclerView.applyInsetter {
+            type(navigationBars = true) {
+                margin()
+            }
+        }
 
         if (!isFlags) titleRes = R.string.share_prefs_title
         if (import) titleRes =
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ThemeChangerActivity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ThemeChangerActivity.kt
index b4f42c2f..45ce4bda 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ThemeChangerActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ThemeChangerActivity.kt
@@ -1,11 +1,14 @@
 package de.dertyp7214.rboardthememanager.screens
 
 import android.content.Context
+import android.graphics.Color
 import android.os.Bundle
 import android.view.ContextThemeWrapper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
@@ -20,14 +23,25 @@ import de.dertyp7214.rboardthememanager.core.get
 import de.dertyp7214.rboardthememanager.core.getAttr
 import de.dertyp7214.rboardthememanager.core.set
 import de.dertyp7214.rboardthememanager.databinding.ActivityThemeChangerBinding
+import dev.chrisbanes.insetter.applyInsetter
 
 class ThemeChangerActivity : AppCompatActivity() {
 
-    val binding by lazy { ActivityThemeChangerBinding.inflate(layoutInflater) }
+    private lateinit var binding: ActivityThemeChangerBinding
     private val currentTheme by lazy { ThemeUtils.getStyleName(this) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+        )
+
+        window.setDecorFitsSystemWindows(false)
+
+        val view: View = window.decorView
+        window.isNavigationBarContrastEnforced = false
+        window.navigationBarColor = Color.TRANSPARENT
         super.onCreate(savedInstanceState)
+        binding = ActivityThemeChangerBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
         val toolbar = binding.toolbar
@@ -36,7 +50,16 @@ class ThemeChangerActivity : AppCompatActivity() {
         val dotsIndicator = binding.wormDotsIndicator
 
         val themes = ThemeUtils.APP_THEMES.toList()
-
+        toolbar.applyInsetter {
+            type(statusBars = true) {
+                margin()
+            }
+        }
+        applyButton.applyInsetter {
+            type(navigationBars = true) {
+                margin()
+            }
+        }
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/widgets/SwitchKeyboardWidgetConfigureActivity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/widgets/SwitchKeyboardWidgetConfigureActivity.kt
index 6ebba447..60b8b109 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/widgets/SwitchKeyboardWidgetConfigureActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/widgets/SwitchKeyboardWidgetConfigureActivity.kt
@@ -3,7 +3,12 @@ package de.dertyp7214.rboardthememanager.widgets
 import android.app.Activity
 import android.appwidget.AppWidgetManager
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
+import android.view.View
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import de.dertyp7214.rboardthememanager.adapter.ThemeAdapter
@@ -11,13 +16,24 @@ import de.dertyp7214.rboardthememanager.data.ThemeDataClass
 import de.dertyp7214.rboardthememanager.databinding.SwitchKeyboardWidgetConfigureBinding
 import de.dertyp7214.rboardthememanager.utils.ThemeUtils
 import de.dertyp7214.rboardcomponents.utils.doAsync
+import de.dertyp7214.rboardthememanager.components.MarginItemDecoration
+import de.dertyp7214.rboardthememanager.core.dpToPxRounded
 
-class SwitchKeyboardWidgetConfigureActivity : Activity() {
+class SwitchKeyboardWidgetConfigureActivity : AppCompatActivity() {
     private var appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID
     private lateinit var recyclerView: RecyclerView
     private lateinit var binding: SwitchKeyboardWidgetConfigureBinding
 
     public override fun onCreate(icicle: Bundle?) {
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+        )
+
+        window.setDecorFitsSystemWindows(false)
+
+        val view: View = window.decorView
+        window.isNavigationBarContrastEnforced = false
+        window.navigationBarColor = Color.TRANSPARENT
         super.onCreate(icicle)
 
         setResult(RESULT_CANCELED)
@@ -44,6 +60,7 @@ class SwitchKeyboardWidgetConfigureActivity : Activity() {
         recyclerView = binding.recyclerView
         recyclerView.adapter = adapter
         recyclerView.layoutManager = LinearLayoutManager(this)
+        recyclerView.addItemDecoration(MarginItemDecoration(2.1.dpToPxRounded(this)))
 
         doAsync(ThemeUtils::loadThemes) { themes ->
             list.addAll(themes)
diff --git a/app/src/main/res/drawable/ic_baseline_outlined_flag_24.xml b/app/src/main/res/drawable/ic_baseline_outlined_flag_24.xml
index caeeb30d..7ee0d84e 100644
--- a/app/src/main/res/drawable/ic_baseline_outlined_flag_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_outlined_flag_24.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M14,6l-1,-2L5,4v17h2v-7h5l1,2h7L20,6h-6zM18,14h-4l-1,-2L7,12L7,6h5l1,2h5v6z" />
diff --git a/app/src/main/res/drawable/ic_emoji_clear.xml b/app/src/main/res/drawable/ic_emoji_clear.xml
new file mode 100644
index 00000000..be80d62e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emoji_clear.xml
@@ -0,0 +1,32 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:alpha=".7"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M 15.999 12.001 C 16.43 12.001 16.789 11.861 17.069 11.57 C 17.349 11.29 17.499 10.931 17.499 10.5 C 17.499 10.07 17.359 9.71 17.069 9.43 C 16.789 9.14 16.43 9 15.999 9 C 15.57 9 15.209 9.14 14.929 9.43 C 14.64 9.71 14.5 10.07 14.5 10.5 C 14.5 10.931 14.64 11.29 14.929 11.57 C 15.209 11.861 15.57 12.001 15.999 12.001 Z"
+        android:fillColor="#FFF"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M 21.713 9.101 C 21.193 7.881 20.473 6.831 19.574 5.931 C 18.673 5.032 17.614 4.321 16.404 3.792 C 15.184 3.262 13.884 3.002 12.504 3.002 L 12.504 5.002 C 14.733 5.002 16.623 5.771 18.183 7.331 C 19.723 8.882 20.503 10.771 20.503 13.001 C 20.503 15.23 19.723 17.12 18.183 18.671 C 16.623 20.221 14.733 21 12.504 21 C 10.273 21 8.384 20.221 6.824 18.671 C 5.284 17.12 4.505 15.23 4.505 13.001 C 4.505 12.661 4.524 12.331 4.575 12.001 L 2.554 12.001 C 2.525 12.331 2.504 12.661 2.504 13.001 C 2.504 14.381 2.764 15.681 3.295 16.901 C 3.814 18.121 4.534 19.18 5.434 20.08 C 6.334 20.98 7.394 21.69 8.604 22.221 C 9.824 22.75 11.124 23.01 12.504 23.01 C 13.884 23.01 15.184 22.75 16.404 22.221 C 17.623 21.7 18.683 20.98 19.574 20.08 C 20.473 19.18 21.183 18.121 21.713 16.901 C 22.243 15.681 22.503 14.381 22.503 13.001 C 22.503 11.621 22.243 10.321 21.713 9.101 Z M 2.88 8.617 L 1.5 7.998 L 2.88 7.378 L 3.5 5.998 L 4.12 7.378 L 5.5 7.998 L 4.12 8.617 L 3.5 9.997 L 2.88 8.617 Z M 6.55 3.05 L 7.499 1 L 8.449 3.05 L 10.5 4 L 8.449 4.95 L 7.499 7 L 6.55 4.95 L 4.5 4 L 6.55 3.05 Z"
+        android:fillColor="#FFF"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M 9.003 12.001 C 9.433 12.001 9.793 11.861 10.073 11.57 C 10.353 11.29 10.503 10.931 10.503 10.5 C 10.503 10.07 10.363 9.71 10.073 9.43 C 9.793 9.14 9.433 9 9.003 9 C 8.574 9 8.213 9.14 7.933 9.43 C 7.644 9.71 7.504 10.07 7.504 10.5 C 7.504 10.931 7.644 11.29 7.933 11.57 C 8.213 11.861 8.574 12.001 9.003 12.001 Z M 16.38 16.92 C 15.48 18.01 13.94 18.73 12.19 18.73 C 10.44 18.73 8.9 18.01 8 16.92 L 9.42 15.5 C 9.87 16.23 10.94 16.73 12.19 16.73 C 13.44 16.73 14.51 16.23 14.96 15.5 L 16.38 16.92 Z"
+        android:fillColor="#FFF"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M 15.999 12.001 C 16.43 12.001 16.789 11.861 17.069 11.57 C 17.349 11.29 17.499 10.931 17.499 10.5 C 17.499 10.07 17.359 9.71 17.069 9.43 C 16.789 9.14 16.43 9 15.999 9 C 15.57 9 15.209 9.14 14.929 9.43 C 14.64 9.71 14.5 10.07 14.5 10.5 C 14.5 10.931 14.64 11.29 14.929 11.57 C 15.209 11.861 15.57 12.001 15.999 12.001 Z"
+        android:fillColor="#FFF"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M 21.713 9.101 C 21.193 7.881 20.473 6.831 19.574 5.931 C 18.673 5.032 17.614 4.321 16.404 3.792 C 15.184 3.262 13.884 3.002 12.504 3.002 L 12.504 5.002 C 14.733 5.002 16.623 5.771 18.183 7.331 C 19.723 8.882 20.503 10.771 20.503 13.001 C 20.503 15.23 19.723 17.12 18.183 18.671 C 16.623 20.221 14.733 21 12.504 21 C 10.273 21 8.384 20.221 6.824 18.671 C 5.284 17.12 4.505 15.23 4.505 13.001 C 4.505 12.661 4.524 12.331 4.575 12.001 L 2.554 12.001 C 2.525 12.331 2.504 12.661 2.504 13.001 C 2.504 14.381 2.764 15.681 3.295 16.901 C 3.814 18.121 4.534 19.18 5.434 20.08 C 6.334 20.98 7.394 21.69 8.604 22.221 C 9.824 22.75 11.124 23.01 12.504 23.01 C 13.884 23.01 15.184 22.75 16.404 22.221 C 17.623 21.7 18.683 20.98 19.574 20.08 C 20.473 19.18 21.183 18.121 21.713 16.901 C 22.243 15.681 22.503 14.381 22.503 13.001 C 22.503 11.621 22.243 10.321 21.713 9.101 Z M 2.88 8.617 L 1.5 7.998 L 2.88 7.378 L 3.5 5.998 L 4.12 7.378 L 5.5 7.998 L 4.12 8.617 L 3.5 9.997 L 2.88 8.617 Z M 6.55 3.05 L 7.499 1 L 8.449 3.05 L 10.5 4 L 8.449 4.95 L 7.499 7 L 6.55 4.95 L 4.5 4 L 6.55 3.05 Z"
+        android:fillColor="#FFF"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M 9.003 12.001 C 9.433 12.001 9.793 11.861 10.073 11.57 C 10.353 11.29 10.503 10.931 10.503 10.5 C 10.503 10.07 10.363 9.71 10.073 9.43 C 9.793 9.14 9.433 9 9.003 9 C 8.574 9 8.213 9.14 7.933 9.43 C 7.644 9.71 7.504 10.07 7.504 10.5 C 7.504 10.931 7.644 11.29 7.933 11.57 C 8.213 11.861 8.574 12.001 9.003 12.001 Z M 16.38 16.92 C 15.48 18.01 13.94 18.73 12.19 18.73 C 10.44 18.73 8.9 18.01 8 16.92 L 9.42 15.5 C 9.87 16.23 10.94 16.73 12.19 16.73 C 13.44 16.73 14.51 16.23 14.96 15.5 L 16.38 16.92 Z"
+        android:fillColor="#FFF"
+        android:strokeWidth="1"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_logs.xml b/app/src/main/res/drawable/ic_logs.xml
new file mode 100644
index 00000000..40903e59
--- /dev/null
+++ b/app/src/main/res/drawable/ic_logs.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:alpha=".7"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFF"
+        android:name="path"
+        android:pathData="M12 4c0.55 0 1 0.45 1 1s-0.45 1-1 1-1-0.45-1-1 0.45-1 1-1Zm0-2c-1.3 0-2.42 0.83-2.83 2H6C4.62 4 3.5 5.12 3.5 6.5v13C3.5 20.88 4.62 22 6 22h12c1.38 0 2.5-1.12 2.5-2.5v-13C20.5 5.12 19.38 4 18 4h-3.17C14.42 2.83 13.3 2 12 2Zm4 3.8h2c0.39 0 0.7 0.31 0.7 0.7v13c0 0.39-0.31 0.7-0.7 0.7H6c-0.39 0-0.7-0.31-0.7-0.7v-13c0-0.39 0.31-0.7 0.7-0.7h2V8h8V5.8ZM8 12v-1.7h8V12H8Zm8 3.2v-1.7H8v1.7h8Zm-8 1.5h5.6v1.7H8v-1.7Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_patch.xml b/app/src/main/res/drawable/ic_patch.xml
index 2ad7a858..a27a242f 100644
--- a/app/src/main/res/drawable/ic_patch.xml
+++ b/app/src/main/res/drawable/ic_patch.xml
@@ -6,6 +6,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="#ffffff"
-        android:fillType="evenOdd"
         android:pathData="M5,21H8.8C8.8,20.167 9.063,19.458 9.588,18.875C10.113,18.292 10.75,18 11.5,18C12.25,18 12.888,18.292 13.413,18.875C13.938,19.458 14.2,20.167 14.2,21H18C18.55,21 19.021,20.804 19.413,20.413C19.804,20.021 20,19.55 20,19V15C20.7,15 21.292,14.758 21.775,14.275C22.258,13.792 22.5,13.2 22.5,12.5C22.5,11.8 22.258,11.208 21.775,10.725C21.292,10.242 20.7,10 20,10V6C20,5.45 19.804,4.979 19.413,4.588C19.021,4.196 18.55,4 18,4H14C14,3.3 13.758,2.708 13.275,2.225C12.792,1.742 12.2,1.5 11.5,1.5C10.8,1.5 10.208,1.742 9.725,2.225C9.242,2.708 9,3.3 9,4H5C4.45,4 3.979,4.196 3.587,4.588C3.196,4.979 3,5.45 3,6V9.8C3.8,9.8 4.5,10.054 5.1,10.562C5.7,11.071 6,11.717 6,12.5C6,13.283 5.7,13.929 5.1,14.438C4.5,14.946 3.8,15.2 3,15.2V19C3,19.55 3.196,20.021 3.587,20.413C3.979,20.804 4.45,21 5,21ZM7.125,19H5V16.8C5.9,16.45 6.625,15.883 7.175,15.1C7.725,14.317 8,13.45 8,12.5C8,11.533 7.725,10.658 7.175,9.875C6.625,9.092 5.9,8.533 5,8.2V6H18V19H15.875C15.475,17.9 14.833,17.125 13.95,16.675C13.067,16.225 12.25,16 11.5,16C10.75,16 9.933,16.225 9.05,16.675C8.167,17.125 7.525,17.9 7.125,19Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml
index fc80bcb6..9804b7ca 100644
--- a/app/src/main/res/drawable/ic_person.xml
+++ b/app/src/main/res/drawable/ic_person.xml
@@ -2,11 +2,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:alpha=".7"
     android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
         android:fillAlpha=".7"
-        android:fillColor="#000"
+        android:fillColor="#FFF"
         android:pathData="M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_pack.xml b/app/src/main/res/layout/activity_install_pack.xml
index 35ed9275..f3fd2384 100644
--- a/app/src/main/res/layout/activity_install_pack.xml
+++ b/app/src/main/res/layout/activity_install_pack.xml
@@ -1,47 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".screens.InstallPackActivity">
+    android:fitsSystemWindows="true">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:attr/statusBarColor"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
+        android:fitsSystemWindows="true"
+        android:background="@drawable/color_surface_overlay_background"
+        app:background="@android:color/transparent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:menu="@menu/install_pack"
-        app:subtitleCentered="true"
-        app:titleCentered="true" />
+        app:layout_constraintTop_toTopOf="parent">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerview"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:requiresFadingEdge="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        tools:ignore="SpeakableTextPresentCheck"
-        tools:listitem="@layout/theme_grid_item_single" />
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:textAlignment="center"
+            android:fitsSystemWindows="true"
+            android:theme="?attr/actionBarTheme"
+            app:menu="@menu/install_pack"
+            app:subtitleCentered="true"
+            app:titleCentered="true" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="18dp"
-        android:layout_marginBottom="18dp"
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:clickable="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:srcCompat="@drawable/ic_baseline_check_24"
-        tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
+        tools:ignore="ContentDescription,SpeakableTextPresentCheck"
+        tools:visibility="visible" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+        tools:context="de.dertyp7214.rboardthememanager.screens.InstallPackActivity">
+
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:requiresFadingEdge="vertical"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="SpeakableTextPresentCheck"
+            tools:listitem="@layout/theme_grid_item_single"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_logs.xml b/app/src/main/res/layout/activity_logs.xml
index 02bd2017..57395e1e 100644
--- a/app/src/main/res/layout/activity_logs.xml
+++ b/app/src/main/res/layout/activity_logs.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".screens.Logs">
+    tools:context=".screens.Logs"
+    android:fitsSystemWindows="true">
 
     <FrameLayout
         android:id="@+id/frame"
diff --git a/app/src/main/res/layout/activity_manage_repo.xml b/app/src/main/res/layout/activity_manage_repo.xml
index c1df0261..28e0c66e 100644
--- a/app/src/main/res/layout/activity_manage_repo.xml
+++ b/app/src/main/res/layout/activity_manage_repo.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".screens.ManageRepo">
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
+        android:background="@drawable/color_surface_overlay_background"
+        app:background="@android:color/transparent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -20,12 +23,21 @@
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
             android:textAlignment="center"
+            android:fitsSystemWindows="true"
             android:theme="?attr/actionBarTheme"
             app:menu="@menu/manage_repo"
             app:titleCentered="true" />
 
     </com.google.android.material.appbar.AppBarLayout>
-
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+        tools:context="de.dertyp7214.rboardthememanager.screens.ManageRepo">
     <LinearLayout
         android:id="@+id/linearLayout3"
         android:layout_width="0dp"
@@ -34,7 +46,7 @@
         android:padding="8dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
+        app:layout_constraintTop_toTopOf="parent">
 
         <TextView
             android:layout_width="match_parent"
@@ -102,4 +114,5 @@
         tools:listitem="@layout/manage_repo_theme_pack">
 
     </androidx.recyclerview.widget.RecyclerView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml
index b148d60c..be3c63ce 100644
--- a/app/src/main/res/layout/activity_preferences.xml
+++ b/app/src/main/res/layout/activity_preferences.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
@@ -43,6 +44,7 @@
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
         android:clickable="true"
+        android:fitsSystemWindows="true"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_read_more_read_fast.xml b/app/src/main/res/layout/activity_read_more_read_fast.xml
index 93859ad5..de250bd8 100644
--- a/app/src/main/res/layout/activity_read_more_read_fast.xml
+++ b/app/src/main/res/layout/activity_read_more_read_fast.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".screens.ReadMoreReadFast">
+    tools:context=".screens.ReadMoreReadFast"
+    android:fitsSystemWindows="true">
 
     <ScrollView
         android:id="@+id/scrollView"
diff --git a/app/src/main/res/layout/activity_share_flags.xml b/app/src/main/res/layout/activity_share_flags.xml
index 9a204325..1202b2a4 100644
--- a/app/src/main/res/layout/activity_share_flags.xml
+++ b/app/src/main/res/layout/activity_share_flags.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".screens.ShareFlags">
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
+        android:background="@drawable/color_surface_overlay_background"
+        app:background="@android:color/transparent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
+            android:fitsSystemWindows="true"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?android:attr/statusBarColor"
             android:minHeight="?attr/actionBarSize"
             android:textAlignment="center"
             android:theme="?attr/actionBarTheme"
@@ -26,6 +29,15 @@
             app:titleCentered="true" />
 
     </com.google.android.material.appbar.AppBarLayout>
+<androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+    tools:context="de.dertyp7214.rboardthememanager.screens.ShareFlags">
 
     <de.dertyp7214.rboardcomponents.components.SearchBar
         android:id="@+id/searchBar"
@@ -33,9 +45,9 @@
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
+        app:layout_constraintTop_toTopOf="parent">
 
-    </de.dertyp7214.rboardcomponents.components.SearchBar>
+        </de.dertyp7214.rboardcomponents.components.SearchBar>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerview"
@@ -46,5 +58,5 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/searchBar" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_theme_changer.xml b/app/src/main/res/layout/activity_theme_changer.xml
index 3e984add..527920be 100644
--- a/app/src/main/res/layout/activity_theme_changer.xml
+++ b/app/src/main/res/layout/activity_theme_changer.xml
@@ -1,33 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".screens.ThemeChangerActivity">
+    android:fitsSystemWindows="true">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/applyButton"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginBottom="24dp"
-        android:text="@string/apply_theme"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
-        android:layout_width="0dp"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:attr/statusBarColor"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
+        android:fitsSystemWindows="true"
+        android:background="@drawable/color_surface_overlay_background"
+        app:background="@android:color/transparent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:fitsSystemWindows="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:textAlignment="center"
+            android:theme="?attr/actionBarTheme"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+<androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+    tools:context="de.dertyp7214.rboardthememanager.screens.ThemeChangerActivity">
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewPager"
@@ -37,8 +45,20 @@
         app:layout_constraintBottom_toTopOf="@+id/worm_dots_indicator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar" />
+        app:layout_constraintTop_toTopOf="parent" />
+
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/applyButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
+        android:text="@string/apply_theme"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
     <com.tbuonomo.viewpagerdotsindicator.WormDotsIndicator
         android:id="@+id/worm_dots_indicator"
         android:layout_width="wrap_content"
@@ -53,4 +73,5 @@
         app:layout_constraintBottom_toTopOf="@+id/applyButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"/>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_no_root.xml b/app/src/main/res/layout/dialog_no_root.xml
index 5ca97a27..fb5ffef5 100644
--- a/app/src/main/res/layout/dialog_no_root.xml
+++ b/app/src/main/res/layout/dialog_no_root.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
+    android:background="?attr/colorSurface"
+    android:fitsSystemWindows="true">
 
     <ImageView
         android:id="@+id/icon"
diff --git a/app/src/main/res/layout/switch_keyboard_widget_configure.xml b/app/src/main/res/layout/switch_keyboard_widget_configure.xml
index 5896f84c..0c38bfa0 100644
--- a/app/src/main/res/layout/switch_keyboard_widget_configure.xml
+++ b/app/src/main/res/layout/switch_keyboard_widget_configure.xml
@@ -4,14 +4,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="8dp">
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/cardView"
         android:layout_width="0dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_height="wrap_content"
         android:translationZ="0dp"
-        app:cardBackgroundColor="?attr/colorBackgroundFloating"
+        android:background="@android:color/transparent"
         app:cardCornerRadius="25dp"
         app:cardElevation="0dp"
         app:elevation="0dp"
diff --git a/app/src/main/res/layout/usage_dialog.xml b/app/src/main/res/layout/usage_dialog.xml
index ff95df3f..2ff49b7a 100644
--- a/app/src/main/res/layout/usage_dialog.xml
+++ b/app/src/main/res/layout/usage_dialog.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
+    android:background="?attr/colorSurface"
+    android:fitsSystemWindows="true">
 
     <ImageView
         android:id="@+id/icon"
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-in/strings.xml
similarity index 100%
rename from app/src/main/res/values-id/strings.xml
rename to app/src/main/res/values-in/strings.xml
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c7d28e91..61209238 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,7 +3,9 @@
     <style name="Theme.RboardThemeManagerV3" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
 
-        <item name="android:statusBarColor">?android:attr/colorBackground</item>
+        <item name="fontFamily">@font/google_sans_text_400</item>
+
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
 
         <item name="floatingActionButtonStyle">?floatingActionButtonSecondaryStyle</item>
@@ -12,8 +14,6 @@
             @style/Dialog.RboardThemeManagerV3.MaterialAlertDialog
         </item>
 
-        <item name="fontFamily">@font/google_sans_text_400</item>
-
         <item name="collapsingToolbarLayoutStyle">@style/Widget.CollapsingToolbar</item>
 
         <item name="snackbarStyle">@style/Widget.App.Snackbar</item>
@@ -23,9 +23,7 @@
         <item name="android:windowSplashScreenBackground">?attr/colorSurface</item>
         <item name="android:windowSplashScreenBrandingImage">@drawable/dertyp_branding</item>
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_launcher_animation</item>
-        <item name="android:windowSplashScreenAnimationDuration">
-            @integer/splashAnimationDuration
-        </item>
+        <item name="android:windowSplashScreenAnimationDuration">@integer/splashAnimationDuration</item>
     </style>
 
     <style name="Theme.RboardThemeManagerV3.Main" parent="Theme.RboardThemeManagerV3" />
diff --git a/build.gradle.kts b/build.gradle.kts
index b652987c..e97cc9a3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
     dependencies {
         classpath(libs.gradle)
         //noinspection DifferentKotlinGradleVersion
-        classpath(kotlin("gradle-plugin", version = "1.9.24"))
+        classpath(kotlin("gradle-plugin", version = "2.0.0"))
         classpath(libs.google.services)
     }
 }
diff --git a/colorutilsc b/colorutilsc
index 09168c33..e5623cd3 160000
--- a/colorutilsc
+++ b/colorutilsc
@@ -1 +1 @@
-Subproject commit 09168c33c6267487aca8ba1e51e30be973ec1924
+Subproject commit e5623cd31084beea7a557f530f88ac40506c44be
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d376d0db..f770c417 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,27 +1,27 @@
 [versions]
-androidx-junit = "1.1.5"
+androidx-junit = "1.2.1"
 de-PRDownloader = "v0.6.0"
 google-core = "2.1.0"
 google-core-ktx = "2.1.0"
 junit-junit = "4.13.2"
-kotlinReflect = "1.9.24"
+kotlinReflect = "2.0.0"
 ksp = "4.16.0"
-libsuVersion = "5.2.2"
+libsuVersion = "6.0.0"
 insetter = "0.6.1"
 
-kotlin-stdlib = "1.9.24"
-appcompat = "1.7.0-beta01"
+kotlin-stdlib = "2.0.0"
+appcompat = "1.7.0"
 constraintlayout = "2.2.0-alpha13"
 preference-ktx = "1.2.1"
-activity-ktx = "1.9.0"
-fragment-ktx = "1.7.0"
-lifecycle-viewmodel-ktx = "2.7.0"
+activity-ktx = "1.9.1"
+fragment-ktx = "1.8.2"
+lifecycle-viewmodel-ktx = "2.8.4"
 browser = "1.8.0"
 glide = "4.16.0"
 flagkit = "1.0.2"
-firebase-bom = "33.0.0"
+firebase-bom = "33.1.2"
 firebase-messaging-ktx = "24.0.0"
-firebase-analytics-ktx = "22.0.0"
+firebase-analytics-ktx = "22.0.2"
 legacy-support-v4 = "1.0.0"
 navigation-fragment-ktx = "2.7.7"
 navigation-ui-ktx = "2.7.7"
@@ -29,21 +29,21 @@ commons-text = "1.12.0"
 core-ktx = "1.13.1"
 core = "1.13.1"
 material = "1.12.0"
-espresso-core = "3.5.1"
+espresso-core = "3.6.1"
 android-shell = "1.0.0"
-firebase-analytics = "22.0.0"
+firebase-analytics = "22.0.2"
 firebase-messaging = "24.0.0"
-gson = "2.10.1"
+gson = "2.11.0"
 protobufDynamic = "1.0.1"
 simple-item-decoration = "1.0.0"
-balloon = "1.6.4"
-kspPlugin = "1.9.24-1.0.20"
+balloon = "1.6.5"
+kspPlugin = "2.0.0-1.0.23"
 dotsIndicator = "5.0"
 
-googleServices = "4.4.1"
-gradle = "8.5.0-alpha08"
-uiTooling = "1.6.7"
-kotlin = "1.9.24"
+googleServices = "4.4.2"
+gradle = "8.7.0-alpha03"
+uiTooling = "1.6.8"
+kotlin = "2.0.0"
 
 [libraries]
 prDownloader = { module = "de.dertyp7214:PRDownloader", version.ref = "de-PRDownloader" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 141a154d..e5ff5cb7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Tue Apr 23 08:52:35 CEST 2024
+#Fri Jul 26 22:21:56 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mathc b/mathc
index 0ed4aa53..48039013 160000
--- a/mathc
+++ b/mathc
@@ -1 +1 @@
-Subproject commit 0ed4aa5391b184b28cabfbfc9863c56692de4640
+Subproject commit 48039013994eba3b227211bed672cfc08c8799e0
diff --git a/rboardcomponents b/rboardcomponents
index 46caa643..6ca9f893 160000
--- a/rboardcomponents
+++ b/rboardcomponents
@@ -1 +1 @@
-Subproject commit 46caa643b9c4afff9bd42ef87cb576ee11981c45
+Subproject commit 6ca9f893e50c70f0f6dd459f9f6078bef9f76b69

From 596f9e5effe2e81bb7590109c20bc5ba4475b542 Mon Sep 17 00:00:00 2001
From: PahaAkos <paha.akos@gmail.com>
Date: Tue, 30 Jul 2024 14:08:42 +0200
Subject: [PATCH 2/2] Update Submodule
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🔧 New dependencies changes:
• Update Balloon to 1.6.6
• Update Kotlin KSP to 2.0.0-1.0.24

🗂️ Others Changes:
• Update RboardComponents Submodule
---
 gradle/libs.versions.toml | 4 ++--
 rboardcomponents          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f770c417..9e297cea 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -36,8 +36,8 @@ firebase-messaging = "24.0.0"
 gson = "2.11.0"
 protobufDynamic = "1.0.1"
 simple-item-decoration = "1.0.0"
-balloon = "1.6.5"
-kspPlugin = "2.0.0-1.0.23"
+balloon = "1.6.6"
+kspPlugin = "2.0.0-1.0.24"
 dotsIndicator = "5.0"
 
 googleServices = "4.4.2"
diff --git a/rboardcomponents b/rboardcomponents
index 6ca9f893..721ce83e 160000
--- a/rboardcomponents
+++ b/rboardcomponents
@@ -1 +1 @@
-Subproject commit 6ca9f893e50c70f0f6dd459f9f6078bef9f76b69
+Subproject commit 721ce83e3d5842ead7336ce6c380d1063f72bf70