diff --git a/about/build.gradle b/about/build.gradle
index 95ae51438..7d3bd6a8e 100644
--- a/about/build.gradle
+++ b/about/build.gradle
@@ -53,7 +53,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
 
     // Lifecycle
     api 'android.arch.lifecycle:extensions:1.1.1'
@@ -73,7 +73,7 @@ dependencies {
 
     // Unit Tests
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:2.24.0'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation "io.mockk:mockk:1.11.0"
 }
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 362d7e887..18fc7c0fa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 1501011
-        versionName '15.1.1'
+        versionCode 1502001
+        versionName '15.2.0'
         minSdkVersion 21
         targetSdkVersion 31
         multiDexEnabled true
@@ -132,7 +132,7 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.activity:activity-ktx:1.3.1'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
-    implementation 'androidx.work:work-runtime-ktx:2.7.0'
+    implementation 'androidx.work:work-runtime-ktx:2.7.1'
 
     // Lifecycle
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
@@ -144,7 +144,7 @@ dependencies {
     implementation 'androidx.room:room-ktx:2.3.0'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
 
     // Google
     implementation 'com.google.android.material:material:1.4.0'
@@ -161,13 +161,13 @@ dependencies {
     // Tests
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'android.arch.core:core-testing:1.1.1'
-    testImplementation 'androidx.core:core-ktx:1.6.0'
+    testImplementation 'androidx.core:core-ktx:1.7.0'
     testImplementation 'androidx.test:core-ktx:1.4.0'
     testImplementation 'androidx.test:rules:1.4.0'
     testImplementation 'androidx.test:runner:1.4.0'
     testImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     testImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
-    testImplementation 'androidx.fragment:fragment-testing:1.3.6'
+    testImplementation 'androidx.fragment:fragment-testing:1.4.0'
     testImplementation 'org.robolectric:robolectric:4.5.1'
     testImplementation 'androidx.test.ext:junit:1.1.3'
     testImplementation 'io.mockk:mockk:1.11.0'
diff --git a/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
index 4e2e5f141..4c04baf4a 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
@@ -245,7 +245,7 @@ class GameActivity :
 
                 tipsCounter.text = it.tips.toL10nString()
 
-                if (!it.isGameCompleted && it.useHelp) {
+                if (!it.isGameCompleted && it.isActive && it.useHelp) {
                     refreshTipShortcutIcon()
                 } else {
                     refreshRetryShortcut(it.hasMines)
diff --git a/app/src/main/java/dev/lucasnlm/antimine/gameover/GameOverDialogFragment.kt b/app/src/main/java/dev/lucasnlm/antimine/gameover/GameOverDialogFragment.kt
index 7b4f3e8ab..ab5bcca81 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/gameover/GameOverDialogFragment.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/gameover/GameOverDialogFragment.kt
@@ -41,6 +41,7 @@ import dev.lucasnlm.external.IAnalyticsManager
 import dev.lucasnlm.external.IBillingManager
 import dev.lucasnlm.external.IFeatureFlagManager
 import dev.lucasnlm.external.IInstantAppManager
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
@@ -104,6 +105,7 @@ class GameOverDialogFragment : AppCompatDialogFragment() {
                         endGameViewModel.observeState().collect { state ->
                             val newGameButton: AppCompatButton = findViewById(R.id.new_game)
                             val continueButton: AppCompatButton = findViewById(R.id.continue_game)
+                            val countdown: TextView = findViewById(R.id.countdown)
                             val removeAdsButton: AppCompatButton = findViewById(R.id.remove_ads)
                             val tutorialButton: AppCompatButton = findViewById(R.id.tutorial)
                             val settingsButton: View = findViewById(R.id.settings)
@@ -198,8 +200,25 @@ class GameOverDialogFragment : AppCompatDialogFragment() {
                                         R.drawable.watch_ads_icon, 0, 0, 0
                                     )
                                 }
+
+                                if (!preferencesRepository.isPremiumEnabled() &&
+                                    featureFlagManager.showCountdownToContinue
+                                ) {
+                                    countdown.visibility = View.VISIBLE
+                                    lifecycleScope.launchWhenCreated {
+                                        var countdownTime = 10
+                                        while (countdownTime > 0) {
+                                            countdown.text = countdownTime.toString()
+                                            delay(1000L)
+                                            countdownTime -= 1
+                                        }
+                                        countdown.visibility = View.GONE
+                                        continueButton.visibility = View.GONE
+                                    }
+                                }
                             } else {
                                 continueButton.visibility = View.GONE
+                                countdown.visibility = View.GONE
                             }
 
                             if (state.showTutorial) {
diff --git a/app/src/main/res/layout/game_over_dialog.xml b/app/src/main/res/layout/game_over_dialog.xml
index a7d538a5c..305362417 100644
--- a/app/src/main/res/layout/game_over_dialog.xml
+++ b/app/src/main/res/layout/game_over_dialog.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -12,10 +11,10 @@
         android:layout_height="wrap_content"
         android:background="@drawable/round_background"
         android:padding="16dp"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/adFrame"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
             android:id="@+id/title_emoji"
@@ -105,13 +104,31 @@
                 <requestFocus />
             </androidx.appcompat.widget.AppCompatButton>
 
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/continue_game"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/continue_game"
-                android:textAllCaps="true" />
+                android:layout_height="wrap_content">
+
+                <androidx.appcompat.widget.AppCompatButton
+                    android:id="@+id/continue_game"
+                    style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/continue_game"
+                    android:textAllCaps="true" />
+
+                <TextView
+                    android:id="@+id/countdown"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|end"
+                    android:paddingVertical="4dp"
+                    android:paddingHorizontal="8dp"
+                    android:textColor="?colorAccent"
+                    android:textStyle="bold"
+                    android:visibility="gone"
+                    tools:visibility="visible"
+                    tools:text="10" />
+            </FrameLayout>
 
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/remove_ads"
@@ -139,14 +156,14 @@
         android:id="@+id/adFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="50dp"
-        android:background="@drawable/round_background"
         android:layout_marginTop="16dp"
+        android:background="@drawable/round_background"
         android:gravity="center"
+        android:minHeight="50dp"
         android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/dialog"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/dialog" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/common/build.gradle b/common/build.gradle
index 0a34ec05f..7c8a6b58b 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -52,7 +52,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.4.0'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
 
     // Lifecycle
     api 'android.arch.lifecycle:extensions:1.1.1'
@@ -83,7 +83,7 @@ dependencies {
 
     // Unit Tests
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:2.24.0'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation 'io.mockk:mockk:1.11.0'
 
diff --git a/common/src/test/java/dev/lucasnlm/antimine/common/level/database/converters/AreaConverterTest.kt b/common/src/test/java/dev/lucasnlm/antimine/common/level/database/converters/AreaConverterTest.kt
index e9b7e6f60..3ad548807 100644
--- a/common/src/test/java/dev/lucasnlm/antimine/common/level/database/converters/AreaConverterTest.kt
+++ b/common/src/test/java/dev/lucasnlm/antimine/common/level/database/converters/AreaConverterTest.kt
@@ -18,9 +18,9 @@ class AreaConverterTest {
               "mistake":false,
               "isCovered":true,
               "mark":"None",
-              "highlighted":true,
               "revealed":false,
-              "neighborsIds":[]
+              "neighborsIds":[],
+              "dimNumber":false
            },
            {
               "id":2,
@@ -31,9 +31,9 @@ class AreaConverterTest {
               "mistake":true,
               "isCovered":false,
               "mark":"PurposefulNone",
-              "highlighted":false,
               "revealed":false,
-              "neighborsIds":[]
+              "neighborsIds":[],
+              "dimNumber":false
            },
            {
               "id":3,
@@ -44,9 +44,9 @@ class AreaConverterTest {
               "mistake":false,
               "isCovered":true,
               "mark":"Flag",
-              "highlighted":true,
               "revealed":false,
-              "neighborsIds":[]
+              "neighborsIds":[],
+              "dimNumber":false
            },
            {
               "id":4,
@@ -57,9 +57,9 @@ class AreaConverterTest {
               "mistake":false,
               "isCovered":true,
               "mark":"Question",
-              "highlighted":true,
               "revealed":true,
-              "neighborsIds":[]
+              "neighborsIds":[],
+              "dimNumber":true
            }
         ]
         """.trimIndent().replace(
@@ -104,6 +104,7 @@ class AreaConverterTest {
                 mark = Mark.Question,
                 revealed = true,
                 neighborsIds = listOf(),
+                dimNumber = true,
             )
         )
 
diff --git a/control/build.gradle b/control/build.gradle
index c2b33d66a..b7f46d4ba 100644
--- a/control/build.gradle
+++ b/control/build.gradle
@@ -52,7 +52,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
 
     // Lifecycle
     api 'android.arch.lifecycle:extensions:1.1.1'
@@ -72,7 +72,7 @@ dependencies {
 
     // Unit Tests
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:2.24.0'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation 'io.mockk:mockk:1.11.0'
 }
\ No newline at end of file
diff --git a/control/src/main/java/dev/lucasnlm/antimine/control/ControlActivity.kt b/control/src/main/java/dev/lucasnlm/antimine/control/ControlActivity.kt
index d1d80ce48..a32de49d9 100644
--- a/control/src/main/java/dev/lucasnlm/antimine/control/ControlActivity.kt
+++ b/control/src/main/java/dev/lucasnlm/antimine/control/ControlActivity.kt
@@ -58,8 +58,9 @@ class ControlActivity : ThematicActivity(R.layout.activity_control), Slider.OnCh
         lifecycleScope.launchWhenCreated {
             viewModel.observeState().collect {
                 controlAdapter.bindControlStyleList(it.selected, it.controls)
-                longPress.value = it.longPress.toFloat()
-                touchSensibility.value = it.touchSensibility.toFloat()
+                longPress.value = (it.longPress.toFloat() / longPress.stepSize).toInt() * longPress.stepSize
+                touchSensibility.value =
+                    (it.touchSensibility.toFloat() / touchSensibility.stepSize).toInt() * touchSensibility.stepSize
 
                 val toggleVisible = if (it.showToggleButtonSettings) View.VISIBLE else View.GONE
                 toggleButtonTopBar.visibility = toggleVisible
@@ -79,7 +80,8 @@ class ControlActivity : ThematicActivity(R.layout.activity_control), Slider.OnCh
                 doubleClick.visibility = doubleClickVisible
                 doubleClickLabel.visibility = doubleClickVisible
 
-                hapticLevel.value = it.hapticFeedbackLevel.toFloat()
+                hapticLevel.value =
+                    (it.hapticFeedbackLevel.toFloat() / hapticLevel.stepSize).toInt() * hapticLevel.stepSize
             }
         }
     }
diff --git a/external/src/main/java/dev/lucasnlm/external/IFeatureFlagManager.kt b/external/src/main/java/dev/lucasnlm/external/IFeatureFlagManager.kt
index 9843db8b0..cf7501131 100644
--- a/external/src/main/java/dev/lucasnlm/external/IFeatureFlagManager.kt
+++ b/external/src/main/java/dev/lucasnlm/external/IFeatureFlagManager.kt
@@ -18,6 +18,7 @@ abstract class IFeatureFlagManager {
     abstract val isWeekDaySalesEnabled: Boolean
     abstract val isHexBannerEnabled: Boolean
     abstract val showAdWhenUsingTip: Boolean
+    abstract val showCountdownToContinue: Boolean
 
     abstract suspend fun refresh()
 }
diff --git a/fastlane/metadata/android/it-IT/full_description.txt b/fastlane/metadata/android/it-IT/full_description.txt
index 4439e2dcd..427bbb901 100644
--- a/fastlane/metadata/android/it-IT/full_description.txt
+++ b/fastlane/metadata/android/it-IT/full_description.txt
@@ -6,13 +6,13 @@ Riuscirai a sgombrare il campo minato? Iniziamo!
 OBIETTIVO
 È come Campo Minato. Vinci la partita quando hai contrassegnato ogni mina nel campo minato. Attenzione a non farle esplodere!
 
-NON DEVI INDOVINARE
+NON SERVE INDOVINARE
 Il gioco ha un algoritmo che crea sempre campi minati risolvibili. Non sarà necessario indovinare dov'è l'ultima mina!
 
-LIVELLI DI GIOCO
+LIVELLI DI DIFFICOLTÀ
 Proprio come Campo Minato, questo gioco ha diversi livelli: Principiante, Intermedio e Esperto. Ha anche una modalità progressiva che diventa più difficile dopo ogni vittoria.
 
-LIVELLO CUSTOM
+DIFFICOLTÀ PERSONALIZZATA
 Se le modalità standard non ti soddisfano, puoi creare il tuo livello di difficoltà!
 
 TEMI
@@ -25,9 +25,9 @@ TUTORIAL
 Non sai come si gioca a Campo Minato? Nessun problema, puoi giocare il tutorial e attivare i suggerimenti nelle impostazioni.
 
 STATISTICHE
-Controlla i tuoi risultati e lo sviluppo.
+Controlla i tuoi risultati e la tua crescita.
 
-ASSISTENZA DEL GIOCO
+ASSISTENTE DI GIOCO
 Il gioco contrassegna automaticamente le caselle che hai isolato. 
 
 PERSONALIZZAZIONE
diff --git a/fastlane/metadata/android/ro-RO/full_description.txt b/fastlane/metadata/android/ro-RO/full_description.txt
index a55978d5b..a55a0caf5 100644
--- a/fastlane/metadata/android/ro-RO/full_description.txt
+++ b/fastlane/metadata/android/ro-RO/full_description.txt
@@ -1,49 +1,49 @@
-Testează-ți puterea de gândire într-un joc de puzzle provocator în care trebuie să rezolvi un câmp de mine fără să explodezi vreo mină.
-Aceasta este o versiune minimalistă și modernă a clasicului joc Minesweeper.
+Testează-ți raționamentul pe un joc-enigmă provocator, unde trebuie să rezolvi un câmp minat fără să detonezi nicio mină.
+Aceasta este o versiune minimalistă și modernă a jocului clasic Minesweeper.
 
-Sunteți capabili să curățați un câmp de mine? Să începem!
+Poți elibera un câmp minat? Să încercăm!
 
-OBIECTIVE
-Este ca Minesweeper. Câștigi jocul atunci când ai marcat toate minele din câmp. Ai grijă să nu declanșezi una!
+OBIECTIV
+Acest joc este precum Minesweeper. Câștigi jocul după ce marchezi cu un steag toate minele dintr-un câmp minat. Ai grijă să nu detonezi nicio mină!
 
 FĂRĂ GHICIT
-Acest joc are un algoritm care creează întotdeauna câmpuri de mine care pot fi rezolvate. Nu va trebui să ghicești unde este ultima mină!
+Acest joc are un algoritm care creează întotdeauna câmpuri minate de rezolvat. Nu va trebui să ghicești unde se află ultima mină!
 
-NIVELURILE JOCULUI
-La fel ca Minesweeper, acest joc are diferite nivele: începător, intermediar și expert. Dar are și un mod progresiv unic, care devine din ce în ce mai greu atunci când câștigi.
+NIVELURI DE JOC
+La fel ca Minesweeper, acest joc are diferite niveluri: începător, intermediar și expert. Dar are și un mod progresiv unic, care devine din ce în ce mai dificil atunci când câștigi.
 
-NIVEL PERSONALIZAT
-Dacă modurile standard nu sunt suficiente, îți poți crea propriul nivel de dificultate!
+NIVEL PARTICULARIZAT
+Dacă modurile standard nu sunt suficiente, poți crea propriul nivel de dificultate!
 
-INTERFAȚĂ
-Antimine are mai mult de 15 teme (inclusiv aprins, întunecat și AMOLED). Iar în curând se vor adăuga mai multe!
+TEME
+Antimine are peste 15 teme (inclusiv luminos, întunecat și AMOLED). Și în curând vor fi adăugate mai multe!
 
 MINIMALIST
-Un aspect curat: un aspect vizual minimalist și, de asemenea, o dimensiune redusă a aplicației (mai puțin de 9 MB).
+Aspect și senzație tactilă minimaliste: efecte vizuale minimaliste, precum și o aplicație cu dimensiune redusă (mai puțin de 9 MB).
 
 TUTORIAL
-Nu știi cum se joacă Minesweeper? Nicio problemă, puteți juca nivelul nostru de tutorial și activați Sfaturi în setări.
+Nu știi cum se joacă Minesweeper? Nicio problemă. Poți juca un nivel de tutorial și activa sfaturile din setări.
 
 STATISTICI
-Verifică-ți rezultate și progresul.
+Examinează-ți rezultatele și progresul.
 
 ASISTENT DE JOC
-Jocul va marca automat pătratele pe care le-ați izolat. 
+Jocul va marca automat pătratele pe care le-ai izolat. 
 
-PERSONALIZARE
-Poți schimba jocul pentru a-l face așa cum dorești. 
-Exemplu: Ajutor, animații, feedback haptic, semn de întrebare.
+PARTICULARIZARE
+Poți modifica jocul după propriile preferințe. 
+Exemplu: ajutor, animații, reacție haptică, semn de întrebare.
 
-CONTROALE
-Acest joc suportă 4 scheme diferite de controale. Exemplu: marcaj folosind apăsare scurtă sau apăsare lungă.
+COMENZI
+Oferă patru scheme de control diferite. Exemplu: plasarea steagului prin folosirea apăsării scurte sau lungi.
 
-REALIZĂRI ȘI CLASAMENT 
-Ai opt realizări de deblocat și diferite clasamente pe care să le împarți cu prietenii tăi.
+REALIZĂRI ȘI CLASAMENTE 
+Ai opt realizări de deblocat și diferite clasamente de împărtășit cu prietenii tăi.
 
-ONLINE SAU OFFLINE
-Nu trebuie să fii online pentru a juca jocul acesta!
+CU SAU FĂRĂ CONEXIUNE LA INTERNET
+Nu trebuie să te conectezi la internet pentru a juca jocul!
 
 SALVARE AUTOMATĂ
-Poți începe un joc și îl poți continua mai târziu! Se va salva automat jocul.
+Poți începe un joc și să-l continui mai târziu! Jocul se va salva automat.
 
-Bucurați-vă.
+Bucură-te de joc.
diff --git a/fastlane/metadata/android/ro-RO/short_description.txt b/fastlane/metadata/android/ro-RO/short_description.txt
index f6aa0bd59..da10ad540 100644
--- a/fastlane/metadata/android/ro-RO/short_description.txt
+++ b/fastlane/metadata/android/ro-RO/short_description.txt
@@ -1 +1 @@
-Un joc de puzzle în care trebuie să cauți toate minele ascunse. 
+Un joc-enigmă în care cauți minele ascunse. 
diff --git a/fastlane/metadata/android/ro-RO/title.txt b/fastlane/metadata/android/ro-RO/title.txt
index 0e07705c5..52fe78296 100644
--- a/fastlane/metadata/android/ro-RO/title.txt
+++ b/fastlane/metadata/android/ro-RO/title.txt
@@ -1 +1 @@
-Minesweeper - Antimine
+Minesweeper – Antimine
diff --git a/foss/src/main/java/dev/lucasnlm/external/FeatureFlagManager.kt b/foss/src/main/java/dev/lucasnlm/external/FeatureFlagManager.kt
index 58f9928b5..bec2002f9 100644
--- a/foss/src/main/java/dev/lucasnlm/external/FeatureFlagManager.kt
+++ b/foss/src/main/java/dev/lucasnlm/external/FeatureFlagManager.kt
@@ -18,6 +18,7 @@ class FeatureFlagManager : IFeatureFlagManager() {
     override val isWeekDaySalesEnabled: Boolean = false
     override val isHexBannerEnabled: Boolean = false
     override val showAdWhenUsingTip: Boolean = false
+    override val showCountdownToContinue: Boolean = false
 
     override suspend fun refresh() {
         // No Feature Flags on FOSS
diff --git a/gdx/src/main/java/dev/lucasnlm/antimine/gdx/actors/AreaActor.kt b/gdx/src/main/java/dev/lucasnlm/antimine/gdx/actors/AreaActor.kt
index 4e980422f..c279fed06 100644
--- a/gdx/src/main/java/dev/lucasnlm/antimine/gdx/actors/AreaActor.kt
+++ b/gdx/src/main/java/dev/lucasnlm/antimine/gdx/actors/AreaActor.kt
@@ -197,10 +197,10 @@ class AreaActor(
                 pieces.forEach { piece ->
                     batch.drawRegion(
                         texture = atlas.findRegion(piece),
-                        x = x,
-                        y = y,
-                        width = width,
-                        height = height,
+                        x = x - 0.5f,
+                        y = y - 0.5f,
+                        width = width + 0.5f,
+                        height = height + 0.5f,
                         color = if (area.mark.isNotNone()) {
                             coverColor.toGdxColor(1.0f).dim(0.6f)
                         } else {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e85c5a3be..61876139e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
-#Wed Jun 30 19:00:49 GMT-03:00 2021
+#Sun Dec 12 18:53:07 BRT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
-distributionSha256Sum=3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d
+zipStoreBase=GRADLE_USER_HOME
diff --git a/i18n/build.gradle b/i18n/build.gradle
index 6f35e25be..06296f0cc 100644
--- a/i18n/build.gradle
+++ b/i18n/build.gradle
@@ -34,7 +34,6 @@ android {
 dependencies {
     // Dependencies must be hardcoded to support F-droid
 
-    implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
     testImplementation 'junit:junit:4.13.2'
diff --git a/i18n/src/main/res/values-af-rZA/strings.xml b/i18n/src/main/res/values-af-rZA/strings.xml
index ad388ddac..58d5ecdf7 100644
--- a/i18n/src/main/res/values-af-rZA/strings.xml
+++ b/i18n/src/main/res/values-af-rZA/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Afgeronde vierkant</string>
     <string name="space_between_squares">Spasie tussen vierkante</string>
     <string name="system">Stelsel</string>
-    <string name="rating">Terugvoer</string>
     <string name="sign_in_failed">Kan nie koppel nie. Gaan asseblief jou netwerkverbinding na en probeer weer.</string>
     <string name="you_won">Jy het Gewen!</string>
     <string name="victories">Oorwinnings</string>
diff --git a/i18n/src/main/res/values-ar-rSA/strings.xml b/i18n/src/main/res/values-ar-rSA/strings.xml
index b49069482..34bdb62f3 100644
--- a/i18n/src/main/res/values-ar-rSA/strings.xml
+++ b/i18n/src/main/res/values-ar-rSA/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">مربع مدور</string>
     <string name="space_between_squares">المساحة بين المربعات</string>
     <string name="system">نظام</string>
-    <string name="rating">تعليقات</string>
     <string name="sign_in_failed">فشل تسجيل الدخول. يرجى التحقق من اتصال الشبكة والمحاولة مرة أخرى.</string>
     <string name="you_won">لقد فزت!</string>
     <string name="victories">الانتصارات</string>
diff --git a/i18n/src/main/res/values-bg-rBG/strings.xml b/i18n/src/main/res/values-bg-rBG/strings.xml
index c54a7eeed..9641aa6a4 100644
--- a/i18n/src/main/res/values-bg-rBG/strings.xml
+++ b/i18n/src/main/res/values-bg-rBG/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Заоблен квадрат</string>
     <string name="space_between_squares">Пространство между квадратите</string>
     <string name="system">Система</string>
-    <string name="rating">Обратна връзка</string>
     <string name="sign_in_failed">Неуспешно влизане. Моля проверете връзката си с интернет и опитайте отново.</string>
     <string name="you_won">Вие победихте!</string>
     <string name="victories">Победи</string>
diff --git a/i18n/src/main/res/values-ca-rES/strings.xml b/i18n/src/main/res/values-ca-rES/strings.xml
index 2cd474bae..22128da05 100644
--- a/i18n/src/main/res/values-ca-rES/strings.xml
+++ b/i18n/src/main/res/values-ca-rES/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Quadrat arrodonit</string>
     <string name="space_between_squares">Espai entre places</string>
     <string name="system">Sistema</string>
-    <string name="rating">Opina</string>
     <string name="sign_in_failed">No s\'ha pogut connectar. Si us plau verifica la teva connexió de xarxa i intenta-ho de nou.</string>
     <string name="you_won">Has guanyat!</string>
     <string name="victories">Victòries</string>
diff --git a/i18n/src/main/res/values-cs-rCZ/strings.xml b/i18n/src/main/res/values-cs-rCZ/strings.xml
index fa615b53c..8b5d32a25 100644
--- a/i18n/src/main/res/values-cs-rCZ/strings.xml
+++ b/i18n/src/main/res/values-cs-rCZ/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Zaoblený čtverec</string>
     <string name="space_between_squares">Prostor mezi čtverci</string>
     <string name="system">Systém</string>
-    <string name="rating">Zpětná vazba</string>
     <string name="sign_in_failed">Nelze se přihlásit. Zkontrolujte síťové připojení a akci opakujte.</string>
     <string name="you_won">Vyhráli jste!</string>
     <string name="victories">Vítězství</string>
diff --git a/i18n/src/main/res/values-da-rDK/strings.xml b/i18n/src/main/res/values-da-rDK/strings.xml
index ee60961d3..e09403467 100644
--- a/i18n/src/main/res/values-da-rDK/strings.xml
+++ b/i18n/src/main/res/values-da-rDK/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Afrundet firkant</string>
     <string name="space_between_squares">Mellemrum Mellem Firkanter</string>
     <string name="system">System</string>
-    <string name="rating">Tilbagemelding</string>
     <string name="sign_in_failed">Kan ikke forbinde. Tjek venligst din netværksforbindelse, og prøv igen.</string>
     <string name="you_won">Du vandt!</string>
     <string name="victories">Sejre</string>
diff --git a/i18n/src/main/res/values-de-rDE/strings.xml b/i18n/src/main/res/values-de-rDE/strings.xml
index ad1a46e3c..a7a2e739a 100644
--- a/i18n/src/main/res/values-de-rDE/strings.xml
+++ b/i18n/src/main/res/values-de-rDE/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Abgerundetes Quadrat</string>
     <string name="space_between_squares">Platz zwischen Quadraten</string>
     <string name="system">System</string>
-    <string name="rating">Rückmeldung</string>
     <string name="sign_in_failed">Login fehlgeschlagen. Überprüfe Deine Netzwerkverbindung und versuche es erneut.</string>
     <string name="you_won">Du hast gewonnen!</string>
     <string name="victories">Siege</string>
@@ -121,5 +120,5 @@
     <string name="no_guess_fail_warning">Das aktuelle Minenfeld ist möglicherweise nicht ratenfrei!</string>
     <string name="fixed_size">Feste Größe</string>
     <string name="progressive">Fortschrittlich</string>
-    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
+    <string name="highlight_unsolved_numbers">Ungelöste Zahlen hervorheben</string>
 </resources>
diff --git a/i18n/src/main/res/values-el-rGR/strings.xml b/i18n/src/main/res/values-el-rGR/strings.xml
index 1b1e6b82a..effc244fa 100644
--- a/i18n/src/main/res/values-el-rGR/strings.xml
+++ b/i18n/src/main/res/values-el-rGR/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Στρογγυλεμένο τετράγωνο</string>
     <string name="space_between_squares">Διάστημα Μεταξύ Τετραγώνων</string>
     <string name="system">Σύστημα</string>
-    <string name="rating">Αξιολόγηση</string>
     <string name="sign_in_failed">Αποτυχία σύνδεσης. Ελέγξτε τη σύνδεση δικτύου σας και δοκιμάστε ξανά.</string>
     <string name="you_won">Κέρδισες!</string>
     <string name="victories">Νίκες</string>
diff --git a/i18n/src/main/res/values-en-rUS/strings.xml b/i18n/src/main/res/values-en-rUS/strings.xml
index a13a03c24..30562345f 100644
--- a/i18n/src/main/res/values-en-rUS/strings.xml
+++ b/i18n/src/main/res/values-en-rUS/strings.xml
@@ -3,7 +3,7 @@
     <string name="tutorial">Tutorial</string>
     <string name="tutorial_basic">The rule of the game is simple, the number on a square shows the number of mines adjacent to it and you have to flag all the mines.</string>
     <string name="tutorial_text_1">If a number is touching the same number of squares, then the squares are all mines.</string>
-    <string name="tutorial_text_2">After mark your first flag, review the numbers and analyze the next square.</string>
+    <string name="tutorial_text_2">After marking your first flag, review the numbers and analyze the next square.</string>
     <string name="tutorial_text_3">If a square has the same number of flags, all other remaining squares adjacent to it aren\'t mines (the green arrow).</string>
     <string name="tutorial_text_4">Review the numbers and keep opening squares.</string>
     <string name="games">Games</string>
@@ -39,7 +39,6 @@
     <string name="rounded_square">Rounded Square</string>
     <string name="space_between_squares">Space between squares</string>
     <string name="system">System</string>
-    <string name="rating">Feedback</string>
     <string name="sign_in_failed">Failed to sign in. Please check your network connection and try again.</string>
     <string name="you_won">You won!</string>
     <string name="victories">Victories</string>
diff --git a/i18n/src/main/res/values-eo-rUY/strings.xml b/i18n/src/main/res/values-eo-rUY/strings.xml
index 0a80dea9c..bb215bfa4 100644
--- a/i18n/src/main/res/values-eo-rUY/strings.xml
+++ b/i18n/src/main/res/values-eo-rUY/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Ronda Kvadrato</string>
     <string name="space_between_squares">Spaco inter kvadratoj</string>
     <string name="system">Operaciumo</string>
-    <string name="rating">Prikomentado</string>
     <string name="sign_in_failed">Malsukcesis ensaluto. Bonvolu kontroli vian retkonekton kaj reprovi.</string>
     <string name="you_won">Vi venkis!</string>
     <string name="victories">Venkoj</string>
diff --git a/i18n/src/main/res/values-es-rES/strings.xml b/i18n/src/main/res/values-es-rES/strings.xml
index 21634603e..77910810d 100644
--- a/i18n/src/main/res/values-es-rES/strings.xml
+++ b/i18n/src/main/res/values-es-rES/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Cuadrado redondeado</string>
     <string name="space_between_squares">Espacio entre cuadrados</string>
     <string name="system">Sistema</string>
-    <string name="rating">Comentarios</string>
     <string name="sign_in_failed">Imposible conectar. Por favor, revisa tu conexión de datos e inténtalo nuevamente.</string>
     <string name="you_won">¡Ganaste!</string>
     <string name="victories">Victorias</string>
diff --git a/i18n/src/main/res/values-fa-rIR/strings.xml b/i18n/src/main/res/values-fa-rIR/strings.xml
index 2f0420e19..ae819be65 100644
--- a/i18n/src/main/res/values-fa-rIR/strings.xml
+++ b/i18n/src/main/res/values-fa-rIR/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Rounded Square</string>
     <string name="space_between_squares">Space Between Squares</string>
     <string name="system">System</string>
-    <string name="rating">Feedback</string>
     <string name="sign_in_failed">Failed to sign in. Please check your network connection and try again.</string>
     <string name="you_won">You won!</string>
     <string name="victories">Victories</string>
diff --git a/i18n/src/main/res/values-fi-rFI/strings.xml b/i18n/src/main/res/values-fi-rFI/strings.xml
index b654224a5..26ab61fd6 100644
--- a/i18n/src/main/res/values-fi-rFI/strings.xml
+++ b/i18n/src/main/res/values-fi-rFI/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Pyöristetty neliö</string>
     <string name="space_between_squares">Tila Neliöiden Välillä</string>
     <string name="system">Järjestelmä</string>
-    <string name="rating">Lähetä palautetta</string>
     <string name="sign_in_failed">Virhe kirjautuessa sisään. Tarkista verkkoyhteytesi ja yritä uudelleen.</string>
     <string name="you_won">Sinä voitit!</string>
     <string name="victories">Voittoja</string>
diff --git a/i18n/src/main/res/values-fr-rFR/strings.xml b/i18n/src/main/res/values-fr-rFR/strings.xml
index 7dd7ad803..c7cb9beca 100644
--- a/i18n/src/main/res/values-fr-rFR/strings.xml
+++ b/i18n/src/main/res/values-fr-rFR/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Carré arrondi</string>
     <string name="space_between_squares">Espace entre les cases</string>
     <string name="system">Système</string>
-    <string name="rating">Retour d\'expérience</string>
     <string name="sign_in_failed">Erreur lors de la connexion. Vérifiez l\'état de votre connexion Internet et réessayez.</string>
     <string name="you_won">Victoire !</string>
     <string name="victories">Victoires</string>
@@ -121,5 +120,5 @@
     <string name="no_guess_fail_warning">Le champ de mines actuel ne peut pas être résolu sans deviner !</string>
     <string name="fixed_size">Taille fixe</string>
     <string name="progressive">Progressif</string>
-    <string name="highlight_unsolved_numbers">Surligner les nombres non résolus</string>
+    <string name="highlight_unsolved_numbers">Mettre en évidence les nombres non résolus</string>
 </resources>
diff --git a/i18n/src/main/res/values-hi-rIN/strings.xml b/i18n/src/main/res/values-hi-rIN/strings.xml
index 8947e6a68..3f444d332 100644
--- a/i18n/src/main/res/values-hi-rIN/strings.xml
+++ b/i18n/src/main/res/values-hi-rIN/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">गोल स्क्वेयर</string>
     <string name="space_between_squares">स्क्वेयर के बीच की जगह</string>
     <string name="system">सिस्ट</string>
-    <string name="rating">फ़ीडबैक</string>
     <string name="sign_in_failed">साइन इन करने में विफल. कृपया अपने नेटवर्क कनेक्शन की जांच करें और फिर कोशिश करें.</string>
     <string name="you_won">आप जीत गए!</string>
     <string name="victories">जीत</string>
diff --git a/i18n/src/main/res/values-hu-rHU/strings.xml b/i18n/src/main/res/values-hu-rHU/strings.xml
index 23560e166..3fbf8c5f6 100644
--- a/i18n/src/main/res/values-hu-rHU/strings.xml
+++ b/i18n/src/main/res/values-hu-rHU/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Lekerekített négyzet</string>
     <string name="space_between_squares">Tér a négyzetek között</string>
     <string name="system">Rendszer</string>
-    <string name="rating">Visszajelzés</string>
     <string name="sign_in_failed">Sikertelen bejelentkezés. Kérlek ellenőrizd a hálózati csatlakozást és próbáld újra.</string>
     <string name="you_won">Győztél!</string>
     <string name="victories">Győzelmek</string>
diff --git a/i18n/src/main/res/values-in-rID/strings.xml b/i18n/src/main/res/values-in-rID/strings.xml
index bd97bef92..ef3b0e578 100644
--- a/i18n/src/main/res/values-in-rID/strings.xml
+++ b/i18n/src/main/res/values-in-rID/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Persegi Bulat</string>
     <string name="space_between_squares">Spasi Antar Kotak</string>
     <string name="system">Sistem</string>
-    <string name="rating">Umpan Balik</string>
     <string name="sign_in_failed">Gagal untuk masuk. Silakan periksa koneksi jaringan anda dan coba lagi.</string>
     <string name="you_won">Anda menang!</string>
     <string name="victories">Kemenangan</string>
diff --git a/i18n/src/main/res/values-it-rIT/strings.xml b/i18n/src/main/res/values-it-rIT/strings.xml
index ed2a0d11a..368d89c60 100644
--- a/i18n/src/main/res/values-it-rIT/strings.xml
+++ b/i18n/src/main/res/values-it-rIT/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Caselle Arrotondate</string>
     <string name="space_between_squares">Spazio Tra Caselle</string>
     <string name="system">Sistema</string>
-    <string name="rating">Suggerimenti</string>
     <string name="sign_in_failed">Impossibile accedere. Controllare la connessione di rete e riprovare.</string>
     <string name="you_won">Hai vinto!</string>
     <string name="victories">Vittorie</string>
@@ -118,7 +117,7 @@
     <string name="click_numbers">Consenti tocco sui numeri</string>
     <string name="tap_to_customize">Tocca per modificare</string>
     <string name="toggle_button_top">Mostra \"Attiva Tasto\" nella barra in alto</string>
-    <string name="no_guess_fail_warning">L\'attuale campo minato potrebbe non essere indovinabile!</string>
+    <string name="no_guess_fail_warning">L\'attuale campo minato potrebbe non essere risolvibile senza indovinare!</string>
     <string name="fixed_size">Dimensione Fissa</string>
     <string name="progressive">Progressivo</string>
     <string name="highlight_unsolved_numbers">Evidenzia numeri non risolti</string>
diff --git a/i18n/src/main/res/values-iw-rIL/strings.xml b/i18n/src/main/res/values-iw-rIL/strings.xml
index 5075d83d2..ea83eecf0 100644
--- a/i18n/src/main/res/values-iw-rIL/strings.xml
+++ b/i18n/src/main/res/values-iw-rIL/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">ריבוע בעל פינות עגולות</string>
     <string name="space_between_squares">רווח בין ריבועים</string>
     <string name="system">מערכת</string>
-    <string name="rating">משוב</string>
     <string name="sign_in_failed">אין אפשרות להתחבר. בדוק את חיבור הרשת ונסה שוב.</string>
     <string name="you_won">ניצחת!</string>
     <string name="victories">נצחונות</string>
diff --git a/i18n/src/main/res/values-ja-rJP/strings.xml b/i18n/src/main/res/values-ja-rJP/strings.xml
index 57f135c5d..03ab8023f 100644
--- a/i18n/src/main/res/values-ja-rJP/strings.xml
+++ b/i18n/src/main/res/values-ja-rJP/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">丸い長方形</string>
     <string name="space_between_squares">正方形間のスペース</string>
     <string name="system">システム</string>
-    <string name="rating">フィードバック</string>
     <string name="sign_in_failed">サインインに失敗しました。インターネット接続を確認してからもう一度お試しください。</string>
     <string name="you_won">あなたの勝ちです！</string>
     <string name="victories">勝利回数</string>
diff --git a/i18n/src/main/res/values-ko-rKR/strings.xml b/i18n/src/main/res/values-ko-rKR/strings.xml
index ebc1e5fe2..16a12548a 100644
--- a/i18n/src/main/res/values-ko-rKR/strings.xml
+++ b/i18n/src/main/res/values-ko-rKR/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">둥근 사각형</string>
     <string name="space_between_squares">사각형 사이의 공간</string>
     <string name="system">시스템</string>
-    <string name="rating">피드백</string>
     <string name="sign_in_failed">게임에 접속할 수 없습니다. 네트워크 환경을 확인해고 다시 접속해주세요.</string>
     <string name="you_won">성공!</string>
     <string name="victories">성공 횟수</string>
diff --git a/i18n/src/main/res/values-ku-rTR/strings.xml b/i18n/src/main/res/values-ku-rTR/strings.xml
index b95f9d7da..188992b35 100644
--- a/i18n/src/main/res/values-ku-rTR/strings.xml
+++ b/i18n/src/main/res/values-ku-rTR/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">چوارگۆشەی چەماو</string>
     <string name="space_between_squares">بۆشایی نێوان چوارگۆشەکان</string>
     <string name="system">سیستەم</string>
-    <string name="rating">پێڕاگه‌یاندنه‌وه‌</string>
     <string name="sign_in_failed">چوونە ژوورەوە سەرکەوتوو نەبوو. تکایە گرێدانی تۆڕەکەت بپشکنە و دووبارە هەوڵ بدەرەوە.</string>
     <string name="you_won">تۆبردتەوە!</string>
     <string name="victories">سەرکەوتنەکان</string>
diff --git a/i18n/src/main/res/values-lv-rLV/strings.xml b/i18n/src/main/res/values-lv-rLV/strings.xml
index fb6af9db5..3aa4d61e7 100644
--- a/i18n/src/main/res/values-lv-rLV/strings.xml
+++ b/i18n/src/main/res/values-lv-rLV/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Noapaļoti kvadrāti</string>
     <string name="space_between_squares">Attālums starp kvadrātiem</string>
     <string name="system">Sistēmas</string>
-    <string name="rating">Atgriezeniskā saite / atsauksme</string>
     <string name="sign_in_failed">Neizdevās pierakstīties. Lūdzu, pārbaudiet savu tīkla savienojumu un mēģiniet vēlreiz.</string>
     <string name="you_won">Tu uzvarēji!</string>
     <string name="victories">Uzvaras</string>
diff --git a/i18n/src/main/res/values-nl-rNL/strings.xml b/i18n/src/main/res/values-nl-rNL/strings.xml
index dac5bdc51..d702680e0 100644
--- a/i18n/src/main/res/values-nl-rNL/strings.xml
+++ b/i18n/src/main/res/values-nl-rNL/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Afgerond vierkant</string>
     <string name="space_between_squares">Ruimte tussen vierkanten</string>
     <string name="system">Systeem</string>
-    <string name="rating">Feedback</string>
     <string name="sign_in_failed">Aanmelden mislukt. Controleer uw netwerkverbinding en probeer het opnieuw.</string>
     <string name="you_won">Je hebt gewonnen!</string>
     <string name="victories">Overwinningen</string>
diff --git a/i18n/src/main/res/values-no-rNO/strings.xml b/i18n/src/main/res/values-no-rNO/strings.xml
index dc6b744bd..9a5568f34 100644
--- a/i18n/src/main/res/values-no-rNO/strings.xml
+++ b/i18n/src/main/res/values-no-rNO/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Avrundet Rute</string>
     <string name="space_between_squares">Mellomrom mellom ruter</string>
     <string name="system">System</string>
-    <string name="rating">Tilbakemelding</string>
     <string name="sign_in_failed">Innlogging feilet. Vennligst sjekk nettverkstilkoblingen din og prøv igjen.</string>
     <string name="you_won">Du vant!</string>
     <string name="victories">Seire</string>
diff --git a/i18n/src/main/res/values-pl-rPL/strings.xml b/i18n/src/main/res/values-pl-rPL/strings.xml
index b73183b5e..8d6549d3e 100644
--- a/i18n/src/main/res/values-pl-rPL/strings.xml
+++ b/i18n/src/main/res/values-pl-rPL/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Zaokrąglenie pól</string>
     <string name="space_between_squares">Rozstaw pól</string>
     <string name="system">Systemowy</string>
-    <string name="rating">Opinia</string>
     <string name="sign_in_failed">Błąd logowania. Sprawdź swoje połączenie z Internetem i spróbuj ponownie.</string>
     <string name="you_won">Udało się!</string>
     <string name="victories">Zwycięstwa</string>
diff --git a/i18n/src/main/res/values-pt-rBR/strings.xml b/i18n/src/main/res/values-pt-rBR/strings.xml
index 302b2d677..bca320bca 100644
--- a/i18n/src/main/res/values-pt-rBR/strings.xml
+++ b/i18n/src/main/res/values-pt-rBR/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Quadrado arredondado</string>
     <string name="space_between_squares">Espaço entre Quadrados</string>
     <string name="system">Sistema</string>
-    <string name="rating">Opinião</string>
     <string name="sign_in_failed">Não foi possível conectar. Favor verificar sua conexão de rede e tente novamente.</string>
     <string name="you_won">Você venceu!</string>
     <string name="victories">Vitórias</string>
diff --git a/i18n/src/main/res/values-pt-rPT/strings.xml b/i18n/src/main/res/values-pt-rPT/strings.xml
index 3b7d4b160..ae5167e38 100644
--- a/i18n/src/main/res/values-pt-rPT/strings.xml
+++ b/i18n/src/main/res/values-pt-rPT/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Quadrado arredondado</string>
     <string name="space_between_squares">Espaço entre quadrados</string>
     <string name="system">Sistema</string>
-    <string name="rating">Opinião</string>
     <string name="sign_in_failed">Não foi possível fazer a autenticação. Por favor verifica a tua ligação à Internet e tenta de novo.</string>
     <string name="you_won">Ganhaste!</string>
     <string name="victories">Vitórias</string>
diff --git a/i18n/src/main/res/values-ro-rRO/strings.xml b/i18n/src/main/res/values-ro-rRO/strings.xml
index ad39f2221..79f375355 100644
--- a/i18n/src/main/res/values-ro-rRO/strings.xml
+++ b/i18n/src/main/res/values-ro-rRO/strings.xml
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:locale="ro">
     <string name="tutorial">Tutorial</string>
-    <string name="tutorial_basic">Regula jocului este simplă: numărul de pe un pătrat indică numărul de mine adiacente acestuia și trebuie să marchezi toate minele.</string>
-    <string name="tutorial_text_1">Dacă un număr atinge același număr de pătrate, atunci toate pătratele sunt mine.</string>
-    <string name="tutorial_text_2">După ce ați marcat primul steag, revizuiți numerele și analizați următorul pătrat.</string>
-    <string name="tutorial_text_3">Dacă un pătrat are același număr de steaguri, toate celelalte pătrate rămase adiacente nu sunt mine (săgeata verde).</string>
-    <string name="tutorial_text_4">Revedeți numerele și continuați să deschideți pătrățele.</string>
+    <string name="tutorial_basic">Regula jocului este simplă: numărul dintr-un pătrat indică numărul de mine adiacente și trebuie să marchezi toate minele cu un steag.</string>
+    <string name="tutorial_text_1">Dacă un număr atinge același număr de pătrate, atunci pătratele sunt toate mine.</string>
+    <string name="tutorial_text_2">După marcarea primului steag, examinează numerele și analizează următorul pătrat.</string>
+    <string name="tutorial_text_3">Dacă un pătrat are același număr de steaguri, toate celelalte pătrate rămase adiacente nu sunt mine (săgeată verde).</string>
+    <string name="tutorial_text_4">Examinează numerele și continuă să deschizi pătrate.</string>
     <string name="games">Jocuri</string>
-    <string name="tap_to_begin">Atingeți pentru a începe</string>
+    <string name="tap_to_begin">Atinge pentru a începe</string>
     <string name="previous_games">Jocuri anterioare</string>
     <string name="minefield">Dificultate</string>
     <string name="standard">Standard</string>
     <string name="beginner">Începător</string>
-    <string name="intermediate">Mediu</string>
+    <string name="intermediate">Intermediar</string>
     <string name="expert">Expert</string>
     <string name="master">Maestru</string>
     <string name="legend">Legendă</string>
-    <string name="open">Deschideți</string>
+    <string name="open">Deschide</string>
     <string name="settings">Setări</string>
     <string name="animations">Animații</string>
-    <string name="vibration">Feedback haptic</string>
+    <string name="vibration">Reacție haptică</string>
     <string name="about">Despre</string>
     <string name="events">Statistici</string>
-    <string name="custom">Personalizat</string>
-    <string name="start">Start</string>
+    <string name="custom">Particularizat</string>
+    <string name="start">Începe</string>
     <string name="width">Lățime</string>
-    <string name="height">Înălţime</string>
+    <string name="height">Înălțime</string>
     <string name="mines">Mine</string>
-    <string name="retry_sure">Dacă începeți un joc nou, progresul actual va fi pierdut.</string>
-    <string name="show_licenses">Afişează licenţele</string>
+    <string name="retry_sure">Dacă începi un joc nou, progresul actual va fi pierdut.</string>
+    <string name="show_licenses">Afișează licențele</string>
     <string name="new_game_request">Vrei să începi un joc nou?</string>
     <string name="mines_remaining">%d mine</string>
-    <string name="game_time">Durata Jocului</string>
+    <string name="game_time">Timp de joc</string>
     <string name="settings_general">General</string>
-    <string name="settings_gameplay">Joc</string>
+    <string name="settings_gameplay">Dinamica jocului</string>
     <string name="settings_accessibility">Accesibilitate</string>
     <string name="size">Dimensiune</string>
     <string name="rounded_square">Pătrat rotunjit</string>
     <string name="space_between_squares">Spațiul dintre pătrate</string>
     <string name="system">Sistem</string>
-    <string name="rating">Feedback</string>
-    <string name="sign_in_failed">Nu s-a putut conecta. Vă rugăm să verificați conexiunea de rețea și să încercați din nou.</string>
-    <string name="you_won">Aţi câștigat!</string>
+    <string name="sign_in_failed">Nu se poate conecta. Te rugăm să îți verifici conexiunea la rețea și să încerci din nou.</string>
+    <string name="you_won">Ai câștigat!</string>
     <string name="victories">Victorii</string>
-    <string name="you_lost">Aţi pierdut!</string>
-    <string name="you_finished">Ați terminat!</string>
+    <string name="you_lost">Ai pierdut!</string>
+    <string name="you_finished">Ai terminat!</string>
     <string name="defeats">Înfrângeri</string>
     <string name="generic_game_over">Mult noroc la următorul joc.</string>
-    <string name="generic_win">Ați găsit %1$d mine în %2$d secunde.</string>
-    <string name="fail_to_share">Partajare eșuată</string>
+    <string name="generic_win">You found %1$d mines in %2$d seconds.</string>
+    <string name="fail_to_share">Distribuire eșuată</string>
     <string name="version_s">Versiunea %1$s</string>
     <string name="sound_effects">Efecte sonore</string>
-    <string name="are_you_sure">Sunteți sigur?</string>
-    <string name="enable_automatic_flags">Activați plasarea automată a steagurilor</string>
+    <string name="are_you_sure">Confirmi acțiunea?</string>
+    <string name="enable_automatic_flags">Activează plasarea automată a steagurilor</string>
     <string name="open_areas">Zone deschise</string>
     <string name="total_time">Timp total</string>
     <string name="average_time">Timp mediu</string>
     <string name="shortest_time">Cel mai scurt timp</string>
     <string name="performance">Performanță</string>
     <string name="ok">OK</string>
-    <string name="use_question_mark">Folosiți semnul de întrebare</string>
-    <string name="no_guessing_mode">Modul \'Fără ghicit\'</string>
-    <string name="control">Controale</string>
-    <string name="single_click">O singură atingere</string>
-    <string name="double_click">Atingere dublă</string>
+    <string name="use_question_mark">Folosește semnul de întrebare</string>
+    <string name="no_guessing_mode">Modul „Fără ghicit”</string>
+    <string name="control">Comenzi</string>
+    <string name="single_click">Apăsare singură</string>
+    <string name="double_click">Apăsare dublă</string>
     <string name="long_press">Apăsare lungă</string>
-    <string name="touch_sensibility">Sensibilitate atingerii</string>
+    <string name="touch_sensibility">Sensibilitatea la atingere</string>
     <string name="open_tile">Deschide</string>
     <string name="flag_tile">Plasare steag</string>
-    <string name="retry">Încercați din nou</string>
-    <string name="continue_game">Continuare</string>
+    <string name="retry">Reîncearcă</string>
+    <string name="continue_game">Continuă</string>
     <string name="empty">Gol</string>
     <string name="cant_do_it_now">Nu se poate face acest lucru acum</string>
-    <string name="you_have_received">Ați primit: +%1$d</string>
-    <string name="help_win_a_game">Pentru mai mult ajutor, trebuie să câștigi un joc.</string>
+    <string name="you_have_received">Ai primit: +%1$d</string>
+    <string name="help_win_a_game">Trebuie să câștigi un joc pentru a beneficia de mai mult ajutor.</string>
     <string name="unknown_error">Eroare necunoscută.</string>
     <string name="leaderboards">Clasamente</string>
     <string name="cancel">Anulează</string>
-    <string name="resume">Continuă</string>
+    <string name="resume">Reia</string>
     <string name="yes">Da</string>
-    <string name="unlock">Deblocați</string>
+    <string name="unlock">Deblocare</string>
     <string name="achievements">Realizări</string>
     <string name="no">Nu</string>
     <string name="general">General</string>
-    <string name="more">Mai mult</string>
+    <string name="more">Mai multe</string>
     <string name="source_code">Cod sursă</string>
     <string name="translation">Traducere</string>
-    <string name="licenses">Licenţe</string>
+    <string name="licenses">Licențe</string>
     <string name="google_play_games">Jocuri Google Play</string>
-    <string name="loading">Încărcare…</string>
-    <string name="connect">Conectați-vă</string>
+    <string name="loading">Se încarcă…</string>
+    <string name="connect">Conectare</string>
     <string name="connecting">Se conectează…</string>
-    <string name="disconnect">Deconectați</string>
+    <string name="disconnect">Deconectare</string>
     <string name="disconnected">Deconectat</string>
     <string name="new_game">Joc nou</string>
     <string name="share">Distribuie</string>
-    <string name="share_menu">Distribuie…</string>
-    <string name="no_network">Nu există conexiune la internet.</string>
-    <string name="delete_all">Ștergeți totul</string>
+    <string name="share_menu">Distribuie cu…</string>
+    <string name="no_network">Fără conexiune la internet.</string>
+    <string name="delete_all">Șterge totul</string>
     <string name="appearance">Aspect</string>
     <string name="themes">Teme</string>
-    <string name="delete_all_message">Ștergeți definitiv toate evenimentele.</string>
+    <string name="delete_all_message">Șterge permanent toate evenimentele.</string>
     <string name="remove_ad">Premium</string>
     <string name="help">Ajutor</string>
     <string name="back">Înapoi</string>
     <string name="donation">Donație</string>
-    <string name="open_on_game">Deschidere pe ecranul de joc</string>
-    <string name="show_windows">Afișați ferestrele</string>
-    <string name="select_language">Selectare limbă</string>
-    <string name="switch_control">Comutați: Plasare steag și deschidere</string>
-    <string name="switch_control_desc">Utilizați butonul pentru a comuta între plasare steag și deschidere</string>
-    <string name="app_description">Trebuie să eliberezi o tablă dreptunghiulară care conține mine ascunse fără să detonezi niciuna dintre ele.</string>
+    <string name="open_on_game">Deschide pe ecranul jocului</string>
+    <string name="show_windows">Arată ferestrele</string>
+    <string name="select_language">Selectează limba</string>
+    <string name="switch_control">Comutare: Plasare steag și Deschide</string>
+    <string name="switch_control_desc">Folosește butonul pentru a comuta între Plasare steag și Deschide</string>
+    <string name="app_description">Trebuie să eliberezi o tablă dreptunghiulară cu mine ascunse fără să detonezi niciuna.</string>
     <string name="app_name">Antimine</string>
-    <string name="do_you_know_how_to_play">Știi cum se joacă minesweeper?</string>
+    <string name="do_you_know_how_to_play">Știi cum se joacă Minesweeper?</string>
     <string name="close">Închide</string>
-    <string name="open_tutorial">Deschideți tutorialul</string>
-    <string name="click_numbers">Permiteți atingerea numerelor</string>
-    <string name="tap_to_customize">Atingeți pentru a personaliza</string>
-    <string name="toggle_button_top">Afișați \"Butonul de comutare\" pe bara de sus</string>
-    <string name="no_guess_fail_warning">Este posibil ca actualul teren de mine să nu fie lipsit de ghiciri!</string>
+    <string name="open_tutorial">Deschide tutorialul</string>
+    <string name="click_numbers">Permite atingerea numerelor</string>
+    <string name="tap_to_customize">Atinge pentru a particulariza</string>
+    <string name="toggle_button_top">Afișează „butonul de comutare” în bara de sus</string>
+    <string name="no_guess_fail_warning">Câmpul minat actual nu poate fi rezolvat fără ghiciri!</string>
     <string name="fixed_size">Dimensiune fixă</string>
     <string name="progressive">Progresiv</string>
-    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
+    <string name="highlight_unsolved_numbers">Evidențiază numerele nerezolvate</string>
 </resources>
diff --git a/i18n/src/main/res/values-ru-rRU/strings.xml b/i18n/src/main/res/values-ru-rRU/strings.xml
index 631512bc3..860ed028a 100644
--- a/i18n/src/main/res/values-ru-rRU/strings.xml
+++ b/i18n/src/main/res/values-ru-rRU/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Скругленный квадрат</string>
     <string name="space_between_squares">Расстояние между квадратами</string>
     <string name="system">Система</string>
-    <string name="rating">Обратная связь</string>
     <string name="sign_in_failed">Подключение невозможно. Проверьте интернет-подключение и повторите попытку.</string>
     <string name="you_won">Вы выиграли!</string>
     <string name="victories">Победы</string>
diff --git a/i18n/src/main/res/values-sk-rSK/strings.xml b/i18n/src/main/res/values-sk-rSK/strings.xml
index a45a09dba..8b5d52721 100644
--- a/i18n/src/main/res/values-sk-rSK/strings.xml
+++ b/i18n/src/main/res/values-sk-rSK/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Rounded Square</string>
     <string name="space_between_squares">Space Between Squares</string>
     <string name="system">System</string>
-    <string name="rating">Feedback</string>
     <string name="sign_in_failed">Failed to sign in. Please check your network connection and try again.</string>
     <string name="you_won">You won!</string>
     <string name="victories">Victories</string>
diff --git a/i18n/src/main/res/values-sv-rSE/strings.xml b/i18n/src/main/res/values-sv-rSE/strings.xml
index ef7509da0..43e9d1087 100644
--- a/i18n/src/main/res/values-sv-rSE/strings.xml
+++ b/i18n/src/main/res/values-sv-rSE/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Avrundad kvadrat</string>
     <string name="space_between_squares">Mellanrum mellan rutor</string>
     <string name="system">System</string>
-    <string name="rating">Feedback</string>
     <string name="sign_in_failed">Det gick inte att logga in. Kontrollera nätverksanslutningen och försök igen.</string>
     <string name="you_won">Du vann!</string>
     <string name="victories">Vinster</string>
diff --git a/i18n/src/main/res/values-ta-rIN/strings.xml b/i18n/src/main/res/values-ta-rIN/strings.xml
index afbd0ba23..bb8eb22aa 100644
--- a/i18n/src/main/res/values-ta-rIN/strings.xml
+++ b/i18n/src/main/res/values-ta-rIN/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Rounded Square</string>
     <string name="space_between_squares">Space Between Squares</string>
     <string name="system">System</string>
-    <string name="rating">Feedback</string>
     <string name="sign_in_failed">Failed to sign in. Please check your network connection and try again.</string>
     <string name="you_won">You won!</string>
     <string name="victories">Victories</string>
diff --git a/i18n/src/main/res/values-th-rTH/strings.xml b/i18n/src/main/res/values-th-rTH/strings.xml
index f7f0f9cf3..d817233eb 100644
--- a/i18n/src/main/res/values-th-rTH/strings.xml
+++ b/i18n/src/main/res/values-th-rTH/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">สี่เหลี่ยมจัตุรัสขอบมน</string>
     <string name="space_between_squares">ช่องว่างระหว่างกำลังสอง</string>
     <string name="system">ระบบ</string>
-    <string name="rating">ผลตอบรับ</string>
     <string name="sign_in_failed">ไม่สามารถเชื่อมต่อได้ กรุณาตรวจสอบการเชื่อมต่อเครือข่ายของคุณและลองอีกครั้ง</string>
     <string name="you_won">คุณชนะแล้ว!</string>
     <string name="victories">ชัยชนะ</string>
diff --git a/i18n/src/main/res/values-tr-rTR/strings.xml b/i18n/src/main/res/values-tr-rTR/strings.xml
index 563cb07a0..47ed6ee0f 100644
--- a/i18n/src/main/res/values-tr-rTR/strings.xml
+++ b/i18n/src/main/res/values-tr-rTR/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Yuvarlak kare</string>
     <string name="space_between_squares">Kareler Arası Boşluk</string>
     <string name="system">Sistem</string>
-    <string name="rating">Geri bildirim</string>
     <string name="sign_in_failed">Oturum açılamadı. Lütfen ağ bağlantınızı kontrol edip tekrar deneyin.</string>
     <string name="you_won">Kazandın!</string>
     <string name="victories">Zaferler</string>
diff --git a/i18n/src/main/res/values-uk-rUA/strings.xml b/i18n/src/main/res/values-uk-rUA/strings.xml
index 8c61eee82..cccd12fa8 100644
--- a/i18n/src/main/res/values-uk-rUA/strings.xml
+++ b/i18n/src/main/res/values-uk-rUA/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Округлі квадрати</string>
     <string name="space_between_squares">Простір між квадратами</string>
     <string name="system">Система</string>
-    <string name="rating">Відгук</string>
     <string name="sign_in_failed">Не вдається увійти. Перевірте підключення до Інтернету і повторіть спробу.</string>
     <string name="you_won">Ви перемогли!</string>
     <string name="victories">Перемог</string>
diff --git a/i18n/src/main/res/values-vec-rIT/strings.xml b/i18n/src/main/res/values-vec-rIT/strings.xml
index 36e15064a..74f397898 100644
--- a/i18n/src/main/res/values-vec-rIT/strings.xml
+++ b/i18n/src/main/res/values-vec-rIT/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Cuadrati Stondài</string>
     <string name="space_between_squares">Spasio infra i cuadrài</string>
     <string name="system">Sistema</string>
-    <string name="rating">Vałutasion</string>
     <string name="sign_in_failed">Aceso mìa riusìo. Controła ła conesion e prova da novo.</string>
     <string name="you_won">Te ghè vinto!</string>
     <string name="victories">Vitorie</string>
diff --git a/i18n/src/main/res/values-vi-rVN/strings.xml b/i18n/src/main/res/values-vi-rVN/strings.xml
index 83560f79a..c02a960dd 100644
--- a/i18n/src/main/res/values-vi-rVN/strings.xml
+++ b/i18n/src/main/res/values-vi-rVN/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">Hình vuông bo góc</string>
     <string name="space_between_squares">Khoảng cách giữa các ô vuông</string>
     <string name="system">Hệ thống</string>
-    <string name="rating">Phản hồi</string>
     <string name="sign_in_failed">Không đăng nhập được. Hãy kiểm tra lại kết nối mạng và thử lại.</string>
     <string name="you_won">Thắng rồi!</string>
     <string name="victories">Thắng</string>
@@ -121,5 +120,5 @@
     <string name="no_guess_fail_warning">Bãi mìn hiện tại có thể sẽ không giải được mà không đoán!</string>
     <string name="fixed_size">Kích thước cố định</string>
     <string name="progressive">Tiến trình</string>
-    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
+    <string name="highlight_unsolved_numbers">Đánh dấu các số chưa giải</string>
 </resources>
diff --git a/i18n/src/main/res/values-zh-rCN/strings.xml b/i18n/src/main/res/values-zh-rCN/strings.xml
index 77c483198..c07d1878e 100644
--- a/i18n/src/main/res/values-zh-rCN/strings.xml
+++ b/i18n/src/main/res/values-zh-rCN/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">方块圆角</string>
     <string name="space_between_squares">方块之间的空隙</string>
     <string name="system">系统</string>
-    <string name="rating">反馈</string>
     <string name="sign_in_failed">登录失败。请检查你的网络连接，然后重试。</string>
     <string name="you_won">你获胜了！</string>
     <string name="victories">胜利</string>
diff --git a/i18n/src/main/res/values-zh-rTW/strings.xml b/i18n/src/main/res/values-zh-rTW/strings.xml
index ad2919e95..9e11e64d6 100644
--- a/i18n/src/main/res/values-zh-rTW/strings.xml
+++ b/i18n/src/main/res/values-zh-rTW/strings.xml
@@ -39,7 +39,6 @@
     <string name="rounded_square">圓角正方形</string>
     <string name="space_between_squares">正方形之間的空間</string>
     <string name="system">系統</string>
-    <string name="rating">回饋</string>
     <string name="sign_in_failed">無法登錄。請檢查您的網絡連接，然後重試。</string>
     <string name="you_won">你贏了！</string>
     <string name="victories">勝利</string>
diff --git a/i18n/src/main/res/values/strings.xml b/i18n/src/main/res/values/strings.xml
index acb6b20ad..11c506330 100644
--- a/i18n/src/main/res/values/strings.xml
+++ b/i18n/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="tutorial">Tutorial</string>
     <string name="tutorial_basic">The rule of the game is simple, the number on a square shows the number of mines adjacent to it and you have to flag all the mines.</string>
     <string name="tutorial_text_1">If a number is touching the same number of squares, then the squares are all mines.</string>
-    <string name="tutorial_text_2">After mark your first flag, review the numbers and analyze the next square.</string>
+    <string name="tutorial_text_2">After marking your first flag, review the numbers and analyze the next square.</string>
     <string name="tutorial_text_3">If a square has the same number of flags, all other remaining squares adjacent to it aren\'t mines (the green arrow).</string>
     <string name="tutorial_text_4">Review the numbers and keep opening squares.</string>
     <string name="games">Games</string>
diff --git a/preferences/build.gradle b/preferences/build.gradle
index 31b57b55b..ca7681242 100644
--- a/preferences/build.gradle
+++ b/preferences/build.gradle
@@ -40,7 +40,7 @@ dependencies {
 
     // Unit Tests
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:2.24.0'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation 'io.mockk:mockk:1.11.0'
 }
\ No newline at end of file
diff --git a/proprietary/build.gradle b/proprietary/build.gradle
index 8b37dad6c..66bc26fab 100644
--- a/proprietary/build.gradle
+++ b/proprietary/build.gradle
@@ -46,7 +46,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-instantapps:17.0.1'
     implementation 'com.google.android.gms:play-services-games:21.0.0'
     implementation 'com.google.android.gms:play-services-auth:19.2.0'
-    implementation 'com.google.android.gms:play-services-ads:20.4.0'
+    implementation 'com.google.android.gms:play-services-ads:20.5.0'
     implementation 'com.google.android.play:core-ktx:1.8.1'
 
     // Jetbrains
diff --git a/proprietary/src/main/java/dev/lucasnlm/external/FeatureFlagManager.kt b/proprietary/src/main/java/dev/lucasnlm/external/FeatureFlagManager.kt
index f699b2fe4..8b0c111ef 100644
--- a/proprietary/src/main/java/dev/lucasnlm/external/FeatureFlagManager.kt
+++ b/proprietary/src/main/java/dev/lucasnlm/external/FeatureFlagManager.kt
@@ -24,6 +24,7 @@ class FeatureFlagManager : IFeatureFlagManager() {
         ENABLE_WEEK_DAY_SALES to true,
         HEX_BANNER to false,
         SHOW_ADS_WHEN_USE_TIP to true,
+        SHOW_COUNTDOWN_TO_CONTINUE to true,
     )
 
     private var remoteConfig: FirebaseRemoteConfig? = null
@@ -128,6 +129,10 @@ class FeatureFlagManager : IFeatureFlagManager() {
         getBoolean(SHOW_ADS_WHEN_USE_TIP)
     }
 
+    override val showCountdownToContinue: Boolean by lazy {
+        getBoolean(SHOW_COUNTDOWN_TO_CONTINUE)
+    }
+
     override suspend fun refresh() {
         val remoteConfig = getRemoteConfig()
         if (!BuildConfig.DEBUG && remoteConfig != null) {
@@ -160,5 +165,6 @@ class FeatureFlagManager : IFeatureFlagManager() {
         private const val ENABLE_WEEK_DAY_SALES = "enable_sales"
         private const val HEX_BANNER = "hex_banner_enabled"
         private const val SHOW_ADS_WHEN_USE_TIP = "show_ads_when_use_tip"
+        private const val SHOW_COUNTDOWN_TO_CONTINUE = "show_countdown_to_continue"
     }
 }
diff --git a/sgtatham/build.gradle b/sgtatham/build.gradle
index c8d97d494..91df372bf 100644
--- a/sgtatham/build.gradle
+++ b/sgtatham/build.gradle
@@ -43,8 +43,6 @@ android {
 }
 
 dependencies {
-
-    implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/themes/build.gradle b/themes/build.gradle
index f26da1e71..eeb895b26 100644
--- a/themes/build.gradle
+++ b/themes/build.gradle
@@ -53,7 +53,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
 
     // Lifecycle
     api 'android.arch.lifecycle:extensions:1.1.1'
@@ -73,7 +73,7 @@ dependencies {
 
     // Unit Tests
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:2.24.0'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation 'io.mockk:mockk:1.11.0'
 }
\ No newline at end of file
diff --git a/tutorial/build.gradle b/tutorial/build.gradle
index f26da1e71..eeb895b26 100644
--- a/tutorial/build.gradle
+++ b/tutorial/build.gradle
@@ -53,7 +53,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
 
     // Lifecycle
     api 'android.arch.lifecycle:extensions:1.1.1'
@@ -73,7 +73,7 @@ dependencies {
 
     // Unit Tests
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:2.24.0'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation 'io.mockk:mockk:1.11.0'
 }
\ No newline at end of file
diff --git a/ui/build.gradle b/ui/build.gradle
index 185b5e59d..f51ac56fd 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -50,7 +50,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
 
     // Lifecycle
     api 'android.arch.lifecycle:extensions:1.1.1'
@@ -70,7 +70,7 @@ dependencies {
 
     // Unit Tests
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:2.24.0'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation 'io.mockk:mockk:1.11.0'
 }
\ No newline at end of file