diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml
index b2bc298e..409bd1d1 100644
--- a/.github/workflows/buildCi.yml
+++ b/.github/workflows/buildCi.yml
@@ -19,10 +19,16 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
+      
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '3.30.3'
+          
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r27
+          ndk-version: r27b
 
       - name: Get Commit Message
         id: commitMessage
@@ -32,7 +38,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 22
 
       - name: Cache Gradle dependencies
         uses: actions/cache@v4
@@ -67,10 +73,11 @@ jobs:
 
       - name: Build apk
         id: buildAllApks
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: wrapper
-          arguments: assembleDebug
+            gradle-version: wrapper
+      - name: AssembleDebug the project
+        run: ./gradlew assembleDebug
 
       - name: Get JSON
         id: metadataJson
@@ -146,7 +153,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r27
+          ndk-version: r27b
 
       - name: Get Commit Message
         id: commitMessage
@@ -156,7 +163,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 22
 
       - name: Cache Gradle dependencies
         uses: actions/cache@v4
@@ -191,10 +198,11 @@ jobs:
         
       - name: Build apk
         id: buildAllApks
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: wrapper
-          arguments: assembleRelease
+            gradle-version: wrapper
+      - name: AssembleRelease the project
+        run: ./gradlew assembleRelease
 
       - name: Get JSON
         id: metadataJson
@@ -273,10 +281,16 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
+      
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '3.30.3'
+          
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r27
+          ndk-version: r27b
 
       - name: Get Commit Message
         id: commitMessage
@@ -286,7 +300,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 22
 
       - name: Cache Gradle dependencies
         uses: actions/cache@v4
@@ -321,10 +335,11 @@ jobs:
 
       - name: Build apk
         id: buildAllApks
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: wrapper
-          arguments: assembleDebug
+            gradle-version: wrapper
+      - name: AssembleDebug the project
+        run: ./gradlew assembleDebug
 
       - name: Get JSON
         id: metadataJson
diff --git a/.github/workflows/buildPro.yml b/.github/workflows/buildPro.yml
index 726ba29d..190c59b5 100644
--- a/.github/workflows/buildPro.yml
+++ b/.github/workflows/buildPro.yml
@@ -12,10 +12,15 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-
+      
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '3.30.3'
+          
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r27
+          ndk-version: r27b
 
       - name: Get Commit Message
         id: commitMessage
@@ -25,7 +30,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 22
 
       - name: Cache Gradle dependencies
         uses: actions/cache@v4
@@ -54,10 +59,11 @@ jobs:
         
       - name: Build apk
         id: buildAllApks
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: wrapper
-          arguments: assemblePro
+            gradle-version: wrapper
+      - name: AssemblePro the project
+        run: ./gradlew assemblePro
 
       - name: Get JSON
         id: metadataJson
diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml
index d718b3e0..5e60b678 100644
--- a/.github/workflows/pullRequest.yml
+++ b/.github/workflows/pullRequest.yml
@@ -21,15 +21,20 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '3.30.3'
+
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r27
+          ndk-version: r27b
 
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 22
 
       - name: Cache Gradle dependencies
         uses: actions/cache@v4
@@ -56,15 +61,16 @@ jobs:
       - name: Accept Preview SDK License
         run: echo -n -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > /usr/local/lib/android/sdk/licenses/android-sdk-preview-license
 
+      - name: CMake Version
+        run: cmake --version
+
       - name: Build apk
         id: buildAllApks
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: wrapper
-          wrapper-cache-enabled: true
-          dependencies-cache-enabled: true
-          configuration-cache-enabled: true
-          arguments: assembleDebug
+            gradle-version: wrapper
+      - name: AssembleDebug the project
+        run: ./gradlew assembleDebug
 
       - name: Get JSON
         id: metadataJson
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b86273d9..6030a3de 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
+    <bytecodeTargetLevel target="22" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index f65cb801..360b2559 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-05-01T18:10:01.943798400Z">
+        <DropdownSelection timestamp="2024-09-04T20:51:26.476991100Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\orang\.android\avd\Pixel_8_Pro_API_33.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\orang\.android\avd\Pixel_9_Pro_Fold_API_35.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e6f56ef8..6d414fee 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,8 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="21" />
+        <option name="gradleJvm" value="22" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 485accd3..57f84913 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="moduleKind" value="plain" />
+  </component>
   <component name="Kotlin2JvmCompilerArguments">
-    <option name="jvmTarget" value="21" />
+    <option name="jvmTarget" value="22" />
   </component>
   <component name="KotlinCommonCompilerArguments">
-    <option name="apiVersion" value="2.0" />
-    <option name="languageVersion" value="2.0" />
+    <option name="apiVersion" value="2.1" />
+    <option name="languageVersion" value="2.1" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.0" />
+    <option name="version" value="2.1.0-Beta1" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 881bbb21..75e8d6a2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="androidx.annotation.Nullable" />
     <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="15">
+        <list size="16">
           <item index="0" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="org.jspecify.nullness.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
@@ -21,12 +21,13 @@
           <item index="12" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
           <item index="13" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
           <item index="14" class="java.lang.String" itemvalue="android.annotation.Nullable" />
+          <item index="15" class="java.lang.String" itemvalue="org.jspecify.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="14">
+        <list size="15">
           <item index="0" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
           <item index="1" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
           <item index="2" class="java.lang.String" itemvalue="jakarta.annotation.Nonnull" />
@@ -41,11 +42,12 @@
           <item index="11" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
           <item index="13" class="java.lang.String" itemvalue="android.annotation.NonNull" />
+          <item index="14" class="java.lang.String" itemvalue="org.jspecify.annotations.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_22" default="true" project-jdk-name="22" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/other.xml b/.idea/other.xml
index 6f37c95e..f3d4a2e5 100644
--- a/.idea/other.xml
+++ b/.idea/other.xml
@@ -3,242 +3,4 @@
   <component name="ScreenshotViewer">
     <option name="frameScreenshot" value="true" />
   </component>
