diff --git a/app/src/main/kotlin/org/fossify/gallery/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/gallery/activities/SettingsActivity.kt
index 26f96ee6d..0666fa3a3 100644
--- a/app/src/main/kotlin/org/fossify/gallery/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/org/fossify/gallery/activities/SettingsActivity.kt
@@ -853,7 +853,6 @@ class SettingsActivity : SimpleActivity() {
     private fun setupExportSettings() {
         binding.settingsExportHolder.setOnClickListener {
             val configItems = LinkedHashMap<String, Any>().apply {
-                put(IS_USING_SHARED_THEME, config.isUsingSharedTheme)
                 put(TEXT_COLOR, config.textColor)
                 put(BACKGROUND_COLOR, config.backgroundColor)
                 put(PRIMARY_COLOR, config.primaryColor)
@@ -991,7 +990,6 @@ class SettingsActivity : SimpleActivity() {
 
         for ((key, value) in configValues) {
             when (key) {
-                IS_USING_SHARED_THEME -> config.isUsingSharedTheme = value.toBoolean()
                 TEXT_COLOR -> config.textColor = value.toInt()
                 BACKGROUND_COLOR -> config.backgroundColor = value.toInt()
                 PRIMARY_COLOR -> config.primaryColor = value.toInt()
diff --git a/app/src/main/kotlin/org/fossify/gallery/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/org/fossify/gallery/activities/WidgetConfigureActivity.kt
index c29d5892e..413f1507d 100644
--- a/app/src/main/kotlin/org/fossify/gallery/activities/WidgetConfigureActivity.kt
+++ b/app/src/main/kotlin/org/fossify/gallery/activities/WidgetConfigureActivity.kt
@@ -88,7 +88,7 @@ class WidgetConfigureActivity : SimpleActivity() {
         updateBackgroundColor()
 
         mTextColor = config.widgetTextColor
-        if (mTextColor == resources.getColor(org.fossify.commons.R.color.default_widget_text_color) && config.isUsingSystemTheme) {
+        if (mTextColor == resources.getColor(org.fossify.commons.R.color.default_widget_text_color) && isDynamicTheme()) {
             mTextColor = resources.getColor(org.fossify.commons.R.color.you_primary_color, theme)
         }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b502dc6ac..0d718f5cf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
 #jetbrains
-kotlin = "1.9.24"
+kotlin = "1.9.25"
 #KSP
-ksp = "1.9.24-1.0.20"
+ksp = "1.9.25-1.0.20"
 #AndroidX
 androidx-swiperefreshlayout = "1.1.0"
 androidx-constraintlayout = "2.1.4"
@@ -11,9 +11,9 @@ exif = "1.0.1"
 #Room
 room = "2.6.1"
 #Fossify
-commons = "d25611c7d4"
+commons = "81814b5117"
 #Gradle4
-gradlePlugins-agp = "8.5.0"
+gradlePlugins-agp = "8.6.1"
 #Other
 androidGifDrawable = "1.2.25"
 androidImageCropper = "4.5.0"