diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b016f49..278fca5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,11 +25,11 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28b
+          ndk-version: r28c
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '4.0.2'
+          cmake-version: '4.0.3'
 
       - name: Setup Ninja
         run: sudo apt-get install ninja-build
diff --git a/.github/workflows/playstore.yml b/.github/workflows/playstore.yml
index 4b2c8a3..8a43b75 100644
--- a/.github/workflows/playstore.yml
+++ b/.github/workflows/playstore.yml
@@ -23,15 +23,15 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28b
+          ndk-version: r28c
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28b
+          ndk-version: r28c
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '4.0.2'
+          cmake-version: '4.0.3'
 
       - name: Setup JDK
         uses: actions/setup-java@v4
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a346487..be73c1a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ba3ef84..2f1c65f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -18,7 +18,7 @@ android {
         applicationId = "de.dertyp7214.rboardthemecreator"
         minSdk = 26
         targetSdk = 36
-        versionCode = 133002
+        versionCode = 133003
         versionName = "1.3.3"
 
         vectorDrawables.useSupportLibrary = true
@@ -66,8 +66,6 @@ dependencies {
     implementation(project(":rboardcomponents"))
 
     implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.messaging.ktx)
-    implementation(libs.firebase.analytics.ktx)
     
     implementation(libs.firebase.analytics)
     implementation(libs.firebase.messaging)
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 718b265..21ed316 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -15,12 +15,6 @@
     <string name="gboard_not_installed">Gboard غير مثبت</string>
     <string name="install_rboard">هل تريد تثبيت Rboard؟</string>
     <string name="rboard_not_installed">Rboard غير مثبت</string>
-    <string name="default_notification_channel_id">قناة الإشعارات</string>
-    <string name="download_notification_channel_id">قناة تنزيل الإشعارات</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>
diff --git a/colorutilsc b/colorutilsc
index bda25ab..880cb45 160000
--- a/colorutilsc
+++ b/colorutilsc
@@ -1 +1 @@
-Subproject commit bda25ab9fde131ec27a188970f0709f2714bb0bb
+Subproject commit 880cb45ee0fc842a754e4ee5edc52db9928be639
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e8e3a65..d27df1b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,37 +1,37 @@
 [versions]
-activity-ktx = "1.12.0-alpha03"
+activity-ktx = "1.12.0-alpha04"
 android-shell = "1.0.0"
 appcompat = "1.7.1"
-browser = "1.9.0-alpha05"
+browser = "1.9.0-rc01"
 commons-text = "1.13.1"
 constraintlayout = "2.2.1"
-core = "1.17.0-alpha01"
-core-ktx = "1.17.0-alpha01"
+core = "1.17.0-beta01"
+core-ktx = "1.17.0-beta01"
 desugar_jdk_libs_nio = "2.1.5"
-espresso-core = "3.7.0-beta01"
-firebase-bom = "33.16.0"
-firebase-analytics-ktx = "22.5.0"
-firebase-messaging-ktx = "24.1.2"
+espresso-core = "3.7.0-rc01"
+firebase-bom = "34.0.0"
+firebase-analytics = "23.0.0"
+firebase-messaging = "25.0.0"
 fragment-ktx = "1.8.8"
 github-ksp = "4.16.0"
-gradle = "8.12.0-alpha07"
+gradle = "8.13.0-alpha02"
 gson = "2.13.1"
 insetter = "0.6.1"
 junit = "1.2.1"
 junit-junit = "4.13.2"
 kotlin-gradle-plugin = "2.2.0"
 kotlin-reflect = "2.2.0"
-material = "1.14.0-alpha02"
-navigation-ui-ktx = "2.9.0"
-navigation-fragment-ktx = "2.9.0"
+material = "1.14.0-alpha03"
+navigation-ui-ktx = "2.9.2"
+navigation-fragment-ktx = "2.9.2"
 legacy-support-v4 = "1.0.0"
 pikolo = "2.0.2"
 prdownloader = "v0.6.0"
 preference-ktx = "1.2.1"
-r8 = "8.11.18"
+r8 = "8.13.0-dev"
 simple-item-decoration = "1.0.0"
 vectorchildfinder = "1.0.0"
-webkit = "1.14.0"
+webkit = "1.15.0-alpha01"
 kspPlugin = "2.2.0-2.0.2"
 
 [libraries]
@@ -52,10 +52,8 @@ androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx",
 androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation-fragment-ktx" }
 androidx-legacy-support-v4 = { module = "androidx.legacy:legacy-support-v4", version.ref = "legacy-support-v4" }
 core-ktx = { module = "androidx.core:core-ktx", version.ref = "core-ktx" }
-firebase-analytics = { module = "com.google.firebase:firebase-analytics", version.ref = "firebase-analytics-ktx" }
-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-ktx" }
-firebase-messaging-ktx = { module = "com.google.firebase:firebase-messaging-ktx", version.ref = "firebase-messaging-ktx" }
+firebase-analytics = { module = "com.google.firebase:firebase-analytics", version.ref = "firebase-analytics" }
+firebase-messaging = { module = "com.google.firebase:firebase-messaging", version.ref = "firebase-messaging" }
 glide = { module = "com.github.bumptech.glide:glide", version.ref = "github-ksp" }
 glide-ksp = { module = "com.github.bumptech.glide:ksp", version.ref = "github-ksp" }
 gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index febdf88..dd5988d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Jun 12 11:26:22 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/rboardcomponents b/rboardcomponents
index 016ca73..fbd9a47 160000
--- a/rboardcomponents
+++ b/rboardcomponents
@@ -1 +1 @@
-Subproject commit 016ca739d2f0b0c444002d764ad46ee9cbb29db5
+Subproject commit fbd9a475a480c166270cb944da81c1c23d847b53