diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cf694d66f..a22a1d41a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -85,7 +85,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 ac02880ed..fcdfa9461 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 41c48b217..d89a62c67 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/clock/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/MainActivity.kt
index 44d6a7bc1..6fe7d9dff 100644
--- a/app/src/main/kotlin/org/fossify/clock/activities/MainActivity.kt
+++ b/app/src/main/kotlin/org/fossify/clock/activities/MainActivity.kt
@@ -191,7 +191,7 @@ class MainActivity : SimpleActivity() {
             findItem(R.id.sort).isVisible = binding.viewPager.currentItem == getTabIndex(TAB_ALARM)
                     || binding.viewPager.currentItem == getTabIndex(TAB_TIMER)
             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)
         }
     }
 
@@ -375,7 +375,7 @@ class MainActivity : SimpleActivity() {
             )
         )
 
-        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(
                     title = org.fossify.commons.R.string.faq_2_title_commons,
diff --git a/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt
index 66a10e184..732df0d2d 100644
--- a/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt
@@ -33,7 +33,6 @@ import org.fossify.commons.extensions.beVisibleIf
 import org.fossify.commons.extensions.formatMinutesToTimeString
 import org.fossify.commons.extensions.formatSecondsToTimeString
 import org.fossify.commons.extensions.getProperPrimaryColor
-import org.fossify.commons.extensions.isOrWasThankYouInstalled
 import org.fossify.commons.extensions.showPickSecondsDialog
 import org.fossify.commons.extensions.toast
 import org.fossify.commons.extensions.updateTextColors
diff --git a/app/src/main/kotlin/org/fossify/clock/activities/WidgetAnalogueConfigureActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/WidgetAnalogueConfigureActivity.kt
index 2db36cc1b..8986cad08 100644
--- a/app/src/main/kotlin/org/fossify/clock/activities/WidgetAnalogueConfigureActivity.kt
+++ b/app/src/main/kotlin/org/fossify/clock/activities/WidgetAnalogueConfigureActivity.kt
@@ -10,14 +10,12 @@ import org.fossify.clock.databinding.WidgetConfigAnalogueBinding
 import org.fossify.clock.extensions.config
 import org.fossify.clock.helpers.MyAnalogueTimeWidgetProvider
 import org.fossify.commons.dialogs.ColorPickerDialog
-import org.fossify.commons.dialogs.FeatureLockedDialog
 import org.fossify.commons.extensions.adjustAlpha
 import org.fossify.commons.extensions.applyColorFilter
 import org.fossify.commons.extensions.getContrastColor
 import org.fossify.commons.extensions.getProperPrimaryColor
 import org.fossify.commons.extensions.getProperTextColor
 import org.fossify.commons.extensions.isDynamicTheme
-import org.fossify.commons.extensions.isOrWasThankYouInstalled
 import org.fossify.commons.extensions.setFillWithStroke
 import org.fossify.commons.extensions.viewBinding
 import org.fossify.commons.helpers.IS_CUSTOMIZING_COLORS
@@ -27,7 +25,6 @@ class WidgetAnalogueConfigureActivity : SimpleActivity() {
     private var mWidgetId = 0
     private var mBgColor = 0
     private var mBgColorWithoutTransparency = 0
-    private var mFeatureLockedDialog: FeatureLockedDialog? = null
     private val binding: WidgetConfigAnalogueBinding by viewBinding(WidgetConfigAnalogueBinding::inflate)
 
     public override fun onCreate(savedInstanceState: Bundle?) {
@@ -52,21 +49,6 @@ class WidgetAnalogueConfigureActivity : SimpleActivity() {
 
         val primaryColor = getProperPrimaryColor()
         binding.configAnalogueBgSeekbar.setColors(getProperTextColor(), primaryColor, primaryColor)
-
-        if (!isCustomizingColors && !isOrWasThankYouInstalled()) {
-            mFeatureLockedDialog = FeatureLockedDialog(this) {
-                if (!isOrWasThankYouInstalled()) {
-                    finish()
-                }
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        if (mFeatureLockedDialog != null && isOrWasThankYouInstalled()) {
-            mFeatureLockedDialog?.dismissDialog()
-        }
     }
 
     private fun initVariables() {
diff --git a/app/src/main/kotlin/org/fossify/clock/activities/WidgetDigitalConfigureActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/WidgetDigitalConfigureActivity.kt
index 392dfdea6..cd844e088 100644
--- a/app/src/main/kotlin/org/fossify/clock/activities/WidgetDigitalConfigureActivity.kt
+++ b/app/src/main/kotlin/org/fossify/clock/activities/WidgetDigitalConfigureActivity.kt
@@ -14,13 +14,11 @@ import org.fossify.clock.helpers.FORMAT_24H
 import org.fossify.clock.helpers.MyDigitalTimeWidgetProvider
 import org.fossify.clock.helpers.SIMPLE_PHONE
 import org.fossify.commons.dialogs.ColorPickerDialog
-import org.fossify.commons.dialogs.FeatureLockedDialog
 import org.fossify.commons.extensions.adjustAlpha
 import org.fossify.commons.extensions.applyColorFilter
 import org.fossify.commons.extensions.getContrastColor
 import org.fossify.commons.extensions.getProperPrimaryColor
 import org.fossify.commons.extensions.isDynamicTheme
-import org.fossify.commons.extensions.isOrWasThankYouInstalled
 import org.fossify.commons.extensions.setFillWithStroke
 import org.fossify.commons.extensions.viewBinding
 import org.fossify.commons.helpers.IS_CUSTOMIZING_COLORS
@@ -31,7 +29,6 @@ class WidgetDigitalConfigureActivity : SimpleActivity() {
     private var mBgColor = 0
     private var mTextColor = 0
     private var mBgColorWithoutTransparency = 0
-    private var mFeatureLockedDialog: FeatureLockedDialog? = null
     private val binding: WidgetConfigDigitalBinding by viewBinding(WidgetConfigDigitalBinding::inflate)
 
     public override fun onCreate(savedInstanceState: Bundle?) {
@@ -62,21 +59,6 @@ class WidgetDigitalConfigureActivity : SimpleActivity() {
 
         val primaryColor = getProperPrimaryColor()
         binding.configDigitalBgSeekbar.setColors(mTextColor, primaryColor, primaryColor)
-
-        if (!isCustomizingColors && !isOrWasThankYouInstalled()) {
-            mFeatureLockedDialog = FeatureLockedDialog(this) {
-                if (!isOrWasThankYouInstalled()) {
-                    finish()
-                }
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        if (mFeatureLockedDialog != null && isOrWasThankYouInstalled()) {
-            mFeatureLockedDialog?.dismissDialog()
-        }
     }
 
     private fun initVariables() {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 53063e63f..6e859290c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ numberpicker = "2.4.13"
 #Room
 room = "2.8.5"
 #Fossify
-commons = "6.1.6"
+commons = "7.1.0"
 #Gradle
 gradlePlugins-agp = "9.4.1"
 #build