diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c63f42be..5b48f731 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -82,7 +82,6 @@ android {
 
     flavorDimensions.add("variants")
     productFlavors {
-        register("core")
         register("foss")
         register("gplay")
     }
diff --git a/app/src/foss/res/values/bools.xml b/app/src/foss/res/values/bools.xml
index ac02880e..fcdfa946 100644
--- a/app/src/foss/res/values/bools.xml
+++ b/app/src/foss/res/values/bools.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="show_donate_in_about">true</bool>
-    <bool name="hide_google_relations">true</bool>
-    <bool name="pretend_thank_you_installed">true</bool>
+    <bool name="is_google_play_build">false</bool>
 </resources>
diff --git a/app/src/gplay/res/values/bools.xml b/app/src/gplay/res/values/bools.xml
index 41c48b21..d89a62c6 100644
--- a/app/src/gplay/res/values/bools.xml
+++ b/app/src/gplay/res/values/bools.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="show_donate_in_about">false</bool>
-    <bool name="hide_google_relations">false</bool>
-    <bool name="pretend_thank_you_installed">true</bool>
+    <bool name="is_google_play_build">true</bool>
 </resources>
diff --git a/app/src/main/kotlin/org/fossify/camera/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/camera/activities/SettingsActivity.kt
index fb727c75..7b359cfd 100644
--- a/app/src/main/kotlin/org/fossify/camera/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/org/fossify/camera/activities/SettingsActivity.kt
@@ -65,7 +65,7 @@ class SettingsActivity : SimpleActivity() {
     private fun refreshMenuItems() {
         binding.settingsToolbar.menu.apply {
             findItem(R.id.more_apps_from_us).isVisible =
-                !resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations)
+                resources.getBoolean(org.fossify.commons.R.bool.is_google_play_build)
         }
     }
 
@@ -116,7 +116,7 @@ class SettingsActivity : SimpleActivity() {
             FAQItem(R.string.faq_1_title, R.string.faq_1_text)
         )
 
-        if (!resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations)) {
+        if (resources.getBoolean(org.fossify.commons.R.bool.is_google_play_build)) {
             faqItems.add(
                 FAQItem(
                     org.fossify.commons.R.string.faq_2_title_commons,
@@ -217,26 +217,22 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private fun setupSavePhotosFolder() = binding.apply {
-        settingsSavePhotosLabel.text = addLockedLabelIfNeeded(R.string.save_photos)
+        settingsSavePhotosLabel.text = getString(R.string.save_photos)
         settingsSavePhotos.text = getLastPart(config.savePhotosFolder)
         settingsSavePhotosHolder.setOnClickListener {
-            if (isOrWasThankYouInstalled()) {
-                FilePickerDialog(
-                    this@SettingsActivity,
-                    config.savePhotosFolder,
-                    false,
-                    showFAB = true
-                ) {
-                    val path = it
-                    handleSAFDialog(it) { success ->
-                        if (success) {
-                            config.savePhotosFolder = path
-                            settingsSavePhotos.text = getLastPart(config.savePhotosFolder)
-                        }
+            FilePickerDialog(
+                this@SettingsActivity,
+                config.savePhotosFolder,
+                false,
+                showFAB = true
+            ) {
+                val path = it
+                handleSAFDialog(it) { success ->
+                    if (success) {
+                        config.savePhotosFolder = path
+                        settingsSavePhotos.text = getLastPart(config.savePhotosFolder)
                     }
                 }
-            } else {
-                FeatureLockedDialog(this@SettingsActivity) { }
             }
         }
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4100dd62..f88f1f7b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ androidx-window = "1.5.1"
 androidx-camera = "1.6.1"
 androidx-ktx = "2.10.0"
 #Fossify
-commons = "6.1.6"
+commons = "7.1.0"
 #Gradle
 gradlePlugins-agp = "9.4.1"
 #build