-  <component name="direct_access_persist.xml">
-    <option name="deviceSelectionList">
-      <list>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="27" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="F01L" />
-          <option name="id" value="F01L" />
-          <option name="manufacturer" value="FUJITSU" />
-          <option name="name" value="F-01L" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1280" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="28" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="SH-01L" />
-          <option name="id" value="SH-01L" />
-          <option name="manufacturer" value="SHARP" />
-          <option name="name" value="AQUOS sense2 SH-01L" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a51" />
-          <option name="id" value="a51" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy A51" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="b0q" />
-          <option name="id" value="b0q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S22 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="32" />
-          <option name="brand" value="google" />
-          <option name="codename" value="bluejay" />
-          <option name="id" value="bluejay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="crownqlteue" />
-          <option name="id" value="crownqlteue" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Note9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2220" />
-          <option name="screenY" value="1080" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix_camera" />
-          <option name="id" value="felix_camera" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold (Camera-enabled)" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts8uwifi" />
-          <option name="id" value="gts8uwifi" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S8 Ultra" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1848" />
-          <option name="screenY" value="2960" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="husky" />
-          <option name="id" value="husky" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8 Pro" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="java" />
-          <option name="id" value="java" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="G20" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="lynx" />
-          <option name="id" value="lynx" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="google" />
-          <option name="codename" value="oriole" />
-          <option name="id" value="oriole" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="panther" />
-          <option name="id" value="panther" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q2q" />
-          <option name="id" value="q2q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold3" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1768" />
-          <option name="screenY" value="2208" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q5q" />
-          <option name="id" value="q5q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold5" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1812" />
-          <option name="screenY" value="2176" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="r11" />
-          <option name="id" value="r11" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Watch" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="384" />
-          <option name="screenY" value="384" />
-          <option name="type" value="WEAR_OS" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="redfin" />
-          <option name="id" value="redfin" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 5" />
-          <option name="screenDensity" value="440" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="shiba" />
-          <option name="id" value="shiba" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tangorpro" />
-          <option name="id" value="tangorpro" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Tablet" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="x1q" />
-          <option name="id" value="x1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S20" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3200" />
-        </PersistentDeviceSelectionData>
-      </list>
-    </option>
-  </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 34232c6e..247098c4 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Download R Compatible DEV APK](https://img.shields.io/badge/dynamic/json.svg?label=download&url=https://api.github.com/repos/DerTyp7214/RboardThemeManagerV3/releases/tags/latest-rCompatible-debug&query=$.assets[0].name)](https://github.com/DerTyp7214/RboardThemeManagerV3/releases/download/latest-rCompatible-debug/app-debug.apk)
 [![Build R Compatible](https://github.com/DerTyp7214/RboardThemeManagerV3/actions/workflows/buildCi.yml/badge.svg?branch=rCompatible)](https://github.com/DerTyp7214/RboardThemeManagerV3/actions/workflows/buildCi.yml?query=branch%3ArCompatible)
 [![Build R Compatible DEV](https://github.com/DerTyp7214/RboardThemeManagerV3/actions/workflows/buildCi.yml/badge.svg?branch=rCompatible-Dev)](https://github.com/DerTyp7214/RboardThemeManagerV3/actions/workflows/buildCi.yml?query=branch%3ArCompatible-Dev)
-[![Donate Dev](https://img.shields.io/badge/Donate%20Dev-PayPal-green.svg)](https://paypal.me/JosuaLengwenath)
+[![Donate Dev](https://img.shields.io/badge/Donate%20Dev-PayPal-green.svg)](https://paypal.me/DerTyp7214)
 [![Donate Designer](https://img.shields.io/badge/Donate%20Designer-PayPal-green.svg)](https://paypal.me/rkbdi)
 # For translators
 work on [master](https://github.com/DerTyp7214/RboardThemeManagerV3/tree/master) and [rCompatible-Dev](https://github.com/DerTyp7214/RboardThemeManagerV3/tree/rCompatible-Dev)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c9224182..51007669 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.config.JvmTarget
-
 plugins {
     id("com.android.application")
     id("com.google.gms.google-services")
@@ -21,12 +19,14 @@ android {
         // Update the minSdk if old Android Versions are no longer supported on the Gboard side.
         minSdk = 23
         targetSdk = 35
-        versionCode = 393000
+        versionCode = 393006
         versionName = "3.9.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        resourceConfigurations += listOf(
+    }
+    @Suppress("UnstableApiUsage")
+    androidResources {
+        localeFilters += listOf(
             "ar", "cs", "da", "de",
             "el", "en", "es", "fi",
             "fr", "hi", "hu", "in",
@@ -51,25 +51,28 @@ android {
     }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.current()
+        targetCompatibility = JavaVersion.current()
     }
 
     kotlinOptions {
-        jvmTarget = JvmTarget.JVM_21.toString()
+        jvmTarget = JavaVersion.current().toString()
         freeCompilerArgs += listOf(
             "-P",
             "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true",
             "-Xsuppress-version-warnings"
         )
     }
-
     packaging {
         jniLibs {
             useLegacyPackaging = true
         }
         resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
     }
+    lint {
+        baseline = file("lint-baseline.xml")
+    }
+
     namespace = "de.dertyp7214.rboardthememanager"
 }
 
@@ -81,8 +84,6 @@ dependencies {
     implementation(libs.firebase.messaging.ktx)
     implementation(libs.firebase.analytics.ktx)
 
-    implementation(libs.preferencesplus)
-
     implementation(libs.protobuf.dynamic)
 
     implementation(libs.legacy.support.v4)
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
new file mode 100644
index 00000000..06eefac3
--- /dev/null
+++ b/app/lint-baseline.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.8.0-alpha04" type="baseline" client="gradle" dependencies="false" name="AGP (8.8.0-alpha04)" variant="fatal" version="8.8.0-alpha04">
+
+    <issue
+        id="InvalidSetHasFixedSize"
+        message="When using `setHasFixedSize() in an `RecyclerView`, `wrap_content` cannot be used as a value for `size` in the scrolling direction."
+        errorLine1="                    recyclerView.setHasFixedSize(true)"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/de/dertyp7214/rboardthememanager/adapter/SoundPackAdapter.kt"
+            line="64"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="InvalidSetHasFixedSize"
+        message="When using `setHasFixedSize() in an `RecyclerView`, `wrap_content` cannot be used as a value for `size` in the scrolling direction."
+        errorLine1="        recyclerView.setHasFixedSize(true)"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/de/dertyp7214/rboardthememanager/fragments/SoundsFragment.kt"
+            line="48"
+            column="9"/>
+    </issue>
+
+</issues>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c220a28..e29e6554 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,6 +28,7 @@
         tools:targetApi="tiramisu">
         <activity
             android:name=".screens.ThemeChangerActivity"
+            android:screenOrientation="portrait"
             android:exported="false" />
         <activity
             android:name=".screens.Logs"
@@ -48,6 +49,7 @@
 
         <receiver
             android:name=".widgets.SwitchKeyboardWidget"
+            android:screenOrientation="portrait"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -69,6 +71,7 @@
 
         <receiver
             android:name=".widgets.FlagsWidget"
+            android:screenOrientation="portrait"
             android:enabled="@bool/is_post_api_31"
             android:exported="true">
             <intent-filter>
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/adapter/SoundPackAdapter.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/adapter/SoundPackAdapter.kt
index 45e0cefc..241d7986 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/adapter/SoundPackAdapter.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/adapter/SoundPackAdapter.kt
@@ -1,7 +1,9 @@
 package de.dertyp7214.rboardthememanager.adapter
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.media.MediaPlayer
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -16,8 +18,11 @@ import de.dertyp7214.rboardthememanager.Config
 import de.dertyp7214.rboardthememanager.R
 import de.dertyp7214.rboardthememanager.core.copyRecursively
 import de.dertyp7214.rboardthememanager.core.download
+import de.dertyp7214.rboardthememanager.core.format
 import de.dertyp7214.rboardthememanager.core.openDialog
 import de.dertyp7214.rboardthememanager.core.showMaterial
+import de.dertyp7214.rboardthememanager.core.toHumanReadableBytes
+import de.dertyp7214.rboardthememanager.core.zeroOrNull
 import de.dertyp7214.rboardthememanager.data.SoundPack
 import de.dertyp7214.rboardthememanager.utils.RootUtils
 import de.dertyp7214.rboardthememanager.utils.getSoundsDirectory
@@ -35,9 +40,11 @@ class SoundPackAdapter(
 
     class ViewHolder(v: View) : RecyclerView.ViewHolder(v) {
         val root: View = v.findViewById(R.id.root)
+        val size: TextView = v.findViewById(R.id.size)
         val title: TextView = v.findViewById(R.id.title)
         val image: ImageView = v.findViewById(R.id.image)
         val author: TextView = v.findViewById(R.id.author)
+        val lastUpdate: TextView = v.findViewById(R.id.lastUpdate)
     }
 
     override fun getItemId(position: Int): Long {
@@ -48,23 +55,32 @@ class SoundPackAdapter(
         return ViewHolder(LayoutInflater.from(activity).inflate(R.layout.pack_item, parent, false))
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val soundPack = list[position]
 
+        holder.size.text =
+            soundPack.size.zeroOrNull {
+                it.toHumanReadableBytes(
+                    activity
+                )
+            } ?: ""
         holder.title.text = soundPack.title
         holder.author.text = soundPack.author
 
         holder.image.setImageResource(R.drawable.ic_sounds)
 
+        holder.lastUpdate.text = soundPack.date.zeroOrNull{it.format(System.currentTimeMillis())} ?: ""
         holder.root.setOnClickListener {
             soundPack.download(activity) { sounds ->
                 activity.openDialog(R.layout.soundpack_dialog) { dialog ->
                     val recyclerView = findViewById<RecyclerView>(R.id.recyclerView)
+                    val textView = findViewById<TextView>(R.id.TextViewSound)
 
                     recyclerView.setHasFixedSize(true)
                     recyclerView.layoutManager = LinearLayoutManager(activity)
                     recyclerView.adapter = SoundAdapter(sounds, activity)
-
+                    textView.text = soundPack.title
                     findViewById<Button>(R.id.ok)?.setOnClickListener {
                         getSoundsDirectory()?.path?.let { path ->
                             SuFile("${Config.MODULE_PATH}$path/audio/ui").apply {
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/core/Activity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/core/Activity.kt
index b9e26c61..79bb3736 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/core/Activity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/core/Activity.kt
@@ -26,9 +26,9 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputLayout
 import de.dertyp7214.rboardthememanager.R
-import de.dertyp7214.rboardthememanager.components.XMLEntry
 import de.dertyp7214.rboardthememanager.components.XMLType
 import de.dertyp7214.rboardthememanager.data.ThemeDataClass
+import de.dertyp7214.rboardthememanager.components.XMLEntry
 
 val Activity.preferences: SharedPreferences
     get() = PreferenceManager.getDefaultSharedPreferences(this)
@@ -175,14 +175,17 @@ fun Activity.openShareThemeDialog(
 }
 
 @SuppressLint("InflateParams")
-fun Activity.openInputDialog(
+fun Activity.openInputDialogFlag(
+    name: String,
     @StringRes hint: Int,
     value: String? = null,
     @StringRes negativeText: Int = android.R.string.cancel,
     negative: ((dialogInterface: DialogInterface) -> Unit) = { it.dismiss() },
     positive: (dialogInterface: DialogInterface, text: String) -> Unit
-) = openDialog(R.layout.input_dialog, false) { dialog ->
+) = openDialog(R.layout.input_dialog_with_title, false) { dialog ->
+    val flagnames = findViewById<TextView>(R.id.TextViewFlag)
     val input = findViewById<EditText>(R.id.editText)
+    flagnames.text = name
     input.setHint(hint)
     if (value != null) input.setText(value)
 
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/data/SoundPack.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/data/SoundPack.kt
index 10258cbd..93a9bcb7 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/data/SoundPack.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/data/SoundPack.kt
@@ -1,3 +1,23 @@
 package de.dertyp7214.rboardthememanager.data
 
-data class SoundPack(val author: String, val url: String, val title: String)
\ No newline at end of file
+import kotlin.jvm.javaClass
+
+data class SoundPack(
+    val author: String, val url: String, val title: String,
+    val size: Long = 0,
+    val date: Long = Long.MAX_VALUE
+) {
+    override fun hashCode(): Int {
+        return author.hashCode() + url.hashCode()
+    }
+override fun equals(other: Any?): Boolean {
+
+    other as SoundPack
+
+    if (author != other.author) return false
+    if (url != other.url) return false
+    if (size != other.size) return false
+    if (date != other.date) return false
+
+    return true
+}}
\ No newline at end of file
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 a8ab6a02..6fcb1da7 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/dialogs/NoRootDialog.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/dialogs/NoRootDialog.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package de.dertyp7214.rboardthememanager.dialogs
 
 import android.app.Dialog
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 da0be2d0..da51b9ae 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/dialogs/UsageDialog.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/dialogs/UsageDialog.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package de.dertyp7214.rboardthememanager.dialogs
 
 import android.app.Dialog
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/fragments/DownloadListFragment.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/fragments/DownloadListFragment.kt
index dc65ea2e..1c74e5c8 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/fragments/DownloadListFragment.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/fragments/DownloadListFragment.kt
@@ -24,6 +24,7 @@ import de.dertyp7214.rboardthememanager.screens.InstallPackActivity
 import de.dertyp7214.rboardthememanager.utils.*
 import de.dertyp7214.rboardcomponents.utils.asyncInto
 import de.dertyp7214.rboardcomponents.utils.doAsyncCallback
+import de.dertyp7214.rboardthememanager.Config
 import de.dertyp7214.rboardthememanager.viewmodels.MainViewModel
 
 class DownloadListFragment : Fragment() {
@@ -71,7 +72,7 @@ class DownloadListFragment : Fragment() {
                     )
                         .setAnchorView(requireActivity().findViewById(R.id.bottom_bar))
                         .also { snackbar ->
-                            if (IS_MIUI)
+                            if (IS_MIUI || Config.useMagisk)
                                 snackbar.setAction(
                                     R.string.reboot
                                 ) {
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 dab852e9..78b32232 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/About.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/About.kt
@@ -1,26 +1,54 @@
 package de.dertyp7214.rboardthememanager.preferences
 
+import android.content.Context
+import android.content.Intent
+import android.os.Build
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
+import android.widget.Button
+import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.core.content.ContextCompat.startActivity
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.RequestOptions
+import com.google.android.material.snackbar.Snackbar
 import com.murgupluoglu.flagkit.FlagKit
+import com.topjohnwu.superuser.io.SuFile
 import de.Maxr1998.modernpreferences.PreferenceScreen
 import de.Maxr1998.modernpreferences.PreferencesAdapter
 import de.Maxr1998.modernpreferences.helpers.categoryHeader
 import de.Maxr1998.modernpreferences.helpers.onClick
+import de.Maxr1998.modernpreferences.helpers.onClickView
 import de.Maxr1998.modernpreferences.helpers.pref
+import de.dertyp7214.rboardthememanager.Config
+import de.dertyp7214.rboardthememanager.Config.GBOARD_PACKAGE_NAME
+import de.dertyp7214.rboardthememanager.Config.PLAY_URL
 import de.dertyp7214.rboardthememanager.R
+import de.dertyp7214.rboardthememanager.adapter.SoundPackAdapter.SoundAdapter
 import de.dertyp7214.rboardthememanager.core.SafeJSON
+import de.dertyp7214.rboardthememanager.core.copyRecursively
+import de.dertyp7214.rboardthememanager.core.getSystemProperty
 import de.dertyp7214.rboardthememanager.core.openUrl
 import de.dertyp7214.rboardthememanager.core.isReachable
+import de.dertyp7214.rboardthememanager.core.openDialog
+import de.dertyp7214.rboardthememanager.core.openInputDialogFlag
+import de.dertyp7214.rboardthememanager.core.runAsCommand
+import de.dertyp7214.rboardthememanager.core.safeString
+import de.dertyp7214.rboardthememanager.core.setSystemProperty
+import de.dertyp7214.rboardthememanager.core.showMaterial
+import de.dertyp7214.rboardthememanager.screens.PreferencesActivity
+import de.dertyp7214.rboardthememanager.utils.PackageUtils
+import de.dertyp7214.rboardthememanager.utils.RootUtils
+import de.dertyp7214.rboardthememanager.utils.getSoundsDirectory
 import java.net.URL
+import kotlin.coroutines.coroutineContext
 
 class About(private val activity: AppCompatActivity, private val args: SafeJSON) :
     AbstractMenuPreference() {
@@ -152,15 +180,79 @@ class About(private val activity: AppCompatActivity, private val args: SafeJSON)
                 false
             }
         }
+        builder.categoryHeader("rboard_apps") {
+            titleRes = R.string.rboard_apps
+        }
+        builder.pref("more_rboard_apps") {
+            titleRes = R.string.more_rboard_apps
+            summaryRes = R.string.more_rboard_apps_desc
+            iconRes = R.drawable.ic_rboard
+            onClickView {
+                activity.openDialog(R.layout.more_rboard_apps_dialog) { dialog ->
+                    val title = findViewById<TextView>(R.id.TextViewApps)
+                title.text = activity.getString(R.string.more_rboard_apps)
+                val rboardThemePatcher = findViewById<TextView>(R.id.rboard_theme_patcher)
+                val rboardThemeCreator = findViewById<TextView>(R.id.rboard_theme_creator)
+                val rboardDeepLink = findViewById<TextView>(R.id.rboard_deep_link)
+                val rboardImeTester = findViewById<TextView>(R.id.rboard_ime_tester)
+
+                rboardDeepLink.setOnClickListener {
+                    activity.packageManager.getLaunchIntentForPackage(
+                        "de.dertyp7214.deeplinkrboard"
+                    )?.let(activity::startActivity)
+                        ?: activity.openUrl(activity.getString(R.string.rboard_deep_link))
+                }
+                rboardThemePatcher.setOnClickListener {
+                    activity.packageManager.getLaunchIntentForPackage(
+                        "de.dertyp7214.rboardpatcher"
+                    )?.let(activity::startActivity)
+                        ?: activity.openUrl(PLAY_URL("de.dertyp7214.rboardpatcher"))
+                }
+                rboardThemeCreator.setOnClickListener {
+                    activity.packageManager.getLaunchIntentForPackage(
+                        "de.dertyp7214.rboardthemecreator"
+                    )?.let(activity::startActivity)
+                        ?: if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        activity.openUrl(PLAY_URL("de.dertyp7214.rboardthemecreator"))
+                    }
+                    else{
+                        activity.openUrl("https://github.com/DerTyp7214/RboardThemeCreator/releases/tag/1.2.5")
+                    }
+
+                }
+                rboardImeTester.setOnClickListener {
+                    activity.packageManager.getLaunchIntentForPackage(
+                        "de.dertyp7214.rboardimetester"
+                    )?.let(activity::startActivity)
+                        ?: activity.openUrl(PLAY_URL("de.dertyp7214.rboardimetester"))
+                }
+
+                findViewById<Button>(R.id.close)?.setOnClickListener { dialog.dismiss() }
+            }
+            }
+        }
         builder.categoryHeader("translators") {
             titleRes = R.string.translators
         }
+        builder.pref("ar") {
+            titleRes = R.string.arabic
+            summaryRes = R.string.muhammadbahaa2001
+            useTint = false
+            iconRes = FlagKit.getResId(activity, "arab")
+        }
         builder.pref("pt-rBR") {
             titleRes = R.string.portuguese_brazilian
             summaryRes = R.string.igormiguell
             useTint = false
             iconRes = FlagKit.getResId(activity, "br")
         }
+        builder.pref("zh")
+        {
+            titleRes = R.string.chinese
+            summaryRes = R.string.contingency
+            useTint = false
+            iconRes = FlagKit.getResId(activity, "cn")
+        }
         builder.pref("fr") {
             titleRes = R.string.french
             summaryRes = R.string.yoanndp
@@ -197,11 +289,5 @@ class About(private val activity: AppCompatActivity, private val args: SafeJSON)
             useTint = false
             iconRes = FlagKit.getResId(activity, "vn")
         }
-        builder.pref("zh") {
-            titleRes = R.string.chinese
-            summaryRes = R.string.contingency
-            useTint = false
-            iconRes = FlagKit.getResId(activity, "cn")
-        }
     }
 }
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Flags.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Flags.kt
index 4d79bd07..315b26f2 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Flags.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Flags.kt
@@ -23,6 +23,7 @@ import de.Maxr1998.modernpreferences.PreferenceScreen
 import de.Maxr1998.modernpreferences.PreferencesAdapter
 import de.Maxr1998.modernpreferences.helpers.*
 import de.Maxr1998.modernpreferences.preferences.CategoryHeader
+import de.Maxr1998.modernpreferences.preferences.SeekBarPreference
 import de.Maxr1998.modernpreferences.preferences.SwitchPreference
 import de.Maxr1998.modernpreferences.preferences.choice.SelectionItem
 import de.Maxr1998.modernpreferences.preferences.choice.SingleChoiceDialogPreference
@@ -276,7 +277,8 @@ class Flags(val activity: Activity, private val args: SafeJSON) : AbstractPrefer
                 if (item.summary == -1) summary = item.key
                 if (listOf(TYPE.INT, TYPE.LONG, TYPE.FLOAT, TYPE.STRING).contains(item.type))
                     onClick {
-                        activity.openInputDialog(
+                        activity.openInputDialogFlag(
+                            title.toString(),
                             R.string.nothing,
                             item.defaultValue.toString()
                         ) { dialogInterface, text ->
@@ -413,7 +415,8 @@ class Flags(val activity: Activity, private val args: SafeJSON) : AbstractPrefer
                         }
                         summary = entry.value.toString()
                         onClick {
-                            activity.openInputDialog(
+                            activity.openInputDialogFlag(
+                                title.toString(),
                                 R.string.nothing,
                                 summary?.toString()
                             ) { dialogInterface, text ->
@@ -552,7 +555,8 @@ class Flags(val activity: Activity, private val args: SafeJSON) : AbstractPrefer
                         }
                         summary = entry.value.toString()
                         onClick {
-                            activity.openInputDialog(
+                            activity.openInputDialogFlag(
+                                title.toString(),
                                 R.string.nothing,
                                 summary?.toString()
                             ) { dialogInterface, text ->
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Props.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Props.kt
index 99405e3d..90113dd2 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Props.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Props.kt
@@ -17,12 +17,14 @@ import de.dertyp7214.rboardthememanager.Config.GBOARD_PACKAGE_NAME
 import de.dertyp7214.rboardthememanager.R
 import de.dertyp7214.rboardthememanager.core.SafeJSON
 import de.dertyp7214.rboardthememanager.core.getSystemProperty
-import de.dertyp7214.rboardthememanager.core.openInputDialog
+import de.dertyp7214.rboardthememanager.core.openInputDialogFlag
 import de.dertyp7214.rboardthememanager.core.runAsCommand
 import de.dertyp7214.rboardthememanager.core.safeIcon
 import de.dertyp7214.rboardthememanager.core.safeString
 import de.dertyp7214.rboardthememanager.core.setSystemProperty
 import de.dertyp7214.rboardthememanager.utils.FileUtils
+import de.dertyp7214.rboardthememanager.utils.GboardUtils
+import kotlin.math.absoluteValue
 
 class Props(private val activity: AppCompatActivity, private val args: SafeJSON) :
     AbstractMenuPreference() {
@@ -37,7 +39,8 @@ class Props(private val activity: AppCompatActivity, private val args: SafeJSON)
     }
 
     override fun preferences(builder: PreferenceScreen.Builder) {
-        val prefs = if (Application.context?.resources?.getBoolean(R.bool.isTab_or_fold) == true){
+        val prefs = if (Application.context?.resources?.getBoolean(R.bool.isTab_or_fold) == true && GboardUtils.getGboardVersionCode(
+                activity) < 153612662){
             listOf(
                 "ch_margins",
 
@@ -65,9 +68,62 @@ class Props(private val activity: AppCompatActivity, private val args: SafeJSON)
 
                 "ch_radius",
 
-                "corner_key_r"
+                "corner_key_r",
+
+                "ch_top_icon_num",
+
+                "top_icon_num"
+            )}
+        else if (Application.context?.resources?.getBoolean(R.bool.isTab_or_fold) == true && GboardUtils.getGboardVersionCode(
+                activity) >= 153612662){
+            listOf(
+                "ch_margins",
+
+                "kb_pad_port_b",
+                "kb_pad_port_l",
+                "kb_pad_port_r",
+
+                "ch_margins_landscape",
+
+                "kb_pad_land_b",
+                "kb_pad_land_l",
+                "kb_pad_land_r",
+
+                "ch_margins_fold",
+
+                "kbp_fport_b",
+                "kbp_fport_l",
+                "kbp_fport_r",
+
+                "ch_margins_landscape_fold",
+
+                "kbp_fland_b",
+                "kbp_fland_l",
+                "kbp_fland_r",
+
+                "ch_top_icon_num",
+
+                "top_icon_num"
             )}
-        else{
+        else if (Application.context?.resources?.getBoolean(R.bool.isTab_or_fold) == false && GboardUtils.getGboardVersionCode(activity)  >= 153612662 ){
+            listOf(
+                "ch_margins",
+
+                "kb_pad_port_b",
+                "kb_pad_port_l",
+                "kb_pad_port_r",
+
+                "ch_margins_landscape",
+
+                "kb_pad_land_b",
+                "kb_pad_land_l",
+                "kb_pad_land_r",
+
+                "ch_top_icon_num",
+
+                "top_icon_num"
+            )}
+        else {
             listOf(
                 "ch_margins",
 
@@ -83,7 +139,11 @@ class Props(private val activity: AppCompatActivity, private val args: SafeJSON)
 
                 "ch_radius",
 
-                "corner_key_r"
+                "corner_key_r",
+
+                "ch_top_icon_num",
+
+                "top_icon_num"
             )
         }
 
@@ -114,9 +174,14 @@ class Props(private val activity: AppCompatActivity, private val args: SafeJSON)
                 summary = value.ifBlank { activity.getString(R.string.not_set) }
                 iconRes = getIcon("ic_$key").safeIcon
                 onClick {
-                    activity.openInputDialog(
-                        getString(key).safeString,
-                        value,
+                    activity.openInputDialogFlag(
+                        activity.getResources().getString(getString(key).safeString),
+                        if(key == "top_icon_num"){
+                            R.string.top_icon_num_long
+                        }else{
+                            R.string.nothing
+                             },
+                        "ro.com.google.ime.$key".getSystemProperty(),
                         R.string.reset,
                         {
                             it.dismiss()
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Repos.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Repos.kt
index a64de9e3..df281f7e 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Repos.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Repos.kt
@@ -110,7 +110,10 @@ class Repos(
         fab.visibility = View.VISIBLE
         fab.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.ic_baseline_add_24))
         fab.setOnClickListener {
-            activity.openInputDialog(R.string.repository) { dialog, text ->
+            activity.openInputDialogFlag(
+                activity.getResources().getString(R.string.repository),
+                R.string.nothing, ""
+            ) { dialog, text ->
                 doAsync("true:$text"::parseRepo) {
                     dialog.dismiss()
                     repositories.add(it)
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 e6b06fcb..e68e3d50 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt
@@ -31,7 +31,6 @@ import de.dertyp7214.rboardthememanager.BuildConfig
 import de.dertyp7214.rboardthememanager.Config
 import de.dertyp7214.rboardthememanager.Config.FLAG_PATH
 import de.dertyp7214.rboardthememanager.Config.MODULE_ID
-import de.dertyp7214.rboardthememanager.Config.PLAY_URL
 import de.dertyp7214.rboardthememanager.R
 import de.dertyp7214.rboardthememanager.components.XMLEntry
 import de.dertyp7214.rboardthememanager.components.XMLFile
@@ -259,11 +258,13 @@ class Settings(private val activity: Activity, private val args: SafeJSON) : Abs
             TYPE.STRING,
             listOf(),
             {
-                listOf(
-                    "rm -r \"${FILES.CACHE.Path}\"",
-                    "am force-stop ${Config.GBOARD_PACKAGE_NAME}"
-                ).runAsCommand()
-                Toast.makeText(this, R.string.gboard_cache_cleared, Toast.LENGTH_LONG).show()
+                openDialog(R.string.gboard_cache_clear_long_question, R.string.gboard_cache_clear_question, false) {
+                    listOf(
+                        "rm -r \"${FILES.CACHE.Path}\"",
+                        "am force-stop ${Config.GBOARD_PACKAGE_NAME}"
+                    ).runAsCommand()
+                    Toast.makeText(this, R.string.gboard_cache_cleared, Toast.LENGTH_LONG).show()
+                }
             }
         ),
         CLEAR_RECENT_EMOJIS(
@@ -272,57 +273,15 @@ class Settings(private val activity: Activity, private val args: SafeJSON) : Abs
             R.string.clear_recent_emojis_long,
             R.drawable.ic_emoji_clear,
             "",
-            TYPE.STRING,
-            listOf(),
-            {
-                listOf(
-                    "rm \"${FILES.EMOJIS.Path}\"",
-                    "am force-stop ${Config.GBOARD_PACKAGE_NAME}"
-                ).runAsCommand()
-                Toast.makeText(this, R.string.recent_emojis_cleared, Toast.LENGTH_LONG).show()
-            }
-        ),
-        DEEP_LINK(
-            "deep_link",
-            R.string.deep_link,
-            R.string.deep_link,
-            R.drawable.ic_link,
-            "",
-            TYPE.STRING,
-            listOf(),
-            {
-                packageManager.getLaunchIntentForPackage("de.dertyp7214.deeplinkrboard")
-                    ?.let(::startActivity)
-                    ?: openUrl("https://github.com/DerTyp7214/DeepLinkRboard")
-            },
-            BuildConfig.DEBUG
-        ),
-        THEME_VALUES(
-            "theme_values",
-            R.string.theme_values,
-            R.string.theme_values_long,
-            R.drawable.ic_theme_settings,
-            "",
-            TYPE.STRING,
-            listOf(),
+            TYPE.STRING,listOf(),
             {
-                packageManager.getLaunchIntentForPackage("de.dertyp7214.monetextractor")
-                    ?.let(::startActivity)
-                    ?: openUrl(PLAY_URL("de.dertyp7214.monetextractor"))
-            }
-        ),
-        IME_TEST(
-            "ime_test",
-            R.string.ime_test,
-            R.string.ime_test_long,
-            R.drawable.ic_ime_tester,
-            "",
-            TYPE.STRING,
-            listOf(),
-            {
-                packageManager.getLaunchIntentForPackage("de.dertyp7214.rboardimetester")
-                    ?.let(::startActivity)
-                    ?: openUrl(PLAY_URL("de.dertyp7214.rboardimetester"))
+                openDialog(R.string.clear_recent_emojis_question, R.string.clear_recent_emojis, false) {
+                    listOf(
+                        "rm \"${FILES.EMOJIS.Path}\"",
+                        "am force-stop ${Config.GBOARD_PACKAGE_NAME}"
+                    ).runAsCommand()
+                    Toast.makeText(this, R.string.recent_emojis_cleared, Toast.LENGTH_LONG).show()
+                }
             }
         ),
         UNINSTALL(
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 789c43e3..c9b27b44 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/InstallPackActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/InstallPackActivity.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package de.dertyp7214.rboardthememanager.screens
 
 import android.graphics.Color
@@ -49,7 +51,6 @@ class InstallPackActivity : AppCompatActivity() {
             window.setDecorFitsSystemWindows(false)
         }
 
-        val view: View = window.decorView
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             window.isNavigationBarContrastEnforced = false
             window.navigationBarColor = Color.TRANSPARENT
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 fb942ade..92adf237 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/Logs.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/Logs.kt
@@ -1,10 +1,11 @@
+@file:Suppress("DEPRECATION")
+
 package de.dertyp7214.rboardthememanager.screens
 
 import android.annotation.SuppressLint
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
-import android.view.View
 import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
@@ -29,7 +30,6 @@ class Logs : AppCompatActivity() {
             window.setDecorFitsSystemWindows(false)
         }
 
-        val view: View = window.decorView
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             window.isNavigationBarContrastEnforced = false
             window.navigationBarColor = Color.TRANSPARENT
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 999d68ec..2e4e4a90 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
@@ -156,7 +156,6 @@ class MainActivity : AppCompatActivity() {
             window.setDecorFitsSystemWindows(false)
         }
 
-        val view: View = window.decorView
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             window.isNavigationBarContrastEnforced = false
             window.navigationBarColor = Color.TRANSPARENT
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 69752dab..43eacc6a 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt
@@ -1,4 +1,4 @@
-@file:Suppress("unused", "SameParameterValue")
+@file:Suppress("unused", "SameParameterValue", "DEPRECATION")
 
 package de.dertyp7214.rboardthememanager.screens
 
@@ -7,7 +7,6 @@ import android.content.Intent
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
-import android.view.View
 import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
@@ -19,6 +18,7 @@ import de.dertyp7214.rboardthememanager.adapter.ManageRepoThemePackAdapter
 import de.dertyp7214.rboardthememanager.components.LayoutManager
 import de.dertyp7214.rboardthememanager.core.applyTheme
 import de.dertyp7214.rboardthememanager.core.getTextFromUrl
+import de.dertyp7214.rboardthememanager.core.openDialog
 import de.dertyp7214.rboardthememanager.core.safeParse
 import de.dertyp7214.rboardthememanager.data.ThemePack
 import de.dertyp7214.rboardthememanager.databinding.ActivityManageRepoBinding
@@ -56,7 +56,6 @@ class ManageRepo : AppCompatActivity() {
             window.setDecorFitsSystemWindows(false)
         }
 
-        val view: View = window.decorView
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             window.isNavigationBarContrastEnforced = false
             window.navigationBarColor = Color.TRANSPARENT
@@ -100,7 +99,14 @@ class ManageRepo : AppCompatActivity() {
         toolbar.setNavigationOnClickListener { onBackPressedDispatcher.onBackPressed() }
         toolbar.setOnMenuItemClickListener {
             when (it.itemId) {
-                R.id.delete -> finishWithAction(Action.DELETE)
+                R.id.delete ->
+                    openDialog(
+                        R.string.do_you_want_to_delete_repo,
+                        R.string.delete_repo
+                    ) { dialog ->
+                        dialog.dismiss()
+                        finishWithAction(Action.DELETE)
+                    }
                 R.id.enabled -> if (it.isCheckable) {
                     it.isChecked = !it.isChecked
                     setAction(if (it.isChecked) Action.ENABLE else Action.DISABLE)
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 8ace219f..fcb8f4ea 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt
@@ -66,7 +66,6 @@ class PreferencesActivity : AppCompatActivity() {
             window.setDecorFitsSystemWindows(false)
         }
 
-        val view: View = window.decorView
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             window.isNavigationBarContrastEnforced = false
             window.navigationBarColor = Color.TRANSPARENT
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 675bd38c..c3d11d26 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ReadMoreReadFast.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ReadMoreReadFast.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package de.dertyp7214.rboardthememanager.screens
 
 import android.annotation.SuppressLint
@@ -36,7 +38,6 @@ class ReadMoreReadFast : AppCompatActivity() {
             window.setDecorFitsSystemWindows(false)
         }
 
-        val view: View = window.decorView
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             window.isNavigationBarContrastEnforced = false
             window.navigationBarColor = Color.TRANSPARENT
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 ec2bbd8a..b3b284eb 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ShareFlags.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ShareFlags.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package de.dertyp7214.rboardthememanager.screens
 
 import android.annotation.SuppressLint
@@ -60,7 +62,6 @@ class ShareFlags : AppCompatActivity() {
             window.setDecorFitsSystemWindows(false)
         }
 
-        val view: View = window.decorView
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             window.isNavigationBarContrastEnforced = false
             window.navigationBarColor = Color.TRANSPARENT
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 49e399fb..fc10a701 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ThemeChangerActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ThemeChangerActivity.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package de.dertyp7214.rboardthememanager.screens
 
 import android.content.Context
@@ -49,7 +51,6 @@ class ThemeChangerActivity : AppCompatActivity() {
             window.setDecorFitsSystemWindows(false)
         }
 
-        val view: View = window.decorView
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             window.isNavigationBarContrastEnforced = false
             window.navigationBarColor = Color.TRANSPARENT
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 f9575046..08bc96e7 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/widgets/SwitchKeyboardWidgetConfigureActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/widgets/SwitchKeyboardWidgetConfigureActivity.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package de.dertyp7214.rboardthememanager.widgets
 
 import android.app.Activity
diff --git a/app/src/main/res/layout/soundpack_dialog.xml b/app/src/main/res/layout/soundpack_dialog.xml
index dec52162..db7548f5 100644
--- a/app/src/main/res/layout/soundpack_dialog.xml
+++ b/app/src/main/res/layout/soundpack_dialog.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/TextViewSound"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="16dp"
+            android:importantForAutofill="no"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="text"
+            android:textSize="16sp"/>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
@@ -15,7 +30,7 @@
             android:layout_marginEnd="16dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/TextViewSound" />
 
         <LinearLayout
             android:layout_width="0dp"
diff --git a/app/src/main/res/raw/flags.json b/app/src/main/res/raw/flags.json
index 2c6ecd04..88376420 100644
--- a/app/src/main/res/raw/flags.json
+++ b/app/src/main/res/raw/flags.json
@@ -1,5 +1,5 @@
 {
-  "time": "1714154132813",
+  "time": "1727767527651",
   "flags": [
     {
       "key": "general",
@@ -174,7 +174,8 @@
         "show_branding_on_space",
         "show_branding_interval_seconds",
         "branding_fadeout_delay_ms"
-      ]
+      ],
+      "visible": false
     },
     {
       "key": "show_branding_on_space",
@@ -332,7 +333,8 @@
       "icon": "ic_pill",
       "defaultValue": false,
       "type": "BOOLEAN",
-      "file": "FLAGS"
+      "file": "FLAGS",
+      "visible": false
     },
     {
       "key": "enable_bitmoji_contextual_category_icon",
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 8c328969..b7241b89 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,44 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="search">البحث</string>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+    <string name="search">بحث</string>
+
     <string name="title_themes">السمات</string>
     <string name="title_downloads">التنزيلات</string>
     <string name="title_sounds">الأصوات</string>
-    <string name="error">عفوا!</string>
-    <string name="update_ready">تحديث جاهز، هل تريد تثبيته؟</string>
+    <string name="error">عفوًا!</string>
+    <string name="update_ready">التحديث جاهز، هل تريد تثبيته؟</string>
     <string name="update">تحديث</string>
     <string name="install_gboard">هل تريد تثبيت Gboard؟</string>
     <string name="gboard_not_installed">لم يتم تثبيت Gboard</string>
-    <string name="cant_use_app">لا يمكنك استخدام هذا التطبيق بدون الروت</string>
-    <string name="not_rooted">جهازك غير متجذر</string>
-    <string name="channel_name">دفع الإشعارات</string>
-    <string name="channel_description">للحصول على تحديثات ومعلومات.</string>
-    <string name="channel_name_download">تنزيل الإشعارات</string>
-    <string name="channel_description_download">للتنزيل الإشعارات</string>
-    <string name="download_update">تنزيل التحديث</string>
-    <string name="download_update_progress">تنزيل التحديث (%s)</string>
+    <string name="cant_use_app">لا يمكنك استخدام هذا التطبيق بدون روت</string>
+    <string name="not_rooted">جهازك غير مروت</string>
+    <string name="channel_name">إشعارات الدفع</string>
+    <string name="channel_description">للتحديثات والمعلومات.</string>
+    <string name="channel_name_download">إشعارات التنزيل</string>
+    <string name="channel_description_download">لإشعارات التنزيل</string>
+    <string name="download_update">جارٍ تنزيل التحديث</string>
+    <string name="download_update_progress">جارٍ تنزيل التحديث (%s)</string>
     <string name="download_complete">اكتمل التنزيل</string>
-    <string name="download_error">حدث خطأ أثناء التحميل</string>
-    <string name="reboot">Reboot</string>
+    <string name="download_error">خطأ أثناء التنزيل</string>
+    <string name="reboot">إعادة تشغيل</string>
     <string name="reboot_now">إعادة التشغيل الآن؟</string>
-    <string name="reboot_to_continue">يجب عليك إعادة التشغيل للوحدة النمطية للعمل</string>
+    <string name="reboot_to_continue">يجب إعادة التشغيل لكي تعمل الإضافة</string>
     <string name="apply_theme">تطبيق السمة</string>
-    <string name="apply_automatic_theme">تطبيق السمة التلقائية</string>
+    <string name="apply_automatic_theme">تطبيق السم التلقائي</string>
     <string name="applied">تم تطبيق السمة</string>
-    <string name="delete_theme">حذف السمة</string>
-    <string name="q_delete_theme">هل تريد حذف هذا الموضوع؟</string>
+    <string name="delete_theme">حذف السم</string>
+    <string name="q_delete_theme">هل تريد حذف هذا السمة؟</string>
     <string name="theme_deleted">تم حذف السمة</string>
+
     <string name="info">معلومات</string>
     <string name="theme_count">عدد السمات</string>
     <string name="theme_path">مسار السمة</string>
     <string name="installation_method">طريقة التثبيت</string>
-    <string name="other">اخرى</string>
+    <string name="other">أخرى</string>
     <string name="rboard_app_version">إصدار تطبيق Rboard</string>
     <string name="device">الجهاز</string>
-    <string name="android_version">إصدار الأندرويد</string>
-    <string name="root_version">الإصدار الجذر</string>
+    <string name="android_version">إصدار أندرويد</string>
+    <string name="root_version">إصدار الروت</string>
     <string name="gboard_version">إصدار Gboard</string>
-    <string name="unsupported_oem">هو غير مدعوم OEM</string>
+    <string name="unsupported_oem">الشركة المصنعة غير مدعومة</string>
     <string name="no">لا</string>
     <string name="yes">نعم</string>
     <string name="share">مشاركة</string>
@@ -46,137 +47,261 @@
     <string name="name">الاسم</string>
     <string name="author">المؤلف</string>
     <string name="share_themes">مشاركة السمات</string>
-    <string name="select_at_least_one_not_default_theme">حدد سمة واحدة على الأقل غير افتراضية</string>
-    <string name="rboard_theme_creator">منشئ قالب اللوحة</string>
-    <string name="downloading_pack">تنزيل الحزمة</string>
+    <string name="select_at_least_one_not_default_theme">اختر على الأقل سمة واحدة غير افتراضية</string>
+    <string name="rboard_theme_creator">منشئ سمةات Rboard</string>
+    <string name="downloading_pack">جارٍ تنزيل الحزمة</string>
     <string name="install_themes">تثبيت السمات (%s)</string>
     <string name="install">تثبيت</string>
-    <string name="themes_installed">الثيمات المثبتة</string>
-    <string name="unpacking_themes">فك تعبئة السمات</string>
-    <string name="do_you_want_to_delete_theme">هل تريد حذف هذه المواضيع؟</string>
-    <string name="show_preinstalled_themes">إظهار السمات المثبتة مسبقاً</string>
-    <string name="emoji_compat_app_whitelist">إصلاح البوصلة الرموز التعبيرية</string>
-    <string name="flags">أعلام البرج</string>
+    <string name="themes_installed">تم تثبيت السمات</string>
+    <string name="unpacking_themes">جارٍ فك ضغط السمات</string>
+    <string name="do_you_want_to_delete_theme">هل تريد حذف هذه السمات؟</string>
+    <string name="show_preinstalled_themes">إظهار السمات المثبتة مسبقًا</string>
+    <string name="emoji_compat_app_whitelist">إصلاح توافق الإيموجي</string>
+    <string name="flags">أعلام Gboard</string>
     <string name="themes_header">السمات</string>
     <string name="show_system_theme">إظهار سمة النظام</string>
-    <string name="enable_joystick_delete">حذف عصا التحكم</string>
-    <string name="deprecate_search">أيقونة قوقل</string>
-    <string name="enable_sharing">مشاركة الأيقونة</string>
+    <string name="enable_joystick_delete">حذف الجويستيك</string>
+    <string name="deprecate_search">أيقونة جوجل</string>
+    <string name="enable_sharing">أيقونة المشاركة</string>
     <string name="themed_nav_bar_all_devices">لون شريط التنقل</string>
-    <string name="enable_email_provider_completion">موفر البريد الإلكتروني</string>
-    <string name="enable_popup_view_v2">Popup v2</string>
-    <string name="enable_key_border">تمكين حدود المفتاح</string>
-    <string name="enable_secondary_symbols">تمكين الرموز الثانوية</string>
+    <string name="enable_email_provider_completion">مقدم خدمة البريد الإلكتروني</string>
+    <string name="enable_popup_view_v2">العرض المنبثق v2</string>
+    <string name="enable_key_border">حدود المفتاح</string>
+    <string name="enable_secondary_symbols">الرموز الثانوية</string>
     <string name="show_suggestions">إظهار الاقتراحات</string>
     <string name="show_all_flags">إظهار جميع الأعلام</string>
-    <string name="show_all_flags_long">عرض جميع الأعلام المحددة حاليا</string>
+    <string name="show_all_flags_long">إظهار جميع الأعلام المضبوطة حاليًا</string>
     <string name="all_flags">جميع الأعلام</string>
-    <string name="loading_preferences">تحميل التفضيلات</string>
-    <string name="use_silk_theme_by_default">استخدام سمة الخيوط بشكل افتراضي</string>
-    <string name="monet">مونت</string>
-    <string name="silk_on_all_pixel">الحرير على كل البكسل</string>
+    <string name="loading_preferences">جارٍ تحميل التفضيلات</string>
+    <string name="use_silk_theme_by_default">استخدام سمة الحرير بشكل افتراضي</string>
+    <string name="monet">مونيت</string>
+    <string name="silk_on_all_devices">الحرير على جميع الأجهزة</string>
+    <string name="silk_on_all_pixel">الحرير على جميع أجهزة Pixel</string>
     <string name="silk_theme">سمة الحرير</string>
-    <string name="android_12">Android 12</string>
+    <string name="android_12">أندرويد 12</string>
     <string name="general">عام</string>
-    <string name="show_branding_on_space">إظهار العلامة التجارية في المساحة</string>
-    <string name="enable_auto_float_keyboard_in_multi_window">تمكين لوحة المفاتيح العائمة تلقائيا في النافذة المتعددة</string>
-    <string name="pill_shaped_key">تحرير مفتاح الشكل</string>
-    <string name="enable_clipboard_screenshot_paste">تمكين لصق لقطة شاشة الحافظة</string>
+    <string name="show_branding_on_space">إظهار العلامة التجارية على المسافة</string>
+    <string name="show_branding_on_space_details">إظهار العلامة التجارية لجوجل على المسافة</string>
+    <string name="enable_auto_float_keyboard_in_multi_window">لوحة المفاتيح العائمة التلقائية في النوافذ المتعددة</string>
+    <string name="pill_shaped_key">مفتاح على شكل حبة</string>
+    <string name="enable_clipboard_screenshot_paste">لصق لقطات الشاشة من الحافظة</string>
     <string name="enable_lens">تمكين العدسة</string>
-    <string name="branding">العلامة</string>
-    <string name="show_branding_interval_seconds">إظهار الفاصل الزمني للعلامات التجارية</string>
-    <string name="branding_fadeout_delay_ms">تأخير تلاشي العلامات التجارية</string>
-    <string name="monet_details">سمة لوحة المفاتيح استناداً إلى موضوع النظام</string>
+    <string name="branding">العلامة التجارية</string>
+    <string name="show_branding_interval_seconds">عرض فترة العلامة التجارية بالثواني</string>
+    <string name="branding_fadeout_delay_ms">تأخير تلاشي العلامة التجارية</string>
+    <string name="monet_details">سمة لوحة المفاتيح بناءً على سمة النظام</string>
     <string name="download_header">تنزيل</string>
-    <string name="repos">مستودعات</string>
-    <string name="repos_long">تغيير مستودعات الموضوع</string>
+    <string name="repos">المستودعات</string>
+    <string name="repos_long">تغيير مستودعات السمات</string>
     <string name="apply">تطبيق</string>
     <string name="add">إضافة</string>
     <string name="save_repos">هل تريد تطبيق التغييرات؟</string>
     <string name="repository">رابط المستودع</string>
-    <string name="repo_added">تم إضافة المستودع</string>
-    <string name="configure">تكوين</string>
-    <string name="add_widget">إضافة أداة</string>
-    <string name="app_widget_description">أداة تبديل لوحة المفاتيح</string>
-    <string name="flags_app_widget_description">تبديل شريط الأعلام</string>
-    <string name="flag_applied">تطبيق العلم</string>
-    <string name="theme_pack">هذه حزمة سمة</string>
+    <string name="repo_added">تمت إضافة المستودع</string>
+    <string name="configure">تهيئة</string>
+    <string name="add_widget">إضافة عنصر واجهة</string>
+    <string name="app_widget_description">عنصر واجهة لتبديل لوحة المفاتيح</string>
+    <string name="flags_app_widget_description">عنصر واجهة لتبديل الأعلام</string>
+    <string name="flag_applied">تم تطبيق العلم</string>
+    <string name="theme_pack">هذه حزمة سمات</string>
     <string name="description">الوصف</string>
-    <string name="easter_egg">النظام يذهب إلى الوضع السريع الآن</string>
-    <string name="filter_settings">إعدادات الفلتر</string>
+    <string name="easter_egg">النظام في وضع السرعة الآن</string>
+    <string name="filter_settings">تصفية الإعدادات</string>
     <string name="settings">الإعدادات</string>
-    <string name="select_all">حدد الكل</string>
+    <string name="select_all">تحديد الكل</string>
     <string name="manager">مدير</string>
-    <string name="uninstall">إلغاء</string>
-    <string name="uninstall_long">إلغاء تثبيت الوحدة وإعادة التشغيل</string>
-    <string name="apply_dark">تطبيق السمة للظلام</string>
-    <string name="apply_light">تطبيق السمة للضوء</string>
+    <string name="uninstall">إلغاء التثبيت</string>
+    <string name="uninstall_long">إلغاء تثبيت الإضافة وإعادة التشغيل</string>
+    <string name="apply_dark">تطبيق السمة الداكنة</string>
+    <string name="apply_light">تطبيق السمة الفاتحة</string>
     <string name="app_theme">سمة التطبيق</string>
     <string name="dark">داكن</string>
     <string name="light">فاتح</string>
     <string name="system_theme">سمة النظام</string>
-    <string name="flags_loaded">%o أعلام تم تحميلها</string>
-    <string name="show_preinstalled_themes_long">إظهار السمات المثبتة مسبقاً في قسم المواضيع</string>
-    <string name="show_system_theme_long">إظهار سمات النظام في قسم المواضيع</string>
-    <string name="speedup_process">عملية التسريع</string>
+    <string name="flags_loaded">%o أعلام محملة</string>
+    <string name="show_preinstalled_themes_long">إظهار السمات المثبتة مسبقًا في قسم السمات</string>
+    <string name="show_system_theme_long">إظهار سمات النظام في قسم السمات</string>
+    <string name="speedup_process">تسريع العملية</string>
     <string name="key">المفتاح</string>
-    <string name="unreleased">تم إلغاء إصدار هذا التطبيق، بعض الميزات قد لا تعمل. الرجاء عدم الإبلاغ عن أي أخطاء للمجموعة الرئيسية.</string>
-    <string name="notice">إشعار</string>
+    <string name="unreleased">هذا التطبيق غير صادر، قد لا تعمل بعض الميزات. يرجى عدم الإبلاغ عن أي أخطاء إلى المجموعة الرئيسية.</string>
+    <string name="notice">ملاحظة</string>
     <string name="flags_applied">تم تطبيق الأعلام</string>
-    <string name="install_module">تم العثور على مسار السمات الموجودة، هل مازلت تريد تثبيت الوحدة؟</string>
-    <string name="module">تثبيت الوحدة</string>
-    <string name="use_gboard">هل تريد تحميل السمات مباشرة في اللوحة؟ أو الاستمرار مع الوحدة</string>
-    <string name="gboard_magisk">استخدام وحدة Magisk بدلاً من تحميل السمات في اللوحة</string>
-    <string name="use_module">الوحدة</string>
+    <string name="install_module">تم العثور على مسار السمات الموجودة، هل تريد تثبيت الإضافة؟</string>
+    <string name="module">تثبيت الإضافة</string>
+    <string name="use_gboard">هل تريد تحميل السمات مباشرة في Gboard؟ أو الاستمرار مع الإضافة</string>
+    <string name="gboard_magisk">استخدام إضافة Magisk بدلاً من تحميل السمات في Gboard</string>
+    <string name="use_module">الإضافة</string>
     <string name="use_magisk">استخدام Magisk</string>
-    <string name="gboard">استخدم اللوحة</string>
-    <string name="show_only_disabled">إظهار فقط الأعلام المعطلة</string>
+    <string name="gboard">استخدام Gboard</string>
+    <string name="show_only_disabled">إظهار الأعلام المعطلة فقط</string>
     <string name="share_flags">مشاركة الأعلام</string>
     <string name="share_flags_title">مشاركة الأعلام (%o)</string>
-    <string name="import_flags_title">استيراد أعلام (%o)</string>
-    <string name="model">الموديل</string>
-    <string name="processing_flags">معالجة الأعلام</string>
+    <string name="import_flags_title">استيراد الأعلام (%o)</string>
+    <string name="share_prefs_title">مشاركة التفضيلات (%o)</string>
+    <string name="import_prefs_title">استيراد التفضيلات (%o)</string>
+    <string name="model">الطراز</string>
+    <string name="processing_flags">جارٍ معالجة الأعلام</string>
     <string name="load_flags">تحميل الأعلام</string>
-    <string name="load_flags_long">تم العثور على نسخ احتياطي للعلم القديم. هل تريد تحميله؟</string>
-    <string name="use_blur">استخدام الضبابية</string>
-    <string name="use_blur_long">استخدام تأثيرات العارض الضبابية</string>
+    <string name="load_flags_long">تم العثور على نسخة احتياطية من الأعلام القديمة. هل تريد تحميلها؟</string>
+    <string name="use_blur">استخدام التمويه</string>
+    <string name="use_blur_long">استخدام تأثيرات التمويه</string>
     <string name="remove_repo">إزالة المستودع؟</string>
     <string name="remove_repo_long">هل تريد إزالة هذا المستودع؟</string>
     <string name="manage_repo">إدارة المستودع</string>
     <string name="address">العنوان</string>
-    <string name="enabled">تمكين</string>
+    <string name="enabled">مفعل</string>
     <string name="themes">السمات</string>
     <string name="invalid_repo">مستودع غير صالح</string>
-    <string name="invalid_repo_long">مستودع غير صالح. الرجاء التحقق من الرابط مرة أخرى.</string>
-    <string name="download_themes">تنزيل السمات</string>
-    <string name="theme_pack_count">عدد حزمة الثيم</string>
-    <string name="theme_packs">حزم الثيم</string>
-    <string name="keyboard_redesign_forbid_key_shadows">إعادة تصميم لوحة المفاتيح منع ظلال المفتاح</string>
-    <string name="none">لا</string>
+    <string name="invalid_repo_long">مستودع غير صالح. يرجى التحقق من الرابط مرة أخرى.</string>
+    <string name="download_themes">تحميل السمات</string>
+    <string name="theme_pack_count">عدد حزم السمات</string>
+    <string name="theme_packs">حزم السمات</string>
+    <string name="keyboard_redesign_forbid_key_shadows">إزالة ظلال المفاتيح</string>
+    <string name="none">لا شيء</string>
     <string name="enable_bitmoji_contextual_category_icon">تمكين Bitmoji</string>
-    <string name="do_not_report">لا تبلغ عن هذا الخطأ.</string>
-    <string name="menu_moved">القائمة الآن في اللوحة السفلية.</string>
+    <string name="do_not_report">لا تقم بالإبلاغ عن هذا الخطأ.</string>
+    <string name="menu_moved">القائمة الآن في الجزء السفلي.</string>
     <string name="fix_flags">إصلاح الأعلام</string>
-    <string name="fix_flags_long">يحذف الأعلام و فرض إغلاق اللوحة.</string>
+    <string name="fix_flags_long">حذف الأعلام وإغلاق Gboard بالقوة.</string>
     <string name="flags_fixed">تم إصلاح الأعلام</string>
-    <string name="try_fix_flags">حاول الذهاب إلى الإعدادات والنقر على \"إصلاح الأعلام\"</string>
+    <string name="flags_copied">تم نسخ الأعلام</string>
+    <string name="try_fix_flags">حاول الذهاب إلى الإعدادات والنقر على "إصلاح الأعلام"</string>
     <string name="flags_corrupted">يبدو أن الأعلام تالفة</string>
-    <string name="sort_by_date">الترتيب حسب التاريخ</string>
-    <string name="press_back_to_apply">لتطبيق الأعلام فقط اضغط إلى الخلف</string>
-    <string name="sounds_applied">الأصوات المطبقة</string>
+    <string name="sort_by_date">الفرز حسب التاريخ</string>
+    <string name="press_back_to_apply">لتطبيق الأعلام فقط اضغط على الرجوع</string>
+    <string name="sounds_applied">تم تطبيق الأصوات</string>
     <string name="theme_applied">تم تطبيق السمة</string>
     <string name="all_preferences">جميع التفضيلات</string>
-    <string name="show_all_preferences">إظهار كافة التفضيلات</string>
+    <string name="show_all_preferences">إظهار جميع التفضيلات</string>
     <string name="show_all_preferences_long">إظهار جميع تفضيلات Gboard</string>
     <string name="team">الفريق</string>
-    <string name="owner_themer">المالك &amp; السمة</string>
-    <string name="developer_themer">المطور &amp; الموضوع</string>
+    <string name="owner_themer">المالك &amp; المصمم</string>
+    <string name="developer_themer">المطور &amp; المصمم</string>
     <string name="developer">المطور الرئيسي</string>
     <string name="moderator">مشرف المجموعة</string>
     <string name="links">الروابط</string>
-    <string name="telegram_channel">قناة تيليجرام</string>
-    <string name="telegram_group">مجموعة تيليجرام</string>
+    <string name="telegram_channel">قناة Telegram</string>
+    <string name="telegram_group">مجموعة Telegram</string>
     <string name="about">حول</string>
     <string name="xda_thread">موضوع XDA</string>
-    <string name="github_repo">GitHub Repo</string>
-</resources>
+    <string name="github_repo">مستودع GitHub</string>
+    <string name="translators">المترجمون</string>
+    <string name="applied_theme">(مُطبق)</string>
+    <string name="keyboard_height_ratio">نسبة ارتفاع لوحة المفاتيح</string>
+    <string name="max_short">0.50 الحد الأقصى - قصير</string>
+    <string name="extra_extra_short">0.65 قصير جداً جداً</string>
+    <string name="extra_short">0.85 قصير جداً</string>
+    <string name="key_short">0.90 قصير</string>
+    <string name="mid_short">0.95 قصير متوسط</string>
+    <string name="normal">1.00 طبيعي</string>
+    <string name="mid_tall">1.05 طويل متوسط</string>
+    <string name="tall">1.10 طويل</string>
+    <string name="extra_tall">1.15 طويل جداً</string>
+    <string name="more_tall">1.20 أطول</string>
+    <string name="extra_more_tall">1.30 طويل جداً جداً</string>
+    <string name="extra_mooore">1.40 طويل جداً جداً جداً</string>
+    <string name="extra_extra_tall">1.50 طويل جداً جداً</string>
+    <string name="max_tall">2.00 طويل جداً</string>
+    <string name="margins">الهوامش</string>
+    <string name="margins_landscape">هوامش العرض الأفقي</string>
+    <string name="margins_fold">هوامش الأجهزة القابلة للطي</string>
+    <string name="margins_landscape_fold">هوامش العرض الأفقي للأجهزة القابلة للطي</string>
+    <string name="radius">نصف القطر</string>
+    <string name="not_set" tools:ignore="PrivateResource">غير مُحدد</string>
+
+    <string name="kb_pad_land_b">أسفل</string>
+    <string name="kb_pad_land_l">يسار</string>
+    <string name="kb_pad_land_r">يمين</string>
+    <string name="kb_pad_port_b">أسفل</string>
+    <string name="kb_pad_port_l">يسار</string>
+    <string name="kb_pad_port_r">يمين</string>
+
+    <string name="kbp_fland_b">أسفل</string>
+    <string name="kbp_fland_l">يسار</string>
+    <string name="kbp_fland_r">يمين</string>
+    <string name="kbp_fport_b">أسفل</string>
+    <string name="kbp_fport_l">يسار</string>
+    <string name="kbp_fport_r">يمين</string>
+
+    <string name="corner_key_l">نصف القطر - أسفل اليسار</string>
+    <string name="corner_key_r">نصف القطر - أسفل</string>
+    <string name="props">الخصائص</string>
+    <string name="other_props">خصائص أخرى</string>
+    <string name="other_props_long">خصائص أخرى يتم تعيينها عبر resetprop</string>
+    <string name="prop_changed">تم تغيير الخاصية</string>
+    <string name="reset">إعادة تعيين</string>
+    <string name="invalid_link">رابط غير صالح</string>
+    <string name="deep_link">رابط عميق</string>
+    <string name="download">تنزيل</string>
+    <string name="include_theme_names">تضمين أسماء السمات</string>
+    <string name="update_available">التحديث متاح (%s)</string>
+    <string name="help">مساعدة</string>
+    <string name="enable_get_bitmoji_card">احصل على بطاقة Bitmoji</string>
+    <string name="translate_new_ui">ترجمة الواجهة الجديدة</string>
+    <string name="enable_floating_keyboard_v2">لوحة المفاتيح العائمة V2</string>
+    <string name="silk_key_press">ضغطة مفتاح الحرير</string>
+    <string name="silk_popup">منبثق الحرير</string>
+    <string name="silk">منبثق الحرير</string>
+    <string name="silk_details">منبثق الحرير</string>
+    <string name="keyboard_redesign_google_sans">إعادة تصميم لوحة المفاتيح Google Sans</string>
+    <string name="gboard_cache_cleared">تم مسح ذاكرة Gboard المؤقتة</string>
+    <string name="gboard_cache_clear">مسح ذاكرة Gboard المؤقتة</string>
+    <string name="gboard_cache_clear_long">مسح الذاكرة المؤقتة وإغلاق Gboard بالقوة.</string>
+    <string name="clear_recent_emojis">مسح الإيموجي المستخدمة مؤخرًا</string>
+    <string name="clear_recent_emojis_long">حذف الإيموجي المستخدمة مؤخرًا وإغلاق Gboard بالقوة.</string>
+    <string name="recent_emojis_cleared">تم مسح الإيموجي المستخدمة مؤخرًا</string>
+    <string name="show_language_switch_key">إظهار مفتاح تبديل اللغة</string>
+    <string name="value">القيمة</string>
+    <string name="type">النوع</string>
+    <string name="not_empty">لا يمكن أن يكون فارغًا</string>
+    <string name="show_only_disabled_prefs">إظهار التفضيلات المعطلة فقط</string>
+    <string name="share_prefs">مشاركة التفضيلات</string>
+    <string name="patch">ترقية</string>
+    <string name="share_theme">مشاركة السمة</string>
+    <string name="logs">السجلات</string>
+    <string name="logs_long">فتح صفحة السجلات</string>
+    <string name="copy_flags">نسخ الأعلام</string>
+    <string name="copy_flags_long"><![CDATA[نسخ \"flag_value.xml\" -> \"flag_override.xml\"]]></string>
+    <string name="new_flags_long">تم العثور على أعلام جديدة.</string>
+    <string name="app_style">نمط التطبيق</string>
+    <string name="ime_test">اختبار IME</string>
+    <string name="ime_test_long">اختبار IME في Rboard</string>
+    <string name="why_no_root">لماذا لم تقم بعمل روت؟</string>
+    <string name="get_magisk">احصل على Magisk</string>
+    <string name="no_magisk_detected">لم يتم الكشف عن Magisk</string>
+    <string name="root_explanation">بدون روت، لا يمكن حتى الآن. هذا يعني لا حيل adb ولا شيء. لقد جربنا كل شيء لكن لم يعمل.</string>
+    <string name="install_methods">نحن نقدم طريقتين للتثبيت.\nيمكنك تغيير هذا في أي وقت في الإعدادات.</string>
+    <string name="magisk_module">الإضافة</string>
+    <string name="inside_gboard">داخل Gboard</string>
+    <string name="module_1">سمة منفصلة للمهر الداكن والساطع</string>
+    <string name="module_2">تحرير الزوايا وخصائص الهوامش</string>
+    <string name="module_3">تغيير الأصوات</string>
+    <string name="module_4">لا يعمل على Color OS</string>
+    <string name="module_5">مشاكل في رومات MIUI</string>
+    <string name="gboard_1">تنزيل وتثبيت السمات الأساسية</string>
+    <string name="gboard_2">لا يتطلب إضافة Magisk</string>
+    <string name="gboard_3">تغيير الأصوات لن يعمل</string>
+    <string name="gboard_4">السمات لن تظهر في إعدادات Gboard</string>
+    <string name="gboard_5">التوافق</string>
+    <string name="hash_mismatch">عدم تطابق الهاش</string>
+    <string name="theme_values">قيم السمة</string>
+    <string name="copied_to_clipboard">تم النسخ إلى الحافظة</string>
+    <string name="theme_values_long">قيم السمة</string>
+    <string name="value_prefix">بادئة القيمة</string>
+    <string name="theme_changer">مغير السمة</string>
+    <string name="material3_theme">سمة Material3</string>
+    <string name="material3_theme_details">نظام Material3 تلقائيًا سمة لوحة المفاتيح داكن/فاتح</string>
+    <string name="show_language_switch_key_details">إظهار مفتاح مخصص لتبديل اللغات</string>
+    <string name="show_suggestions_details">عرض شريط الاقتراحات أثناء الكتابة</string>
+    <string name="pill_shaped_key_details">استخدام مفتاح ذو شكل حبة الدواء</string>
+    <string name="enable_clipboard_screenshot_paste_details">إضافة لقطات الشاشة إلى حافظة Gboard لسهولة اللصق</string>
+    <string name="keyboard_redesign_forbid_key_shadows_details">إزالة ظل غير مرغوب من المفتاح</string>
+    <string name="enable_auto_float_keyboard_in_multi_window_details">لوحة المفاتيح العائمة التلقائية في نوافذ متعددة</string>
+    <string name="enable_sharing_details">إظهار رمز المشاركة</string>
+    <string name="enable_key_border_details">استخدام حدود المفاتيح</string>
+    <string name="enable_secondary_symbols_details">استخدام الرموز الثانوية</string>
+    <string name="silk_popup_details">استخدام منبثق الحرير</string>
+    <string name="keyboard_redesign_google_sans_details">استخدام إعادة تصميم لوحة المفاتيح Google Sans</string>
+    <string name="emoji_compat_app_whitelist_details">استخدام إصلاح توافق الإيموجي</string>
+    <string name="enable_email_provider_completion_details">استخدام مزود البريد الإلكتروني</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 36e62652..f43b3f33 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -26,6 +26,7 @@
     <string name="apply_automatic_theme">Automatikus Téma Alkalmazása</string>
     <string name="applied">Téma Alkalmazva</string>
     <string name="delete_theme">Téma Törlése</string>
+    <string name="delete_repo">Tároló törlése</string>
     <string name="q_delete_theme">Szeretné törölni ezt a témát?</string>
     <string name="theme_deleted">Téma Törölve</string>
     <string name="info">Információ</string>
@@ -54,6 +55,7 @@
     <string name="themes_installed">Témák telepítve</string>
     <string name="unpacking_themes">Témák kicsomagolása</string>
     <string name="do_you_want_to_delete_theme">Szeretné törölni ezeket a témákat?</string>
+    <string name="do_you_want_to_delete_repo">Szeretné törölni ezeket a repókat?</string>
     <string name="show_preinstalled_themes">Előre telepített témák megjelenítése</string>
     <string name="emoji_compat_app_whitelist">Emoji Kompatibilis Javítás</string>
     <string name="flags">Gboard Zászlók</string>
@@ -246,8 +248,10 @@
     <string name="gboard_cache_cleared">Gboard gyorsítótár törölve</string>
     <string name="gboard_cache_clear">Gboard gyorsítótár törlése</string>
     <string name="gboard_cache_clear_long">Törli a gyorsítótárat és kényszeríti a gboard bezárását.</string>
+    <string name="gboard_cache_clear_long_question">Szeretné törölni a gyorsítótárat és kényszeríteni a gboard bezárását?</string>
     <string name="clear_recent_emojis">A legutóbb használt emojik törlése</string>
     <string name="clear_recent_emojis_long">Törli a legutóbb használt emojikat és kényszeríti a gboard bezárását.</string>
+    <string name="clear_recent_emojis_question">Szeretné törölni a legutóbb használt emojikat és kényszeríteni a gboard bezárását?</string>
     <string name="recent_emojis_cleared">Legutóbb használt emojik törölve</string>
     <string name="show_language_switch_key">Nyelvváltó gomb megjelenítése</string>
     <string name="value">Érték</string>
@@ -303,4 +307,14 @@
     <string name="silk_popup_details">Selyem Popup Használata</string>
     <string name="emoji_compat_app_whitelist_details">Emoji Kompatibilis Javítás Használata</string>
     <string name="enable_email_provider_completion_details">E-mail Szolgáltató Használata</string>
+    <string name="deep_link_long">Rboard Deep link</string>
+    <string name="rboard_apps">Rboard Alkalmazások</string>
+    <string name="more_rboard_apps">Még több tőlünk</string>
+    <string name="more_rboard_apps_desc">További Rboard alkalmazások letöltése</string>
+    <string name="close">Bezár</string>
+    <string name="rboard_theme_patcher">Rboard Patcher</string>
+    <string name="rboard_monet_extractor">Monet Extractor</string>
+    <string name="top_icon_num">Max hozzáférési pontok konfigurálása</string>
+    <string name="top_icon_num_long">(Az érvényes értéknek 3 és 8 között kell lennie)</string>
+    <string name="gboard_cache_clear_question">Törli a gboard gyorsítótárat</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 7cfe0873..3f274344 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -55,7 +55,7 @@
     <string name="unpacking_themes">Descompactando temas</string>
     <string name="do_you_want_to_delete_theme">Deseja excluir esses temas?</string>
     <string name="show_preinstalled_themes">Mostrar temas pré-instalados</string>
-    <string name="emoji_compat_app_whitelist">Correção de compatibilidade de emojis</string>
+    <string name="emoji_compat_app_whitelist">Corrigir emojis</string>
     <string name="flags">Flags do Gboard</string>
     <string name="themes_header">Temas</string>
     <string name="show_system_theme">Mostrar tema do sistema</string>
@@ -65,32 +65,33 @@
     <string name="themed_nav_bar_all_devices">Cor da barra de navegação</string>
     <string name="enable_email_provider_completion">Provedor de e-mail</string>
     <string name="enable_popup_view_v2">Pop-up v2</string>
-    <string name="enable_key_border">Bordas das teclas</string>
+    <string name="enable_key_border">Borda das teclas</string>
     <string name="enable_secondary_symbols">Símbolos secundários</string>
     <string name="show_suggestions">Mostrar sugestões</string>
     <string name="show_all_flags">Mostrar todas as flags</string>
-    <string name="show_all_flags_long">Mostrar todas as flags atualmente definidas</string>
+    <string name="show_all_flags_long">Mostre todas as flags atualmente definidas</string>
     <string name="all_flags">Todas as flags</string>
     <string name="loading_preferences">Carregando preferências</string>
-    <string name="use_silk_theme_by_default">Use o tema Silk por padrão</string>
+    <string name="use_silk_theme_by_default">Use o tema silk por padrão</string>
     <string name="monet">Monet</string>
     <string name="silk_on_all_devices">Silk em todos os dispositivos</string>
     <string name="silk_on_all_pixel">Silk em todos os Pixel</string>
-    <string name="silk_theme">Tema Silk</string>
+    <string name="silk_theme">Tema silk</string>
     <string name="android_12">Android 12</string>
     <string name="general">Geral</string>
-    <string name="show_branding_on_space">Mostrar logo do Google na barra de espaço</string>
-    <string name="enable_auto_float_keyboard_in_multi_window">Teclado auto-flutuante no modo multi-janelas</string>
+    <string name="show_branding_on_space">Mostrar logo do Google</string>
+    <string name="show_branding_on_space_details">Mostre a logo do Google na barra de espaço</string>
+    <string name="enable_auto_float_keyboard_in_multi_window">Teclado flutuante</string>
     <string name="pill_shaped_key">Teclas em formato de pílula</string>
-    <string name="enable_clipboard_screenshot_paste">Colar captura de tela da área de transferência</string>
+    <string name="enable_clipboard_screenshot_paste">Colar captura de tela</string>
     <string name="enable_lens">Ativar Google Lens</string>
-    <string name="branding">Marca</string>
-    <string name="show_branding_interval_seconds">Mostrar segundos de intervalo da marca</string>
-    <string name="branding_fadeout_delay_ms">Mostrar segundos de intervalo para escurecer a marca</string>
+    <string name="branding">Logo</string>
+    <string name="show_branding_interval_seconds">Mostrar segundos de intervalo da logo</string>
+    <string name="branding_fadeout_delay_ms">Mostrar segundos de intervalo para escurecer a logo</string>
     <string name="monet_details">Tema do teclado baseado no tema do sistema</string>
     <string name="download_header">Baixar</string>
     <string name="repos">Repositórios</string>
-    <string name="repos_long">Alterar repositório do tema</string>
+    <string name="repos_long">Altere o repositório do tema</string>
     <string name="apply">Aplicar</string>
     <string name="add">Adicionar</string>
     <string name="save_repos">Deseja aplicar as mudanças?</string>
@@ -109,16 +110,16 @@
     <string name="select_all">Selecionar tudo</string>
     <string name="manager">Gerenciar</string>
     <string name="uninstall">Desinstalar</string>
-    <string name="uninstall_long">Desinstalar módulo e reiniciar</string>
+    <string name="uninstall_long">Desinstala o módulo e reinicia o dispositivo</string>
     <string name="apply_dark">Aplicar tema escuro</string>
     <string name="apply_light">Aplicar tema claro</string>
     <string name="app_theme">Tema do app</string>
     <string name="dark">Escuro</string>
     <string name="light">Claro</string>
     <string name="system_theme">Tema do sistema</string>
-    <string name="flags_loaded">flags carregadas (%o)</string>
-    <string name="show_preinstalled_themes_long">Mostrar temas pré-instalados na seção de temas</string>
-    <string name="show_system_theme_long">Mostrar temas do sistema na seção de temas</string>
+    <string name="flags_loaded">Flags carregadas (%o)</string>
+    <string name="show_preinstalled_themes_long">Mostre temas pré-instalados na seção de temas</string>
+    <string name="show_system_theme_long">Mostre temas do sistema na seção de temas</string>
     <string name="speedup_process">Acelerar processo</string>
     <string name="key">Chave</string>
     <string name="unreleased">Este app não foi lançado, alguns recursos podem não funcionar. Por favor, não relate nenhum erro ao grupo principal.</string>
@@ -131,7 +132,7 @@
     <string name="use_module">Módulo</string>
     <string name="use_magisk">Usar Magisk</string>
     <string name="gboard">Usar Gboard</string>
-    <string name="show_only_disabled">Mostrar apenas flags desativadas</string>
+    <string name="show_only_disabled">Mostrar apenas desativadas</string>
     <string name="share_flags">Compartilhar flags</string>
     <string name="share_flags_title">Compartilhar flags (%o)</string>
     <string name="import_flags_title">Importar flags (%o)</string>
@@ -142,7 +143,7 @@
     <string name="load_flags">Carregar flags</string>
     <string name="load_flags_long">Backup de flags antigas encontrado. Deseja carregá-lo?</string>
     <string name="use_blur">Usar blur</string>
-    <string name="use_blur_long">Usar RenderEffects</string>
+    <string name="use_blur_long">Use o blur RenderEffects</string>
     <string name="remove_repo">Remover repositório?</string>
     <string name="remove_repo_long">Deseja remover este repositório?</string>
     <string name="manage_repo">Gerenciar repositório</string>
@@ -150,7 +151,7 @@
     <string name="enabled">Ativado</string>
     <string name="themes">Temas</string>
     <string name="invalid_repo">Repositório inválido</string>
-    <string name="invalid_repo_long">Repositório inválido. Por favor, verifique o URL novamente.</string>
+    <string name="invalid_repo_long">Repositório inválido. Por favor, verifique a URL novamente.</string>
     <string name="download_themes">Baixar temas</string>
     <string name="theme_pack_count">Número de pacotes de temas</string>
     <string name="theme_packs">Pacotes de temas</string>
@@ -160,7 +161,7 @@
     <string name="do_not_report">Não reporte este erro</string>
     <string name="menu_moved">O menu agora está na página inferior</string>
     <string name="fix_flags">Corrigir flags</string>
-    <string name="fix_flags_long">Excluir flags e forçar parada do Gboard</string>
+    <string name="fix_flags_long">Exclua as flags e force a parada do Gboard</string>
     <string name="flags_fixed">Flags corrigidas</string>
     <string name="flags_copied">Flags copiadas</string>
     <string name="try_fix_flags">Tente ir nas Configurações e clique em \"Corrigir flags\"</string>
@@ -171,7 +172,7 @@
     <string name="theme_applied">Tema aplicado</string>
     <string name="all_preferences">Todas as preferências</string>
     <string name="show_all_preferences">Mostrar todas as preferências</string>
-    <string name="show_all_preferences_long">Mostrar todas as preferências do Gboard</string>
+    <string name="show_all_preferences_long">Mostre todas as preferências do Gboard</string>
     <string name="team">Equipe</string>
     <string name="owner_themer">Dono &amp; Themer</string>
     <string name="developer_themer">Desenvolvedor &amp; Themer</string>
@@ -232,29 +233,29 @@
     <string name="update_available">Atualização disponível (%s)</string>
     <string name="help">Ajuda</string>
     <string name="enable_get_bitmoji_card">Obtenha o card Bitmoji</string>
-    <string name="translate_new_ui">Nova IU do Traduzir</string>
+    <string name="translate_new_ui">Nova UI do Traduzir</string>
     <string name="enable_floating_keyboard_v2">Teclado flutuante V2</string>
-    <string name="silk_key_press">Pressione a tecla Silk</string>
+    <string name="silk_key_press">Pressione a tecla silk</string>
     <string name="silk_popup">Silk pop-up</string>
     <string name="silk">Silk pop-up</string>
     <string name="silk_details">Silk pop-up</string>
     <string name="keyboard_redesign_google_sans">Usar fonte Google Sans</string>
     <string name="gboard_cache_cleared">Cache do Gboard limpo</string>
     <string name="gboard_cache_clear">Limpar cache do Gboard</string>
-    <string name="gboard_cache_clear_long">Limpar cache e forçar parada do Gboard</string>
+    <string name="gboard_cache_clear_long">Limpe o cache e force a parada do Gboard</string>
     <string name="clear_recent_emojis">Limpar emojis usados recentemente</string>
-    <string name="clear_recent_emojis_long">Limpar emojis usados recentemente e forçar parada do Gboard</string>
+    <string name="clear_recent_emojis_long">Limpe os emojis usados recentemente e force a parada do Gboard</string>
     <string name="recent_emojis_cleared">Emojis usados recentemente limpos</string>
-    <string name="show_language_switch_key">Mostrar tecla de mudança de idioma</string>
+    <string name="show_language_switch_key">Mostrar botão de idioma</string>
     <string name="value">Valor</string>
     <string name="type">Tipo</string>
     <string name="not_empty">Não pode estar vazio</string>
-    <string name="show_only_disabled_prefs">Mostrar apenas preferências desabilitadas</string>
+    <string name="show_only_disabled_prefs">Mostrar apenas desativadas</string>
     <string name="share_prefs">Compartilhar preferências</string>
     <string name="patch">Correção</string>
     <string name="share_theme">Compartilhar tema</string>
-    <string name="logs">Registros</string>
-    <string name="logs_long">Abrir página de registros</string>
+    <string name="logs">Logs</string>
+    <string name="logs_long">Abrir página de logs</string>
     <string name="copy_flags">Copiar flags</string>
     <string name="copy_flags_long"><![CDATA[Copiar \"flag_value.xml\" -> \"flag_override.xml\"]]></string>
     <string name="new_flags_long">Novas flags encontradas</string>
@@ -271,7 +272,7 @@
     <string name="module_1">Temas claro e escuro separados</string>
     <string name="module_2">Editando cantos e parâmetros de preenchimento</string>
     <string name="module_3">Sons personalizados</string>
-    <string name="module_4">Não funciona no ColorOS</string>
+    <string name="module_4">Não funciona na ColorOS</string>
     <string name="module_5">Problemas em ROM MIUI</string>
     <string name="gboard_1">Download básico e instalação de temas</string>
     <string name="gboard_2">Não requer módulo do Magisk</string>
@@ -284,4 +285,19 @@
     <string name="theme_values_long">Valores do tema</string>
     <string name="value_prefix">Prefixo de valor</string>
     <string name="theme_changer">Alterador de tema</string>
-</resources>
+    <string name="material3_theme">Tema Materia l3</string>
+    <string name="material3_theme_details">Tema de teclado Material3 do sistema automático escuro/claro</string>
+    <string name="show_language_switch_key_details">Mostre a tecla dedicada para mudar de idioma</string>
+    <string name="show_suggestions_details">Mostre a faixa de sugestões enquanto digita</string>
+    <string name="pill_shaped_key_details">Use as teclas em formato de pílula</string>
+    <string name="enable_clipboard_screenshot_paste_details">Adicione capturas de tela à área de transferência do Gboard</string>
+    <string name="keyboard_redesign_forbid_key_shadows_details">Remova uma sombra proibida das teclas</string>
+    <string name="enable_auto_float_keyboard_in_multi_window_details">Mostre o teclado flutuante automático em múltiplas janelas</string>
+    <string name="enable_sharing_details">Mostre o ícone de compartilhamento</string>
+    <string name="enable_key_border_details">Use a borda das teclas</string>
+    <string name="enable_secondary_symbols_details">Use os símbolos secundários</string>
+    <string name="silk_popup_details">Usando silk pop-up</string>
+    <string name="keyboard_redesign_google_sans_details">Use o redesign do teclado com o Google Sans</string>
+    <string name="emoji_compat_app_whitelist_details">Use a correção de compatibilidade de emojis</string>
+    <string name="enable_email_provider_completion_details">Use o provedor de e-mail</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings-do-not-translate.xml b/app/src/main/res/values/strings-do-not-translate.xml
index c0c2a61a..81b013bb 100644
--- a/app/src/main/res/values/strings-do-not-translate.xml
+++ b/app/src/main/res/values/strings-do-not-translate.xml
@@ -27,6 +27,7 @@
     <string name="xda_thread_url">https://forum.xda-developers.com/t/app-rboard-theme-manager.4331445</string>
     <string name="github_repo_url">https://github.com/DerTyp7214/RboardThemeManagerV3</string>
     <string name="magisk_github_url">https://github.com/topjohnwu/Magisk</string>
+    <string name="rboard_deep_link">https://github.com/DerTyp7214/DeepLinkRboard</string>
     <string name="hungarian">Hungarian</string>
     <string name="italian">Italian</string>
     <string name="alpha4041">Alpha4041</string>
@@ -41,4 +42,6 @@
     <string name="contingency">Contingency</string>
     <string name="french">French</string>
     <string name="yoanndp">Yoanndp</string>
+    <string name="arabic">Arabic</string>
+    <string name="muhammadbahaa2001">Muhammadbahaa</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 725e0984..d2889d55 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,6 +26,7 @@
     <string name="apply_automatic_theme">Apply Automatic Theme</string>
     <string name="applied">Theme Applied</string>
     <string name="delete_theme">Delete Theme</string>
+    <string name="delete_repo">Delete Repo</string>
     <string name="q_delete_theme">Do you want to delete this theme?</string>
     <string name="theme_deleted">Theme Deleted</string>
 
@@ -49,12 +50,14 @@
     <string name="share_themes">Share themes</string>
     <string name="select_at_least_one_not_default_theme">Select at least one not default theme</string>
     <string name="rboard_theme_creator">Rboard Theme Creator</string>
+    <string name="rboard_theme_patcher">Rboard Patcher</string>
     <string name="downloading_pack">Downloading pack</string>
     <string name="install_themes">Install themes (%s)</string>
     <string name="install">Install</string>
     <string name="themes_installed">Themes installed</string>
     <string name="unpacking_themes">Unpacking themes</string>
     <string name="do_you_want_to_delete_theme">Do you want to delete these themes?</string>
+    <string name="do_you_want_to_delete_repo">Do you want to delete these repo?</string>
     <string name="show_preinstalled_themes">Show preinstalled themes</string>
     <string name="emoji_compat_app_whitelist">Emoji Compat Fix</string>
     <string name="flags">Gboard Flags</string>
@@ -232,6 +235,7 @@
     <string name="reset">Reset</string>
     <string name="invalid_link">Invalid Link</string>
     <string name="deep_link">Deep link</string>
+    <string name="deep_link_long">Rboard Deep link</string>
     <string name="download">Download</string>
     <string name="include_theme_names">Include Theme Names</string>
     <string name="update_available">Update available (%s)</string>
@@ -247,8 +251,11 @@
     <string name="gboard_cache_cleared">Gboard cache cleared</string>
     <string name="gboard_cache_clear">Gboard cache clear</string>
     <string name="gboard_cache_clear_long">Deletes cache and force closes gboard.</string>
+    <string name="gboard_cache_clear_question">Deletes gboard cache</string>
+    <string name="gboard_cache_clear_long_question">Do you want to clear the cache and force close gboard?</string>
     <string name="clear_recent_emojis">Clear recent used emojis</string>
     <string name="clear_recent_emojis_long">Deletes recent used emojis and force closes gboard.</string>
+    <string name="clear_recent_emojis_question">Do you want to delete recent used emojis and force close gboard?</string>
     <string name="recent_emojis_cleared">Recent used emojis cleared</string>
     <string name="show_language_switch_key">Show Language Switch Key</string>
     <string name="value">Value</string>
@@ -304,4 +311,11 @@
     <string name="keyboard_redesign_google_sans_details">Using Keyboard Redesign Google Sans</string>
     <string name="emoji_compat_app_whitelist_details">Using Emoji Compat Fix</string>
     <string name="enable_email_provider_completion_details">Using Email Provider</string>
+    <string name="rboard_apps">Rboard Apps</string>
+    <string name="more_rboard_apps">More from Us</string>
+    <string name="more_rboard_apps_desc">Download more Rboard applications</string>
+    <string name="close">Close</string>
+    <string name="rboard_monet_extractor">Monet Extractor</string>
+    <string name="top_icon_num">Config Max Access Points</string>
+    <string name="top_icon_num_long">(Valid value should between 3 and 8)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/locale_config.xml b/app/src/main/res/xml/locale_config.xml
index 6438a5f4..75d16c59 100644
--- a/app/src/main/res/xml/locale_config.xml
+++ b/app/src/main/res/xml/locale_config.xml
@@ -11,7 +11,7 @@
     <locale android:name="fr" />
     <locale android:name="hi" />
     <locale android:name="hu" />
-    <locale android:name="id" />
+    <locale android:name="in" />
     <locale android:name="it" />
     <locale android:name="ja" />
     <locale android:name="nl" />
diff --git a/build.gradle.kts b/build.gradle.kts
index 2543ce00..fce17812 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,7 @@ buildscript {
         classpath(libs.gradle)
         classpath(libs.r8)
         //noinspection DifferentKotlinGradleVersion
-        classpath(kotlin("gradle-plugin", version = "2.0.0"))
+        classpath(kotlin("gradle-plugin", version = "2.1.0-Beta1"))
         classpath(libs.google.services)
     }
 }
diff --git a/colorutilsc b/colorutilsc
index e5623cd3..6745a9cf 160000
--- a/colorutilsc
+++ b/colorutilsc
@@ -1 +1 @@
-Subproject commit e5623cd31084beea7a557f530f88ac40506c44be
+Subproject commit 6745a9cf5eab9f9530a8e33a71ed0f64e86fedb2
diff --git a/gradle.properties b/gradle.properties
index 8b3c4e3d..d73a4b40 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,5 +20,5 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 android.injected.testOnly=false
-org.gradle.caching=false
-android.nonTransitiveRClass=false
\ No newline at end of file
+android.nonTransitiveRClass=false
+kapt.use.k2=true
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 81cfdcf0..bebbf092 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,45 +1,44 @@
 [versions]
-activity-ktx = "1.9.1"
+activity-ktx = "1.10.0-alpha02"
 android-shell = "1.0.0"
 androidx-junit = "1.2.1"
 appcompat = "1.7.0"
-balloon = "1.6.6"
+balloon = "1.6.7"
 browser = "1.8.0"
 commons-text = "1.12.0"
-constraintlayout = "2.2.0-alpha13"
-core = "1.15.0-alpha01"
-core-ktx = "1.15.0-alpha01"
-desugar_jdk_libs_nio = "2.0.4"
-dotsIndicator = "5.0"
+constraintlayout = "2.2.0-beta01"
+core = "1.15.0-beta01"
+core-ktx = "1.15.0-beta01"
+desugar_jdk_libs_nio = "2.1.2"
+dotsIndicator = "5.1.0"
 espresso-core = "3.6.1"
-firebase-bom = "33.1.2"
-firebase-analytics = "22.0.2"
-firebase-analytics-ktx = "22.0.2"
-firebase-messaging = "24.0.0"
-firebase-messaging-ktx = "24.0.0"
-flagkit-android = "1.0.2"
-fragment-ktx = "1.8.2"
+firebase-bom = "33.4.0"
+firebase-analytics = "22.1.2"
+firebase-analytics-ktx = "22.1.2"
+firebase-messaging = "24.0.2"
+firebase-messaging-ktx = "24.0.2"
+flagkit-android = "1.0.3"
+fragment-ktx = "1.8.4"
 googleServices = "4.4.2"
-gradle = "8.7.0-alpha03"
+gradle = "8.8.0-alpha05"
 gson = "2.11.0"
 insetter = "0.6.1"
 junit = "4.13.2"
-kotlin-reflect = "2.0.0"
+kotlin-reflect = "2.1.0-Beta1"
 ksp = "5.0.0-SNAPSHOT"
-kspPlugin = "2.0.0-1.0.24"
+kspPlugin = "2.1.0-Beta1-1.0.25"
 legacy-support-v4 = "1.0.0"
 libsuVersion = "6.0.0"
-lifecycle-viewmodel-ktx = "2.8.4"
-material = "1.13.0-alpha04"
-navigation-fragment-ktx = "2.8.0-beta06"
-navigation-ui-ktx = "2.8.0-beta06"
+lifecycle-viewmodel-ktx = "2.9.0-alpha04"
+material = "1.13.0-alpha06"
+navigation-fragment-ktx = "2.8.2"
+navigation-ui-ktx = "2.8.2"
 prdownloader = "v0.6.0"
 preference-ktx = "1.2.1"
-preferencesplus = "1.1"
 protobuf-dynamic = "1.0.1"
 simple-item-decoration = "1.0.0"
-ui-tooling = "1.7.0-beta06"
-r8 = "8.7.1-dev"
+ui-tooling = "1.8.0-alpha03"
+r8 = "8.8.10-dev"
 
 [libraries]
 android-shell = { module = "com.jaredrummler:android-shell", version.ref = "android-shell" }
@@ -64,7 +63,7 @@ firebase-analytics = { module = "com.google.firebase:firebase-analytics", versio
 firebase-analytics-ktx = { module = "com.google.firebase:firebase-analytics-ktx", version.ref = "firebase-analytics-ktx" }
 firebase-messaging = { module = "com.google.firebase:firebase-messaging", version.ref = "firebase-messaging" }
 firebase-messaging-ktx = { module = "com.google.firebase:firebase-messaging-ktx", version.ref = "firebase-messaging-ktx" }
-flagkit-android = { module = "com.github.murgupluoglu:flagkit-android", version.ref = "flagkit-android" }
+flagkit-android = { module = "com.github.akospaha01:flagkit-android", version.ref = "flagkit-android" }
 glide = { module = "com.github.bumptech.glide:glide", version.ref = "ksp" }
 google-services = { module = "com.google.gms:google-services", version.ref = "googleServices" }
 gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
@@ -81,7 +80,6 @@ navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-kt
 navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation-ui-ktx" }
 nio = { module = "com.github.topjohnwu.libsu:nio", version.ref = "libsuVersion" }
 prdownloader = { module = "de.dertyp7214:PRDownloader", version.ref = "prdownloader" }
-preferencesplus = { module = "com.github.DerTyp7214:PreferencesPlus", version.ref = "preferencesplus" }
 protobuf-dynamic = { module = "com.github.os72:protobuf-dynamic", version.ref = "protobuf-dynamic" }
 simple-item-decoration = { module = "com.bignerdranch.android:simple-item-decoration", version.ref = "simple-item-decoration" }
 dots-indicator = { group = "com.tbuonomo", name = "dotsindicator", version.ref = "dotsIndicator" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a37ca0e6..cebd49de 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Tue Jul 16 08:19:21 CEST 2024
+#Mon Oct 07 23:22:29 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mathc b/mathc
index 48039013..547bb39b 160000
--- a/mathc
+++ b/mathc
@@ -1 +1 @@
-Subproject commit 48039013994eba3b227211bed672cfc08c8799e0
+Subproject commit 547bb39b9cf79cbf8e1eaf53030222ba8d1934da
diff --git a/rboardcomponents b/rboardcomponents
index 721ce83e..13c96c23 160000
--- a/rboardcomponents
+++ b/rboardcomponents
@@ -1 +1 @@
-Subproject commit 721ce83e3d5842ead7336ce6c380d1063f72bf70
+Subproject commit 13c96c238b3482359313d7f464ac0089593c8daa