diff --git a/core/common/actions/src/main/java/com/buzbuz/smartautoclicker/core/common/actions/gesture/GestureExecutor.kt b/core/common/actions/src/main/java/com/buzbuz/smartautoclicker/core/common/actions/gesture/GestureExecutor.kt
index 85d7d1126..4364b4244 100644
--- a/core/common/actions/src/main/java/com/buzbuz/smartautoclicker/core/common/actions/gesture/GestureExecutor.kt
+++ b/core/common/actions/src/main/java/com/buzbuz/smartautoclicker/core/common/actions/gesture/GestureExecutor.kt
@@ -23,13 +23,15 @@ import android.util.Log
 
 import com.buzbuz.smartautoclicker.core.base.Dumpable
 import com.buzbuz.smartautoclicker.core.base.addDumpTabulationLvl
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withTimeoutOrNull
 
 import java.io.PrintWriter
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
+import kotlin.time.Duration.Companion.milliseconds
 
 
 @Singleton
@@ -60,17 +62,29 @@ internal class GestureExecutor @Inject constructor() : Dumpable {
         }
 
         resultCallback = resultCallback ?: newGestureResultCallback()
-        return suspendCoroutine { continuation ->
-            currentContinuation = continuation
 
-            try {
-                service.dispatchGesture(gesture, resultCallback, null)
-            } catch (rEx: RuntimeException) {
-                Log.w(TAG, "System is not responsive, the user might be spamming gesture too quickly", rEx)
-                errorGestures++
-                resumeExecution(gestureError = true)
+        val timeoutMs = gesture.gestureDurationMs() * GESTURE_CALLBACK_TIMEOUT_DURATION_RATIO_MS
+        val result = withTimeoutOrNull(timeoutMs.milliseconds) {
+            suspendCancellableCoroutine { continuation ->
+                currentContinuation = continuation
+
+                try {
+                    service.dispatchGesture(gesture, resultCallback, null)
+                } catch (rEx: RuntimeException) {
+                    Log.w(TAG, "System is not responsive, the user might be spamming gesture too quickly", rEx)
+                    errorGestures++
+                    resumeExecution(gestureError = true)
+                }
             }
         }
+
+        if (result == null) {
+            Log.w(TAG, "Gesture timed out after ${timeoutMs}ms, no callback received")
+            errorGestures++
+            currentContinuation = null
+        }
+
+        return result ?: false
     }
 
     private fun resumeExecution(gestureError: Boolean) {
@@ -109,4 +123,14 @@ internal class GestureExecutor @Inject constructor() : Dumpable {
     }
 }
 
+private fun GestureDescription.gestureDurationMs(): Long {
+    var maxEndTime = 0L
+    for (i in 0 until strokeCount) {
+        val stroke = getStroke(i)
+        maxEndTime = maxOf(maxEndTime, stroke.startTime + stroke.duration)
+    }
+    return maxEndTime
+}
+
+private const val GESTURE_CALLBACK_TIMEOUT_DURATION_RATIO_MS = 1.25
 private const val TAG = "GestureExecutor"
\ No newline at end of file
diff --git a/core/common/overlays/src/main/java/com/buzbuz/smartautoclicker/core/common/overlays/menu/implementation/common/OverlayMenuAnimations.kt b/core/common/overlays/src/main/java/com/buzbuz/smartautoclicker/core/common/overlays/menu/implementation/common/OverlayMenuAnimations.kt
index d6a446c62..e91dbce44 100644
--- a/core/common/overlays/src/main/java/com/buzbuz/smartautoclicker/core/common/overlays/menu/implementation/common/OverlayMenuAnimations.kt
+++ b/core/common/overlays/src/main/java/com/buzbuz/smartautoclicker/core/common/overlays/menu/implementation/common/OverlayMenuAnimations.kt
@@ -60,13 +60,23 @@ internal class OverlayMenuAnimations : Dumpable {
 
     fun startShowAnimation(view: View, overlayView: View? = null, onAnimationEnded: () -> Unit) {
         if (showAnimationIsRunning) return
+        showAnimationIsRunning = true
 
         Log.d(TAG, "Start show animation on view ${view} with visibility ${view.visibility}")
 
-        showAnimationIsRunning = true
+        val timeoutCallback = Runnable {
+            Log.w(TAG, "Show animation timeout !")
+            showAnimationIsRunning = false
+            showOverlayMenuAnimation.cancel()
+            showOverlayViewAnimation.cancel()
+            onAnimationEnded()
+        }
+        view.postDelayed(timeoutCallback, 1_000)
+
         showOverlayMenuAnimation.setListener(
             end = {
                 Log.d(TAG, "Show animation ended")
+                view.removeCallbacks(timeoutCallback)
                 showAnimationIsRunning = false
                 onAnimationEnded()
             }
@@ -88,13 +98,23 @@ internal class OverlayMenuAnimations : Dumpable {
 
     fun startHideAnimation(view: View, overlayView: View? = null, onAnimationEnded: () -> Unit) {
         if (hideAnimationIsRunning) return
+        hideAnimationIsRunning = true
 
         Log.d(TAG, "Start hide animation")
 
-        hideAnimationIsRunning = true
+        val timeoutCallback = Runnable {
+            Log.w(TAG, "Hide animation timeout !")
+            hideAnimationIsRunning = false
+            hideOverlayMenuAnimation.cancel()
+            hideOverlayViewAnimation.cancel()
+            onAnimationEnded()
+        }
+
+        view.postDelayed(timeoutCallback, 1_000)
         hideOverlayMenuAnimation.setListener(
             end = {
                 Log.d(TAG, "Hide animation ended")
+                view.removeCallbacks(timeoutCallback)
                 hideAnimationIsRunning = false
                 onAnimationEnded()
             }
diff --git a/core/common/ui/src/main/res/values/styles.xml b/core/common/ui/src/main/res/values/styles.xml
index fed2cb7a8..3c7fb22a8 100644
--- a/core/common/ui/src/main/res/values/styles.xml
+++ b/core/common/ui/src/main/res/values/styles.xml
@@ -73,7 +73,7 @@
         <item name="android:background">?attr/colorOutlineVariant</item>
     </style>
     <!-- Style for the secondary horizontal dividers. -->
-    <style name="AppTheme.Widget.Divider.Horizontal">
+    <style name="AppTheme.Widget.Divider.Horizontal" parent="Widget.MaterialComponents.MaterialDivider">
         <item name="android:layout_marginTop">@dimen/margin_vertical_default</item>
         <item name="android:layout_marginBottom">@dimen/margin_vertical_small</item>
         <item name="android:layout_marginStart">@dimen/margin_horizontal_default</item>
diff --git a/core/smart/database/schemas/com.buzbuz.smartautoclicker.core.database.ClickDatabase/23.json b/core/smart/database/schemas/com.buzbuz.smartautoclicker.core.database.ClickDatabase/23.json
new file mode 100644
index 000000000..a59b536d9
--- /dev/null
+++ b/core/smart/database/schemas/com.buzbuz.smartautoclicker.core.database.ClickDatabase/23.json
@@ -0,0 +1,857 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 23,
+    "identityHash": "62febb35151bfc4c81528537d18c9bcb",
+    "entities": [
+      {
+        "tableName": "action_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `eventId` INTEGER NOT NULL, `priority` INTEGER NOT NULL, `name` TEXT NOT NULL, `type` TEXT NOT NULL, `clickPositionType` TEXT, `x` INTEGER, `y` INTEGER, `clickOnConditionId` INTEGER, `pressDuration` INTEGER, `clickOffsetX` INTEGER, `clickOffsetY` INTEGER, `fromX` INTEGER, `fromY` INTEGER, `toX` INTEGER, `toY` INTEGER, `swipeDuration` INTEGER, `pauseDuration` INTEGER, `isAdvanced` INTEGER, `isBroadcast` INTEGER, `intent_action` TEXT, `component_name` TEXT, `flags` INTEGER, `toggle_all` INTEGER, `toggle_all_type` TEXT, `counter_name` TEXT, `counter_operation` TEXT, `counter_operation_value_type` TEXT, `counter_operation_value` REAL, `counter_operation_counter_name` TEXT, `notification_message_text` TEXT, `notification_importance` INTEGER, `system_action_type` TEXT, `text_value` TEXT, `text_validate_input` INTEGER, FOREIGN KEY(`eventId`) REFERENCES `event_table`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`clickOnConditionId`) REFERENCES `condition_table`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "eventId",
+            "columnName": "eventId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clickPositionType",
+            "columnName": "clickPositionType",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "x",
+            "columnName": "x",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "y",
+            "columnName": "y",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "clickOnConditionId",
+            "columnName": "clickOnConditionId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "pressDuration",
+            "columnName": "pressDuration",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "clickOffsetX",
+            "columnName": "clickOffsetX",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "clickOffsetY",
+            "columnName": "clickOffsetY",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "fromX",
+            "columnName": "fromX",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "fromY",
+            "columnName": "fromY",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "toX",
+            "columnName": "toX",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "toY",
+            "columnName": "toY",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "swipeDuration",
+            "columnName": "swipeDuration",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "pauseDuration",
+            "columnName": "pauseDuration",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "isAdvanced",
+            "columnName": "isAdvanced",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "isBroadcast",
+            "columnName": "isBroadcast",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "intentAction",
+            "columnName": "intent_action",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "componentName",
+            "columnName": "component_name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "toggleAll",
+            "columnName": "toggle_all",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "toggleAllType",
+            "columnName": "toggle_all_type",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "counterName",
+            "columnName": "counter_name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "counterOperation",
+            "columnName": "counter_operation",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "counterOperationValueType",
+            "columnName": "counter_operation_value_type",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "counterOperationValue",
+            "columnName": "counter_operation_value",
+            "affinity": "REAL"
+          },
+          {
+            "fieldPath": "counterOperationCounterName",
+            "columnName": "counter_operation_counter_name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "notificationMessageText",
+            "columnName": "notification_message_text",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "notificationImportance",
+            "columnName": "notification_importance",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "systemActionType",
+            "columnName": "system_action_type",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "textValue",
+            "columnName": "text_value",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "textValidateInput",
+            "columnName": "text_validate_input",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_action_table_eventId",
+            "unique": false,
+            "columnNames": [
+              "eventId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_action_table_eventId` ON `${TABLE_NAME}` (`eventId`)"
+          },
+          {
+            "name": "index_action_table_clickOnConditionId",
+            "unique": false,
+            "columnNames": [
+              "clickOnConditionId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_action_table_clickOnConditionId` ON `${TABLE_NAME}` (`clickOnConditionId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "event_table",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "eventId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "condition_table",
+            "onDelete": "SET NULL",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "clickOnConditionId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "event_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scenario_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `operator` INTEGER NOT NULL, `priority` INTEGER NOT NULL, `enabled_on_start` INTEGER NOT NULL DEFAULT 1, `type` TEXT NOT NULL, `keep_detecting` INTEGER, `detecetion_cooldown_ms` INTEGER, FOREIGN KEY(`scenario_id`) REFERENCES `scenario_table`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scenarioId",
+            "columnName": "scenario_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conditionOperator",
+            "columnName": "operator",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "enabledOnStart",
+            "columnName": "enabled_on_start",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keepDetecting",
+            "columnName": "keep_detecting",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "detectionCooldownMs",
+            "columnName": "detecetion_cooldown_ms",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_event_table_scenario_id",
+            "unique": false,
+            "columnNames": [
+              "scenario_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_event_table_scenario_id` ON `${TABLE_NAME}` (`scenario_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "scenario_table",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "scenario_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "scenario_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `detection_quality` INTEGER NOT NULL, `compute_rate` REAL NOT NULL DEFAULT 0.0, `randomize` INTEGER NOT NULL DEFAULT 0, `keep_screen_on` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "detectionQuality",
+            "columnName": "detection_quality",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "computeRate",
+            "columnName": "compute_rate",
+            "affinity": "REAL",
+            "notNull": true,
+            "defaultValue": "0.0"
+          },
+          {
+            "fieldPath": "randomize",
+            "columnName": "randomize",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "keepScreenOn",
+            "columnName": "keep_screen_on",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "condition_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `eventId` INTEGER NOT NULL, `name` TEXT NOT NULL, `type` TEXT NOT NULL, `priority` INTEGER NOT NULL DEFAULT 0, `shouldBeDetected` INTEGER, `path` TEXT, `area_left` INTEGER, `area_top` INTEGER, `area_right` INTEGER, `area_bottom` INTEGER, `threshold` INTEGER, `detection_type` INTEGER, `detection_area_left` INTEGER, `detection_area_top` INTEGER, `detection_area_right` INTEGER, `detection_area_bottom` INTEGER, `broadcast_action` TEXT, `counter_name` TEXT, `counter_comparison_operation` TEXT, `counter_operation_value_type` TEXT, `counter_value` REAL, `counter_value_counter_name` TEXT, `timer_value_ms` INTEGER, `timer_restart_when_reached` INTEGER, `color_rgba` INTEGER, `number_counter_comparison_operation` TEXT, `number_counter_operation_value_type` TEXT, `number_counter_value` REAL, `number_counter_value_counter_name` TEXT, `number_format_type` TEXT, `text_to_detect` TEXT, `text_alphabet` TEXT, FOREIGN KEY(`eventId`) REFERENCES `event_table`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "eventId",
+            "columnName": "eventId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "shouldBeDetected",
+            "columnName": "shouldBeDetected",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "path",
+            "columnName": "path",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "areaLeft",
+            "columnName": "area_left",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "areaTop",
+            "columnName": "area_top",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "areaRight",
+            "columnName": "area_right",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "areaBottom",
+            "columnName": "area_bottom",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "threshold",
+            "columnName": "threshold",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "detectionType",
+            "columnName": "detection_type",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "detectionAreaLeft",
+            "columnName": "detection_area_left",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "detectionAreaTop",
+            "columnName": "detection_area_top",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "detectionAreaRight",
+            "columnName": "detection_area_right",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "detectionAreaBottom",
+            "columnName": "detection_area_bottom",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "broadcastAction",
+            "columnName": "broadcast_action",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "counterName",
+            "columnName": "counter_name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "counterComparisonOperation",
+            "columnName": "counter_comparison_operation",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "counterOperationValueType",
+            "columnName": "counter_operation_value_type",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "counterValue",
+            "columnName": "counter_value",
+            "affinity": "REAL"
+          },
+          {
+            "fieldPath": "counterOperationCounterName",
+            "columnName": "counter_value_counter_name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "timerValueMs",
+            "columnName": "timer_value_ms",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "restartWhenReached",
+            "columnName": "timer_restart_when_reached",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "colorRgba",
+            "columnName": "color_rgba",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "numberCounterComparisonOperation",
+            "columnName": "number_counter_comparison_operation",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "numberCounterOperationValueType",
+            "columnName": "number_counter_operation_value_type",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "numberCounterValue",
+            "columnName": "number_counter_value",
+            "affinity": "REAL"
+          },
+          {
+            "fieldPath": "numberCounterOperationCounterName",
+            "columnName": "number_counter_value_counter_name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "numberFormatType",
+            "columnName": "number_format_type",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "textToDetect",
+            "columnName": "text_to_detect",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "textAlphabet",
+            "columnName": "text_alphabet",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_condition_table_eventId",
+            "unique": false,
+            "columnNames": [
+              "eventId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_condition_table_eventId` ON `${TABLE_NAME}` (`eventId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "event_table",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "eventId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "intent_extra_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `action_id` INTEGER NOT NULL, `type` TEXT NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, FOREIGN KEY(`action_id`) REFERENCES `action_table`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionId",
+            "columnName": "action_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_intent_extra_table_action_id",
+            "unique": false,
+            "columnNames": [
+              "action_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_intent_extra_table_action_id` ON `${TABLE_NAME}` (`action_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "action_table",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "action_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "event_toggle_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `action_id` INTEGER NOT NULL, `toggle_type` TEXT NOT NULL, `toggle_event_id` INTEGER NOT NULL, FOREIGN KEY(`action_id`) REFERENCES `action_table`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`toggle_event_id`) REFERENCES `event_table`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionId",
+            "columnName": "action_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "toggle_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toggleEventId",
+            "columnName": "toggle_event_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_event_toggle_table_action_id",
+            "unique": false,
+            "columnNames": [
+              "action_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_event_toggle_table_action_id` ON `${TABLE_NAME}` (`action_id`)"
+          },
+          {
+            "name": "index_event_toggle_table_toggle_event_id",
+            "unique": false,
+            "columnNames": [
+              "toggle_event_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_event_toggle_table_toggle_event_id` ON `${TABLE_NAME}` (`toggle_event_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "action_table",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "action_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "event_table",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "toggle_event_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "scenario_usage_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scenario_id` INTEGER NOT NULL, `last_start_timestamp_ms` INTEGER NOT NULL, `start_count` INTEGER NOT NULL, FOREIGN KEY(`scenario_id`) REFERENCES `scenario_table`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scenarioId",
+            "columnName": "scenario_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStartTimestampMs",
+            "columnName": "last_start_timestamp_ms",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "startCount",
+            "columnName": "start_count",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_scenario_usage_table_scenario_id",
+            "unique": false,
+            "columnNames": [
+              "scenario_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_scenario_usage_table_scenario_id` ON `${TABLE_NAME}` (`scenario_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "scenario_table",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "scenario_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "counters_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`counterName` TEXT NOT NULL, `scenarioId` INTEGER NOT NULL, `startingValue` REAL NOT NULL, PRIMARY KEY(`counterName`, `scenarioId`), FOREIGN KEY(`scenarioId`) REFERENCES `scenario_table`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "counterName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scenarioId",
+            "columnName": "scenarioId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "startingValue",
+            "columnName": "startingValue",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "counterName",
+            "scenarioId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_counters_table_scenarioId",
+            "unique": false,
+            "columnNames": [
+              "scenarioId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_counters_table_scenarioId` ON `${TABLE_NAME}` (`scenarioId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "scenario_table",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "scenarioId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '62febb35151bfc4c81528537d18c9bcb')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/ClickDatabase.kt b/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/ClickDatabase.kt
index 69ab6e597..bb6353623 100644
--- a/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/ClickDatabase.kt
+++ b/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/ClickDatabase.kt
@@ -56,6 +56,7 @@ import javax.inject.Singleton
         AutoMigration (from = 17, to = 18),
         AutoMigration (from = 18, to = 19),
         AutoMigration (from = 20, to = 21),
+        AutoMigration (from = 22, to = 23),
     ]
 )
 abstract class ClickDatabase : ScenarioDatabase()
diff --git a/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/DatabaseInfo.kt b/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/DatabaseInfo.kt
index 200c18125..229562b08 100644
--- a/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/DatabaseInfo.kt
+++ b/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/DatabaseInfo.kt
@@ -40,4 +40,4 @@ internal const val COUNTERS_TABLE = "counters_table"
 internal const val END_CONDITION_TABLE = "end_condition_table"
 
 /** Current version of the database. */
-const val DATABASE_VERSION = 22
\ No newline at end of file
+const val DATABASE_VERSION = 23
\ No newline at end of file
diff --git a/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/entity/ConditionEntity.kt b/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/entity/ConditionEntity.kt
index 170de7ebb..e2ab430a3 100644
--- a/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/entity/ConditionEntity.kt
+++ b/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/entity/ConditionEntity.kt
@@ -104,6 +104,7 @@ data class ConditionEntity(
     @ColumnInfo(name = "number_counter_operation_value_type") val numberCounterOperationValueType: CounterOperationValueType? = null,
     @ColumnInfo(name = "number_counter_value") val numberCounterValue: Double? = null,
     @ColumnInfo(name = "number_counter_value_counter_name") val numberCounterOperationCounterName: String? = null,
+    @ColumnInfo(name = "number_format_type") val numberFormatType: NumberFormatType? = null,
 
     // ConditionType.ON_TEXT_DETECTED
     @ColumnInfo(name = "text_to_detect") val textToDetect: String? = null,
diff --git a/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/entity/DatabaseEnums.kt b/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/entity/DatabaseEnums.kt
index 81f5883c7..68b8cf1d5 100644
--- a/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/entity/DatabaseEnums.kt
+++ b/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/entity/DatabaseEnums.kt
@@ -170,6 +170,17 @@ enum class SystemActionType {
 }
 
 
+/** Format used to parse a number detected via OCR. */
+enum class NumberFormatType {
+    /** Automatically detect the format from the number structure. */
+    AUTO,
+    /** Dot is the decimal separator, comma is the thousands separator (e.g. 1,234.56). */
+    DOT_DECIMAL,
+    /** Comma is the decimal separator, dot is the thousands separator (e.g. 1.234,56). */
+    COMMA_DECIMAL,
+}
+
+
 /** DELETED but kept because referenced in migrations/deserialization. */
 enum class NotificationMessageType {
     TEXT,
diff --git a/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/migrations/Migration19to20.kt b/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/migrations/Migration19to20.kt
index 9af223861..bb329df0d 100644
--- a/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/migrations/Migration19to20.kt
+++ b/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/migrations/Migration19to20.kt
@@ -87,7 +87,7 @@ object Migration19to20 : Migration(19, 20) {
             val counterReachedValues = buildMap {
                 forEachCounterReachedCondition { id, type, counterValue ->
                     if (id == null || type == null || counterValue == null) return@forEachCounterReachedCondition
-                    if (ConditionType.valueOf(type) == ConditionType.ON_COUNTER_REACHED) put(id, counterValue)
+                    if (ConditionType.valueOf(type.uppercase()) == ConditionType.ON_COUNTER_REACHED) put(id, counterValue)
                 }
             }
 
@@ -108,7 +108,7 @@ object Migration19to20 : Migration(19, 20) {
             val counterValues = buildMap {
                 forEachChangeCounterAction { id, type, counterValue ->
                     if (id == null || type == null || counterValue == null) return@forEachChangeCounterAction
-                    if (ActionType.valueOf(type) == ActionType.CHANGE_COUNTER) put(id, counterValue)
+                    if (ActionType.valueOf(type.uppercase()) == ActionType.CHANGE_COUNTER) put(id, counterValue)
                 }
             }
 
diff --git a/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/serialization/compat/CompatDeserializer.kt b/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/serialization/compat/CompatDeserializer.kt
index c0cace1b1..227563f88 100644
--- a/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/serialization/compat/CompatDeserializer.kt
+++ b/core/smart/database/src/main/java/com/buzbuz/smartautoclicker/core/database/serialization/compat/CompatDeserializer.kt
@@ -48,6 +48,7 @@ import com.buzbuz.smartautoclicker.core.database.entity.EventToggleType
 import com.buzbuz.smartautoclicker.core.database.entity.EventType
 import com.buzbuz.smartautoclicker.core.database.entity.IntentExtraEntity
 import com.buzbuz.smartautoclicker.core.database.entity.IntentExtraType
+import com.buzbuz.smartautoclicker.core.database.entity.NumberFormatType
 import com.buzbuz.smartautoclicker.core.database.entity.ScenarioEntity
 import com.buzbuz.smartautoclicker.core.database.entity.SystemActionType
 import com.buzbuz.smartautoclicker.core.database.serialization.Deserializer
@@ -124,8 +125,11 @@ internal open class CompatDeserializer : Deserializer {
 
     open fun deserializeCounters(jsonCounters: JsonArray): List<CountersEntity> =
         jsonCounters.mapNotNull { jsonCounter ->
+            val name = jsonCounter.jsonObject.getString("name")
+            if (name.isNullOrEmpty()) return@mapNotNull null
+
             CountersEntity(
-                name = jsonCounter.jsonObject.getString("name") ?: return@mapNotNull null,
+                name = name,
                 scenarioId = jsonCounter.jsonObject.getLong("scenarioId") ?: return@mapNotNull null,
                 startingValue = jsonCounter.jsonObject.getDouble("startingValue") ?: return@mapNotNull null,
             )
@@ -337,6 +341,10 @@ internal open class CompatDeserializer : Deserializer {
             numberCounterOperationValueType = counterOperationValueType,
             numberCounterValue = counterOperationValue,
             numberCounterOperationCounterName = counterOperationCounterName,
+            numberFormatType = jsonCondition.getEnum<NumberFormatType>("numberFormatType") ?: NumberFormatType.AUTO,
+            threshold = jsonCondition.getInt("threshold")
+                ?.coerceIn(CONDITION_THRESHOLD_LOWER_BOUND, CONDITION_THRESHOLD_UPPER_BOUND)
+                ?: CONDITION_THRESHOLD_DEFAULT_VALUE,
         )
     }
 
diff --git a/core/smart/database/src/test/java/com/buzbuz/smartautoclicker/core/database/serialization/compat/CompatDeserializerTests.kt b/core/smart/database/src/test/java/com/buzbuz/smartautoclicker/core/database/serialization/compat/CompatDeserializerTests.kt
index 766fca93a..80ed83212 100644
--- a/core/smart/database/src/test/java/com/buzbuz/smartautoclicker/core/database/serialization/compat/CompatDeserializerTests.kt
+++ b/core/smart/database/src/test/java/com/buzbuz/smartautoclicker/core/database/serialization/compat/CompatDeserializerTests.kt
@@ -20,6 +20,7 @@ import android.os.Build
 import androidx.test.ext.junit.runners.AndroidJUnit4
 
 import com.buzbuz.smartautoclicker.core.database.entity.ConditionType
+import com.buzbuz.smartautoclicker.core.database.entity.CounterComparisonOperation
 
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
@@ -121,4 +122,65 @@ class CompatDeserializerTests {
         assertNotNull(result)
         assertEquals(3, result!!.detectionType)
     }
+
+    // ===== deserializeConditionNumberDetected – threshold =====
+
+    private fun createJsonNumberCondition(threshold: Int? = null): JsonObject {
+        val map = mutableMapOf(
+            "id" to JsonPrimitive(1L),
+            "eventId" to JsonPrimitive(1L),
+            "name" to JsonPrimitive("test"),
+            "type" to JsonPrimitive(ConditionType.ON_NUMBER_DETECTED.name),
+            "detectionAreaLeft" to JsonPrimitive(0),
+            "detectionAreaTop" to JsonPrimitive(0),
+            "detectionAreaRight" to JsonPrimitive(100),
+            "detectionAreaBottom" to JsonPrimitive(100),
+            "numberCounterComparisonOperation" to JsonPrimitive(CounterComparisonOperation.GREATER.name),
+            "numberCounterValue" to JsonPrimitive(0.0),
+        )
+        if (threshold != null) map["threshold"] = JsonPrimitive(threshold)
+        return JsonObject(map)
+    }
+
+    @Test
+    fun deserializeConditionNumberDetected_threshold_validValue_isPreserved() {
+        val json = createJsonNumberCondition(threshold = 10)
+
+        val result = deserializer.deserializeConditionNumberDetected(json)
+
+        assertNotNull(result)
+        assertEquals(10, result!!.threshold)
+    }
+
+    @Test
+    fun deserializeConditionNumberDetected_threshold_belowLowerBound_isClamped() {
+        // threshold = -1, below CONDITION_THRESHOLD_LOWER_BOUND = 0
+        val json = createJsonNumberCondition(threshold = -1)
+
+        val result = deserializer.deserializeConditionNumberDetected(json)
+
+        assertNotNull(result)
+        assertEquals(0, result!!.threshold)
+    }
+
+    @Test
+    fun deserializeConditionNumberDetected_threshold_aboveUpperBound_isClamped() {
+        // threshold = 99, above CONDITION_THRESHOLD_UPPER_BOUND = 20
+        val json = createJsonNumberCondition(threshold = 99)
+
+        val result = deserializer.deserializeConditionNumberDetected(json)
+
+        assertNotNull(result)
+        assertEquals(20, result!!.threshold)
+    }
+
+    @Test
+    fun deserializeConditionNumberDetected_threshold_missing_usesDefault() {
+        val json = createJsonNumberCondition(threshold = null)
+
+        val result = deserializer.deserializeConditionNumberDetected(json)
+
+        assertNotNull(result)
+        assertEquals(4, result!!.threshold)
+    }
 }
diff --git a/core/smart/debugging/build.gradle.kts b/core/smart/debugging/build.gradle.kts
index d22683246..d172e33de 100644
--- a/core/smart/debugging/build.gradle.kts
+++ b/core/smart/debugging/build.gradle.kts
@@ -17,6 +17,7 @@
 
 plugins {
     alias(libs.plugins.buzbuz.androidLibrary)
+    alias(libs.plugins.buzbuz.androidUnitTest)
     alias(libs.plugins.buzbuz.flavour)
     alias(libs.plugins.buzbuz.hilt)
     alias(libs.plugins.buzbuz.protobuf)
@@ -30,4 +31,6 @@ dependencies {
     implementation(project(":core:common:base"))
     implementation(project(":core:smart:domain"))
     implementation(project(":core:smart:processing"))
+
+    testImplementation(libs.kotlinx.coroutines.test)
 }
diff --git a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/data/DebugReportLocalDataSource.kt b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/data/DebugReportLocalDataSource.kt
index 3f8248cfe..0186e41f5 100644
--- a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/data/DebugReportLocalDataSource.kt
+++ b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/data/DebugReportLocalDataSource.kt
@@ -25,7 +25,9 @@ import com.buzbuz.smartautoclicker.core.base.extensions.safeExists
 import com.buzbuz.smartautoclicker.core.base.extensions.safeInputStream
 import com.buzbuz.smartautoclicker.core.base.extensions.safeRecreate
 import com.buzbuz.smartautoclicker.core.smart.debugging.data.mapping.toDomain
+import com.buzbuz.smartautoclicker.core.smart.debugging.data.mapping.toCountersInitialValues
 import com.buzbuz.smartautoclicker.core.smart.debugging.data.mapping.toProtobuf
+import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportCounterInitialValue
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportEventOccurrence
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportOverview
 import com.google.protobuf.MessageLite
@@ -93,6 +95,18 @@ internal class DebugReportLocalDataSource @Inject constructor(
         }
     }
 
+    /**
+     * Write a raw [ProtoDebugReportMessage] to the report.
+     * The writing needs to be started with [startReportWrite] first.
+     *
+     * @param message The proto message to write in the report file.
+     */
+    suspend fun writeMessageToReport(message: ProtoDebugReportMessage) {
+        filesMutex.withLock {
+            messagesOutputStream?.safeWriteDelimited(message)
+        }
+    }
+
     /**
      * Write an event occurrence to the report.
      * The writing needs to be started with [startReportWrite] first.
@@ -144,6 +158,27 @@ internal class DebugReportLocalDataSource @Inject constructor(
             return null
         }
 
+    /**
+     * Get the counters initial values from the last detection session report.
+     *
+     * @return the counters initial values, if available. Writing needs to be stopped or this will always be null.
+     */
+    suspend fun readCountersInitialValues(): List<DebugReportCounterInitialValue>? =
+        filesMutex.withLock {
+            if (isWritingReport) return null
+
+            messagesFile.safeInputStream()?.use { inputStream ->
+                var protoMessage: ProtoDebugReportMessage?
+                while (true) {
+                    protoMessage = inputStream.safeParseDebugReportMessage() ?: break
+                    val countersInit = protoMessage.toCountersInitialValues()
+                    if (countersInit != null) return countersInit
+                }
+            }
+
+            return null
+        }
+
     /**
      * Get the last detection session debug report event occurrences.
      *
@@ -156,10 +191,10 @@ internal class DebugReportLocalDataSource @Inject constructor(
                 if (isWritingReport) return@buildList
 
                 messagesFile.safeInputStream()?.use { inputStream ->
-                    var eventOccurrence: DebugReportEventOccurrence?
+                    var protoMessage: ProtoDebugReportMessage?
                     while (true) {
-                        eventOccurrence = inputStream.safeParseDebugReportMessage()?.toDomain() ?: break
-                        add(eventOccurrence)
+                        protoMessage = inputStream.safeParseDebugReportMessage() ?: break
+                        protoMessage.toDomain()?.let { add(it) }
                         yield() // Allow loop stop upon coroutine cancellation
                     }
                 }
diff --git a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/data/mapping/DebugReportEventOccurrenceMapping.kt b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/data/mapping/DebugReportEventOccurrenceMapping.kt
index 9f444ce2c..fe59f3877 100644
--- a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/data/mapping/DebugReportEventOccurrenceMapping.kt
+++ b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/data/mapping/DebugReportEventOccurrenceMapping.kt
@@ -18,16 +18,36 @@ package com.buzbuz.smartautoclicker.core.smart.debugging.data.mapping
 
 import android.util.Log
 
+import com.buzbuz.smartautoclicker.core.domain.model.counter.Counter
+import com.buzbuz.smartautoclicker.core.smart.debugging.CountersInitMessageKt.counterInitialValues
+import com.buzbuz.smartautoclicker.core.smart.debugging.countersInitMessage
 import com.buzbuz.smartautoclicker.core.smart.debugging.debugReportMessage
+import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportCounterInitialValue
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportEventOccurrence
 import com.buzbuz.smartautoclicker.core.smart.debugging.imageEventMessage
 import com.buzbuz.smartautoclicker.core.smart.debugging.triggerEventMessage
 
+import com.buzbuz.smartautoclicker.core.smart.debugging.CountersInitMessage as ProtoCountersInitMessage
 import com.buzbuz.smartautoclicker.core.smart.debugging.DebugReportMessage as ProtoDebugReportMessage
 import com.buzbuz.smartautoclicker.core.smart.debugging.ImageEventMessage as ProtoImageEventMessage
 import com.buzbuz.smartautoclicker.core.smart.debugging.TriggerEventMessage as ProtoTriggerEventMessage
 
 
+internal fun List<Counter>.toCountersInitProtobuf(): ProtoDebugReportMessage =
+    debugReportMessage {
+        relativeTimestampMs = 0L
+        countersInitMessage = countersInitMessage {
+            initialValues.addAll(
+                this@toCountersInitProtobuf.map { counter ->
+                    counterInitialValues {
+                        name = counter.counterName
+                        initialValue = counter.defaultValue
+                    }
+                }
+            )
+        }
+    }
+
 internal fun DebugReportEventOccurrence.toProtobuf(): ProtoDebugReportMessage =
     debugReportMessage {
         relativeTimestampMs = this@toProtobuf.relativeTimestampMs
@@ -58,6 +78,18 @@ private fun DebugReportEventOccurrence.TriggerEvent.toTriggerEventProtobuf(): Pr
         )
     }
 
+internal fun ProtoDebugReportMessage.toCountersInitialValues(): List<DebugReportCounterInitialValue>? =
+    if (messageTypeCase == ProtoDebugReportMessage.MessageTypeCase.COUNTERSINITMESSAGE)
+        countersInitMessage.toDomain()
+    else null
+
+private fun ProtoCountersInitMessage.toDomain(): List<DebugReportCounterInitialValue> =
+    initialValuesList.map { entry ->
+        DebugReportCounterInitialValue(
+            counterName = entry.name,
+            initialValue = entry.initialValue,
+        )
+    }
 
 internal fun ProtoDebugReportMessage.toDomain(): DebugReportEventOccurrence? =
     when (messageTypeCase) {
@@ -65,6 +97,7 @@ internal fun ProtoDebugReportMessage.toDomain(): DebugReportEventOccurrence? =
             imageEventMessage.toDomain(relativeTimestampMs)
         ProtoDebugReportMessage.MessageTypeCase.TRIGGEREVENTMESSAGE ->
             triggerEventMessage.toDomain(relativeTimestampMs)
+        ProtoDebugReportMessage.MessageTypeCase.COUNTERSINITMESSAGE -> null
         ProtoDebugReportMessage.MessageTypeCase.MESSAGETYPE_NOT_SET -> {
             Log.e(LOG_TAG, "Can't read DebugReportEventOccurrence from protobuf")
             null
diff --git a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/DebuggingRepository.kt b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/DebuggingRepository.kt
index 964eee156..0357f78de 100644
--- a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/DebuggingRepository.kt
+++ b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/DebuggingRepository.kt
@@ -17,6 +17,7 @@
 package com.buzbuz.smartautoclicker.core.smart.debugging.domain
 
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.live.DebugLiveEventOccurrence
+import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportCounterInitialValue
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportEventOccurrence
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportOverview
 import kotlinx.coroutines.flow.Flow
@@ -46,6 +47,9 @@ interface DebuggingRepository {
     /** Read the last detection session report overview, if any. */
     fun getLastReportOverview(): Flow<DebugReportOverview?>
 
+    /** Read the counters initial values from the last detection session report. Null if no report is available. */
+    fun getLastReportCountersInitialValues(): Flow<List<DebugReportCounterInitialValue>?>
+
     /** Read the last detection session events occurrences. List will be empty no rapport is available. */
     fun getLastReportEventsOccurrences(): Flow<List<DebugReportEventOccurrence>?>
 }
\ No newline at end of file
diff --git a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/DebuggingRepositoryImpl.kt b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/DebuggingRepositoryImpl.kt
index 8ca985824..67dfced5f 100644
--- a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/DebuggingRepositoryImpl.kt
+++ b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/DebuggingRepositoryImpl.kt
@@ -21,6 +21,7 @@ import com.buzbuz.smartautoclicker.core.base.di.HiltCoroutineDispatchers.IO
 import com.buzbuz.smartautoclicker.core.smart.debugging.data.DebugConfigurationLocalDataSource
 import com.buzbuz.smartautoclicker.core.smart.debugging.data.DebugReportLocalDataSource
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.live.DebugLiveEventOccurrence
+import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportCounterInitialValue
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportEventOccurrence
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportOverview
 import com.buzbuz.smartautoclicker.core.smart.debugging.engine.DebugEngine
@@ -85,6 +86,11 @@ internal class DebuggingRepositoryImpl @Inject constructor(
         }.flowOn(ioDispatcher)
 
 
+    override fun getLastReportCountersInitialValues(): Flow<List<DebugReportCounterInitialValue>?> =
+        flow {
+            emit(debugReportDataSource.readCountersInitialValues())
+        }.flowOn(ioDispatcher)
+
     override fun getLastReportEventsOccurrences(): Flow<List<DebugReportEventOccurrence>?> =
         flow {
             emit(debugReportDataSource.readMessages())
diff --git a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/model/live/DebugLiveEventOccurrence.kt b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/model/live/DebugLiveEventOccurrence.kt
index ca5a5b959..069940ee0 100644
--- a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/model/live/DebugLiveEventOccurrence.kt
+++ b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/model/live/DebugLiveEventOccurrence.kt
@@ -26,6 +26,7 @@ sealed interface DebugLiveEventOccurrence {
     val fulfilled: Boolean
     val fulfilledCount: Int
     val processingDurationMs: Long
+    val timestamp: Long
     val conditionsResults: List<DebugLiveEventConditionResult>
 
     data class Screen(
@@ -33,6 +34,7 @@ sealed interface DebugLiveEventOccurrence {
         override val fulfilled: Boolean,
         override val fulfilledCount: Int,
         override val processingDurationMs: Long,
+        override val timestamp: Long,
         override val conditionsResults: List<DebugLiveEventConditionResult.Screen>,
     ) : DebugLiveEventOccurrence
 
@@ -41,6 +43,7 @@ sealed interface DebugLiveEventOccurrence {
         override val fulfilled: Boolean,
         override val fulfilledCount: Int,
         override val processingDurationMs: Long,
+        override val timestamp: Long,
         override val conditionsResults: List<DebugLiveEventConditionResult.Trigger>,
     ) : DebugLiveEventOccurrence
 }
diff --git a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/model/report/DebugReportCounterInitialValue.kt b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/model/report/DebugReportCounterInitialValue.kt
new file mode 100644
index 000000000..7ff5b9b4c
--- /dev/null
+++ b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/model/report/DebugReportCounterInitialValue.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2026 Kevin Buzeau
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report
+
+/**
+ * The initial value of a counter at the start of a detection session.
+ *
+ * @param counterName the name of the counter.
+ * @param initialValue the value the counter started at when the session began.
+ */
+data class DebugReportCounterInitialValue(
+    val counterName: String,
+    val initialValue: Double,
+)
diff --git a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/usecase/GetDebugOccurrenceAllCounterStateUseCase.kt b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/usecase/GetDebugOccurrenceAllCounterStateUseCase.kt
index a36abd216..7b20f150d 100644
--- a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/usecase/GetDebugOccurrenceAllCounterStateUseCase.kt
+++ b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/usecase/GetDebugOccurrenceAllCounterStateUseCase.kt
@@ -18,6 +18,7 @@ package com.buzbuz.smartautoclicker.core.smart.debugging.domain.usecase
 
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.DebuggingRepository
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugEventOccurrenceCounterState
+import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportCounterInitialValue
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportEventOccurrence
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportOverview
 
@@ -34,18 +35,24 @@ import javax.inject.Inject
 class GetDebugOccurrenceAllCounterStateUseCase @Inject constructor(debuggingRepository: DebuggingRepository) {
 
     private val overview: Flow<DebugReportOverview?> = debuggingRepository.getLastReportOverview()
+    private val countersInitialValues: Flow<List<DebugReportCounterInitialValue>?> =
+        debuggingRepository.getLastReportCountersInitialValues()
     private val eventOccurrences: Flow<List<DebugReportEventOccurrence>?> =
         debuggingRepository.getLastReportEventsOccurrences()
 
     operator fun invoke(eventOccurrence: DebugReportEventOccurrence): Flow<List<DebugEventOccurrenceCounterState>> =
-        combine(overview, eventOccurrences) { overview, occurrences ->
+        combine(overview, countersInitialValues, eventOccurrences) { overview, initialValues, occurrences ->
             if (overview == null || occurrences == null) return@combine emptyList()
 
-            // Initialize all counters state
+            val initialValuesByName = initialValues?.associateBy { it.counterName } ?: emptyMap()
+
+            // Initialize all counters state using their actual initial values
             val countersStateMap = mutableMapOf<String, DebugEventOccurrenceCounterState>()
             overview.counterNames.forEach { counterName ->
-                countersStateMap[counterName] =
-                    DebugEventOccurrenceCounterState(counterName = counterName, currentValue = 0.0)
+                countersStateMap[counterName] = DebugEventOccurrenceCounterState(
+                    counterName = counterName,
+                    currentValue = initialValuesByName[counterName]?.initialValue ?: 0.0,
+                )
             }
 
             // Update counters state up to requested event occurrence
diff --git a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/engine/DebugEngine.kt b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/engine/DebugEngine.kt
index f2e094686..6ebd47e48 100644
--- a/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/engine/DebugEngine.kt
+++ b/core/smart/debugging/src/main/java/com/buzbuz/smartautoclicker/core/smart/debugging/engine/DebugEngine.kt
@@ -30,7 +30,6 @@ import com.buzbuz.smartautoclicker.core.domain.model.scenario.Scenario
 import com.buzbuz.smartautoclicker.core.processing.domain.EventType
 import com.buzbuz.smartautoclicker.core.processing.domain.SmartProcessingListener
 import com.buzbuz.smartautoclicker.core.processing.domain.model.ProcessedConditionResult
-import com.buzbuz.smartautoclicker.core.smart.debugging.data.DebugConfigurationLocalDataSource
 import com.buzbuz.smartautoclicker.core.smart.debugging.data.DebugReportLocalDataSource
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.live.DebugLiveEventConditionResult
 import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.live.DebugLiveEventOccurrence
@@ -41,6 +40,7 @@ import com.buzbuz.smartautoclicker.core.smart.debugging.engine.recorder.CounterV
 import com.buzbuz.smartautoclicker.core.smart.debugging.engine.recorder.DebugReportOverviewRecorder
 import com.buzbuz.smartautoclicker.core.smart.debugging.engine.recorder.EventOccurrencesRecorder
 import com.buzbuz.smartautoclicker.core.smart.debugging.engine.recorder.EventStateRecorder
+import com.buzbuz.smartautoclicker.core.smart.debugging.data.mapping.toCountersInitProtobuf
 import com.buzbuz.smartautoclicker.core.smart.debugging.engine.recorder.ScreenConditionOccurrenceRecorder
 
 import kotlinx.coroutines.CoroutineDispatcher
@@ -101,7 +101,9 @@ internal class DebugEngine @Inject constructor(
             if (shouldWriteReport) {
                 overviewRecorder.onSessionStart(scenario)
                 counterValuesRecorder.onSessionStarted(counters)
+
                 debugReportLocalDataSource.startReportWrite()
+                writeCountersInitToReport(counters)
             }
         }
     }
@@ -257,6 +259,7 @@ internal class DebugEngine @Inject constructor(
             fulfilled = fulfilled,
             fulfilledCount = eventOccurrencesRecorder.getEventOccurrences(event.id.databaseId),
             processingDurationMs = eventOccurrencesRecorder.getLastEventDurationMs(),
+            timestamp = System.currentTimeMillis(),
             conditionsResults = results.map { result ->
                 DebugLiveEventConditionResult.Screen(
                     condition = result.condition,
@@ -275,6 +278,7 @@ internal class DebugEngine @Inject constructor(
             fulfilled = fulfilled,
             fulfilledCount = eventOccurrencesRecorder.getEventOccurrences(event.id.databaseId),
             processingDurationMs = eventOccurrencesRecorder.getLastEventDurationMs(),
+            timestamp = System.currentTimeMillis(),
             conditionsResults = results.map { result ->
                 DebugLiveEventConditionResult.Trigger(
                     condition = result.condition,
@@ -283,6 +287,10 @@ internal class DebugEngine @Inject constructor(
             },
         )
 
+    private suspend fun writeCountersInitToReport(counters: List<Counter>) {
+        debugReportLocalDataSource.writeMessageToReport(counters.toCountersInitProtobuf())
+    }
+
     private suspend fun writeImageEventToReport(event: ScreenEvent) {
         debugReportLocalDataSource.writeEventOccurrenceToReport(
             occurrence = DebugReportEventOccurrence.ScreenEvent(
diff --git a/core/smart/debugging/src/main/proto/CountersInitMessage.proto b/core/smart/debugging/src/main/proto/CountersInitMessage.proto
new file mode 100644
index 000000000..85a1116f8
--- /dev/null
+++ b/core/smart/debugging/src/main/proto/CountersInitMessage.proto
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2026 Kevin Buzeau
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+syntax = "proto3";
+option java_multiple_files = true;
+
+package com.buzbuz.smartautoclicker.core.smart.debugging;
+
+/** Sent once at session start and contains the counters initial values. */
+message CountersInitMessage {
+
+    /** List of initial values for counters. */
+    repeated CounterInitialValues initialValues = 1;
+
+    /** Counter init values. */
+    message CounterInitialValues {
+        /** Counter unique name. */
+        string name = 1;
+        /** Counter initial value. */
+        double initialValue = 2;
+    }
+}
\ No newline at end of file
diff --git a/core/smart/debugging/src/main/proto/DebugReportMessage.proto b/core/smart/debugging/src/main/proto/DebugReportMessage.proto
index e9d9cb9f8..48bbe8f69 100644
--- a/core/smart/debugging/src/main/proto/DebugReportMessage.proto
+++ b/core/smart/debugging/src/main/proto/DebugReportMessage.proto
@@ -19,6 +19,7 @@ option java_multiple_files = true;
 
 package com.buzbuz.smartautoclicker.core.smart.debugging;
 
+import "CountersInitMessage.proto";
 import "ImageEventMessage.proto";
 import "TriggerEventMessage.proto";
 
@@ -36,5 +37,8 @@ message DebugReportMessage {
 
         /** A trigger event has been triggered. */
         TriggerEventMessage triggerEventMessage = 3;
+
+        /** Initial value for counters. */
+        CountersInitMessage countersInitMessage = 4;
     }
 }
diff --git a/core/smart/debugging/src/test/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/usecase/GetDebugOccurrenceAllCounterStateUseCaseTests.kt b/core/smart/debugging/src/test/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/usecase/GetDebugOccurrenceAllCounterStateUseCaseTests.kt
new file mode 100644
index 000000000..950f46ebe
--- /dev/null
+++ b/core/smart/debugging/src/test/java/com/buzbuz/smartautoclicker/core/smart/debugging/domain/usecase/GetDebugOccurrenceAllCounterStateUseCaseTests.kt
@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2026 Kevin Buzeau
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.buzbuz.smartautoclicker.core.smart.debugging.domain.usecase
+
+import android.os.Build
+
+import com.buzbuz.smartautoclicker.core.smart.debugging.domain.DebuggingRepository
+import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugEventOccurrenceCounterState
+import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportActionResult
+import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportCounterInitialValue
+import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportEventOccurrence
+import com.buzbuz.smartautoclicker.core.smart.debugging.domain.model.report.DebugReportOverview
+
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.MockitoAnnotations
+import org.mockito.Mockito.`when` as mockWhen
+
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+import kotlin.time.Duration.Companion.seconds
+
+/** Tests for [GetDebugOccurrenceAllCounterStateUseCase]. */
+@ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [Build.VERSION_CODES.Q])
+class GetDebugOccurrenceAllCounterStateUseCaseTests {
+
+    @Mock private lateinit var mockDebuggingRepository: DebuggingRepository
+
+    private lateinit var useCase: GetDebugOccurrenceAllCounterStateUseCase
+
+    @Before
+    fun setUp() {
+        MockitoAnnotations.openMocks(this)
+    }
+
+    // --- Helpers ---
+
+    /**
+     * Stub the repository then create the use case. The use case captures flows at construction
+     * time, so mocks must be set up before instantiation.
+     */
+    private fun mockRepository(
+        counterNames: Set<String>,
+        initialValues: List<DebugReportCounterInitialValue>?,
+        occurrences: List<DebugReportEventOccurrence>,
+    ) {
+        mockWhen(mockDebuggingRepository.getLastReportOverview()).thenReturn(
+            flowOf(
+                DebugReportOverview(
+                    scenarioId = 1L,
+                    duration = 10.seconds,
+                    frameCount = 100L,
+                    averageFrameProcessingDuration = 0.1.seconds,
+                    imageEventFulfilledCount = 0,
+                    triggerEventFulfilledCount = 0,
+                    counterNames = counterNames,
+                )
+            )
+        )
+        mockWhen(mockDebuggingRepository.getLastReportCountersInitialValues()).thenReturn(flowOf(initialValues))
+        mockWhen(mockDebuggingRepository.getLastReportEventsOccurrences()).thenReturn(flowOf(occurrences))
+        useCase = GetDebugOccurrenceAllCounterStateUseCase(mockDebuggingRepository)
+    }
+
+    private fun screenEvent(
+        id: Long,
+        vararg counterChanges: DebugReportActionResult.CounterChange,
+    ): DebugReportEventOccurrence.ScreenEvent =
+        DebugReportEventOccurrence.ScreenEvent(
+            eventId = id,
+            relativeTimestampMs = 0L,
+            frameNumber = id,
+            conditionsResults = emptyList(),
+            counterChanges = counterChanges.toList(),
+            eventStateChanges = emptyList(),
+        )
+
+    private fun counterChange(name: String, from: Double, to: Double) =
+        DebugReportActionResult.CounterChange(counterName = name, previousValue = from, newValue = to)
+
+    private fun counterState(name: String, current: Double, previous: Double? = null) =
+        DebugEventOccurrenceCounterState(counterName = name, currentValue = current, previousValue = previous)
+
+    // --- Tests ---
+
+    @Test
+    fun noReport_returnsEmpty() = runTest {
+        mockWhen(mockDebuggingRepository.getLastReportOverview()).thenReturn(flowOf(null))
+        mockWhen(mockDebuggingRepository.getLastReportCountersInitialValues()).thenReturn(flowOf(null))
+        mockWhen(mockDebuggingRepository.getLastReportEventsOccurrences()).thenReturn(flowOf(null))
+        useCase = GetDebugOccurrenceAllCounterStateUseCase(mockDebuggingRepository)
+
+        val event = screenEvent(id = 1L)
+        val result = useCase(event).first()
+
+        assertEquals(emptyList<DebugEventOccurrenceCounterState>(), result)
+    }
+
+    @Test
+    fun noInitialValues_countersStartAtZero() = runTest {
+        val event = screenEvent(id = 1L)
+        mockRepository(
+            counterNames = setOf("score"),
+            initialValues = null,
+            occurrences = listOf(event),
+        )
+
+        val result = useCase(event).first()
+
+        assertEquals(listOf(counterState("score", 0.0)), result)
+    }
+
+    @Test
+    fun initialValues_usedAsStartingState() = runTest {
+        val event = screenEvent(id = 1L)
+        mockRepository(
+            counterNames = setOf("score", "lives"),
+            initialValues = listOf(
+                DebugReportCounterInitialValue("score", 100.0),
+                DebugReportCounterInitialValue("lives", 3.0),
+            ),
+            occurrences = listOf(event),
+        )
+
+        val result = useCase(event).first()
+
+        assertEquals(
+            listOf(
+                counterState("lives", 3.0),
+                counterState("score", 100.0),
+            ),
+            result,
+        )
+    }
+
+    @Test
+    fun initialValues_counterChangedBefore_stateReflectsChange() = runTest {
+        val eventBefore = screenEvent(id = 1L, counterChange("score", 100.0, 110.0))
+        val targetEvent = screenEvent(id = 2L)
+        mockRepository(
+            counterNames = setOf("score"),
+            initialValues = listOf(DebugReportCounterInitialValue("score", 100.0)),
+            occurrences = listOf(eventBefore, targetEvent),
+        )
+
+        val result = useCase(targetEvent).first()
+
+        assertEquals(listOf(counterState("score", 110.0)), result)
+    }
+
+    @Test
+    fun initialValues_counterChangedAtTarget_previousValueShown() = runTest {
+        val targetEvent = screenEvent(id = 1L, counterChange("score", 100.0, 150.0))
+        mockRepository(
+            counterNames = setOf("score"),
+            initialValues = listOf(DebugReportCounterInitialValue("score", 100.0)),
+            occurrences = listOf(targetEvent),
+        )
+
+        val result = useCase(targetEvent).first()
+
+        assertEquals(listOf(counterState("score", current = 150.0, previous = 100.0)), result)
+    }
+
+    @Test
+    fun initialValues_multipleCounters_orderedByName() = runTest {
+        val event = screenEvent(id = 1L)
+        mockRepository(
+            counterNames = setOf("zeta", "alpha", "mu"),
+            initialValues = listOf(
+                DebugReportCounterInitialValue("zeta", 1.0),
+                DebugReportCounterInitialValue("alpha", 2.0),
+                DebugReportCounterInitialValue("mu", 3.0),
+            ),
+            occurrences = listOf(event),
+        )
+
+        val result = useCase(event).first()
+
+        assertEquals(
+            listOf(
+                counterState("alpha", 2.0),
+                counterState("mu", 3.0),
+                counterState("zeta", 1.0),
+            ),
+            result,
+        )
+    }
+
+    @Test
+    fun initialValues_counterNotInInitialValues_fallsBackToZero() = runTest {
+        val event = screenEvent(id = 1L)
+        mockRepository(
+            counterNames = setOf("known", "unknown"),
+            initialValues = listOf(DebugReportCounterInitialValue("known", 42.0)),
+            occurrences = listOf(event),
+        )
+
+        val result = useCase(event).first()
+
+        assertEquals(
+            listOf(
+                counterState("known", 42.0),
+                counterState("unknown", 0.0),
+            ),
+            result,
+        )
+    }
+
+    @Test
+    fun initialValues_multipleChangesOnSameCounterAtTarget_earliestPreviousValueKept() = runTest {
+        val targetEvent = screenEvent(
+            id = 1L,
+            counterChange("score", 100.0, 110.0),
+            counterChange("score", 110.0, 120.0),
+        )
+        mockRepository(
+            counterNames = setOf("score"),
+            initialValues = listOf(DebugReportCounterInitialValue("score", 100.0)),
+            occurrences = listOf(targetEvent),
+        )
+
+        val result = useCase(targetEvent).first()
+
+        assertEquals(listOf(counterState("score", current = 120.0, previous = 100.0)), result)
+    }
+}
diff --git a/core/smart/detection/src/androidTest/assets/models/text/detect/det.ncnn.bin b/core/smart/detection/src/androidTest/assets/models/text/detect/det.ncnn.bin
new file mode 100644
index 000000000..7b00c2a8e
Binary files /dev/null and b/core/smart/detection/src/androidTest/assets/models/text/detect/det.ncnn.bin differ
diff --git a/core/smart/detection/src/androidTest/assets/models/text/detect/det.ncnn.param b/core/smart/detection/src/androidTest/assets/models/text/detect/det.ncnn.param
new file mode 100644
index 000000000..e4bbad685
--- /dev/null
+++ b/core/smart/detection/src/androidTest/assets/models/text/detect/det.ncnn.param
@@ -0,0 +1,191 @@
+7767517
+189 221
+Input                    in0                      0 1 in0
+Convolution              conv_0                   1 1 in0 1 0=8 1=3 11=3 12=1 13=2 14=1 2=1 3=2 4=1 5=1 6=216
+HardSwish                hswish_75                1 1 1 2 0=0.166667 1=0.5
+Split                    splitncnn_0              1 2 2 3 4
+Convolution              convrelu_0               1 1 4 5 0=8 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=64 9=1
+ConvolutionDepthWise     convdwrelu_0             1 1 5 6 0=8 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=72 7=8 9=1
+Convolution              conv_2                   1 1 6 7 0=8 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=64
+BinaryOp                 add_0                    2 1 3 7 8 0=0
+Convolution              convrelu_1               1 1 8 9 0=32 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=256 9=1
+ConvolutionDepthWise     convdwrelu_1             1 1 9 10 0=32 1=3 11=3 12=1 13=2 14=1 2=1 3=2 4=1 5=1 6=288 7=32 9=1
+Convolution              conv_4                   1 1 10 11 0=16 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=512
+Split                    splitncnn_1              1 2 11 12 13
+Convolution              convrelu_2               1 1 13 14 0=40 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=640 9=1
+ConvolutionDepthWise     convdwrelu_2             1 1 14 15 0=40 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=360 7=40 9=1
+Convolution              conv_6                   1 1 15 16 0=16 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=640
+BinaryOp                 add_1                    2 1 12 16 17 0=0
+Split                    splitncnn_2              1 2 17 18 19
+Convolution              convrelu_3               1 1 19 20 0=40 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=640 9=1
+ConvolutionDepthWise     convdwrelu_3             1 1 20 21 0=40 1=5 11=5 12=1 13=2 14=2 2=1 3=2 4=2 5=1 6=1000 7=40 9=1
+Convolution              conv_8                   1 1 21 22 0=24 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=960
+Split                    splitncnn_3              1 2 22 23 24
+Convolution              convrelu_4               1 1 24 25 0=64 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=1536 9=1
+ConvolutionDepthWise     convdwrelu_4             1 1 25 26 0=64 1=5 11=5 12=1 13=1 14=2 2=1 3=1 4=2 5=1 6=1600 7=64 9=1
+Convolution              conv_10                  1 1 26 27 0=24 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=1536
+BinaryOp                 add_2                    2 1 23 27 28 0=0
+Split                    splitncnn_4              1 2 28 29 30
+Convolution              convrelu_5               1 1 30 31 0=64 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=1536 9=1
+ConvolutionDepthWise     convdwrelu_5             1 1 31 32 0=64 1=5 11=5 12=1 13=1 14=2 2=1 3=1 4=2 5=1 6=1600 7=64 9=1
+Convolution              conv_12                  1 1 32 33 0=24 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=1536
+BinaryOp                 add_3                    2 1 29 33 34 0=0
+Split                    splitncnn_5              1 2 34 35 36
+Convolution              conv_13                  1 1 36 37 0=120 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=2880
+HardSwish                hswish_76                1 1 37 38 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_138               1 1 38 39 0=120 1=3 11=3 12=1 13=2 14=1 2=1 3=2 4=1 5=1 6=1080 7=120
+HardSwish                hswish_77                1 1 39 40 0=0.166667 1=0.5
+Convolution              conv_14                  1 1 40 41 0=40 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=4800
+Split                    splitncnn_6              1 2 41 42 43
+Convolution              conv_15                  1 1 43 44 0=104 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=4160
+HardSwish                hswish_78                1 1 44 45 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_139               1 1 45 46 0=104 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=936 7=104
+HardSwish                hswish_79                1 1 46 47 0=0.166667 1=0.5
+Convolution              conv_16                  1 1 47 48 0=40 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=4160
+BinaryOp                 add_4                    2 1 42 48 49 0=0
+Split                    splitncnn_7              1 2 49 50 51
+Convolution              conv_17                  1 1 51 52 0=96 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=3840
+HardSwish                hswish_80                1 1 52 53 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_140               1 1 53 54 0=96 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=864 7=96
+HardSwish                hswish_81                1 1 54 55 0=0.166667 1=0.5
+Convolution              conv_18                  1 1 55 56 0=40 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=3840
+BinaryOp                 add_5                    2 1 50 56 57 0=0
+Split                    splitncnn_8              1 2 57 58 59
+Convolution              conv_19                  1 1 59 60 0=96 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=3840
+HardSwish                hswish_82                1 1 60 61 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_141               1 1 61 62 0=96 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=864 7=96
+HardSwish                hswish_83                1 1 62 63 0=0.166667 1=0.5
+Convolution              conv_20                  1 1 63 64 0=40 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=3840
+BinaryOp                 add_6                    2 1 58 64 65 0=0
+Convolution              conv_21                  1 1 65 66 0=240 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=9600
+HardSwish                hswish_84                1 1 66 67 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_142               1 1 67 68 0=240 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=2160 7=240
+HardSwish                hswish_85                1 1 68 69 0=0.166667 1=0.5
+Convolution              conv_22                  1 1 69 70 0=56 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=13440
+Split                    splitncnn_9              1 2 70 71 72
+Convolution              conv_23                  1 1 72 73 0=336 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=18816
+HardSwish                hswish_86                1 1 73 74 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_143               1 1 74 75 0=336 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=3024 7=336
+HardSwish                hswish_87                1 1 75 76 0=0.166667 1=0.5
+Convolution              conv_24                  1 1 76 77 0=56 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=18816
+BinaryOp                 add_7                    2 1 71 77 78 0=0
+Split                    splitncnn_10             1 2 78 79 80
+Convolution              conv_25                  1 1 80 81 0=336 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=18816
+HardSwish                hswish_88                1 1 81 82 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_144               1 1 82 83 0=336 1=5 11=5 12=1 13=2 14=2 2=1 3=2 4=2 5=1 6=8400 7=336
+HardSwish                hswish_89                1 1 83 84 0=0.166667 1=0.5
+Convolution              conv_26                  1 1 84 85 0=80 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=26880
+Split                    splitncnn_11             1 2 85 86 87
+Convolution              conv_27                  1 1 87 88 0=480 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=38400
+HardSwish                hswish_90                1 1 88 89 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_145               1 1 89 90 0=480 1=5 11=5 12=1 13=1 14=2 2=1 3=1 4=2 5=1 6=12000 7=480
+HardSwish                hswish_91                1 1 90 91 0=0.166667 1=0.5
+Convolution              conv_28                  1 1 91 92 0=80 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=38400
+BinaryOp                 add_8                    2 1 86 92 93 0=0
+Split                    splitncnn_12             1 2 93 94 95
+Convolution              conv_29                  1 1 95 96 0=480 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=38400
+HardSwish                hswish_92                1 1 96 97 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_146               1 1 97 98 0=480 1=5 11=5 12=1 13=1 14=2 2=1 3=1 4=2 5=1 6=12000 7=480
+HardSwish                hswish_93                1 1 98 99 0=0.166667 1=0.5
+Convolution              conv_30                  1 1 99 100 0=80 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=38400
+BinaryOp                 add_9                    2 1 94 100 101 0=0
+Convolution              conv_31                  1 1 101 102 0=480 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=38400
+HardSwish                hswish_94                1 1 102 103 0=0.166667 1=0.5
+Convolution              conv_32                  1 1 103 104 0=96 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=0 6=46080
+Split                    splitncnn_13             1 3 104 105 106 107
+Pooling                  gap_59                   1 1 107 108 0=1 4=1
+Convolution              convrelu_6               1 1 108 109 0=24 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=2304 9=1
+Convolution              conv_34                  1 1 109 110 0=96 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=2304
+Reshape                  reshape_124              1 1 110 111 0=1 1=1 2=-1
+BinaryOp                 mul_10                   1 1 111 112 0=2 1=1 2=1.2
+HardSigmoid              hsigmoid_67              1 1 112 113 0=0.166667 1=0.5
+BinaryOp                 mul_11                   2 1 105 113 114 0=2
+BinaryOp                 add_12                   2 1 106 114 115 0=0
+Split                    splitncnn_14             1 2 115 116 117
+Convolution              conv_35                  1 1 79 118 0=96 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=0 6=5376
+Split                    splitncnn_15             1 3 118 119 120 121
+Pooling                  gap_60                   1 1 121 122 0=1 4=1
+Convolution              convrelu_7               1 1 122 123 0=24 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=2304 9=1
+Convolution              conv_37                  1 1 123 124 0=96 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=2304
+Reshape                  reshape_125              1 1 124 125 0=1 1=1 2=-1
+BinaryOp                 mul_13                   1 1 125 126 0=2 1=1 2=1.2
+HardSigmoid              hsigmoid_68              1 1 126 127 0=0.166667 1=0.5
+Convolution              conv_38                  1 1 35 128 0=96 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=0 6=2304
+Split                    splitncnn_16             1 3 128 129 130 131
+Pooling                  gap_61                   1 1 131 132 0=1 4=1
+Convolution              convrelu_8               1 1 132 133 0=24 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=2304 9=1
+Convolution              conv_40                  1 1 133 134 0=96 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=2304
+Reshape                  reshape_126              1 1 134 135 0=1 1=1 2=-1
+BinaryOp                 mul_14                   1 1 135 136 0=2 1=1 2=1.2
+HardSigmoid              hsigmoid_69              1 1 136 137 0=0.166667 1=0.5
+Convolution              conv_41                  1 1 18 138 0=96 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=0 6=1536
+Split                    splitncnn_17             1 3 138 139 140 141
+Pooling                  gap_62                   1 1 141 142 0=1 4=1
+Convolution              convrelu_9               1 1 142 143 0=24 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=2304 9=1
+Convolution              conv_43                  1 1 143 144 0=96 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=2304
+Reshape                  reshape_127              1 1 144 145 0=1 1=1 2=-1
+BinaryOp                 mul_15                   1 1 145 146 0=2 1=1 2=1.2
+HardSigmoid              hsigmoid_70              1 1 146 147 0=0.166667 1=0.5
+Interp                   interpolate_95           1 1 117 148 0=1 1=2.0 2=2.0 6=0
+BinaryOp                 mul_16                   2 1 119 127 149 0=2
+BinaryOp                 add_17                   2 1 120 149 150 0=0
+BinaryOp                 add_18                   2 1 150 148 151 0=0
+Split                    splitncnn_18             1 2 151 152 153
+Interp                   interpolate_96           1 1 153 154 0=1 1=2.0 2=2.0 6=0
+BinaryOp                 mul_19                   2 1 129 137 155 0=2
+BinaryOp                 add_20                   2 1 130 155 156 0=0
+BinaryOp                 add_21                   2 1 156 154 157 0=0
+Split                    splitncnn_19             1 2 157 158 159
+Interp                   interpolate_97           1 1 159 160 0=1 1=2.0 2=2.0 6=0
+BinaryOp                 mul_22                   2 1 139 147 161 0=2
+BinaryOp                 add_23                   2 1 140 161 162 0=0
+BinaryOp                 add_24                   2 1 162 160 163 0=0
+Convolution              conv_44                  1 1 116 164 0=24 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=0 6=20736
+Split                    splitncnn_20             1 3 164 165 166 167
+Pooling                  gap_63                   1 1 167 168 0=1 4=1
+Convolution              convrelu_10              1 1 168 169 0=6 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=144 9=1
+Convolution              conv_46                  1 1 169 170 0=24 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=144
+Reshape                  reshape_128              1 1 170 171 0=1 1=1 2=-1
+BinaryOp                 mul_25                   1 1 171 172 0=2 1=1 2=1.2
+HardSigmoid              hsigmoid_71              1 1 172 173 0=0.166667 1=0.5
+BinaryOp                 mul_26                   2 1 165 173 174 0=2
+BinaryOp                 add_27                   2 1 166 174 175 0=0
+Convolution              conv_47                  1 1 152 176 0=24 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=0 6=20736
+Split                    splitncnn_21             1 3 176 177 178 179
+Pooling                  gap_64                   1 1 179 180 0=1 4=1
+Convolution              convrelu_11              1 1 180 181 0=6 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=144 9=1
+Convolution              conv_49                  1 1 181 182 0=24 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=144
+Reshape                  reshape_129              1 1 182 183 0=1 1=1 2=-1
+BinaryOp                 mul_28                   1 1 183 184 0=2 1=1 2=1.2
+HardSigmoid              hsigmoid_72              1 1 184 185 0=0.166667 1=0.5
+BinaryOp                 mul_29                   2 1 177 185 186 0=2
+BinaryOp                 add_30                   2 1 178 186 187 0=0
+Convolution              conv_50                  1 1 158 188 0=24 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=0 6=20736
+Split                    splitncnn_22             1 3 188 189 190 191
+Pooling                  gap_65                   1 1 191 192 0=1 4=1
+Convolution              convrelu_12              1 1 192 193 0=6 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=144 9=1
+Convolution              conv_52                  1 1 193 194 0=24 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=144
+Reshape                  reshape_130              1 1 194 195 0=1 1=1 2=-1
+BinaryOp                 mul_31                   1 1 195 196 0=2 1=1 2=1.2
+HardSigmoid              hsigmoid_73              1 1 196 197 0=0.166667 1=0.5
+BinaryOp                 mul_32                   2 1 189 197 198 0=2
+BinaryOp                 add_33                   2 1 190 198 199 0=0
+Convolution              conv_53                  1 1 163 200 0=24 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=0 6=20736
+Split                    splitncnn_23             1 3 200 201 202 203
+Pooling                  gap_66                   1 1 203 204 0=1 4=1
+Convolution              convrelu_13              1 1 204 205 0=6 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=144 9=1
+Convolution              conv_55                  1 1 205 206 0=24 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=144
+Reshape                  reshape_131              1 1 206 207 0=1 1=1 2=-1
+BinaryOp                 mul_34                   1 1 207 208 0=2 1=1 2=1.2
+HardSigmoid              hsigmoid_74              1 1 208 209 0=0.166667 1=0.5
+BinaryOp                 mul_35                   2 1 201 209 210 0=2
+BinaryOp                 add_36                   2 1 202 210 211 0=0
+Interp                   interpolate_98           1 1 175 212 0=1 1=8.0 2=8.0 6=0
+Interp                   interpolate_99           1 1 187 213 0=1 1=4.0 2=4.0 6=0
+Interp                   interpolate_100          1 1 199 214 0=1 1=2.0 2=2.0 6=0
+Concat                   cat_0                    4 1 212 213 214 211 215 0=0
+Convolution              convrelu_14              1 1 215 216 0=24 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=20736 9=1
+Deconvolution            deconvrelu_0             1 1 216 217 0=24 1=2 11=2 12=1 13=2 14=0 18=0 19=0 2=1 3=2 4=0 5=1 6=2304 9=1
+Deconvolution            deconv_58                1 1 217 218 0=1 1=2 11=2 12=1 13=2 14=0 18=0 19=0 2=1 3=2 4=0 5=0 6=96
+BinaryOp                 add_37                   1 1 218 219 0=0 1=1 2=0.220869
+Sigmoid                  sigmoid_123              1 1 219 out0
diff --git a/core/smart/detection/src/androidTest/assets/models/text/recognize/latin/dict.txt b/core/smart/detection/src/androidTest/assets/models/text/recognize/latin/dict.txt
new file mode 100644
index 000000000..e166bf33e
--- /dev/null
+++ b/core/smart/detection/src/androidTest/assets/models/text/recognize/latin/dict.txt
@@ -0,0 +1,185 @@
+ 
+!
+"
+#
+$
+%
+&
+'
+(
+)
+*
++
+,
+-
+.
+/
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+:
+;
+<
+=
+>
+?
+@
+A
+B
+C
+D
+E
+F
+G
+H
+I
+J
+K
+L
+M
+N
+O
+P
+Q
+R
+S
+T
+U
+V
+W
+X
+Y
+Z
+[
+]
+_
+`
+a
+b
+c
+d
+e
+f
+g
+h
+i
+j
+k
+l
+m
+n
+o
+p
+q
+r
+s
+t
+u
+v
+w
+x
+y
+z
+{
+}
+¡
+£
+§
+ª
+«
+­
+°
+²
+³
+´
+µ
+·
+º
+»
+¿
+À
+Á
+Â
+Ä
+Å
+Ç
+È
+É
+Ê
+Ë
+Ì
+Í
+Î
+Ï
+Ò
+Ó
+Ô
+Õ
+Ö
+Ú
+Ü
+Ý
+ß
+à
+á
+â
+ã
+ä
+å
+æ
+ç
+è
+é
+ê
+ë
+ì
+í
+î
+ï
+ñ
+ò
+ó
+ô
+õ
+ö
+ø
+ù
+ú
+û
+ü
+ý
+ą
+Ć
+ć
+Č
+č
+Đ
+đ
+ę
+ı
+Ł
+ł
+ō
+Œ
+œ
+Š
+š
+Ÿ
+Ž
+ž
+ʒ
+β
+δ
+ε
+з
+Ṡ
+‘
+€
+™
diff --git a/core/smart/detection/src/androidTest/assets/models/text/recognize/latin/rec.ncnn.bin b/core/smart/detection/src/androidTest/assets/models/text/recognize/latin/rec.ncnn.bin
new file mode 100644
index 000000000..bc482a49f
Binary files /dev/null and b/core/smart/detection/src/androidTest/assets/models/text/recognize/latin/rec.ncnn.bin differ
diff --git a/core/smart/detection/src/androidTest/assets/models/text/recognize/latin/rec.ncnn.param b/core/smart/detection/src/androidTest/assets/models/text/recognize/latin/rec.ncnn.param
new file mode 100644
index 000000000..3ba0852bd
--- /dev/null
+++ b/core/smart/detection/src/androidTest/assets/models/text/recognize/latin/rec.ncnn.param
@@ -0,0 +1,113 @@
+7767517
+111 118
+Input                    in0                      0 1 in0
+Convolution              conv_5                   1 1 in0 1 0=16 1=3 11=3 12=1 13=2 14=1 2=1 3=2 4=1 5=1 6=432
+HardSwish                hswish_40                1 1 1 2 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_85                1 1 2 3 0=16 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=144 7=16
+HardSwish                hswish_41                1 1 3 4 0=0.166667 1=0.5
+Convolution              conv_6                   1 1 4 5 0=32 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=512
+HardSwish                hswish_42                1 1 5 6 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_86                1 1 6 7 0=32 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=288 7=32
+HardSwish                hswish_43                1 1 7 8 0=0.166667 1=0.5
+Convolution              conv_7                   1 1 8 9 0=64 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=2048
+HardSwish                hswish_44                1 1 9 10 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_87                1 1 10 11 0=64 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=576 7=64
+HardSwish                hswish_45                1 1 11 12 0=0.166667 1=0.5
+Convolution              conv_8                   1 1 12 13 0=64 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=4096
+HardSwish                hswish_46                1 1 13 14 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_88                1 1 14 15 0=64 1=3 11=3 12=1 13=2 14=1 2=1 3=1 4=1 5=1 6=576 7=64
+HardSwish                hswish_47                1 1 15 16 0=0.166667 1=0.5
+Convolution              conv_9                   1 1 16 17 0=128 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=8192
+HardSwish                hswish_48                1 1 17 18 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_89                1 1 18 19 0=128 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=1152 7=128
+HardSwish                hswish_49                1 1 19 20 0=0.166667 1=0.5
+Convolution              conv_10                  1 1 20 21 0=128 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=16384
+HardSwish                hswish_50                1 1 21 22 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_90                1 1 22 23 0=128 1=3 11=3 12=1 13=2 14=1 2=1 3=1 4=1 5=1 6=1152 7=128
+HardSwish                hswish_51                1 1 23 24 0=0.166667 1=0.5
+Convolution              conv_11                  1 1 24 25 0=256 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=32768
+HardSwish                hswish_52                1 1 25 26 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_91                1 1 26 27 0=256 1=5 11=5 12=1 13=1 14=2 2=1 3=1 4=2 5=1 6=6400 7=256
+HardSwish                hswish_53                1 1 27 28 0=0.166667 1=0.5
+Convolution              conv_12                  1 1 28 29 0=256 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=65536
+HardSwish                hswish_54                1 1 29 30 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_92                1 1 30 31 0=256 1=5 11=5 12=1 13=1 14=2 2=1 3=1 4=2 5=1 6=6400 7=256
+HardSwish                hswish_55                1 1 31 32 0=0.166667 1=0.5
+Convolution              conv_13                  1 1 32 33 0=256 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=65536
+HardSwish                hswish_56                1 1 33 34 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_93                1 1 34 35 0=256 1=5 11=5 12=1 13=1 14=2 2=1 3=1 4=2 5=1 6=6400 7=256
+HardSwish                hswish_57                1 1 35 36 0=0.166667 1=0.5
+Convolution              conv_14                  1 1 36 37 0=256 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=65536
+HardSwish                hswish_58                1 1 37 38 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_94                1 1 38 39 0=256 1=5 11=5 12=1 13=1 14=2 2=1 3=1 4=2 5=1 6=6400 7=256
+HardSwish                hswish_59                1 1 39 40 0=0.166667 1=0.5
+Convolution              conv_15                  1 1 40 41 0=256 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=65536
+HardSwish                hswish_60                1 1 41 42 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_95                1 1 42 43 0=256 1=5 11=5 12=1 13=1 14=2 2=1 3=1 4=2 5=1 6=6400 7=256
+HardSwish                hswish_61                1 1 43 44 0=0.166667 1=0.5
+Convolution              conv_16                  1 1 44 45 0=256 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=65536
+HardSwish                hswish_62                1 1 45 46 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_96                1 1 46 47 0=256 1=5 11=5 12=1 13=2 14=2 2=1 3=1 4=2 5=1 6=6400 7=256
+HardSwish                hswish_63                1 1 47 48 0=0.166667 1=0.5
+Split                    splitncnn_0              1 2 48 49 50
+Pooling                  gap_35                   1 1 50 51 0=1 4=1
+Convolution              convrelu_0               1 1 51 52 0=64 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=16384 9=1
+Convolution              conv_18                  1 1 52 53 0=256 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=16384
+HardSigmoid              hsigmoid_38              1 1 53 54 0=0.166667 1=0.5
+Reshape                  reshape_80               1 1 54 55 0=1 1=1 2=-1
+BinaryOp                 mul_0                    2 1 49 55 56 0=2
+Convolution              conv_19                  1 1 56 57 0=512 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=131072
+HardSwish                hswish_64                1 1 57 58 0=0.166667 1=0.5
+ConvolutionDepthWise     convdw_97                1 1 58 59 0=512 1=5 11=5 12=1 13=1 14=2 2=1 3=2 4=2 5=1 6=12800 7=512
+HardSwish                hswish_65                1 1 59 60 0=0.166667 1=0.5
+Split                    splitncnn_1              1 2 60 61 62
+Pooling                  gap_36                   1 1 62 63 0=1 4=1
+Convolution              convrelu_1               1 1 63 64 0=128 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=65536 9=1
+Convolution              conv_21                  1 1 64 65 0=512 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=65536
+HardSigmoid              hsigmoid_39              1 1 65 66 0=0.166667 1=0.5
+Reshape                  reshape_81               1 1 66 67 0=1 1=1 2=-1
+BinaryOp                 mul_1                    2 1 61 67 68 0=2
+Convolution              conv_22                  1 1 68 69 0=512 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=262144
+HardSwish                hswish_66                1 1 69 70 0=0.166667 1=0.5
+Pooling                  avgpool2d_37             1 1 70 71 0=1 1=2 11=2 12=2 13=0 2=2 3=0 5=1 6=0
+Split                    splitncnn_2              1 2 71 72 73
+Convolution              conv_23                  1 1 73 74 0=64 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=294912
+Swish                    silu_69                  1 1 74 75
+Convolution              conv_24                  1 1 75 76 0=120 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=7680
+Swish                    silu_70                  1 1 76 77
+Reshape                  reshape_82               1 1 77 78 0=40 1=120
+Permute                  permute_77               1 1 78 79 0=1
+Split                    splitncnn_3              1 2 79 80 81
+LayerNorm                ln_28                    1 1 81 82 0=120 1=1.000000e-05 2=1
+MultiHeadAttention       attention_33             1 1 82 83 0=120 1=8 2=14400 3=120 4=120
+BinaryOp                 add_2                    2 1 80 83 84 0=0
+Split                    splitncnn_4              1 2 84 85 86
+LayerNorm                ln_29                    1 1 86 87 0=120 1=1.000000e-05 2=1
+Gemm                     gemm_0                   1 1 87 88 10=4 2=0 3=1 4=0 5=1 6=1 7=40 8=240 9=120
+Swish                    silu_71                  1 1 88 89
+Gemm                     gemm_1                   1 1 89 90 10=4 2=0 3=1 4=0 5=1 6=1 7=40 8=120 9=240
+BinaryOp                 add_3                    2 1 85 90 91 0=0
+Split                    splitncnn_5              1 2 91 92 93
+LayerNorm                ln_30                    1 1 93 94 0=120 1=1.000000e-05 2=1
+MultiHeadAttention       attention_34             1 1 94 95 0=120 1=8 2=14400 3=120 4=120
+BinaryOp                 add_4                    2 1 92 95 96 0=0
+Split                    splitncnn_6              1 2 96 97 98
+LayerNorm                ln_31                    1 1 98 99 0=120 1=1.000000e-05 2=1
+Gemm                     gemm_2                   1 1 99 100 10=4 2=0 3=1 4=0 5=1 6=1 7=40 8=240 9=120
+Swish                    silu_72                  1 1 100 101
+Gemm                     gemm_3                   1 1 101 102 10=4 2=0 3=1 4=0 5=1 6=1 7=40 8=120 9=240
+BinaryOp                 add_5                    2 1 97 102 103 0=0
+LayerNorm                ln_32                    1 1 103 104 0=120 1=1.000000e-06 2=1
+Reshape                  reshape_83               1 1 104 105 0=120 1=40 2=1
+Permute                  permute_78               1 1 105 106 0=4
+Convolution              conv_25                  1 1 106 107 0=512 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=61440
+Swish                    silu_73                  1 1 107 108
+Concat                   cat_0                    2 1 72 108 109 0=0
+Convolution              conv_26                  1 1 109 110 0=64 1=3 11=3 12=1 13=1 14=1 2=1 3=1 4=1 5=1 6=589824
+Swish                    silu_74                  1 1 110 111
+Convolution              conv_27                  1 1 111 112 0=64 1=1 11=1 12=1 13=1 14=0 2=1 3=1 4=0 5=1 6=4096
+Swish                    silu_75                  1 1 112 113
+Squeeze                  squeeze_84               1 1 113 114 -23303=1,1
+Permute                  permute_79               1 1 114 115 0=1
+Gemm                     gemm_4                   1 1 115 116 10=4 2=0 3=1 4=0 5=1 6=1 7=40 8=187 9=64
+Softmax                  softmax_76               1 1 116 out0 0=1 1=1
diff --git a/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/NumberMatcherTests.kt b/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/NumberMatcherTests.kt
new file mode 100644
index 000000000..45c754bc1
--- /dev/null
+++ b/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/NumberMatcherTests.kt
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2026 Kevin Buzeau
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.buzbuz.smartautoclicker.core.detection
+
+import android.content.Context
+import android.graphics.Bitmap
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.test.platform.app.InstrumentationRegistry
+import com.buzbuz.smartautoclicker.core.detection.data.NumberTestCase
+import com.buzbuz.smartautoclicker.core.detection.data.TestImage
+import com.buzbuz.smartautoclicker.core.detection.utils.extractTestOcrModels
+import com.buzbuz.smartautoclicker.core.detection.utils.loadTestBitmap
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@LargeTest
+@RunWith(AndroidJUnit4::class)
+class NumberMatcherTests {
+
+    private lateinit var context: Context
+    private lateinit var testedDetector: ImageDetector
+    private lateinit var screenBitmap: Bitmap
+
+    @Before
+    fun setUp() {
+        context = InstrumentationRegistry.getInstrumentation().targetContext
+        testedDetector = NativeDetector.newInstance()
+            ?: throw IllegalStateException("Can't instantiate detector for tests")
+
+        testedDetector.init()
+
+        val (detectModelPath, recognitionModels) = context.extractTestOcrModels()
+        val modelsLoaded = testedDetector.loadTextDetectionModels(detectModelPath, recognitionModels)
+        assertTrue("OCR models failed to load", modelsLoaded)
+
+        screenBitmap = context.loadTestBitmap(TestImage.NumberConditionsScreen)
+        testedDetector.setScreenBitmap(screenBitmap, "")
+    }
+
+    @After
+    fun tearDown() {
+        testedDetector.close()
+    }
+
+    @Test
+    fun detection_Number_42_Auto() {
+        assertNumberDetected(TestImage.NumberConditionsScreen.numberTestCases[0])
+    }
+
+    @Test
+    fun detection_Number_42dot5_DotDecimal() {
+        assertNumberDetected(TestImage.NumberConditionsScreen.numberTestCases[1])
+    }
+
+    @Test
+    fun detection_Number_42comma5_CommaDecimal() {
+        assertNumberDetected(TestImage.NumberConditionsScreen.numberTestCases[2])
+    }
+
+    @Test
+    fun detection_Number_42dot588_DotDecimal() {
+        assertNumberDetected(TestImage.NumberConditionsScreen.numberTestCases[3])
+    }
+
+    @Test
+    fun detection_Number_42comma588_CommaDecimal() {
+        assertNumberDetected(TestImage.NumberConditionsScreen.numberTestCases[4])
+    }
+
+    @Test
+    fun detection_Number_1dot234dot567comma890_CommaDecimal() {
+        assertNumberDetected(TestImage.NumberConditionsScreen.numberTestCases[5])
+    }
+
+    @Test
+    fun detection_Number_1comma234comma567dot890_DotDecimal() {
+        assertNumberDetected(TestImage.NumberConditionsScreen.numberTestCases[6])
+    }
+
+    private fun assertNumberDetected(testCase: NumberTestCase) {
+        val result = testedDetector.detectNumber(
+            detectionArea = testCase.detectionArea,
+            threshold = 0,
+            numberFormatType = testCase.numberFormatType,
+        )
+
+        assertTrue("Number not detected in area ${testCase.detectionArea}", result.isDetected)
+        assertNotNull("numberDetected is null for area ${testCase.detectionArea}", result.numberDetected)
+        assertEquals(
+            "Wrong value detected for area ${testCase.detectionArea}",
+            testCase.expectedValue,
+            result.numberDetected!!,
+            DETECTION_NUMBER_DELTA,
+        )
+    }
+
+    private companion object {
+        const val DETECTION_NUMBER_DELTA = 0.001
+    }
+}
diff --git a/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/data/TestImages.kt b/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/data/TestImages.kt
index dd5aecb61..6bbcad5b7 100644
--- a/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/data/TestImages.kt
+++ b/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/data/TestImages.kt
@@ -17,8 +17,10 @@
 package com.buzbuz.smartautoclicker.core.detection.data
 
 import android.graphics.Point
+import android.graphics.Rect
 import androidx.annotation.RawRes
 
+import com.buzbuz.smartautoclicker.core.detection.NumberFormatType
 import com.buzbuz.smartautoclicker.core.detection.test.R
 
 /**
@@ -27,7 +29,7 @@ import com.buzbuz.smartautoclicker.core.detection.test.R
  * @param fileRes the resource of the raw image file. Must be generated using the Klickr screen capture.
  * @param size the size of the image, in pixels.
  */
-internal sealed class TestImage(@RawRes val fileRes: Int, val size: Point) {
+internal sealed class TestImage(@field:RawRes val fileRes: Int, val size: Point) {
 
     /** Describe the images used as screen capture. */
     sealed class Screen(fileRes: Int, size: Point) : TestImage(fileRes, size) {
@@ -65,9 +67,42 @@ internal sealed class TestImage(@RawRes val fileRes: Int, val size: Point) {
             expectedResults = emptyMap(),
         )
     }
+
+    /**
+     * Screen capture containing all number detection test cases stacked vertically.
+     * Generated by NumberBitmapGenerator; each row is 107px tall with 20px gaps between rows.
+     * Use [numberTestCases] to get the detection area and expected value for each case.
+     */
+    data object NumberConditionsScreen : TestImage(
+        fileRes = R.raw.screen_text_conditions,
+        size = Point(417, 869),
+    ) {
+        val numberTestCases: List<NumberTestCase> = listOf(
+            NumberTestCase(detectionArea = rowRect(0),  expectedValue = 42.0,          numberFormatType = NumberFormatType.AUTO),
+            NumberTestCase(detectionArea = rowRect(1),  expectedValue = 42.5,          numberFormatType = NumberFormatType.DOT_DECIMAL),
+            NumberTestCase(detectionArea = rowRect(2),  expectedValue = 42.5,          numberFormatType = NumberFormatType.COMMA_DECIMAL),
+            NumberTestCase(detectionArea = rowRect(3),  expectedValue = 42.588,        numberFormatType = NumberFormatType.DOT_DECIMAL),
+            NumberTestCase(detectionArea = rowRect(4),  expectedValue = 42.588,        numberFormatType = NumberFormatType.COMMA_DECIMAL),
+            NumberTestCase(detectionArea = rowRect(5),  expectedValue = 1_234_567.890, numberFormatType = NumberFormatType.COMMA_DECIMAL),
+            NumberTestCase(detectionArea = rowRect(6),  expectedValue = 1_234_567.890, numberFormatType = NumberFormatType.DOT_DECIMAL),
+        )
+
+        private fun rowRect(index: Int): Rect {
+            val rowHeight = 107
+            val rowGap    = 20
+            val top = index * (rowHeight + rowGap)
+            return Rect(0, top, size.x, top + rowHeight)
+        }
+    }
 }
 
 internal data class ExpectedDetectionResults(
     val centerPosition: Point,
     val quality: Double,
 )
+
+internal data class NumberTestCase(
+    val detectionArea: Rect,
+    val expectedValue: Double,
+    val numberFormatType: NumberFormatType,
+)
diff --git a/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/utils/Extensions.kt b/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/utils/Extensions.kt
index 9f1131dcb..e3003cd94 100644
--- a/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/utils/Extensions.kt
+++ b/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/utils/Extensions.kt
@@ -20,6 +20,7 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import com.buzbuz.smartautoclicker.core.detection.data.TestImage
+import java.io.File
 
 
 internal fun Context.loadTestBitmap(image: TestImage) : Bitmap {
@@ -28,3 +29,32 @@ internal fun Context.loadTestBitmap(image: TestImage) : Bitmap {
             ?: throw IllegalArgumentException("Test image file ${image.fileRes} can't be decoded")
     }
 }
+
+/**
+ * Extracts the bundled OCR model assets to the device filesystem and returns the paths required
+ * by [com.buzbuz.smartautoclicker.core.detection.ImageDetector.loadTextDetectionModels].
+ *
+ * @return Pair of (detectionModelDirPath, recognitionModels map).
+ */
+internal fun Context.extractTestOcrModels(): Pair<String, Map<String, String>> {
+    val modelsRoot = File(cacheDir, "test_ocr_models")
+
+    val detectDir = File(modelsRoot, "detect").also { it.mkdirs() }
+    val latinDir  = File(modelsRoot, "recognize/latin").also { it.mkdirs() }
+
+    copyAssetDir("models/text/detect",          detectDir)
+    copyAssetDir("models/text/recognize/latin", latinDir)
+
+    return detectDir.absolutePath to mapOf("latin" to latinDir.absolutePath)
+}
+
+private fun Context.copyAssetDir(assetDir: String, targetDir: File) {
+    assets.list(assetDir)?.forEach { filename ->
+        val target = File(targetDir, filename)
+        if (!target.exists()) {
+            assets.open("$assetDir/$filename").use { input ->
+                target.outputStream().use { output -> input.copyTo(output) }
+            }
+        }
+    }
+}
diff --git a/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/utils/NumberBitmapGenerator.kt b/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/utils/NumberBitmapGenerator.kt
new file mode 100644
index 000000000..3c164771c
--- /dev/null
+++ b/core/smart/detection/src/androidTest/java/com/buzbuz/smartautoclicker/core/detection/utils/NumberBitmapGenerator.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2026 Kevin Buzeau
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.buzbuz.smartautoclicker.core.detection.utils
+
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.Typeface
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Test
+import java.io.File
+
+/**
+ * One-shot utility; not a real test.
+ * Run it once on the emulator to regenerate screen_text_conditions.png, then pull with:
+ *   adb pull /data/local/tmp/number_test_images/screen_text_conditions.png
+ * and copy it into core/smart/detection/src/androidTest/res/raw/.
+ *
+ * Layout: numbers from [NUMBERS] stacked vertically, each row [ROW_HEIGHT]px tall,
+ * with [ROW_GAP]px between rows. Detection areas match [TestImage.NumberConditionsScreen.numberTestCases].
+ */
+class NumberBitmapGenerator {
+
+    @Test
+    fun generateNumberImages() {
+        val outputDir = File("/data/local/tmp/number_test_images").also { it.mkdirs() }
+        val bitmap = renderNumberScreen()
+        File(outputDir, "screen_text_conditions.png").outputStream().use { out ->
+            bitmap.compress(Bitmap.CompressFormat.PNG, 100, out)
+        }
+        android.util.Log.i("NumberBitmapGenerator", "Saved screen_text_conditions.png (${bitmap.width}x${bitmap.height})")
+    }
+}
+
+private val NUMBERS = listOf(
+    "42",
+    "42.5",
+    "42,5",
+    "42.588",
+    "42,588",
+    "1.234.567,890",
+    "1,234,567.890",
+)
+
+private const val FONT_SIZE = 48f
+private const val PADDING   = 20
+private const val ROW_GAP   = 20
+
+internal fun renderNumberScreen(): Bitmap {
+    val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.BLACK
+        textSize = FONT_SIZE
+        typeface = Typeface.MONOSPACE
+    }
+
+    val fm = paint.fontMetrics
+    val rowHeight = (-fm.ascent + fm.descent).toInt() + PADDING * 2
+    val canvasW = NUMBERS.maxOf { paint.measureText(it).toInt() } + PADDING * 2
+    val canvasH = rowHeight * NUMBERS.size + ROW_GAP * (NUMBERS.size - 1)
+
+    val bitmap = Bitmap.createBitmap(canvasW, canvasH, Bitmap.Config.ARGB_8888)
+    Canvas(bitmap).apply {
+        drawColor(Color.WHITE)
+        NUMBERS.forEachIndexed { index, text ->
+            val rowY = index * (rowHeight + ROW_GAP)
+            val baseline = rowY + PADDING + (-fm.ascent)
+            drawText(text, PADDING.toFloat(), baseline, paint)
+        }
+    }
+    return bitmap
+}
diff --git a/core/smart/detection/src/androidTest/res/raw/screen_text_conditions.png b/core/smart/detection/src/androidTest/res/raw/screen_text_conditions.png
new file mode 100644
index 000000000..143c6d089
Binary files /dev/null and b/core/smart/detection/src/androidTest/res/raw/screen_text_conditions.png differ
diff --git a/core/smart/detection/src/main/cpp/detector/detector.cpp b/core/smart/detection/src/main/cpp/detector/detector.cpp
index 88bab7228..bfd7c584c 100644
--- a/core/smart/detection/src/main/cpp/detector/detector.cpp
+++ b/core/smart/detection/src/main/cpp/detector/detector.cpp
@@ -98,6 +98,6 @@ TextMatchingResult* Detector::detectText(const char* textCondition, const char*
             threshold);
 }
 
-TextMatchingResult* Detector::detectNumber(const cv::Rect& roi, int threshold) {
-    return textMatcher->matchNumber(*screenImage, roi, threshold);
+TextMatchingResult* Detector::detectNumber(const cv::Rect& roi, int threshold, NumberFormat numberFormat) {
+    return textMatcher->matchNumber(*screenImage, roi, threshold, numberFormat);
 }
diff --git a/core/smart/detection/src/main/cpp/detector/detector.hpp b/core/smart/detection/src/main/cpp/detector/detector.hpp
index aef3035af..f79be1b44 100644
--- a/core/smart/detection/src/main/cpp/detector/detector.hpp
+++ b/core/smart/detection/src/main/cpp/detector/detector.hpp
@@ -26,6 +26,7 @@
 #include "matching/template/template_matcher.hpp"
 #include "matching/template/template_matching_result.hpp"
 #include "matching/text/text_matcher.hpp"
+#include "matching/text/text_matching_result.hpp"
 #include "images/condition_image.hpp"
 #include "images/screen_image.hpp"
 
@@ -66,7 +67,7 @@ namespace smartautoclicker {
                 const cv::Rect &roi,
                 int threshold);
 
-        TextMatchingResult* detectNumber(const cv::Rect& roi, int threshold);
+        TextMatchingResult* detectNumber(const cv::Rect& roi, int threshold, NumberFormat numberFormat);
     };
 }
 
diff --git a/core/smart/detection/src/main/cpp/detector/matching/text/detection/text_detector.hpp b/core/smart/detection/src/main/cpp/detector/matching/text/detection/text_detector.hpp
index bc0eb16f6..5232c3480 100644
--- a/core/smart/detection/src/main/cpp/detector/matching/text/detection/text_detector.hpp
+++ b/core/smart/detection/src/main/cpp/detector/matching/text/detection/text_detector.hpp
@@ -75,7 +75,7 @@ namespace smartautoclicker {
         };
 
         cv::Mat kernelClose  = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(5, 9));
-        cv::Mat kernelDilate = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(30, 3));
+        cv::Mat kernelDilate = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(40, 3));
         cv::Mat kernelVertical = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(1, 11));
 
         /** NCNN text detector.*/
diff --git a/core/smart/detection/src/main/cpp/detector/matching/text/text_matcher.cpp b/core/smart/detection/src/main/cpp/detector/matching/text/text_matcher.cpp
index 22ca03ea2..e62a5c332 100644
--- a/core/smart/detection/src/main/cpp/detector/matching/text/text_matcher.cpp
+++ b/core/smart/detection/src/main/cpp/detector/matching/text/text_matcher.cpp
@@ -80,8 +80,9 @@ TextMatchingResult* TextMatcher::matchText(
 TextMatchingResult* TextMatcher::matchNumber(
         const ScreenImage& screenImage,
         const cv::Rect& detectionArea,
-        int threshold)
-{
+        int threshold,
+        NumberFormat numberFormat
+) {
     clearResults();
 
     if (!isInitialized() || !isRoiValidForMatching(screenImage.getRoi(), detectionArea)) {
@@ -103,7 +104,8 @@ TextMatchingResult* TextMatcher::matchNumber(
         if (!isNumber(recognizerResult.text)) continue;
 
         float score = recognizerResult.confidence * 100;
-        LOGD("TextMatcher", "Score=%f; recognized=%s", score, recognizerResult.text.c_str());
+        auto recognizedNumber = stringToDouble(recognizerResult.text, numberFormat);
+        LOGD("TextMatcher", "Score=%f; recognized=%f", score, recognizedNumber);
 
         // Score is below the best confidence, skip
         if (score < currentMatchingResult.getResultConfidence()) continue;
@@ -112,7 +114,7 @@ TextMatchingResult* TextMatcher::matchNumber(
                 detectionArea,
                 recognizerResult.boundingBox,
                 score,
-                stringToDouble(recognizerResult.text));
+                recognizedNumber);
 
         if ((int) score >= threshold) {
             currentMatchingResult.markResultAsDetected();
@@ -266,12 +268,53 @@ bool TextMatcher::isNumber(const std::string& text) {
     return hasDigit;
 }
 
-double TextMatcher::stringToDouble(const std::string& text) {
-    std::string sanitized = text;
+double TextMatcher::stringToDouble(const std::string& text, NumberFormat format) {
+    std::string s = text;
     // Remove spaces
-    sanitized.erase(std::remove(sanitized.begin(), sanitized.end(), ' '), sanitized.end());
-    // Replace comma with dot
-    std::replace(sanitized.begin(), sanitized.end(), ',', '.');
+    s.erase(std::remove(s.begin(), s.end(), ' '), s.end());
+
+    char decimalSep;
+    char thousandsSep;
+
+    if (format == NumberFormat::DOT_DECIMAL) {
+        decimalSep   = '.';
+        thousandsSep = ',';
+    } else if (format == NumberFormat::COMMA_DECIMAL) {
+        decimalSep   = ',';
+        thousandsSep = '.';
+    } else {
+        // AUTO: infer from structure.
+        // If both separators are present, the last one is the decimal separator.
+        size_t lastDot   = s.rfind('.');
+        size_t lastComma = s.rfind(',');
+
+        if (lastDot != std::string::npos && lastComma != std::string::npos) {
+            decimalSep   = (lastDot > lastComma) ? '.' : ',';
+            thousandsSep = (lastDot > lastComma) ? ',' : '.';
+        } else if (lastComma != std::string::npos) {
+            // Only a comma: thousands separator if exactly 3 digits follow it, else decimal.
+            size_t digitsAfterComma = s.size() - lastComma - 1;
+            if (digitsAfterComma == 3 && lastComma > 0) {
+                decimalSep   = '.';
+                thousandsSep = ',';
+            } else {
+                decimalSep   = ',';
+                thousandsSep = '.';
+            }
+        } else {
+            // Only a dot (or none): treat dot as decimal separator.
+            decimalSep   = '.';
+            thousandsSep = ',';
+        }
+    }
+
+    // Strip thousands separators, then normalise decimal separator to '.'.
+    std::string sanitized;
+    sanitized.reserve(s.size());
+    for (char c : s) {
+        if (c == thousandsSep) continue;
+        sanitized += (c == decimalSep) ? '.' : c;
+    }
 
     try {
         return std::stod(sanitized);
diff --git a/core/smart/detection/src/main/cpp/detector/matching/text/text_matcher.hpp b/core/smart/detection/src/main/cpp/detector/matching/text/text_matcher.hpp
index 1d3d1b941..7820adb7d 100644
--- a/core/smart/detection/src/main/cpp/detector/matching/text/text_matcher.hpp
+++ b/core/smart/detection/src/main/cpp/detector/matching/text/text_matcher.hpp
@@ -29,6 +29,13 @@
 
 namespace smartautoclicker {
 
+    /** How to interpret the decimal and thousands separators in a detected number string. */
+    enum class NumberFormat {
+        AUTO        = 0,
+        DOT_DECIMAL = 1,
+        COMMA_DECIMAL = 2,
+    };
+
     /**
      * Orchestrates the text matching process by combining text detection and recognition.
      * It locates text areas on the screen, converts them to strings using OCR, and compares
@@ -63,11 +70,13 @@ namespace smartautoclicker {
         static bool isNumber(const std::string& text);
 
         /**
-         * Parses a string into a double, removing spaces and handling commas.
+         * Parses a string into a double according to the given number format.
+         * AUTO infers the format from the structure of the string.
          * @param text The text to parse.
+         * @param format How to interpret decimal and thousands separators.
          * @return The double value, or std::numeric_limits<double>::lowest() on failure.
          */
-        static double stringToDouble(const std::string& text);
+        static double stringToDouble(const std::string& text, NumberFormat format);
 
         /**
          * Runs the text detection and recognition on a specific area of the screen.
@@ -156,7 +165,8 @@ namespace smartautoclicker {
         TextMatchingResult* matchNumber(
                 const ScreenImage& screenImage,
                 const cv::Rect& detectionArea,
-                int threshold);
+                int threshold,
+                NumberFormat numberFormat = NumberFormat::AUTO);
     };
 }
 
diff --git a/core/smart/detection/src/main/cpp/jni/jni_detector.cpp b/core/smart/detection/src/main/cpp/jni/jni_detector.cpp
index 645322993..cdfee7d66 100644
--- a/core/smart/detection/src/main/cpp/jni/jni_detector.cpp
+++ b/core/smart/detection/src/main/cpp/jni/jni_detector.cpp
@@ -33,7 +33,7 @@ extern "C" {
     JNIEXPORT jdoubleArray JNICALL Java_com_buzbuz_smartautoclicker_core_detection_NativeDetector_detectImageNative(JNIEnv *env, jobject self, jobject conditionBitmap, jint conditionWidth, jint conditionHeight, jint x, jint y, jint width, jint height, jint threshold);
     JNIEXPORT jdoubleArray JNICALL Java_com_buzbuz_smartautoclicker_core_detection_NativeDetector_detectColorNative(JNIEnv *env, jobject self, jint conditionColor, jint x, jint y, jint width, jint height, jint threshold);
     JNIEXPORT jdoubleArray JNICALL Java_com_buzbuz_smartautoclicker_core_detection_NativeDetector_detectTextNative(JNIEnv *env, jobject self, jstring conditionText, jstring recognitionModelId, jint x, jint y, jint width, jint height, jint threshold);
-    JNIEXPORT jdoubleArray JNICALL Java_com_buzbuz_smartautoclicker_core_detection_NativeDetector_detectNumberNative(JNIEnv *env, jobject self, jint x, jint y, jint width, jint height, jint threshold);
+    JNIEXPORT jdoubleArray JNICALL Java_com_buzbuz_smartautoclicker_core_detection_NativeDetector_detectNumberNative(JNIEnv *env, jobject self, jint x, jint y, jint width, jint height, jint threshold, jint numberFormat);
     JNIEXPORT void JNICALL Java_com_buzbuz_smartautoclicker_core_detection_NativeDetector_releaseScreenImage(JNIEnv *env, jobject self, jobject screenBitmap);
 }
 
@@ -45,7 +45,7 @@ static const JNINativeMethod methods[] = {
         {"detectImageNative", "(Landroid/graphics/Bitmap;IIIIIII)[D", (void*)Java_com_buzbuz_smartautoclicker_core_detection_NativeDetector_detectImageNative},
         {"detectColorNative", "(IIIIII)[D", (void*)Java_com_buzbuz_smartautoclicker_core_detection_NativeDetector_detectColorNative},
         {"detectTextNative", "(Ljava/lang/String;Ljava/lang/String;IIIII)[D", (void*)Java_com_buzbuz_smartautoclicker_core_detection_NativeDetector_detectTextNative},
-        {"detectNumberNative", "(IIIII)[D", (void*)Java_com_buzbuz_smartautoclicker_core_detection_NativeDetector_detectNumberNative},
+        {"detectNumberNative", "(IIIIII)[D", (void*)Java_com_buzbuz_smartautoclicker_core_detection_NativeDetector_detectNumberNative},
         {"releaseScreenImage", "(Landroid/graphics/Bitmap;)V", (void*)Java_com_buzbuz_smartautoclicker_core_detection_NativeDetector_releaseScreenImage}
 };
 
diff --git a/core/smart/detection/src/main/cpp/smartautoclicker.cpp b/core/smart/detection/src/main/cpp/smartautoclicker.cpp
index 2b5d9f720..5ae9b2df5 100644
--- a/core/smart/detection/src/main/cpp/smartautoclicker.cpp
+++ b/core/smart/detection/src/main/cpp/smartautoclicker.cpp
@@ -196,13 +196,17 @@ extern "C" {
             jint y,
             jint width,
             jint height,
-            jint threshold
+            jint threshold,
+            jint numberFormat
     ) {
         auto detector = getDetectorFromJavaRef(env, self);
         if (!detector) return nullptr;
 
         try {
-            return toJniResult(env, detector->detectNumber(cv::Rect(x, y, width, height), threshold));
+            return toJniResult(env, detector->detectNumber(
+                    cv::Rect(x, y, width, height),
+                    threshold,
+                    static_cast<NumberFormat>(numberFormat)));
         } catch (...) {
             throwRuntimeException(env, "Invalid detection arguments for number detection");
         }
diff --git a/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/DetectionResult.kt b/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/DetectionResult.kt
index 10311f7f7..ebef3a9bf 100644
--- a/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/DetectionResult.kt
+++ b/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/DetectionResult.kt
@@ -44,6 +44,6 @@ internal fun DoubleArray?.toDetectionResult(): DetectionResult {
         position = Point(this[1].toInt(), this[2].toInt()),
         size = Point(this[3].toInt(), this[4].toInt()),
         confidenceRate = this[5],
-        numberDetected = if(numberDetected == Double.MIN_VALUE) null else numberDetected,
+        numberDetected = if(numberDetected == -Double.MAX_VALUE) null else numberDetected,
     )
 }
diff --git a/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/ImageDetector.kt b/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/ImageDetector.kt
index 39a6a0fa5..390b9d3bc 100644
--- a/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/ImageDetector.kt
+++ b/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/ImageDetector.kt
@@ -115,6 +115,7 @@ interface ImageDetector : AutoCloseable {
     fun detectNumber(
         detectionArea: Rect,
         threshold: Int,
+        numberFormatType: NumberFormatType = NumberFormatType.AUTO,
     ): DetectionResult
 
     /** Release the resources of the screen image set with [setScreenBitmap]. */
diff --git a/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/NativeDetector.kt b/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/NativeDetector.kt
index ba13e7c1b..71f885092 100644
--- a/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/NativeDetector.kt
+++ b/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/NativeDetector.kt
@@ -32,7 +32,7 @@ import com.buzbuz.smartautoclicker.core.base.extensions.throwWithKeys
 class NativeDetector private constructor() : ImageDetector {
 
     companion object {
-        fun newInstance(): NativeDetector? = try {
+        fun newInstance(): ImageDetector? = try {
             System.loadLibrary("smartautoclicker")
             NativeDetector()
         } catch (_: UnsatisfiedLinkError) {
@@ -169,7 +169,7 @@ class NativeDetector private constructor() : ImageDetector {
         }
     }
 
-    override fun detectNumber(detectionArea: Rect, threshold: Int): DetectionResult {
+    override fun detectNumber(detectionArea: Rect, threshold: Int, numberFormatType: NumberFormatType): DetectionResult {
         if (isClosed) return DetectionResult()
 
         return try {
@@ -178,7 +178,8 @@ class NativeDetector private constructor() : ImageDetector {
                 y = detectionArea.top,
                 width = detectionArea.width(),
                 height = detectionArea.height(),
-                threshold
+                threshold = threshold,
+                numberFormat = numberFormatType.ordinal,
             ).toDetectionResult()
         } catch (ex: Exception) {
             ex.throwWithKeys(
@@ -305,6 +306,7 @@ class NativeDetector private constructor() : ImageDetector {
         width: Int,
         height: Int,
         threshold: Int,
+        numberFormat: Int,
     ): DoubleArray?
 
     /** Native method for releasing the screen image resources set with [setScreenImage]. */
diff --git a/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/NumberFormatType.kt b/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/NumberFormatType.kt
new file mode 100644
index 000000000..7af15ea2e
--- /dev/null
+++ b/core/smart/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/NumberFormatType.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2026 Kevin Buzeau
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.buzbuz.smartautoclicker.core.detection
+
+/** Ordinals must match the C++ NumberFormat enum (AUTO=0, DOT_DECIMAL=1, COMMA_DECIMAL=2). */
+enum class NumberFormatType {
+    AUTO,
+    DOT_DECIMAL,
+    COMMA_DECIMAL,
+}
diff --git a/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/data/ScenarioDataSource.kt b/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/data/ScenarioDataSource.kt
index d2bc0980b..dc43ac63e 100644
--- a/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/data/ScenarioDataSource.kt
+++ b/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/data/ScenarioDataSource.kt
@@ -169,25 +169,28 @@ internal class ScenarioDataSource @Inject constructor(
             throw IllegalArgumentException("Can't update scenario content, one of the event is not complete")
 
         return try {
+            var scenarioId: Identifier? = null
+            val conditionsRemoved = mutableListOf<String>()
             database.withTransaction {
                 // First insert the scenario to get its database id, and put it in all events
-                val scenarioId = Identifier(
+                scenarioId = Identifier(
                     databaseId = database.scenarioDao().add(scenario.toEntity())
                 )
 
                 updateEvents(
                     scenarioDbId = scenarioId.databaseId,
                     events = events,
-                    onImageConditionsRemoved = onImageConditionsRemoved,
+                    onImageConditionsRemoved = { removed -> conditionsRemoved += removed },
                 )
 
                 updateCounters(
                     scenarioDbId = scenarioId.databaseId,
                     newCounters = counters,
                 )
-
-                scenarioId.databaseId
             }
+
+            onImageConditionsRemoved(conditionsRemoved)
+            scenarioId?.databaseId
         } catch (ex: Exception) {
             Log.e(TAG, "Error while inserting scenario copy", ex)
             null
@@ -203,6 +206,7 @@ internal class ScenarioDataSource @Inject constructor(
         Log.d(TAG, "Update scenario in the database: ${scenario.id}")
 
         return try {
+            val conditionsRemoved = mutableListOf<String>()
             database.withTransaction {
                 // Update scenario entity values
                 database.scenarioDao().update(scenario.toEntity())
@@ -210,7 +214,7 @@ internal class ScenarioDataSource @Inject constructor(
                 updateEvents(
                     scenarioDbId = scenario.id.databaseId,
                     events = events,
-                    onImageConditionsRemoved = onImageConditionsRemoved,
+                    onImageConditionsRemoved = { removed -> conditionsRemoved += removed },
                 )
                 // Update counters
                 updateCounters(
@@ -219,6 +223,7 @@ internal class ScenarioDataSource @Inject constructor(
                 )
             }
 
+            onImageConditionsRemoved(conditionsRemoved)
             true
         } catch (ex: Exception) {
             Log.e(TAG, "Error while updating scenario\n* Scenario=$scenario\n* Events=$events\n", ex)
diff --git a/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ConditionMapper.kt b/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ConditionMapper.kt
index cec53dbe0..f336d3cc1 100644
--- a/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ConditionMapper.kt
+++ b/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ConditionMapper.kt
@@ -22,6 +22,7 @@ import com.buzbuz.smartautoclicker.core.base.identifier.Identifier
 import com.buzbuz.smartautoclicker.core.database.entity.ConditionEntity
 import com.buzbuz.smartautoclicker.core.database.entity.ConditionType
 import com.buzbuz.smartautoclicker.core.database.entity.CounterOperationValueType
+import com.buzbuz.smartautoclicker.core.database.entity.NumberFormatType as DbNumberFormatType
 import com.buzbuz.smartautoclicker.core.domain.model.counter.CounterOperationValue
 import com.buzbuz.smartautoclicker.core.domain.model.counter.toDomain
 import com.buzbuz.smartautoclicker.core.domain.model.counter.toEntity
@@ -91,6 +92,7 @@ private fun ScreenCondition.Number.toNumberConditionEntity(): ConditionEntity {
         numberCounterOperationValueType = if (isNumberValue) CounterOperationValueType.NUMBER else CounterOperationValueType.COUNTER,
         numberCounterValue = if (isNumberValue) counterValue.value else null,
         numberCounterOperationCounterName = if (isNumberValue) null else counterValue.value as String,
+        numberFormatType = numberFormatType.toEntity(),
     )
 }
 
@@ -200,6 +202,7 @@ private fun ConditionEntity.toDomainNumberCondition(cleanIds: Boolean = false):
             numberValue = numberCounterValue,
             counterName = numberCounterOperationCounterName,
         ),
+        numberFormatType = numberFormatType.toDomain(),
     )
 
 private fun ConditionEntity.toDomainTextCondition(cleanIds: Boolean = false): ScreenCondition.Text =
@@ -253,6 +256,20 @@ private fun ConditionEntity.getDetectionArea(): Rect? =
     else
         null
 
+private fun DbNumberFormatType?.toDomain(): NumberFormatType =
+    when (this) {
+        DbNumberFormatType.DOT_DECIMAL -> NumberFormatType.DOT_DECIMAL
+        DbNumberFormatType.COMMA_DECIMAL -> NumberFormatType.COMMA_DECIMAL
+        DbNumberFormatType.AUTO, null -> NumberFormatType.AUTO
+    }
+
+private fun NumberFormatType.toEntity(): DbNumberFormatType =
+    when (this) {
+        NumberFormatType.AUTO -> DbNumberFormatType.AUTO
+        NumberFormatType.DOT_DECIMAL -> DbNumberFormatType.DOT_DECIMAL
+        NumberFormatType.COMMA_DECIMAL -> DbNumberFormatType.COMMA_DECIMAL
+    }
+
 private fun ConditionEntity.getTextAlphabet(): OCRAlphabet =
     textAlphabet?.let {
         try {
diff --git a/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/model/condition/NumberFormatType.kt b/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/model/condition/NumberFormatType.kt
new file mode 100644
index 000000000..28b29baec
--- /dev/null
+++ b/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/model/condition/NumberFormatType.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2026 Kevin Buzeau
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.buzbuz.smartautoclicker.core.domain.model.condition
+
+/** Format used to parse a number detected via OCR. */
+enum class NumberFormatType {
+    /** Automatically detect the format from the number structure. */
+    AUTO,
+    /** Dot is the decimal separator, comma is the thousands separator (e.g. 1,234.56). */
+    DOT_DECIMAL,
+    /** Comma is the decimal separator, dot is the thousands separator (e.g. 1.234,56). */
+    COMMA_DECIMAL,
+}
diff --git a/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ScreenCondition.kt b/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ScreenCondition.kt
index 75f268db8..af5a886c7 100644
--- a/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ScreenCondition.kt
+++ b/core/smart/domain/src/main/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ScreenCondition.kt
@@ -116,6 +116,7 @@ sealed class ScreenCondition : Condition(), Prioritizable {
         val detectionArea: Rect,
         val comparisonOperation: ComparisonOperation,
         val counterValue: CounterOperationValue,
+        val numberFormatType: NumberFormatType = NumberFormatType.AUTO,
     ): ScreenCondition(), Prioritizable {
 
         /** Tells if this condition is complete and valid to be saved. */
@@ -124,7 +125,8 @@ sealed class ScreenCondition : Condition(), Prioritizable {
 
         override fun hashCodeNoIds(): Int =
             name.hashCode() + counterValue.hashCode() + threshold.hashCode() + shouldBeDetected.hashCode() +
-                    detectionArea.hashCode() + priority.hashCode() + comparisonOperation.hashCode()
+                    detectionArea.hashCode() + priority.hashCode() + comparisonOperation.hashCode() +
+                    numberFormatType.hashCode()
 
     }
 
diff --git a/core/smart/domain/src/test/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ConditionMapperTests.kt b/core/smart/domain/src/test/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ConditionMapperTests.kt
index ed199f1c8..8338a803b 100644
--- a/core/smart/domain/src/test/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ConditionMapperTests.kt
+++ b/core/smart/domain/src/test/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ConditionMapperTests.kt
@@ -20,6 +20,8 @@ import android.os.Build
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 
+import com.buzbuz.smartautoclicker.core.database.entity.NumberFormatType as DbNumberFormatType
+
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -93,4 +95,102 @@ class ConditionMapperTests {
             ConditionTestsData.getNewTimerReachedConditionEntity(eventId = ConditionTestsData.CONDITION_EVENT_ID).toDomain()
         )
     }
+
+    @Test
+    fun numberCondition_toEntity_formatAuto() {
+        assertEquals(
+            ConditionTestsData.getNewNumberConditionEntity(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = DbNumberFormatType.AUTO,
+            ),
+            ConditionTestsData.getNewNumberCondition(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = NumberFormatType.AUTO,
+            ).toEntity()
+        )
+    }
+
+    @Test
+    fun numberCondition_toEntity_formatDotDecimal() {
+        assertEquals(
+            ConditionTestsData.getNewNumberConditionEntity(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = DbNumberFormatType.DOT_DECIMAL,
+            ),
+            ConditionTestsData.getNewNumberCondition(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = NumberFormatType.DOT_DECIMAL,
+            ).toEntity()
+        )
+    }
+
+    @Test
+    fun numberCondition_toEntity_formatCommaDecimal() {
+        assertEquals(
+            ConditionTestsData.getNewNumberConditionEntity(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = DbNumberFormatType.COMMA_DECIMAL,
+            ),
+            ConditionTestsData.getNewNumberCondition(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = NumberFormatType.COMMA_DECIMAL,
+            ).toEntity()
+        )
+    }
+
+    @Test
+    fun numberCondition_toDomain_formatAuto() {
+        assertEquals(
+            ConditionTestsData.getNewNumberCondition(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = NumberFormatType.AUTO,
+            ),
+            ConditionTestsData.getNewNumberConditionEntity(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = DbNumberFormatType.AUTO,
+            ).toDomain()
+        )
+    }
+
+    @Test
+    fun numberCondition_toDomain_formatNullFallsBackToAuto() {
+        assertEquals(
+            ConditionTestsData.getNewNumberCondition(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = NumberFormatType.AUTO,
+            ),
+            ConditionTestsData.getNewNumberConditionEntity(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = null,
+            ).toDomain()
+        )
+    }
+
+    @Test
+    fun numberCondition_toDomain_formatDotDecimal() {
+        assertEquals(
+            ConditionTestsData.getNewNumberCondition(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = NumberFormatType.DOT_DECIMAL,
+            ),
+            ConditionTestsData.getNewNumberConditionEntity(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = DbNumberFormatType.DOT_DECIMAL,
+            ).toDomain()
+        )
+    }
+
+    @Test
+    fun numberCondition_toDomain_formatCommaDecimal() {
+        assertEquals(
+            ConditionTestsData.getNewNumberCondition(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = NumberFormatType.COMMA_DECIMAL,
+            ),
+            ConditionTestsData.getNewNumberConditionEntity(
+                eventId = ConditionTestsData.CONDITION_EVENT_ID,
+                numberFormatType = DbNumberFormatType.COMMA_DECIMAL,
+            ).toDomain()
+        )
+    }
 }
\ No newline at end of file
diff --git a/core/smart/domain/src/test/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ConditionTestsData.kt b/core/smart/domain/src/test/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ConditionTestsData.kt
index c20899a9e..a2e837476 100644
--- a/core/smart/domain/src/test/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ConditionTestsData.kt
+++ b/core/smart/domain/src/test/java/com/buzbuz/smartautoclicker/core/domain/model/condition/ConditionTestsData.kt
@@ -21,6 +21,7 @@ import android.graphics.Rect
 import com.buzbuz.smartautoclicker.core.database.entity.ConditionEntity
 import com.buzbuz.smartautoclicker.core.database.entity.ConditionType
 import com.buzbuz.smartautoclicker.core.database.entity.CounterOperationValueType
+import com.buzbuz.smartautoclicker.core.database.entity.NumberFormatType as DbNumberFormatType
 import com.buzbuz.smartautoclicker.core.domain.model.counter.CounterOperationValue
 import com.buzbuz.smartautoclicker.core.domain.model.EXACT
 import com.buzbuz.smartautoclicker.core.domain.model.counter.ComparisonOperation
@@ -50,6 +51,59 @@ internal object ConditionTestsData {
 
     const val CONDITION_TIMER_MS = 500L
 
+    val CONDITION_NUMBER_DETECTION_AREA = Rect(10, 20, 110, 120)
+    val CONDITION_NUMBER_COMPARISON_OPERATION = ComparisonOperation.GREATER
+    const val CONDITION_NUMBER_VALUE = 42.0
+    const val CONDITION_NUMBER_THRESHOLD = 10
+
+    fun getNewNumberConditionEntity(
+        id: Long = CONDITION_ID,
+        name: String = CONDITION_NAME,
+        detectionArea: Rect = CONDITION_NUMBER_DETECTION_AREA,
+        comparisonOperation: ComparisonOperation = CONDITION_NUMBER_COMPARISON_OPERATION,
+        numberValue: Double = CONDITION_NUMBER_VALUE,
+        threshold: Int = CONDITION_NUMBER_THRESHOLD,
+        numberFormatType: DbNumberFormatType? = null,
+        eventId: Long,
+    ) = ConditionEntity(
+        id = id,
+        eventId = eventId,
+        name = name,
+        type = ConditionType.ON_NUMBER_DETECTED,
+        priority = 0,
+        threshold = threshold,
+        shouldBeDetected = true,
+        detectionAreaLeft = detectionArea.left,
+        detectionAreaTop = detectionArea.top,
+        detectionAreaRight = detectionArea.right,
+        detectionAreaBottom = detectionArea.bottom,
+        numberCounterComparisonOperation = comparisonOperation.toEntity(),
+        numberCounterOperationValueType = CounterOperationValueType.NUMBER,
+        numberCounterValue = numberValue,
+        numberFormatType = numberFormatType,
+    )
+
+    fun getNewNumberCondition(
+        id: Long = CONDITION_ID,
+        name: String = CONDITION_NAME,
+        detectionArea: Rect = CONDITION_NUMBER_DETECTION_AREA,
+        comparisonOperation: ComparisonOperation = CONDITION_NUMBER_COMPARISON_OPERATION,
+        numberValue: Double = CONDITION_NUMBER_VALUE,
+        threshold: Int = CONDITION_NUMBER_THRESHOLD,
+        numberFormatType: NumberFormatType = NumberFormatType.AUTO,
+        eventId: Long,
+    ) = ScreenCondition.Number(
+        id = id.asIdentifier(),
+        eventId = eventId.asIdentifier(),
+        name = name,
+        priority = 0,
+        threshold = threshold,
+        detectionArea = detectionArea,
+        comparisonOperation = comparisonOperation,
+        counterValue = CounterOperationValue.Number(numberValue),
+        numberFormatType = numberFormatType,
+    )
+
     fun getNewImageConditionEntity(
         id: Long = CONDITION_ID,
         name: String = CONDITION_NAME,
diff --git a/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/DetectorEngine.kt b/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/DetectorEngine.kt
index 25be2bbdc..134096755 100644
--- a/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/DetectorEngine.kt
+++ b/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/DetectorEngine.kt
@@ -98,6 +98,13 @@ class DetectorEngine @Inject constructor(
     /** Coroutine job for the debounced orientation change handler. */
     private var orientationChangeJob: Job? = null
 
+    /**
+     * When true, [processScreenImages] will exit its loop after the current frame finishes rather
+     * than being canceled mid-execution. Used by orientation-change handling so in-progress action
+     * sequences are not interrupted.
+     */
+    @Volatile private var orientationChangeRequested: Boolean = false
+
     private val screenOrientationListener: (Context) -> Unit = { onScreenOrientationChanged() }
 
     /** Backing property for [state].*/
@@ -182,13 +189,14 @@ class DetectorEngine @Inject constructor(
         counters: List<Counter>,
         liveDebugging: Boolean,
         generateReport: Boolean,
+        imageDetectorFactory: () -> ImageDetector? = NativeDetector::newInstance,
     ) {
         if (_state.value != DetectorState.RECORDING) {
             Log.w(TAG, "startDetection: Screen record is not started.")
             return
         }
 
-        val detector = NativeDetector.newInstance()
+        val detector = imageDetectorFactory()
         if (detector == null) {
             Log.e(TAG, "startDetection: native library not found.")
             _state.value = DetectorState.ERROR_NATIVE_DETECTOR_LIB_NOT_FOUND
@@ -278,7 +286,10 @@ class DetectorEngine @Inject constructor(
             delay(ORIENTATION_CHANGE_DEBOUNCE_MS.milliseconds)
 
             if (_state.value == DetectorState.DETECTING) {
-                processingJob?.cancelAndJoin()
+                // Signal the loop to exit after the current frame so in-progress actions finish cleanly.
+                orientationChangeRequested = true
+                processingJob?.join()
+                orientationChangeRequested = false
                 debuggingListener.onEventsProcessingCancelled()
             }
 
@@ -364,7 +375,7 @@ class DetectorEngine @Inject constructor(
         _state.emit(DetectorState.DETECTING)
 
         var processingDurationNs: Long
-        while (processingJob?.isActive == true) {
+        while (processingJob?.isActive == true && !orientationChangeRequested) {
             displayRecorder.acquireLatestBitmap()?.let { screenFrame ->
                 processingDurationNs = measureNanoTime {
                     scenarioProcessor?.process(screenFrame)
diff --git a/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/processor/ConditionsVerifier.kt b/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/processor/ConditionsVerifier.kt
index fbf6a2cff..72ba32d0c 100644
--- a/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/processor/ConditionsVerifier.kt
+++ b/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/processor/ConditionsVerifier.kt
@@ -19,6 +19,8 @@ package com.buzbuz.smartautoclicker.core.processing.data.processor
 import android.graphics.Bitmap
 
 import com.buzbuz.smartautoclicker.core.detection.ImageDetector
+import com.buzbuz.smartautoclicker.core.detection.NumberFormatType as DetectionNumberFormatType
+import com.buzbuz.smartautoclicker.core.domain.model.condition.NumberFormatType as DomainNumberFormatType
 import com.buzbuz.smartautoclicker.core.domain.model.AND
 import com.buzbuz.smartautoclicker.core.domain.model.ConditionOperator
 import com.buzbuz.smartautoclicker.core.domain.model.counter.CounterOperationValue
@@ -35,6 +37,10 @@ import com.buzbuz.smartautoclicker.core.processing.domain.model.ProcessedConditi
 
 import kotlinx.coroutines.yield
 
+import kotlin.math.abs
+
+private const val DOUBLE_EQUALS_EPSILON = 1e-9
+
 internal class ConditionsVerifier(
     private val state: ProcessingState,
     private val imageDetector: ImageDetector,
@@ -107,7 +113,7 @@ internal class ConditionsVerifier(
             when (condition.comparisonOperation) {
                 ComparisonOperation.GREATER -> counterValue > operandValue
                 ComparisonOperation.GREATER_OR_EQUALS -> counterValue >= operandValue
-                ComparisonOperation.EQUALS -> counterValue == operandValue
+                ComparisonOperation.EQUALS -> abs(counterValue - operandValue) < DOUBLE_EQUALS_EPSILON
                 ComparisonOperation.LOWER_OR_EQUALS -> counterValue <= operandValue
                 ComparisonOperation.LOWER -> counterValue < operandValue
             }
@@ -196,6 +202,7 @@ internal class ConditionsVerifier(
         val detectionResult = imageDetector.detectNumber(
             detectionArea = conditionScalingInfo.detectionArea,
             threshold = condition.threshold,
+            numberFormatType = condition.numberFormatType.toDetectionNumberFormatType(),
         )
 
         val numberDetected: Double? = detectionResult.numberDetected
@@ -210,7 +217,7 @@ internal class ConditionsVerifier(
                 val comparisonResult = when (condition.comparisonOperation) {
                     ComparisonOperation.GREATER -> numberDetected > operandValue
                     ComparisonOperation.GREATER_OR_EQUALS -> numberDetected >= operandValue
-                    ComparisonOperation.EQUALS -> numberDetected == operandValue
+                    ComparisonOperation.EQUALS -> abs(numberDetected - operandValue) < DOUBLE_EQUALS_EPSILON
                     ComparisonOperation.LOWER_OR_EQUALS -> numberDetected <= operandValue
                     ComparisonOperation.LOWER -> numberDetected < operandValue
                 }
@@ -272,3 +279,10 @@ internal class ConditionsVerifier(
             condition = this,
         )
 }
+
+private fun DomainNumberFormatType.toDetectionNumberFormatType(): DetectionNumberFormatType =
+    when (this) {
+        DomainNumberFormatType.AUTO -> DetectionNumberFormatType.AUTO
+        DomainNumberFormatType.DOT_DECIMAL -> DetectionNumberFormatType.DOT_DECIMAL
+        DomainNumberFormatType.COMMA_DECIMAL -> DetectionNumberFormatType.COMMA_DECIMAL
+    }
diff --git a/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/processor/ScenarioProcessor.kt b/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/processor/ScenarioProcessor.kt
index f635f8d7e..2db64eaea 100644
--- a/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/processor/ScenarioProcessor.kt
+++ b/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/processor/ScenarioProcessor.kt
@@ -106,7 +106,7 @@ internal class ScenarioProcessor(
         // Handle all trigger events enabled during previous processing
         if (!processingState.areAllTriggerEventsDisabled()) {
             progressListener?.onEventsListProcessingStarted(EventType.Trigger)
-            processTriggerEvents(processingState.getEnabledTriggerEvents())
+            processTriggerEvents()
             progressListener?.onEventsProcessingCompleted(EventType.Trigger)
         }
 
@@ -117,7 +117,7 @@ internal class ScenarioProcessor(
         // Handle the image detection
         if (!processingState.areAllScreenEventsDisabled()) {
             progressListener?.onEventsListProcessingStarted(EventType.Screen)
-            processScreenEvents(screenFrame, processingState.getEnabledScreenEvents())
+            processScreenEvents(screenFrame)
             progressListener?.onEventsProcessingCompleted(EventType.Screen)
         }
 
@@ -127,8 +127,8 @@ internal class ScenarioProcessor(
         return
     }
 
-    private suspend fun processTriggerEvents(events: Collection<TriggerEvent>) {
-        for (triggerEvent in events) {
+    private suspend fun processTriggerEvents() {
+        for (triggerEvent in processingState.getTriggerEvents()) {
             // Enabled state of the event might have changed during the loop
             if (!processingState.isEventEnabled(triggerEvent.id.databaseId)) continue
 
@@ -149,13 +149,16 @@ internal class ScenarioProcessor(
         }
     }
 
-    private suspend fun processScreenEvents(screenFrame: Bitmap, events: Collection<ScreenEvent>) {
+    private suspend fun processScreenEvents(screenFrame: Bitmap) {
         // Set the current screen image
         imageDetector.setScreenBitmap(screenFrame, processingTag)
 
         try {
             // Check all events
-            for (screenEvent in events) {
+            for (screenEvent in processingState.getScreenEvents()) {
+                // Enabled state of the event might have changed during the loop
+                if (!processingState.isEventEnabled(screenEvent.id.databaseId)) continue
+
                 // No conditions ? This should not happen, skip this event
                 if (screenEvent.conditions.isEmpty()) continue
 
diff --git a/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/processor/state/EventsState.kt b/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/processor/state/EventsState.kt
index fea39d747..d3e0c68fc 100644
--- a/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/processor/state/EventsState.kt
+++ b/core/smart/processing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/processor/state/EventsState.kt
@@ -28,8 +28,8 @@ interface IEventsState {
     fun areAllScreenEventsDisabled(): Boolean
     fun areAllTriggerEventsDisabled(): Boolean
 
-    fun getEnabledScreenEvents(): Collection<ScreenEvent>
-    fun getEnabledTriggerEvents(): Collection<TriggerEvent>
+    fun getScreenEvents(): Collection<ScreenEvent>
+    fun getTriggerEvents(): Collection<TriggerEvent>
 
     fun enableAll()
     fun enableEvent(eventId: Long)
@@ -77,14 +77,14 @@ internal class EventsState(
     override fun areAllScreenEventsDisabled(): Boolean =
         screenEventList.areAllEventsDisabled()
 
-    override fun getEnabledScreenEvents(): Collection<ScreenEvent> =
-        screenEventList.getEnabledEvents().sortedByPriority()
+    override fun getScreenEvents(): Collection<ScreenEvent> =
+        screenEventList.getEvents().sortedByPriority()
 
     override fun areAllTriggerEventsDisabled(): Boolean =
         triggerEventList.areAllEventsDisabled()
 
-    override fun getEnabledTriggerEvents(): Collection<TriggerEvent> =
-        triggerEventList.getEnabledEvents().toList()
+    override fun getTriggerEvents(): Collection<TriggerEvent> =
+        triggerEventList.getEvents().toList()
 
     override fun enableEvent(eventId: Long) {
         screenEventList.enableEvent(eventId)
@@ -137,8 +137,8 @@ private class EventList<T : Event>(events: List<T>) {
     fun areAllEventsDisabled(): Boolean =
         enabledEventsMap.isEmpty()
 
-    fun getEnabledEvents(): Collection<T> =
-        enabledEventsMap.values
+    fun getEvents(): Collection<T> =
+        eventsMap.values
 
     fun enableEvent(eventId: Long) {
         if (enabledEventsMap.containsKey(eventId)) return
diff --git a/core/smart/processing/src/test/java/com/buzbuz/smartautoclicker/core/processing/tests/DetectorEngineDetectionOrientationTests.kt b/core/smart/processing/src/test/java/com/buzbuz/smartautoclicker/core/processing/tests/DetectorEngineDetectionOrientationTests.kt
new file mode 100644
index 000000000..d84426575
--- /dev/null
+++ b/core/smart/processing/src/test/java/com/buzbuz/smartautoclicker/core/processing/tests/DetectorEngineDetectionOrientationTests.kt
@@ -0,0 +1,295 @@
+/*
+ * Copyright (C) 2025 Kevin Buzeau
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.buzbuz.smartautoclicker.core.processing.tests
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.content.res.Configuration
+import android.graphics.Point
+import android.os.Build
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import com.buzbuz.smartautoclicker.code.smart.detectionmodels.text.OCRModelsRepository
+import com.buzbuz.smartautoclicker.core.base.data.AppComponentsProvider
+import com.buzbuz.smartautoclicker.core.base.identifier.Identifier
+import com.buzbuz.smartautoclicker.core.bitmaps.BitmapRepository
+import com.buzbuz.smartautoclicker.core.common.actions.AndroidActionExecutor
+import com.buzbuz.smartautoclicker.core.detection.ImageDetector
+import com.buzbuz.smartautoclicker.core.display.config.DisplayConfig
+import com.buzbuz.smartautoclicker.core.display.config.DisplayConfigManager
+import com.buzbuz.smartautoclicker.core.display.recorder.DisplayRecorder
+import com.buzbuz.smartautoclicker.core.domain.model.scenario.Scenario
+import com.buzbuz.smartautoclicker.core.processing.data.DetectorEngine
+import com.buzbuz.smartautoclicker.core.processing.data.DetectorState
+import com.buzbuz.smartautoclicker.core.processing.data.scaling.ScalingManager
+import com.buzbuz.smartautoclicker.core.processing.domain.SmartProcessingListener
+import com.buzbuz.smartautoclicker.core.settings.domain.SettingsRepository
+
+import io.mockk.MockKAnnotations
+import io.mockk.clearAllMocks
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.impl.annotations.RelaxedMockK
+import io.mockk.verify
+
+import kotlinx.coroutines.channels.Channel
+
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceTimeBy
+import kotlinx.coroutines.test.runTest
+
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+
+/**
+ * Tests verifying that orientation changes during DETECTING state allow the current frame to
+ * complete before the display is resized and detection is restarted.
+ *
+ * The fix uses an orientationChangeRequested flag and join() instead of cancelAndJoin(), so
+ * in-progress action sequences are never interrupted mid-execution.
+ *
+ * MockK is used for all mocks — it handles suspend functions natively without runBlocking,
+ * which is critical because acquireLatestBitmap() is called on every loop iteration.
+ * The imageDetectorFactory parameter is used to inject a plain ImageDetector mock, so
+ * NativeDetector (a final class with native methods) is never subclassed or loaded.
+ *
+ * advanceUntilIdle() is intentionally avoided — the detection loop is infinite and would hang.
+ * All time advancement uses advanceTimeBy() with explicit margins instead.
+ */
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(AndroidJUnit4::class)
+@Config(sdk = [Build.VERSION_CODES.Q])
+class DetectorEngineDetectionOrientationTests {
+
+    private companion object {
+        private val TEST_DISPLAY_SIZE = Point(1080, 1920)
+        // Must match the private constants in DetectorEngine.
+        private const val ORIENTATION_DEBOUNCE_MS = 100L
+        private const val NO_IMAGE_DELAY_MS = 20L
+        // Headroom: debounce fires at 100 ms, then the loop's current null-delay (≤ 20 ms)
+        // must also expire before the loop checks the flag and exits.
+        private const val ADVANCE_MS = ORIENTATION_DEBOUNCE_MS + NO_IMAGE_DELAY_MS + 20L
+
+        private val TEST_SCENARIO = Scenario(
+            id = Identifier(databaseId = 1L),
+            name = "Test Scenario",
+            detectionQuality = 600,
+        )
+    }
+
+    @RelaxedMockK private lateinit var mockDisplayConfigManager: DisplayConfigManager
+    @RelaxedMockK private lateinit var mockBitmapRepository: BitmapRepository
+    @RelaxedMockK private lateinit var mockScalingManager: ScalingManager
+    @RelaxedMockK private lateinit var mockDisplayRecorder: DisplayRecorder
+    @RelaxedMockK private lateinit var mockActionExecutor: AndroidActionExecutor
+    @RelaxedMockK private lateinit var mockSettingsRepository: SettingsRepository
+    @RelaxedMockK private lateinit var mockAppComponentsProvider: AppComponentsProvider
+    @RelaxedMockK private lateinit var mockDebuggingListener: SmartProcessingListener
+    @RelaxedMockK private lateinit var mockOcrModelsRepository: OCRModelsRepository
+    @RelaxedMockK private lateinit var mockImageDetector: ImageDetector
+    @RelaxedMockK private lateinit var mockContext: Context
+    @RelaxedMockK private lateinit var mockIntent: Intent
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this)
+
+        every { mockDisplayConfigManager.displayConfig } returns DisplayConfig(
+            sizePx = TEST_DISPLAY_SIZE,
+            orientation = Configuration.ORIENTATION_PORTRAIT,
+            safeInsetTopPx = 0,
+            roundedCorners = emptyMap(),
+        )
+        every { mockScalingManager.startScaling(any(), any()) } returns TEST_DISPLAY_SIZE
+        every { mockScalingManager.refreshScaling() } returns TEST_DISPLAY_SIZE
+        coEvery { mockDisplayRecorder.validateScreenCapture() } returns true
+        every { mockSettingsRepository.isInputBlockWorkaroundEnabled() } returns false
+        every { mockAppComponentsProvider.originalAppId } returns "test.app"
+        // Return null so the processing loop stays in the lightweight null-delay branch.
+        // MockK handles suspend functions natively — no runBlocking wrapper per call,
+        // so this is safe to call on every iteration of the infinite detection loop.
+        coEvery { mockDisplayRecorder.acquireLatestBitmap() } returns null
+    }
+
+    @After
+    fun tearDown() {
+        clearAllMocks()
+    }
+
+    /**
+     * Regression test for the original bug: actions were interrupted on rotation.
+     *
+     * Simulates a frame that is mid-execution when the orientation change fires: the loop is
+     * suspended inside acquireLatestBitmap() waiting for a frame from the channel. The orientation
+     * handler sets the flag and calls join() — but it must wait for the frame to finish.
+     *
+     * Verify that resizeDisplay is NOT called while the frame is in progress, and IS called only
+     * after the frame is released and the loop exits cleanly via the flag.
+     */
+    @Test
+    fun `in-progress frame completes before display is resized on orientation change`() = runTest {
+        // Replace the null stub with a channel so we control exactly when each frame is delivered.
+        val frameChannel = Channel<Bitmap?>(capacity = Channel.UNLIMITED)
+        coEvery { mockDisplayRecorder.acquireLatestBitmap() } coAnswers { frameChannel.receive() }
+
+        val (engine, orientationListener) = startDetectionAndCaptureOrientationListener()
+        // Loop is now blocked in frameChannel.receive() — simulating a frame in progress.
+
+        orientationListener(mockContext)
+        // Advance past the debounce: the orientation handler sets the flag and enters join(),
+        // but the processing loop is still suspended in frameChannel.receive() — join() waits.
+        advanceTimeBy(ADVANCE_MS)
+
+        // Display must NOT have been resized yet — the frame is still "in progress".
+        verify(exactly = 0) { mockScalingManager.refreshScaling() }
+
+        // Release the blocked frame. The loop resumes, returns null from acquireLatestBitmap(),
+        // waits through the null-image delay, then checks the flag and exits cleanly.
+        frameChannel.send(null)
+        advanceTimeBy(NO_IMAGE_DELAY_MS + 5)
+
+        // Frame is done — resize must have happened now.
+        verify(exactly = 1) { mockScalingManager.refreshScaling() }
+
+        // The restarted loop is blocked in frameChannel.receive() again. Stop to let runTest clean up.
+        stopDetection(engine)
+    }
+
+    /**
+     * Verify that an orientation change during DETECTING calls refreshScaling and
+     * onEventsProcessingCancelled, then resumes detection (state returns to DETECTING).
+     */
+    @Test
+    fun `orientation change during detecting resumes detection after resize`() = runTest {
+        val (engine, orientationListener) = startDetectionAndCaptureOrientationListener()
+
+        orientationListener(mockContext)
+        advanceTimeBy(ADVANCE_MS)
+
+        verify(exactly = 1) { mockScalingManager.refreshScaling() }
+        verify(exactly = 1) { mockDebuggingListener.onEventsProcessingCancelled() }
+        assertEquals(DetectorState.DETECTING, engine.state.value)
+
+        stopDetection(engine)
+    }
+
+    /**
+     * Rapid orientation changes during DETECTING must be debounced to a single
+     * refreshScaling call, matching the behaviour already verified for RECORDING state.
+     */
+    @Test
+    fun `rapid orientation changes during detecting are debounced to a single resize`() = runTest {
+        val (engine, orientationListener) = startDetectionAndCaptureOrientationListener()
+
+        orientationListener(mockContext)
+        orientationListener(mockContext)
+        orientationListener(mockContext)
+        advanceTimeBy(ADVANCE_MS)
+
+        verify(exactly = 1) { mockScalingManager.refreshScaling() }
+
+        stopDetection(engine)
+    }
+
+    /**
+     * After the first orientation change is fully handled the orientationChangeRequested flag
+     * must be reset, so a subsequent rotation also triggers a resize.
+     */
+    @Test
+    fun `orientation change flag resets allowing a second change to also trigger resize`() = runTest {
+        val (engine, orientationListener) = startDetectionAndCaptureOrientationListener()
+
+        orientationListener(mockContext)
+        advanceTimeBy(ADVANCE_MS)
+
+        orientationListener(mockContext)
+        advanceTimeBy(ADVANCE_MS)
+
+        verify(exactly = 2) { mockScalingManager.refreshScaling() }
+
+        stopDetection(engine)
+    }
+
+    // ---- helpers ----
+
+    private fun TestScope.startDetectionAndCaptureOrientationListener(): Pair<DetectorEngine, (Context) -> Unit> {
+        val engine = DetectorEngine(
+            ioDispatcher = StandardTestDispatcher(testScheduler),
+            displayConfigManager = mockDisplayConfigManager,
+            bitmapRepository = mockBitmapRepository,
+            scalingManager = mockScalingManager,
+            displayRecorder = mockDisplayRecorder,
+            actionExecutor = mockActionExecutor,
+            settingsRepository = mockSettingsRepository,
+            appComponentsProvider = mockAppComponentsProvider,
+            debuggingListener = mockDebuggingListener,
+            ocrModelsRepository = mockOcrModelsRepository,
+        )
+
+        var capturedListener: ((Context) -> Unit)? = null
+        every { mockDisplayConfigManager.addOrientationListener(any()) } answers {
+            capturedListener = firstArg()
+        }
+
+        engine.startScreenRecord(0, mockIntent, null)
+        // 1 ms: enough to run the startScreenRecord coroutine (no internal delays),
+        // reaching state = RECORDING without advancing any detection-loop delays.
+        advanceTimeBy(1)
+
+        engine.startDetection(
+            context = mockContext,
+            scenario = TEST_SCENARIO,
+            screenEvents = emptyList(),
+            triggerEvents = emptyList(),
+            counters = emptyList(),
+            liveDebugging = false,
+            generateReport = false,
+            // Inject a plain ImageDetector mock so NativeDetector is never subclassed or loaded.
+            imageDetectorFactory = { mockImageDetector },
+        )
+        // 1 ms: runs startDetection setup (no internal delays), enters processScreenImages,
+        // emits DETECTING, then suspends on the first null-image delay.
+        advanceTimeBy(1)
+
+        check(engine.state.value == DetectorState.DETECTING) {
+            "Expected DETECTING after startDetection, got ${engine.state.value}"
+        }
+
+        return engine to checkNotNull(capturedListener) { "Orientation listener was not registered" }
+    }
+
+    /**
+     * Cancels the active detection so the infinite processing loop is gone before runTest's
+     * implicit advanceUntilIdle() cleanup runs. Without this, the loop keeps scheduling more
+     * null-image delays and advanceUntilIdle() never terminates (causing OOM or a hang).
+     */
+    private fun TestScope.stopDetection(engine: DetectorEngine) {
+        engine.stopDetection()
+        // A single tick is enough: stopDetection launches a coroutine that immediately
+        // calls cancelAndJoin() on the processing job (no internal delays), after which
+        // the loop is gone and advanceUntilIdle() will terminate cleanly.
+        advanceTimeBy(1)
+    }
+}
diff --git a/core/smart/processing/src/test/java/com/buzbuz/smartautoclicker/core/processing/tests/ScenarioStateTests.kt b/core/smart/processing/src/test/java/com/buzbuz/smartautoclicker/core/processing/tests/ScenarioStateTests.kt
index 691263723..a87aef30b 100644
--- a/core/smart/processing/src/test/java/com/buzbuz/smartautoclicker/core/processing/tests/ScenarioStateTests.kt
+++ b/core/smart/processing/src/test/java/com/buzbuz/smartautoclicker/core/processing/tests/ScenarioStateTests.kt
@@ -44,7 +44,10 @@ class ScenarioStateTests {
 
         val scenarioState = EventsState(eventList, emptyList())
 
-        Assert.assertEquals("Invalid enabled events count", eventList.size, scenarioState.getEnabledScreenEvents().size)
+        Assert.assertFalse("All events should be enabled", scenarioState.areAllScreenEventsDisabled())
+        eventList.forEach { event ->
+            Assert.assertTrue("Event ${event.getDatabaseId()} should be enabled", scenarioState.isEventEnabled(event.getDatabaseId()))
+        }
     }
 
     @Test
@@ -57,20 +60,24 @@ class ScenarioStateTests {
 
         val scenarioState = EventsState(eventList, emptyList())
 
-        Assert.assertEquals("Invalid enabled events count", 0, scenarioState.getEnabledScreenEvents().size)
+        Assert.assertTrue("All events should be disabled", scenarioState.areAllScreenEventsDisabled())
     }
 
     @Test
     fun mixed_events_enabled_disabled_on_start() {
+        val enabledEvent = ProcessingData.newEvent(id = 2L, enableOnStart = true)
         val eventList = listOf(
             ProcessingData.newEvent(id = 1L, enableOnStart = false),
-            ProcessingData.newEvent(id = 2L, enableOnStart = true),
+            enabledEvent,
             ProcessingData.newEvent(id = 3L, enableOnStart = false),
         )
 
         val scenarioState = EventsState(eventList, emptyList())
 
-        Assert.assertEquals("Invalid enabled events count", 1, scenarioState.getEnabledScreenEvents().size)
+        Assert.assertFalse("All events should not be disabled", scenarioState.areAllScreenEventsDisabled())
+        Assert.assertTrue("Event ${enabledEvent.getDatabaseId()} should be enabled", scenarioState.isEventEnabled(enabledEvent.getDatabaseId()))
+        Assert.assertFalse("Event 1 should be disabled", scenarioState.isEventEnabled(1L))
+        Assert.assertFalse("Event 3 should be disabled", scenarioState.isEventEnabled(3L))
     }
 
     @Test
@@ -86,7 +93,7 @@ class ScenarioStateTests {
             enableEvent(changingEvent.getDatabaseId())
         }
 
-        Assert.assertTrue("Event not enabled", scenarioState.getEnabledScreenEvents().contains(changingEvent))
+        Assert.assertTrue("Event not enabled", scenarioState.isEventEnabled(changingEvent.getDatabaseId()))
     }
 
     @Test
@@ -102,7 +109,7 @@ class ScenarioStateTests {
             enableEvent(changingEvent.getDatabaseId())
         }
 
-        Assert.assertTrue("Event not enabled", scenarioState.getEnabledScreenEvents().contains(changingEvent))
+        Assert.assertTrue("Event not enabled", scenarioState.isEventEnabled(changingEvent.getDatabaseId()))
     }
 
     @Test
@@ -118,7 +125,7 @@ class ScenarioStateTests {
             disableEvent(changingEvent.getDatabaseId())
         }
 
-        Assert.assertFalse("Event should not be enabled", scenarioState.getEnabledScreenEvents().contains(changingEvent))
+        Assert.assertFalse("Event should not be enabled", scenarioState.isEventEnabled(changingEvent.getDatabaseId()))
     }
 
     @Test
@@ -134,7 +141,7 @@ class ScenarioStateTests {
             disableEvent(changingEvent.getDatabaseId())
         }
 
-        Assert.assertFalse("Event should not be enabled", scenarioState.getEnabledScreenEvents().contains(changingEvent))
+        Assert.assertFalse("Event should not be enabled", scenarioState.isEventEnabled(changingEvent.getDatabaseId()))
     }
 
     @Test
@@ -150,7 +157,7 @@ class ScenarioStateTests {
             toggleEvent(changingEvent.getDatabaseId())
         }
 
-        Assert.assertFalse("Event should not be enabled", scenarioState.getEnabledScreenEvents().contains(changingEvent))
+        Assert.assertFalse("Event should not be enabled", scenarioState.isEventEnabled(changingEvent.getDatabaseId()))
     }
 
     @Test
@@ -166,6 +173,6 @@ class ScenarioStateTests {
             toggleEvent(changingEvent.getDatabaseId())
         }
 
-        Assert.assertTrue("Event not enabled", scenarioState.getEnabledScreenEvents().contains(changingEvent))
+        Assert.assertTrue("Event not enabled", scenarioState.isEventEnabled(changingEvent.getDatabaseId()))
     }
 }
\ No newline at end of file
diff --git a/feature/backup/src/main/java/com/buzbuz/smartautoclicker/feature/backup/data/base/ScenarioBackupSerializer.kt b/feature/backup/src/main/java/com/buzbuz/smartautoclicker/feature/backup/data/base/ScenarioBackupSerializer.kt
index 5a4cdd44a..53ed67063 100644
--- a/feature/backup/src/main/java/com/buzbuz/smartautoclicker/feature/backup/data/base/ScenarioBackupSerializer.kt
+++ b/feature/backup/src/main/java/com/buzbuz/smartautoclicker/feature/backup/data/base/ScenarioBackupSerializer.kt
@@ -33,9 +33,9 @@ internal interface ScenarioBackupSerializer<T> {
      * Deserialize a scenario.
      * Depending of the detected version, either kotlin or compat serialization will be used.
      *
-     * @param json the stream to deserialize from.
+     * @param jsonStream the stream to deserialize from.
      *
      * @return the scenario backup deserialized from the json.
      */
-    fun deserialize(json: InputStream): T?
+    fun deserialize(jsonStream: InputStream): T?
 }
\ No newline at end of file
diff --git a/feature/backup/src/main/java/com/buzbuz/smartautoclicker/feature/backup/data/smart/ScenarioSerializer.kt b/feature/backup/src/main/java/com/buzbuz/smartautoclicker/feature/backup/data/smart/ScenarioSerializer.kt
index c233cc439..0357d67f9 100644
--- a/feature/backup/src/main/java/com/buzbuz/smartautoclicker/feature/backup/data/smart/ScenarioSerializer.kt
+++ b/feature/backup/src/main/java/com/buzbuz/smartautoclicker/feature/backup/data/smart/ScenarioSerializer.kt
@@ -38,6 +38,8 @@ import java.io.OutputStream
 @OptIn(ExperimentalSerializationApi::class)
 internal class ScenarioSerializer : ScenarioBackupSerializer<ScenarioBackup> {
 
+    private val json = Json { ignoreUnknownKeys = true }
+
     /**
      * Serialize a scenario.
      *
@@ -51,14 +53,14 @@ internal class ScenarioSerializer : ScenarioBackupSerializer<ScenarioBackup> {
      * Deserialize a scenario.
      * Depending of the detected version, either kotlin or compat serialization will be used.
      *
-     * @param json the stream to deserialize from.
+     * @param jsonStream the stream to deserialize from.
      *
      * @return the scenario backup deserialized from the json.
      */
-    override fun deserialize(json: InputStream): ScenarioBackup? {
+    override fun deserialize(jsonStream: InputStream): ScenarioBackup? {
         Log.d(TAG, "Deserializing smart scenario")
 
-        val jsonBackup = Json.parseToJsonElement(json.readBytes().toString(Charsets.UTF_8)).jsonObject
+        val jsonBackup = json.parseToJsonElement(jsonStream.readBytes().toString(Charsets.UTF_8)).jsonObject
         val version = jsonBackup.getInt("version", true) ?: -1
 
         val scenario = jsonBackup.getJsonObject("scenario", true)?.let { scenario ->
diff --git a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/domain/EditionState.kt b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/domain/EditionState.kt
index 7431f3b03..527d4c7c3 100644
--- a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/domain/EditionState.kt
+++ b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/domain/EditionState.kt
@@ -60,15 +60,16 @@ internal class EditionState internal constructor(
             editor.editedScenarioState,
             editor.editedScreenEventListState,
             editor.editedTriggerEventListState,
-        ) { scenario, imageEvents, triggerEvents ->
+            editor.editedCountersListState,
+        ) { scenario, imageEvents, triggerEvents, counters ->
 
-            if (scenario.value == null || imageEvents.value == null || triggerEvents.value == null)
+            if (scenario.value == null || imageEvents.value == null || triggerEvents.value == null || counters.value == null)
                 return@combine EditedElementState(value = null, hasChanged = false, canBeSaved = false)
 
             EditedElementState(
                 value = EditedScenarioState(scenario.value, imageEvents.value, triggerEvents.value),
-                hasChanged = scenario.hasChanged || imageEvents.hasChanged || triggerEvents.hasChanged,
-                canBeSaved = scenario.canBeSaved && imageEvents.canBeSaved && triggerEvents.canBeSaved
+                hasChanged = scenario.hasChanged || imageEvents.hasChanged || triggerEvents.hasChanged || counters.hasChanged,
+                canBeSaved = scenario.canBeSaved && imageEvents.canBeSaved && triggerEvents.canBeSaved && counters.canBeSaved
                         && (imageEvents.value.isNotEmpty() || triggerEvents.value.isNotEmpty()),
             )
         }
@@ -193,9 +194,8 @@ internal class EditionState internal constructor(
     override fun getAllEditedEvents(): List<Event> =
         editor.getAllEditedEvents()
 
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : Event> getEditedEvent(): T? =
-        editor.currentEventEditor.value?.editedItem?.value as? T
+    override fun getEditedEvent(): Event? =
+        editor.currentEventEditor.value?.editedItem?.value
 
     @Suppress("UNCHECKED_CAST")
     override fun <T : Action> getEditedEventActions(): List<T>? =
@@ -228,7 +228,7 @@ internal class EditionState internal constructor(
         getAllEditedEvents().find { eventId == it.id } != null
 
     override fun isEditedEventReferencedByAction(): Boolean {
-        val event = getEditedEvent<Event>() ?: return false
+        val event = getEditedEvent() ?: return false
         val scenarioEvents = getAllEditedEvents()
 
         return scenarioEvents.find { scenarioEvent ->
@@ -241,7 +241,7 @@ internal class EditionState internal constructor(
     }
 
     override fun isEditedConditionReferencedByClick(): Boolean {
-        val event = getEditedEvent<Event>() ?: return false
+        val event = getEditedEvent() ?: return false
         if (event.conditionOperator == OR) return false
 
         val condition = getEditedCondition<Condition>() ?: return false
diff --git a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/domain/model/IEditionState.kt b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/domain/model/IEditionState.kt
index 8477d0c2a..5cbe56205 100644
--- a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/domain/model/IEditionState.kt
+++ b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/domain/model/IEditionState.kt
@@ -70,7 +70,7 @@ interface IEditionState {
     fun getAllEditedCounters(): List<Counter>
     fun getCounter(name: String): Counter?
     fun getAllEditedEvents(): List<Event>
-    fun <T : Event> getEditedEvent(): T?
+    fun getEditedEvent(): Event?
     fun <T : Action> getEditedEventActions(): List<T>?
     fun <T : Condition> getEditedEventConditions(): List<T>?
     fun <T : Condition> getEditedCondition(): T?
diff --git a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/action/toggleevent/EventTogglesViewModel.kt b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/action/toggleevent/EventTogglesViewModel.kt
index b52fccea8..c57ab4c43 100644
--- a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/action/toggleevent/EventTogglesViewModel.kt
+++ b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/action/toggleevent/EventTogglesViewModel.kt
@@ -72,7 +72,7 @@ class EventTogglesViewModel @Inject constructor(
                         }
                     }
 
-                when (editionRepository.editionState.getEditedEvent<Event>()) {
+                when (editionRepository.editionState.getEditedEvent()) {
                     is TriggerEvent -> {
                         if (triggerEvents.size > 1) addAll(triggerEvents)
                         if (imageEvents.size > 1) addAll(imageEvents)
diff --git a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/common/model/condition/UiNumberFormatDropdownItem.kt b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/common/model/condition/UiNumberFormatDropdownItem.kt
new file mode 100644
index 000000000..ce6933057
--- /dev/null
+++ b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/common/model/condition/UiNumberFormatDropdownItem.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2026 Kevin Buzeau
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.buzbuz.smartautoclicker.feature.smart.config.ui.common.model.condition
+
+import com.buzbuz.smartautoclicker.core.domain.model.condition.NumberFormatType
+import com.buzbuz.smartautoclicker.core.ui.bindings.dropdown.DropdownItem
+import com.buzbuz.smartautoclicker.feature.smart.config.R
+
+sealed class UiNumberFormatDropdownItem(title: Int, helperText: Int) : DropdownItem(title, helperText) {
+    data object Auto : UiNumberFormatDropdownItem(
+        R.string.dropdown_item_number_format_auto,
+        R.string.dropdown_item_number_format_auto_helper,
+    )
+    data object DotDecimal : UiNumberFormatDropdownItem(
+        R.string.dropdown_item_number_format_dot_decimal,
+        R.string.dropdown_item_number_format_dot_decimal_helper,
+    )
+    data object CommaDecimal : UiNumberFormatDropdownItem(
+        R.string.dropdown_item_number_format_comma_decimal,
+        R.string.dropdown_item_number_format_comma_decimal_helper,
+    )
+}
+
+internal fun allNumberFormatDropdownItems(): List<UiNumberFormatDropdownItem> = listOf(
+    UiNumberFormatDropdownItem.Auto,
+    UiNumberFormatDropdownItem.DotDecimal,
+    UiNumberFormatDropdownItem.CommaDecimal,
+)
+
+internal fun NumberFormatType.toDropdownItem(): UiNumberFormatDropdownItem =
+    when (this) {
+        NumberFormatType.AUTO -> UiNumberFormatDropdownItem.Auto
+        NumberFormatType.DOT_DECIMAL -> UiNumberFormatDropdownItem.DotDecimal
+        NumberFormatType.COMMA_DECIMAL -> UiNumberFormatDropdownItem.CommaDecimal
+    }
+
+internal fun UiNumberFormatDropdownItem.toNumberFormatType(): NumberFormatType =
+    when (this) {
+        UiNumberFormatDropdownItem.Auto -> NumberFormatType.AUTO
+        UiNumberFormatDropdownItem.DotDecimal -> NumberFormatType.DOT_DECIMAL
+        UiNumberFormatDropdownItem.CommaDecimal -> NumberFormatType.COMMA_DECIMAL
+    }
diff --git a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/condition/screen/number/NumberConditionDialog.kt b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/condition/screen/number/NumberConditionDialog.kt
index 8fcfedab1..f4f5f299a 100644
--- a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/condition/screen/number/NumberConditionDialog.kt
+++ b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/condition/screen/number/NumberConditionDialog.kt
@@ -47,8 +47,11 @@ import com.buzbuz.smartautoclicker.feature.smart.config.di.ScenarioConfigViewMod
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.bindings.counter.setSelectedOperator
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.bindings.counter.setValueInfo
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.bindings.counter.setup
+import com.buzbuz.smartautoclicker.core.ui.bindings.dropdown.setItems
+import com.buzbuz.smartautoclicker.core.ui.bindings.dropdown.setSelectedItem
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.dialogs.showCloseWithoutSavingDialog
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.dialogs.showDeleteConditionsWithAssociatedActionsDialog
+import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.model.condition.allNumberFormatDropdownItems
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.model.counter.allCounterComparisonOperatorDropdownItems
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.condition.OnConditionConfigCompleteListener
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.condition.screen.areaselector.ConditionAreaSelectorMenu
@@ -124,6 +127,12 @@ class NumberConditionDialog(
                 hideSoftInputOnFocusLoss(staticValueLayout.textField)
             }
 
+            fieldNumberFormat.setItems(
+                label = context.getString(R.string.field_number_condition_number_format_label),
+                items = allNumberFormatDropdownItems(),
+                onItemSelected = viewModel::setNumberFormat,
+            )
+
             fieldSelectArea.apply {
                 setTitle(context.getString(R.string.generic_detection_area_title))
                 setOnClickListener { showDetectionAreaSelector() }
@@ -192,6 +201,7 @@ class NumberConditionDialog(
             editValueLayout.setValueInfo(uiState.operandValue)
             effectDesc.text = uiState.conditionEffectDesc
 
+            fieldNumberFormat.setSelectedItem(uiState.numberFormatDropdownItem)
             fieldSelectArea.setDescription(uiState.detectionAreaDescription)
             fieldSelectArea.setError(uiState.detectionAreaError)
             fieldSliderThreshold.setSliderValue(uiState.detectionThreshold.toFloat())
diff --git a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/condition/screen/number/NumberConditionUiState.kt b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/condition/screen/number/NumberConditionUiState.kt
index 8e95c18dc..cc21f7b76 100644
--- a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/condition/screen/number/NumberConditionUiState.kt
+++ b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/condition/screen/number/NumberConditionUiState.kt
@@ -16,6 +16,7 @@
  */
 package com.buzbuz.smartautoclicker.feature.smart.config.ui.condition.screen.number
 
+import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.model.condition.UiNumberFormatDropdownItem
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.model.counter.UiCounterOperatorDropdownItem
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.model.counter.UiStaticOrCounterSelection
 
@@ -29,4 +30,5 @@ data class NumberConditionUiState(
     val selectorOperatorDropdownItem: UiCounterOperatorDropdownItem,
     val operandValue: UiStaticOrCounterSelection,
     val conditionEffectDesc: String,
+    val numberFormatDropdownItem: UiNumberFormatDropdownItem,
 )
diff --git a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/condition/screen/number/NumberConditionViewModel.kt b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/condition/screen/number/NumberConditionViewModel.kt
index 46e7bfa11..1da3b9840 100644
--- a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/condition/screen/number/NumberConditionViewModel.kt
+++ b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/condition/screen/number/NumberConditionViewModel.kt
@@ -28,6 +28,9 @@ import com.buzbuz.smartautoclicker.core.common.tutorial.impl.monitoring.ViewPosi
 import com.buzbuz.smartautoclicker.core.domain.model.condition.ScreenCondition
 import com.buzbuz.smartautoclicker.core.domain.model.counter.CounterOperationValue
 import com.buzbuz.smartautoclicker.feature.smart.config.domain.EditionRepository
+import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.model.condition.UiNumberFormatDropdownItem
+import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.model.condition.toDropdownItem
+import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.model.condition.toNumberFormatType
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.model.counter.UiCounterOperatorDropdownItem
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.formatters.toAreaDisplayText
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.formatters.toEffectDescription
@@ -123,6 +126,10 @@ class NumberConditionViewModel @Inject constructor(
         }
     }
 
+    fun setNumberFormat(item: UiNumberFormatDropdownItem) {
+        updateEditedCondition { it.copy(numberFormatType = item.toNumberFormatType()) }
+    }
+
     fun monitorSaveButtonView(view: View) {
         monitoredViewsManager.attach(MonitoredViewType.NUMBER_CONDITION_DIALOG_BUTTON_SAVE, view)
     }
@@ -181,6 +188,7 @@ class NumberConditionViewModel @Inject constructor(
             selectorOperatorDropdownItem = comparisonOperation.toCounterOperatorDropdownItem(),
             operandValue = counterValue.toUiStaticOrCounterSelection(),
             conditionEffectDesc = counterValue.toEffectDescription(context, comparisonOperation),
+            numberFormatDropdownItem = numberFormatType.toDropdownItem(),
         )
 
     private fun CounterOperationValue.toUiStaticOrCounterSelection(): UiStaticOrCounterSelection =
diff --git a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/copy/action/ActionCopyViewModel.kt b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/copy/action/ActionCopyViewModel.kt
index cd28def65..6869f16ac 100644
--- a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/copy/action/ActionCopyViewModel.kt
+++ b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/copy/action/ActionCopyViewModel.kt
@@ -131,7 +131,7 @@ class ActionCopyViewModel @Inject constructor(
     }
 
     fun getFixEventDialogArgument(actionsToCopy: List<Action>): FixEventChildrenCopyDialog.Arguments? {
-        val editedEvent = editionRepository.editionState.getEditedEvent<Event>() ?: return null
+        val editedEvent = editionRepository.editionState.getEditedEvent() ?: return null
 
         val allEvents = editionRepository.editionState.getAllEditedEvents()
         val editedEventIndex = allEvents.indexOfFirst { event -> editedEvent.id == event.id }
diff --git a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/copy/condition/ConditionCopyViewModel.kt b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/copy/condition/ConditionCopyViewModel.kt
index 404cffdc3..a1010380a 100644
--- a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/copy/condition/ConditionCopyViewModel.kt
+++ b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/copy/condition/ConditionCopyViewModel.kt
@@ -147,7 +147,7 @@ class ConditionCopyViewModel @Inject constructor(
     }
 
     fun getFixEventDialogArgument(conditionsToCopy: List<Condition>): FixEventChildrenCopyDialog.Arguments? {
-        val editedEvent = editionRepository.editionState.getEditedEvent<Event>() ?: return null
+        val editedEvent = editionRepository.editionState.getEditedEvent() ?: return null
 
         val allEvents = editionRepository.editionState.getAllEditedEvents()
         val editedEventIndex = allEvents.indexOfFirst { event -> editedEvent.id == event.id }
diff --git a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/counter/config/CountersConfigAdapter.kt b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/counter/config/CountersConfigAdapter.kt
index 718e66384..ddfecc81b 100644
--- a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/counter/config/CountersConfigAdapter.kt
+++ b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/counter/config/CountersConfigAdapter.kt
@@ -26,11 +26,13 @@ import androidx.recyclerview.widget.RecyclerView
 
 import com.buzbuz.smartautoclicker.core.ui.bindings.fields.setOnTextChangedListener
 import com.buzbuz.smartautoclicker.core.ui.bindings.fields.setText
+import com.buzbuz.smartautoclicker.core.ui.utils.NumberInputFilter
 import com.buzbuz.smartautoclicker.feature.smart.config.R
 import com.buzbuz.smartautoclicker.feature.smart.config.databinding.ItemCounterConfigBinding
 import com.buzbuz.smartautoclicker.feature.smart.config.ui.common.formatters.toNaturalDisplayString
 
 import com.google.android.material.textfield.TextInputLayout
+import kotlin.arrayOf
 
 /**
  * Adapter for the list of counters in the configuration.
@@ -108,6 +110,7 @@ class CountersConfigViewHolder(
             replaceByText.setOnClickListener { onCancelReplace() }
 
             layoutStartingValue.textLayout.hint = root.context.getString(R.string.field_label_counter_starting_value)
+            layoutStartingValue.textField.filters = arrayOf(NumberInputFilter(Double::class))
             layoutStartingValue.textLayout.endIconMode = TextInputLayout.END_ICON_NONE
             layoutStartingValue.setOnTextChangedListener { text ->
                 val counter = item ?: return@setOnTextChangedListener
diff --git a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/counter/creation/CounterCreationDialog.kt b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/counter/creation/CounterCreationDialog.kt
index 10a8d5457..9f5579ed4 100644
--- a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/counter/creation/CounterCreationDialog.kt
+++ b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/counter/creation/CounterCreationDialog.kt
@@ -39,6 +39,7 @@ import kotlinx.coroutines.launch
 
 import kotlin.getValue
 import com.buzbuz.smartautoclicker.core.common.tutorial.domain.model.monitoring.MonitoredOverlayType
+import com.buzbuz.smartautoclicker.core.ui.utils.NumberInputFilter
 
 class CounterCreationDialog : OverlayDialog(R.style.ScenarioConfigTheme) {
 
@@ -71,6 +72,7 @@ class CounterCreationDialog : OverlayDialog(R.style.ScenarioConfigTheme) {
             fieldName.textField.doAfterTextChanged { viewModel.setName(it.toString()) }
 
             fieldStartingValue.root.hint = context.getString(R.string.field_new_counter_starting_value)
+            fieldStartingValue.textField.filters = arrayOf(NumberInputFilter(Double::class))
             fieldStartingValue.textField.inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL
             fieldStartingValue.textField.setText("0")
             fieldStartingValue.textField.doAfterTextChanged {
diff --git a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/event/EventDialogViewModel.kt b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/event/EventDialogViewModel.kt
index 2bc2c45c0..7d19a3874 100644
--- a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/event/EventDialogViewModel.kt
+++ b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/event/EventDialogViewModel.kt
@@ -70,9 +70,11 @@ class EventDialogViewModel @Inject constructor(
 ) : ViewModel() {
 
     private val userEventCooldownTimeUnit: MutableStateFlow<TimeUnitDropDownItem?> =
-        MutableStateFlow(editionRepository.editionState.getEditedEvent<Event>()?.getInitialCooldownTimeUnit())
+        MutableStateFlow(editionRepository.editionState.getEditedEvent()?.getInitialCooldownTimeUnit())
 
-    private var cachedCooldownMs: Long = editionRepository.editionState.getEditedEvent<ScreenEvent>()?.cooldownMs?.takeIf { it > 0 } ?: 100L
+    private var cachedCooldownMs: Long = (editionRepository.editionState.getEditedEvent() as? ScreenEvent)
+        ?.cooldownMs?.takeIf { it > 0 }
+        ?: 100L
 
     /** Tells if the user is currently editing an event. If that's not the case, dialog should be closed. */
     val isEditingEvent: Flow<Boolean> = editionRepository.isEditingEvent
@@ -91,7 +93,7 @@ class EventDialogViewModel @Inject constructor(
         }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(3_000), null)
 
     fun isConfiguringScreenEvent(): Boolean =
-        editionRepository.editionState.getEditedEvent<Event>() is ScreenEvent
+        editionRepository.editionState.getEditedEvent() is ScreenEvent
 
     fun hasUnsavedModifications(): Boolean =
         uiState.value?.hasUnsavedModifications == true
@@ -104,7 +106,7 @@ class EventDialogViewModel @Inject constructor(
 
     fun getTryInfo(): Pair<Scenario, ScreenEvent>? {
         val scenario = editionRepository.editionState.getScenario() ?: return null
-        val event = editionRepository.editionState.getEditedEvent<ScreenEvent>() ?: return null
+        val event = (editionRepository.editionState.getEditedEvent() as? ScreenEvent) ?: return null
 
         return scenario to event
     }
@@ -189,7 +191,7 @@ class EventDialogViewModel @Inject constructor(
     }
 
     private fun updateEditedEvent(closure: (oldValue: Event) -> Event?) {
-        editionRepository.editionState.getEditedEvent<Event>()?.let { oldValue ->
+        editionRepository.editionState.getEditedEvent()?.let { oldValue ->
             viewModelScope.launch {
                 closure(oldValue)?.let { newValue ->
                     editionRepository.updateEditedEvent(newValue)
diff --git a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/mainmenu/MainMenu.kt b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/mainmenu/MainMenu.kt
index 0211460f2..4eebcf4e9 100644
--- a/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/mainmenu/MainMenu.kt
+++ b/feature/smart-config/src/main/java/com/buzbuz/smartautoclicker/feature/smart/config/ui/mainmenu/MainMenu.kt
@@ -22,12 +22,13 @@ import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.view.View
+import androidx.core.view.isVisible
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
-import com.buzbuz.smartautoclicker.core.base.extensions.setLeftCompoundDrawable
 
+import com.buzbuz.smartautoclicker.core.base.extensions.setLeftCompoundDrawable
 import com.buzbuz.smartautoclicker.core.base.isStopScenarioKey
 import com.buzbuz.smartautoclicker.core.common.navigation.TutorialNavigator
 import com.buzbuz.smartautoclicker.core.common.navigation.getTutorialNavigator
@@ -35,6 +36,7 @@ import com.buzbuz.smartautoclicker.core.common.overlays.base.viewModels
 import com.buzbuz.smartautoclicker.core.common.overlays.manager.OverlayManager.Companion.showAsOverlay
 import com.buzbuz.smartautoclicker.core.common.overlays.menu.OverlayMenu
 import com.buzbuz.smartautoclicker.core.common.tutorial.domain.model.data.Tip
+import com.buzbuz.smartautoclicker.core.common.tutorial.domain.model.monitoring.MonitoredOverlayType
 import com.buzbuz.smartautoclicker.core.ui.utils.AnimatedStatesImageButtonController
 import com.buzbuz.smartautoclicker.core.ui.utils.getDynamicColorsContext
 import com.buzbuz.smartautoclicker.feature.smart.config.R
@@ -51,7 +53,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import com.buzbuz.smartautoclicker.core.common.tutorial.domain.model.monitoring.MonitoredOverlayType
 
 /**
  * [OverlayMenu] implementation for displaying the main menu overlay.
@@ -158,6 +159,7 @@ class MainMenu(private val onStopClicked: () -> Unit) : OverlayMenu() {
     override fun onStop() {
         super.onStop()
         viewModel.stopViewMonitoring()
+        viewBinding.btnPlay.tag = null
     }
 
     override fun onDestroy() {
@@ -253,6 +255,8 @@ class MainMenu(private val onStopClicked: () -> Unit) : OverlayMenu() {
         when (newState) {
             UiState.Idle -> {
                 if (currentState == null) {
+                    viewBinding.btnStop.isVisible = true
+                    viewBinding.btnClickList.isVisible = true
                     playPauseButtonController.toState1(false)
                 } else {
                     animateLayoutChanges {
@@ -265,6 +269,8 @@ class MainMenu(private val onStopClicked: () -> Unit) : OverlayMenu() {
 
             UiState.Detecting -> {
                 if (currentState == null) {
+                    viewBinding.btnStop.isVisible = false
+                    viewBinding.btnClickList.isVisible = false
                     playPauseButtonController.toState2(false)
                 } else {
                     animateLayoutChanges {
diff --git a/feature/smart-config/src/main/res/layout/dialog_config_condition_number.xml b/feature/smart-config/src/main/res/layout/dialog_config_condition_number.xml
index be8485a7b..718bcc831 100644
--- a/feature/smart-config/src/main/res/layout/dialog_config_condition_number.xml
+++ b/feature/smart-config/src/main/res/layout/dialog_config_condition_number.xml
@@ -117,12 +117,31 @@
                 android:layout_marginHorizontal="@dimen/margin_horizontal_default"
                 android:layout_marginBottom="@dimen/margin_vertical_large">
 
-                <include layout="@layout/include_field_selector"
-                    android:id="@+id/field_select_area"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="@dimen/margin_horizontal_default"
-                    android:layout_marginVertical="@dimen/margin_vertical_default"/>
+                    android:orientation="vertical">
+
+                    <include layout="@layout/include_input_field_dropdown"
+                        android:id="@+id/field_number_format"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="@dimen/margin_horizontal_default"
+                        android:layout_marginVertical="@dimen/margin_vertical_default"/>
+
+                    <com.google.android.material.divider.MaterialDivider
+                        style="@style/AppTheme.Widget.Divider.Horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"/>
+
+                    <include layout="@layout/include_field_selector"
+                        android:id="@+id/field_select_area"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="@dimen/margin_horizontal_default"
+                        android:layout_marginVertical="@dimen/margin_vertical_default"/>
+
+                </LinearLayout>
 
             </com.google.android.material.card.MaterialCardView>
 
diff --git a/feature/smart-config/src/main/res/values-ar/strings.xml b/feature/smart-config/src/main/res/values-ar/strings.xml
index c8e0e8a5b..ea85f3de5 100644
--- a/feature/smart-config/src/main/res/values-ar/strings.xml
+++ b/feature/smart-config/src/main/res/values-ar/strings.xml
@@ -419,6 +419,14 @@
     <string name="field_text_to_detect_label">النص المراد اكتشافه</string>
     <string name="field_text_detection_alphabet_title">الأبجدية</string>
 
+    <string name="field_number_condition_number_format_label">تنسيق الرقم</string>
+    <string name="dropdown_item_number_format_auto">اكتشاف تلقائي</string>
+    <string name="dropdown_item_number_format_auto_helper">يستنتج الفواصل من بنية الرقم</string>
+    <string name="dropdown_item_number_format_dot_decimal">النقطة عشرية</string>
+    <string name="dropdown_item_number_format_dot_decimal_helper">النقطة هي الفاصل العشري (مثال: 1,234.56)</string>
+    <string name="dropdown_item_number_format_comma_decimal">الفاصلة عشرية</string>
+    <string name="dropdown_item_number_format_comma_decimal_helper">الفاصلة هي الفاصل العشري (مثال: 1.234,56)</string>
+
     <string name="field_number_condition_effect_title">تأثير الشرط</string>
     <string name="message_number_condition_static_value_desc">يجب أن يكون الرقم المكتشف %1$s %2$s</string>
     <string name="message_number_condition_counter_value_desc">يجب أن يكون الرقم المكتشف %1$s قيمة العداد \"%2$s\"</string>
diff --git a/feature/smart-config/src/main/res/values-es/strings.xml b/feature/smart-config/src/main/res/values-es/strings.xml
index f3113a348..d6f0ba513 100644
--- a/feature/smart-config/src/main/res/values-es/strings.xml
+++ b/feature/smart-config/src/main/res/values-es/strings.xml
@@ -419,6 +419,14 @@
     <string name="field_text_to_detect_label">Texto a detectar</string>
     <string name="field_text_detection_alphabet_title">Alfabeto</string>
 
+    <string name="field_number_condition_number_format_label">Formato de número</string>
+    <string name="dropdown_item_number_format_auto">Detección automática</string>
+    <string name="dropdown_item_number_format_auto_helper">Deduce los separadores de la estructura del número</string>
+    <string name="dropdown_item_number_format_dot_decimal">Punto decimal</string>
+    <string name="dropdown_item_number_format_dot_decimal_helper">El punto es el separador decimal (ej. 1,234.56)</string>
+    <string name="dropdown_item_number_format_comma_decimal">Coma decimal</string>
+    <string name="dropdown_item_number_format_comma_decimal_helper">La coma es el separador decimal (ej. 1.234,56)</string>
+
     <string name="field_number_condition_effect_title">Efecto de condición</string>
     <string name="message_number_condition_static_value_desc">El número detectado debe ser %1$s %2$s</string>
     <string name="message_number_condition_counter_value_desc">El número detectado debe ser %1$s el valor del contador \"%2$s\"</string>
diff --git a/feature/smart-config/src/main/res/values-fr/strings.xml b/feature/smart-config/src/main/res/values-fr/strings.xml
index 2b3537a27..819ca379e 100644
--- a/feature/smart-config/src/main/res/values-fr/strings.xml
+++ b/feature/smart-config/src/main/res/values-fr/strings.xml
@@ -398,6 +398,14 @@
     <string name="field_text_to_detect_label">Texte à détecter</string>
     <string name="field_text_detection_alphabet_title">Alphabet</string>
 
+    <string name="field_number_condition_number_format_label">Format du nombre</string>
+    <string name="dropdown_item_number_format_auto">Détection auto</string>
+    <string name="dropdown_item_number_format_auto_helper">Déduit les séparateurs depuis la structure du nombre</string>
+    <string name="dropdown_item_number_format_dot_decimal">Point décimal</string>
+    <string name="dropdown_item_number_format_dot_decimal_helper">Le point est le séparateur décimal (ex. 1 234,56)</string>
+    <string name="dropdown_item_number_format_comma_decimal">Virgule décimale</string>
+    <string name="dropdown_item_number_format_comma_decimal_helper">La virgule est le séparateur décimal (ex. 1.234,56)</string>
+
     <string name="field_number_condition_effect_title">Effet de la condition</string>
     <string name="message_number_condition_static_value_desc">Le nombre détecté doit être %1$s %2$s</string>
     <string name="message_number_condition_counter_value_desc">Le nombre détecté doit être %1$s la valeur du compteur \"%2$s\"</string>
diff --git a/feature/smart-config/src/main/res/values-it/strings.xml b/feature/smart-config/src/main/res/values-it/strings.xml
index d82b74d35..46f0ecb4d 100644
--- a/feature/smart-config/src/main/res/values-it/strings.xml
+++ b/feature/smart-config/src/main/res/values-it/strings.xml
@@ -400,6 +400,14 @@
     <string name="field_text_to_detect_label">Testo da rilevare</string>
     <string name="field_text_detection_alphabet_title">Alfabeto</string>
 
+    <string name="field_number_condition_number_format_label">Formato numero</string>
+    <string name="dropdown_item_number_format_auto">Rilevamento automatico</string>
+    <string name="dropdown_item_number_format_auto_helper">Deduce i separatori dalla struttura del numero</string>
+    <string name="dropdown_item_number_format_dot_decimal">Punto decimale</string>
+    <string name="dropdown_item_number_format_dot_decimal_helper">Il punto è il separatore decimale (es. 1.234,56)</string>
+    <string name="dropdown_item_number_format_comma_decimal">Virgola decimale</string>
+    <string name="dropdown_item_number_format_comma_decimal_helper">La virgola è il separatore decimale (es. 1.234,56)</string>
+
     <string name="field_number_condition_effect_title">Effetto condizione</string>
     <string name="message_number_condition_static_value_desc">Il numero rilevato deve essere %1$s %2$s</string>
     <string name="message_number_condition_counter_value_desc">Il numero rilevato deve essere %1$s il valore del contatore \"%2$s\"</string>
diff --git a/feature/smart-config/src/main/res/values-ja/strings.xml b/feature/smart-config/src/main/res/values-ja/strings.xml
index 7e7f809a5..b13a6eeb5 100644
--- a/feature/smart-config/src/main/res/values-ja/strings.xml
+++ b/feature/smart-config/src/main/res/values-ja/strings.xml
@@ -259,6 +259,14 @@
     <string name="field_text_to_detect_label">検出するテキスト</string>
     <string name="field_text_detection_alphabet_title">アルファベット</string>
 
+    <string name="field_number_condition_number_format_label">数値フォーマット</string>
+    <string name="dropdown_item_number_format_auto">自動検出</string>
+    <string name="dropdown_item_number_format_auto_helper">数値の構造から区切り文字を推測する</string>
+    <string name="dropdown_item_number_format_dot_decimal">ドット小数点</string>
+    <string name="dropdown_item_number_format_dot_decimal_helper">ドットが小数点区切り（例：1,234.56）</string>
+    <string name="dropdown_item_number_format_comma_decimal">カンマ小数点</string>
+    <string name="dropdown_item_number_format_comma_decimal_helper">カンマが小数点区切り（例：1.234,56）</string>
+
     <string name="field_number_condition_effect_title">条件の効果</string>
     <string name="message_number_condition_static_value_desc">検出された数値は %1$s %2$s である必要があります</string>
     <string name="message_number_condition_counter_value_desc">検出された数値はカウンター \"%2$s\" の値 %1$s である必要があります</string>
diff --git a/feature/smart-config/src/main/res/values-pt-rBR/strings.xml b/feature/smart-config/src/main/res/values-pt-rBR/strings.xml
index a50423311..a0a48aff1 100644
--- a/feature/smart-config/src/main/res/values-pt-rBR/strings.xml
+++ b/feature/smart-config/src/main/res/values-pt-rBR/strings.xml
@@ -415,6 +415,14 @@
     <string name="field_text_to_detect_label">Texto a detectar</string>
     <string name="field_text_detection_alphabet_title">Alfabeto</string>
 
+    <string name="field_number_condition_number_format_label">Formato do número</string>
+    <string name="dropdown_item_number_format_auto">Detecção automática</string>
+    <string name="dropdown_item_number_format_auto_helper">Deduz os separadores a partir da estrutura do número</string>
+    <string name="dropdown_item_number_format_dot_decimal">Ponto decimal</string>
+    <string name="dropdown_item_number_format_dot_decimal_helper">O ponto é o separador decimal (ex.: 1.234,56)</string>
+    <string name="dropdown_item_number_format_comma_decimal">Vírgula decimal</string>
+    <string name="dropdown_item_number_format_comma_decimal_helper">A vírgula é o separador decimal (ex.: 1.234,56)</string>
+
     <string name="field_number_condition_effect_title">Efeito da condição</string>
     <string name="message_number_condition_static_value_desc">O número detectado deve ser %1$s %2$s</string>
     <string name="message_number_condition_counter_value_desc">O número detectado deve ser %1$s o valor do contador \"%2$s\"</string>
diff --git a/feature/smart-config/src/main/res/values-ru/strings.xml b/feature/smart-config/src/main/res/values-ru/strings.xml
index a4a512adf..41c7a37e9 100644
--- a/feature/smart-config/src/main/res/values-ru/strings.xml
+++ b/feature/smart-config/src/main/res/values-ru/strings.xml
@@ -419,6 +419,14 @@
     <string name="field_text_to_detect_label">Текст для обнаружения</string>
     <string name="field_text_detection_alphabet_title">Алфавит</string>
 
+    <string name="field_number_condition_number_format_label">Формат числа</string>
+    <string name="dropdown_item_number_format_auto">Автоопределение</string>
+    <string name="dropdown_item_number_format_auto_helper">Определяет разделители по структуре числа</string>
+    <string name="dropdown_item_number_format_dot_decimal">Точка как десятичный разделитель</string>
+    <string name="dropdown_item_number_format_dot_decimal_helper">Точка — десятичный разделитель (пр. 1 234.56)</string>
+    <string name="dropdown_item_number_format_comma_decimal">Запятая как десятичный разделитель</string>
+    <string name="dropdown_item_number_format_comma_decimal_helper">Запятая — десятичный разделитель (пр. 1.234,56)</string>
+
     <string name="field_number_condition_effect_title">Эффект условия</string>
     <string name="message_number_condition_static_value_desc">Обнаруженное число должно быть %1$s %2$s</string>
     <string name="message_number_condition_counter_value_desc">Обнаруженное число должно быть %1$s значением счётчика \"%2$s\"</string>
diff --git a/feature/smart-config/src/main/res/values-uk/strings.xml b/feature/smart-config/src/main/res/values-uk/strings.xml
index 291364992..c8fc9eb1b 100644
--- a/feature/smart-config/src/main/res/values-uk/strings.xml
+++ b/feature/smart-config/src/main/res/values-uk/strings.xml
@@ -422,6 +422,14 @@
     <string name="field_text_to_detect_label">Текст для виявлення</string>
     <string name="field_text_detection_alphabet_title">Алфавіт</string>
 
+    <string name="field_number_condition_number_format_label">Формат числа</string>
+    <string name="dropdown_item_number_format_auto">Автовизначення</string>
+    <string name="dropdown_item_number_format_auto_helper">Визначає роздільники за структурою числа</string>
+    <string name="dropdown_item_number_format_dot_decimal">Крапка як десятковий роздільник</string>
+    <string name="dropdown_item_number_format_dot_decimal_helper">Крапка — десятковий роздільник (пр. 1 234.56)</string>
+    <string name="dropdown_item_number_format_comma_decimal">Кома як десятковий роздільник</string>
+    <string name="dropdown_item_number_format_comma_decimal_helper">Кома — десятковий роздільник (пр. 1.234,56)</string>
+
     <string name="field_number_condition_effect_title">Ефект умови</string>
     <string name="message_number_condition_static_value_desc">Виявлене число повинно бути %1$s %2$s</string>
     <string name="message_number_condition_counter_value_desc">Виявлене число повинно бути %1$s значенням лічильника \"%2$s\"</string>
diff --git a/feature/smart-config/src/main/res/values-zh-rCN/strings.xml b/feature/smart-config/src/main/res/values-zh-rCN/strings.xml
index 1e229fda1..b8424e18f 100644
--- a/feature/smart-config/src/main/res/values-zh-rCN/strings.xml
+++ b/feature/smart-config/src/main/res/values-zh-rCN/strings.xml
@@ -395,6 +395,14 @@
     <string name="field_text_to_detect_label">要检测的文字</string>
     <string name="field_text_detection_alphabet_title">字母表</string>
 
+    <string name="field_number_condition_number_format_label">数字格式</string>
+    <string name="dropdown_item_number_format_auto">自动检测</string>
+    <string name="dropdown_item_number_format_auto_helper">根据数字结构推断分隔符</string>
+    <string name="dropdown_item_number_format_dot_decimal">点号小数</string>
+    <string name="dropdown_item_number_format_dot_decimal_helper">点号为小数分隔符（例：1,234.56）</string>
+    <string name="dropdown_item_number_format_comma_decimal">逗号小数</string>
+    <string name="dropdown_item_number_format_comma_decimal_helper">逗号为小数分隔符（例：1.234,56）</string>
+
     <string name="field_number_condition_effect_title">条件效果</string>
     <string name="message_number_condition_static_value_desc">检测到的数值必须 %1$s %2$s</string>
     <string name="message_number_condition_counter_value_desc">检测到的数值必须 %1$s 计数器 \"%2$s\" 的值</string>
diff --git a/feature/smart-config/src/main/res/values-zh-rTW/strings.xml b/feature/smart-config/src/main/res/values-zh-rTW/strings.xml
index 269e5a8f1..ba6623ed2 100644
--- a/feature/smart-config/src/main/res/values-zh-rTW/strings.xml
+++ b/feature/smart-config/src/main/res/values-zh-rTW/strings.xml
@@ -395,6 +395,14 @@
     <string name="field_text_to_detect_label">要偵測的文字</string>
     <string name="field_text_detection_alphabet_title">字母表</string>
 
+    <string name="field_number_condition_number_format_label">數字格式</string>
+    <string name="dropdown_item_number_format_auto">自動偵測</string>
+    <string name="dropdown_item_number_format_auto_helper">根據數字結構推斷分隔符號</string>
+    <string name="dropdown_item_number_format_dot_decimal">點號小數</string>
+    <string name="dropdown_item_number_format_dot_decimal_helper">點號為小數分隔符（例：1,234.56）</string>
+    <string name="dropdown_item_number_format_comma_decimal">逗號小數</string>
+    <string name="dropdown_item_number_format_comma_decimal_helper">逗號為小數分隔符（例：1.234,56）</string>
+
     <string name="field_number_condition_effect_title">條件效果</string>
     <string name="message_number_condition_static_value_desc">偵測到的數值必須 %1$s %2$s</string>
     <string name="message_number_condition_counter_value_desc">偵測到的數值必須 %1$s 計數器 \"%2$s\" 的值</string>
diff --git a/feature/smart-config/src/main/res/values/strings.xml b/feature/smart-config/src/main/res/values/strings.xml
index 4db8e0233..ee8bdbcfd 100644
--- a/feature/smart-config/src/main/res/values/strings.xml
+++ b/feature/smart-config/src/main/res/values/strings.xml
@@ -251,6 +251,14 @@
 
     <!-- Dialog Condition Number ==================================================================================== -->
 
+    <string name="field_number_condition_number_format_label">Detection number format</string>
+    <string name="dropdown_item_number_format_auto">Auto-detect</string>
+    <string name="dropdown_item_number_format_auto_helper">Infers separators from the number structure</string>
+    <string name="dropdown_item_number_format_dot_decimal">Dot decimal</string>
+    <string name="dropdown_item_number_format_dot_decimal_helper">Dot is decimal separator (e.g. 1,234.56)</string>
+    <string name="dropdown_item_number_format_comma_decimal">Comma decimal</string>
+    <string name="dropdown_item_number_format_comma_decimal_helper">Comma is decimal separator (e.g. 1.234,56)</string>
+
     <string name="field_number_condition_effect_title">Condition effect</string>
     <!--Ex: The detected number must be greater than 10 -->
     <string name="message_number_condition_static_value_desc">The detected number must be %1$s %2$s</string>
diff --git a/feature/smart-debugging/src/main/java/com/buzbuz/smartautoclicker/feature/smart/debugging/ui/dialog/live/conditiontry/TryImageConditionViewModel.kt b/feature/smart-debugging/src/main/java/com/buzbuz/smartautoclicker/feature/smart/debugging/ui/dialog/live/conditiontry/TryImageConditionViewModel.kt
index 32fa8b594..3189aba8b 100644
--- a/feature/smart-debugging/src/main/java/com/buzbuz/smartautoclicker/feature/smart/debugging/ui/dialog/live/conditiontry/TryImageConditionViewModel.kt
+++ b/feature/smart-debugging/src/main/java/com/buzbuz/smartautoclicker/feature/smart/debugging/ui/dialog/live/conditiontry/TryImageConditionViewModel.kt
@@ -20,8 +20,8 @@ import android.content.Context
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.buzbuz.smartautoclicker.core.domain.model.condition.ScreenCondition
 
+import com.buzbuz.smartautoclicker.core.domain.model.condition.ScreenCondition
 import com.buzbuz.smartautoclicker.core.domain.model.scenario.Scenario
 import com.buzbuz.smartautoclicker.core.processing.domain.SmartProcessingRepository
 import com.buzbuz.smartautoclicker.core.processing.domain.model.DetectionState
@@ -41,6 +41,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
 import javax.inject.Inject
+import kotlin.time.Duration.Companion.milliseconds
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class TryImageConditionViewModel @Inject constructor(
@@ -54,7 +55,7 @@ class TryImageConditionViewModel @Inject constructor(
 
     private val userThreshold: MutableStateFlow<Int> = MutableStateFlow(0)
 
-    private val detectionResult: Flow<ScreenConditionResultUiState?> = detectionResultUseCase()
+    private val detectionResult: Flow<ScreenConditionResultUiState?> = detectionResultUseCase(filterNotFulfilled = false)
         .combine(isPlaying) { results, playing -> if (playing) results else null }
         .map { results ->
             if (results == null || results.conditionsResults.isEmpty()) null
@@ -80,7 +81,7 @@ class TryImageConditionViewModel @Inject constructor(
         viewModelScope.launch {
             userThreshold.value = imageCondition.threshold
 
-            delay(500)
+            delay(500.milliseconds)
             smartProcessingRepository.tryScreenCondition(context, scenario, imageCondition)
         }
     }