diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index a04e803d..e68ef862 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -8,6 +8,6 @@
     <option name="languageVersion" value="1.9" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.23" />
+    <option name="version" value="1.9.24" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c288f557..69705ccd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -25,7 +25,7 @@ android {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 31
         targetSdk = 34
-        versionCode = 392007
+        versionCode = 392008
         versionName = "3.9.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
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 06a39c76..b1e68aac 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package de.dertyp7214.rboardthememanager.screens
 
 import android.annotation.SuppressLint
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 b0696e02..adcd0149 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
diff --git a/app/src/main/res/drawable/ic_md3.xml b/app/src/main/res/drawable/ic_md3.xml
new file mode 100644
index 00000000..47a54186
--- /dev/null
+++ b/app/src/main/res/drawable/ic_md3.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group>
+        <group>
+            <clip-path
+                android:pathData="M24 0H0v24h24V0Z"/>
+            <group>
+                <path
+                    android:fillColor="#fff"
+                    android:pathData="M9.72 2.82c1.17-1.45 3.39-1.45 4.56 0 0.63 0.78 1.6 1.18 2.6 1.08 1.85-0.2 3.42 1.37 3.22 3.23-0.1 0.99 0.3 1.96 1.08 2.59 1.45 1.17 1.45 3.39 0 4.56-0.78 0.63-1.18 1.6-1.08 2.6 0.2 1.85-1.37 3.42-3.23 3.23-0.99-0.1-1.96 0.3-2.59 1.07-1.17 1.45-3.39 1.45-4.56 0-0.63-0.77-1.6-1.18-2.6-1.07-1.85 0.2-3.42-1.38-3.23-3.23 0.1-1-0.3-1.97-1.07-2.6-1.45-1.17-1.45-3.39 0-4.56C3.6 9.09 4 8.12 3.9 7.12 3.7 5.28 5.27 3.7 7.12 3.9c1 0.1 1.97-0.3 2.6-1.08Z"/>
+            </group>
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/raw/flags.json b/app/src/main/res/raw/flags.json
index 7580ba86..2c6ecd04 100644
--- a/app/src/main/res/raw/flags.json
+++ b/app/src/main/res/raw/flags.json
@@ -1,5 +1,5 @@
 {
-  "time": "1705418202551",
+  "time": "1714154132813",
   "flags": [
     {
       "key": "general",
@@ -12,7 +12,7 @@
     {
       "key": "emoji_compat_app_whitelist",
       "title": "emoji_compat_app_whitelist",
-      "summary": "",
+      "summary": "emoji_compat_app_whitelist_details",
       "icon": "ic_emoji_compat",
       "defaultValue": false,
       "type": "BOOLEAN",
@@ -79,7 +79,7 @@
     {
       "key": "enable_sharing",
       "title": "enable_sharing",
-      "summary": "",
+      "summary": "enable_sharing_details",
       "icon": "ic_share",
       "defaultValue": false,
       "type": "BOOLEAN",
@@ -100,7 +100,7 @@
     {
       "key": "enable_email_provider_completion",
       "title": "enable_email_provider_completion",
-      "summary": "",
+      "summary": "enable_email_provider_completion_details",
       "icon": "ic_email",
       "defaultValue": false,
       "type": "BOOLEAN",
@@ -119,7 +119,7 @@
     {
       "key": "enable_key_border",
       "title": "enable_key_border",
-      "summary": "",
+      "summary": "enable_key_border_details",
       "icon": "ic_key_border",
       "defaultValue": false,
       "type": "BOOLEAN",
@@ -128,7 +128,7 @@
     {
       "key": "enable_secondary_symbols",
       "title": "enable_secondary_symbols",
-      "summary": "",
+      "summary": "enable_secondary_symbols_details",
       "icon": "ic_numeric",
       "defaultValue": false,
       "type": "BOOLEAN",
@@ -137,7 +137,7 @@
     {
       "key": "show_language_switch_key",
       "title": "show_language_switch_key",
-      "summary": "",
+      "summary": "show_language_switch_key_details",
       "icon": "ic_globe",
       "defaultValue": false,
       "type": "BOOLEAN",
@@ -146,7 +146,7 @@
     {
       "key": "show_suggestions",
       "title": "show_suggestions",
-      "summary": "",
+      "summary": "show_suggestions_details",
       "icon": "ic_alphabetical",
       "defaultValue": false,
       "type": "BOOLEAN",
@@ -155,7 +155,7 @@
     {
       "key": "keyboard_redesign_google_sans",
       "title": "keyboard_redesign_google_sans",
-      "summary": "",
+      "summary": "keyboard_redesign_google_sans_details",
       "icon": "ic_g_sans",
       "defaultValue": false,
       "type": "BOOLEAN",
@@ -165,7 +165,7 @@
     {
       "key": "branding",
       "title": "show_branding_on_space",
-      "summary": "show_branding_on_space",
+      "summary": "show_branding_on_space_details",
       "icon": "ic_google_logo",
       "defaultValue": false,
       "type": "BOOLEAN",
@@ -230,6 +230,15 @@
         }
       ]
     },
+    {
+      "key": "material3_theme",
+      "title": "material3_theme",
+      "summary": "material3_theme_details",
+      "icon": "ic_md3",
+      "defaultValue": false,
+      "type": "BOOLEAN",
+      "file": "FLAGS"
+    },
     {
       "key": "monet",
       "title": "monet",
@@ -287,7 +296,7 @@
     },{
       "key": "silk",
       "title": "silk",
-      "summary": "silk_details",
+      "summary": "silk_popup_details",
       "icon": "ic_silk_popup",
       "defaultValue": false,
       "type": "BOOLEAN",
@@ -319,7 +328,7 @@
     {
       "key": "pill_shaped_key",
       "title": "pill_shaped_key",
-      "summary": "",
+      "summary": "pill_shaped_key_details",
       "icon": "ic_pill",
       "defaultValue": false,
       "type": "BOOLEAN",
@@ -338,7 +347,7 @@
     {
       "key": "enable_clipboard_screenshot_paste",
       "title": "enable_clipboard_screenshot_paste",
-      "summary": "",
+      "summary": "enable_clipboard_screenshot_paste_details",
       "icon": "ic_screenshot",
       "defaultValue": false,
       "type": "BOOLEAN",
@@ -357,7 +366,7 @@
     {
       "key": "enable_auto_float_keyboard_in_multi_window",
       "title": "enable_auto_float_keyboard_in_multi_window",
-      "summary": "",
+      "summary": "enable_auto_float_keyboard_in_multi_window_details",
       "icon": "ic_float",
       "defaultValue": false,
       "type": "BOOLEAN",
@@ -386,7 +395,7 @@
     {
       "key": "keyboard_redesign_forbid_key_shadows",
       "title": "keyboard_redesign_forbid_key_shadows",
-      "summary": "",
+      "summary": "keyboard_redesign_forbid_key_shadows_details",
       "icon": "ic_box_shadow",
       "defaultValue": false,
       "type": "BOOLEAN",
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1c809d89..a860e3c3 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -55,7 +55,7 @@
     <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="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="emoji_compat_app_whitelist">Emoji Kompatibilis Javítás</string>
     <string name="flags">Gboard Zászlók</string>
     <string name="themes_header">Témák</string>
     <string name="show_system_theme">Rendszertéma megjelenítése</string>
@@ -63,11 +63,11 @@
     <string name="deprecate_search">Google ikon</string>
     <string name="enable_sharing">Megosztás Ikon</string>
     <string name="themed_nav_bar_all_devices">Navigációs sáv szín</string>
-    <string name="enable_email_provider_completion">E-mail szolgáltató</string>
+    <string name="enable_email_provider_completion">E-mail Szolgáltató</string>
     <string name="enable_popup_view_v2">Popup v2</string>
-    <string name="enable_key_border">Billentyű szegély</string>
-    <string name="enable_secondary_symbols">Másodlagos szimbólumok</string>
-    <string name="show_suggestions">Javaslatok megjelenítése</string>
+    <string name="enable_key_border">Billentyű Szegély</string>
+    <string name="enable_secondary_symbols">Másodlagos Szimbólumok</string>
+    <string name="show_suggestions">Javaslatok Megjelenítése</string>
     <string name="show_all_flags">Összes zászló megjelenítése</string>
     <string name="show_all_flags_long">Összes jelenleg beállított zászlót megjelenítése</string>
     <string name="all_flags">Minden zászló</string>
@@ -81,8 +81,8 @@
     <string name="general">Általános</string>
     <string name="show_branding_on_space">Márkajelzés megjelenítése a szóközön</string>
     <string name="enable_auto_float_keyboard_in_multi_window">Automatikus lebegő billentyűzet több ablakban</string>
-    <string name="pill_shaped_key">Pirula alakú billentyű</string>
-    <string name="enable_clipboard_screenshot_paste">Vágólap képernyőkép beillesztése</string>
+    <string name="pill_shaped_key">Pirula Alakú Billentyű</string>
+    <string name="enable_clipboard_screenshot_paste">Vágólap Képernyőkép Beillesztése</string>
     <string name="enable_lens">Lens engedélyezése</string>
     <string name="branding">Márkajelzés</string>
     <string name="show_branding_interval_seconds">A márkaintervallum másodperceinek megjelenítése</string>
@@ -163,7 +163,7 @@
     <string name="fix_flags_long">Törli a zászlókat, és kényszeríti a Gboard bezárását.</string>
     <string name="flags_fixed">Zászlók javítva</string>
     <string name="flags_copied">Zászlók másolva</string>
-    <string name="try_fix_flags">Próbáljon meg a beállításokhoz menni, és kattintson a \\\"Zászlók javítása\\\" gombra.</string>
+    <string name="try_fix_flags">Próbáljon meg a beállításokhoz menni, és kattintson a \"Zászlók javítása\" gombra.</string>
     <string name="flags_corrupted">Úgy tűnik, hogy a zászlók sérültek</string>
     <string name="sort_by_date">Rendezés Dátum Szerint</string>
     <string name="press_back_to_apply">A zászlók alkalmazásához csak nyomja meg a vissza gombot</string>
@@ -264,7 +264,7 @@
     <string name="logs_long">Naplók oldal megnyitása</string>
     <string name="copy_flags">Zászlók másolása</string>
     <string name="copy_flags_long"><![CDATA[Másolja \"flag_value.xml\" -> \"flag_override.xml\"]]></string>
-    <string name="app_style">Alkalmazás Stílusa</string>
+    <string name="app_style">Alkalmazás stílusa</string>
     <string name="ime_test">IME Teszt</string>
     <string name="ime_test_long">Rboard IME Teszt</string>
     <string name="new_flags_long">Új zászlókat találtunk.</string>
@@ -291,4 +291,20 @@
     <string name="theme_values_long">Téma Értékek</string>
     <string name="value_prefix">Érték előtag</string>
     <string name="theme_changer">Téma Váltó</string>
+    <string name="material3_theme">Material3 Téma</string>
+    <string name="show_language_switch_key_details">Külön gomb megjelnítése a nyelvek közötti váltáshoz</string>
+    <string name="show_suggestions_details">Gépelés közben megjeleníti a javaslatsávot</string>
+    <string name="show_branding_on_space_details">Google márkajelzés megjelenítése a szóközön</string>
+    <string name="material3_theme_details">Material3 Rendszer automatikus Sötét/világos billentyűzet téma</string>
+    <string name="pill_shaped_key_details">Pirula Alakú Billentyű Használata</string>
+    <string name="enable_clipboard_screenshot_paste_details">Képernyőképek hozzáadása a Gboard vágólapjához a könnyebb beillesztés érdekében</string>
+    <string name="keyboard_redesign_forbid_key_shadows_details">Tiltott árnyék eltávolítása a kulcsról</string>
+    <string name="enable_auto_float_keyboard_in_multi_window_details">Automatikus lebegő billentyűzet több ablakban</string>
+    <string name="enable_sharing_details">Megosztás Ikon Megjelenítése</string>
+    <string name="enable_key_border_details">Billentyű Szegély Használata</string>
+    <string name="enable_secondary_symbols_details">Másodlagos Szimbólumok Használata</string>
+    <string name="keyboard_redesign_google_sans_details">A billentyűzet újratervezése Google Sans használatával</string>
+    <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>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8c2b7118..302ad94c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -56,7 +56,7 @@
     <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="show_preinstalled_themes">Show preinstalled themes</string>
-    <string name="emoji_compat_app_whitelist">Emoji compat fix</string>
+    <string name="emoji_compat_app_whitelist">Emoji Compat Fix</string>
     <string name="flags">Gboard Flags</string>
     <string name="themes_header">Themes</string>
     <string name="show_system_theme">Show system theme</string>
@@ -64,11 +64,11 @@
     <string name="deprecate_search">Google icon</string>
     <string name="enable_sharing">Share Icon</string>
     <string name="themed_nav_bar_all_devices">Navbar color</string>
-    <string name="enable_email_provider_completion">Email provider</string>
+    <string name="enable_email_provider_completion">Email Provider</string>
     <string name="enable_popup_view_v2">Popup v2</string>
-    <string name="enable_key_border">Key border</string>
-    <string name="enable_secondary_symbols">Secondary symbols</string>
-    <string name="show_suggestions">Show suggestions</string>
+    <string name="enable_key_border">Key Border</string>
+    <string name="enable_secondary_symbols">Secondary Symbols</string>
+    <string name="show_suggestions">Show Suggestions</string>
     <string name="show_all_flags">Show all flags</string>
     <string name="show_all_flags_long">Shows all currently set flags</string>
     <string name="all_flags">All flags</string>
@@ -81,9 +81,10 @@
     <string name="android_12">Android 12</string>
     <string name="general">General</string>
     <string name="show_branding_on_space">Show branding on space</string>
+    <string name="show_branding_on_space_details">Show Google branding on space</string>
     <string name="enable_auto_float_keyboard_in_multi_window">Auto float Keyboard in multi window</string>
-    <string name="pill_shaped_key">Pill shaped key</string>
-    <string name="enable_clipboard_screenshot_paste">Clipboard screenshot paste</string>
+    <string name="pill_shaped_key">Pill Shaped Key</string>
+    <string name="enable_clipboard_screenshot_paste">Clipboard Screenshot Paste</string>
     <string name="enable_lens">Enable lens</string>
     <string name="branding">Branding</string>
     <string name="show_branding_interval_seconds">Show branding interval seconds</string>
@@ -291,4 +292,19 @@
     <string name="theme_values_long">Theme Values</string>
     <string name="value_prefix">Value Prefix</string>
     <string name="theme_changer">Theme Changer</string>
+    <string name="material3_theme">Material3 Theme</string>
+    <string name="material3_theme_details">Material3 System auto Dark/light keyboard theme</string>
+    <string name="show_language_switch_key_details">Show dedicated key to switch languages</string>
+    <string name="show_suggestions_details">Display suggestion strip while typing</string>
+    <string name="pill_shaped_key_details">Using Pill Shaped Key</string>
+    <string name="enable_clipboard_screenshot_paste_details">Add screenshots to your Gboard clipboard for easier pasting</string>
+    <string name="keyboard_redesign_forbid_key_shadows_details">Remove a forbid shadow from the key</string>
+    <string name="enable_auto_float_keyboard_in_multi_window_details">Automatic floating keyboard in multiple windows</string>
+    <string name="enable_sharing_details">Show Sharing Icon</string>
+    <string name="enable_key_border_details">Using Key Border</string>
+    <string name="enable_secondary_symbols_details">Using Secondary Symbols</string>
+    <string name="silk_popup_details">Using Silk Popup</string>
+    <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>
 </resources>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index a02f43c8..b652987c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
     dependencies {
         classpath(libs.gradle)
         //noinspection DifferentKotlinGradleVersion
-        classpath(kotlin("gradle-plugin", version = "1.9.23"))
+        classpath(kotlin("gradle-plugin", version = "1.9.24"))
         classpath(libs.google.services)
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cc56b94f..d376d0db 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,46 +4,46 @@ de-PRDownloader = "v0.6.0"
 google-core = "2.1.0"
 google-core-ktx = "2.1.0"
 junit-junit = "4.13.2"
-kotlinReflect = "1.9.23"
+kotlinReflect = "1.9.24"
 ksp = "4.16.0"
 libsuVersion = "5.2.2"
 insetter = "0.6.1"
 
-kotlin-stdlib = "1.9.23"
-appcompat = "1.7.0-alpha03"
+kotlin-stdlib = "1.9.24"
+appcompat = "1.7.0-beta01"
 constraintlayout = "2.2.0-alpha13"
 preference-ktx = "1.2.1"
 activity-ktx = "1.9.0"
-fragment-ktx = "1.6.2"
+fragment-ktx = "1.7.0"
 lifecycle-viewmodel-ktx = "2.7.0"
 browser = "1.8.0"
 glide = "4.16.0"
 flagkit = "1.0.2"
-firebase-bom = "32.8.1"
-firebase-messaging-ktx = "23.4.1"
-firebase-analytics-ktx = "21.6.2"
+firebase-bom = "33.0.0"
+firebase-messaging-ktx = "24.0.0"
+firebase-analytics-ktx = "22.0.0"
 legacy-support-v4 = "1.0.0"
 navigation-fragment-ktx = "2.7.7"
 navigation-ui-ktx = "2.7.7"
 commons-text = "1.12.0"
-core-ktx = "1.13.0"
-core = "1.13.0"
-material = "1.11.0"
+core-ktx = "1.13.1"
+core = "1.13.1"
+material = "1.12.0"
 espresso-core = "3.5.1"
 android-shell = "1.0.0"
-firebase-analytics = "21.6.2"
-firebase-messaging = "23.4.1"
+firebase-analytics = "22.0.0"
+firebase-messaging = "24.0.0"
 gson = "2.10.1"
 protobufDynamic = "1.0.1"
 simple-item-decoration = "1.0.0"
 balloon = "1.6.4"
-kspPlugin = "1.9.23-1.0.20"
+kspPlugin = "1.9.24-1.0.20"
 dotsIndicator = "5.0"
 
 googleServices = "4.4.1"
-gradle = "8.5.0-alpha06"
-uiTooling = "1.6.6"
-kotlin = "1.9.23"
+gradle = "8.5.0-alpha08"
+uiTooling = "1.6.7"
+kotlin = "1.9.24"
 
 [libraries]
 prDownloader = { module = "de.dertyp7214:PRDownloader", version.ref = "de-PRDownloader" }
diff --git a/rboardcomponents b/rboardcomponents
index 4ed2d492..46caa643 160000
--- a/rboardcomponents
+++ b/rboardcomponents
@@ -1 +1 @@
-Subproject commit 4ed2d492b7064ecf77d75126c8eed03ecd206c97
+Subproject commit 46caa643b9c4afff9bd42ef87cb576ee11981c45