diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 00000000..a6ec6492
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="android">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 44ca2d9b..b67486ec 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,30 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/application/build.gradle.kts b/application/build.gradle.kts
index 42927910..c0c18007 100644
--- a/application/build.gradle.kts
+++ b/application/build.gradle.kts
@@ -16,7 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import extension.*
+import extension.catalog
+import extension.config
+import extension.distribution
+import extension.name
 
 plugins {
     alias(libs.plugins.neoutils.neoregex.android)
diff --git a/application/installation/com.neoutils.NeoRegex.metainfo.xml b/application/installation/com.neoutils.NeoRegex.metainfo.xml
index c310ee2f..9c40248d 100644
--- a/application/installation/com.neoutils.NeoRegex.metainfo.xml
+++ b/application/installation/com.neoutils.NeoRegex.metainfo.xml
@@ -10,7 +10,8 @@
 
     <description>
         <p>
-            Visualize the functioning of your regular expressions in real-time with a useful and intuitive tool. With support for capture groups, undo, and redo.
+            Visualize the functioning of your regular expressions in real-time with a useful and intuitive tool. With
+            support for capture groups, undo, and redo.
         </p>
     </description>
 
@@ -50,10 +51,9 @@
             <description>
                 <p>Improvements in user experience.</p>
                 <ul>
-                    <li>Small improvements across the application.</li>
                     <li>Customized window for a personalized experience.</li>
-                    <li>Enhanced touchscreen support for better usability on touch devices.</li>
                     <li>Improved theme detection.</li>
+                    <li>Small improvements.</li>
                 </ul>
             </description>
         </release>
diff --git a/application/src/androidMain/kotlin/com/neoutils/neoregex/Main.android.kt b/application/src/androidMain/kotlin/com/neoutils/neoregex/Main.android.kt
index 7e3dc00d..757f6569 100644
--- a/application/src/androidMain/kotlin/com/neoutils/neoregex/Main.android.kt
+++ b/application/src/androidMain/kotlin/com/neoutils/neoregex/Main.android.kt
@@ -26,8 +26,8 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.ui.Modifier
-import com.neoutils.neoregex.core.common.util.UiMode
-import com.neoutils.neoregex.core.common.util.resolve
+import com.neoutils.neoregex.core.common.util.ColorTheme
+import com.neoutils.neoregex.core.common.util.colorTheme
 import com.neoutils.neoregex.core.designsystem.theme.NeoTheme
 
 class MainActivity : ComponentActivity() {
@@ -38,6 +38,7 @@ class MainActivity : ComponentActivity() {
         setupSystemBars()
 
         setContent {
+
             NeoTheme {
                 App(Modifier.safeDrawingPadding())
             }
@@ -46,14 +47,14 @@ class MainActivity : ComponentActivity() {
 
     private fun setupSystemBars() {
 
-        val style = when (UiMode.resolve(context = this)) {
-            UiMode.DARK -> {
+        val style = when (colorTheme) {
+            ColorTheme.DARK -> {
                 SystemBarStyle.dark(
                     Color.BLACK,
                 )
             }
 
-            UiMode.LIGHT -> {
+            ColorTheme.LIGHT -> {
                 SystemBarStyle.light(
                     Color.WHITE,
                     Color.BLACK,
diff --git a/application/src/desktopMain/kotlin/com/neoutils/neoregex/Main.desktop.kt b/application/src/desktopMain/kotlin/com/neoutils/neoregex/Main.desktop.kt
index 5dcc3276..4bf1350b 100644
--- a/application/src/desktopMain/kotlin/com/neoutils/neoregex/Main.desktop.kt
+++ b/application/src/desktopMain/kotlin/com/neoutils/neoregex/Main.desktop.kt
@@ -16,80 +16,95 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+@file:OptIn(ExperimentalComposeUiApi::class)
+
 package com.neoutils.neoregex
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme.colorScheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.FrameWindowScope
-import androidx.compose.ui.window.application
-import com.neoutils.neoregex.core.common.util.UiMode
-import com.neoutils.neoregex.core.common.util.isDark
-import com.neoutils.neoregex.core.common.util.resolve
+import androidx.compose.ui.window.launchApplication
+import com.neoutils.neoregex.core.common.util.ColorTheme
+import com.neoutils.neoregex.core.common.util.rememberColorTheme
 import com.neoutils.neoregex.core.designsystem.theme.NeoTheme
 import com.neoutils.neoregex.core.designsystem.theme.NeoTheme.dimensions
 import com.neoutils.neoregex.core.resources.Res
 import com.neoutils.neoregex.core.resources.app_name
 import com.neoutils.neoregex.core.resources.github
-import com.neoutils.neoregex.core.sharedui.component.DefaultHeader
+import com.neoutils.neoregex.core.sharedui.component.NeoHeader
 import com.neoutils.neoregex.core.sharedui.component.NeoWindow
+import kotlinx.coroutines.CoroutineScope
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
+import org.jetbrains.skiko.MainUIDispatcher
 
-fun main() = application {
-
-    val uiMode = remember { UiMode.resolve() }
-
-    NeoTheme(uiMode.isDark) {
-        NeoWindow(
-            header = {
-                TitleBar()
+fun main() {
+    with(CoroutineScope(MainUIDispatcher)) {
+        launchApplication {
+            NeoTheme {
+                NeoWindow(
+                    header = {
+                        Header()
+                    }
+                ) {
+                    App()
+                }
             }
-        ) {
-            App()
         }
     }
 }
 
 @Composable
-private fun FrameWindowScope.TitleBar(
+private fun FrameWindowScope.Header(
     title: String = stringResource(Res.string.app_name),
-    uiMode: UiMode = remember { UiMode.resolve() }
-) {
-    DefaultHeader(
-        title = title,
-        options = {
-            val uriHandler = LocalUriHandler.current
+    colorTheme: ColorTheme = rememberColorTheme()
+) = NeoHeader { padding ->
 
-            Icon(
-                painter = painterResource(Res.drawable.github),
-                contentDescription = null,
-                tint = when (uiMode) {
-                    UiMode.LIGHT -> colorScheme.onSurface
-                    UiMode.DARK -> colorScheme.onSurface
-                },
-                modifier = Modifier
-                    .clip(CircleShape)
-                    .clickable(
-                        onClick = {
-                            uriHandler.openUri(
-                                uri = "https://github.com/NeoUtils/NeoRegex"
-                            )
-                        }
-                    )
-                    .padding(dimensions.medium)
-                    .aspectRatio(ratio = 1f)
-            )
-        }
+    Text(
+        text = title,
+        modifier = Modifier.align(
+            Alignment.Center
+        )
     )
+
+    Row(
+        modifier = Modifier
+            .padding(padding)
+            .padding(horizontal = dimensions.medium)
+            .align(Alignment.CenterEnd)
+    ) {
+        val uriHandler = LocalUriHandler.current
+
+        Icon(
+            painter = painterResource(Res.drawable.github),
+            contentDescription = null,
+            tint = when (colorTheme) {
+                ColorTheme.LIGHT -> colorScheme.onSurface
+                ColorTheme.DARK -> colorScheme.onSurface
+            },
+            modifier = Modifier
+                .clip(CircleShape)
+                .clickable(
+                    onClick = {
+                        uriHandler.openUri(
+                            uri = "https://github.com/NeoUtils/NeoRegex"
+                        )
+                    }
+                )
+                .padding(dimensions.medium)
+                .aspectRatio(ratio = 1f)
+        )
+    }
 }
diff --git a/build-logic/src/main/kotlin/extension/Project.kt b/build-logic/src/main/kotlin/extension/Project.kt
index 0ba93e53..eef306ca 100644
--- a/build-logic/src/main/kotlin/extension/Project.kt
+++ b/build-logic/src/main/kotlin/extension/Project.kt
@@ -26,8 +26,8 @@ import org.gradle.kotlin.dsl.the
 val config = Config(
     version = Config.Version(
         major = 2,
-        minor = 2,
-        patch = 1,
+        minor = 3,
+        patch = 0,
         phase = Config.Phase.RELEASE
     ),
     android = Config.Android(
diff --git a/core/common/src/androidMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.android.kt b/core/common/src/androidMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.android.kt
index 0ba769c7..06614d80 100644
--- a/core/common/src/androidMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.android.kt
+++ b/core/common/src/androidMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.android.kt
@@ -18,7 +18,4 @@
 
 package com.neoutils.neoregex.core.common.platform
 
-import com.neoutils.neoregex.core.common.platform.Platform
-
-actual val Platform.Companion.Current: Platform
-    get() = Platform.ANDROID
\ No newline at end of file
+actual val platform: Platform = Platform.Android
\ No newline at end of file
diff --git a/core/common/src/androidMain/kotlin/com/neoutils/neoregex/core/common/util/UiMode.android.kt b/core/common/src/androidMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.android.kt
similarity index 69%
rename from core/common/src/androidMain/kotlin/com/neoutils/neoregex/core/common/util/UiMode.android.kt
rename to core/common/src/androidMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.android.kt
index 98cec81f..615a0b1b 100644
--- a/core/common/src/androidMain/kotlin/com/neoutils/neoregex/core/common/util/UiMode.android.kt
+++ b/core/common/src/androidMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.android.kt
@@ -21,17 +21,26 @@ package com.neoutils.neoregex.core.common.util
 import android.content.Context
 import android.content.res.Configuration.UI_MODE_NIGHT_MASK
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
-import com.neoutils.neoregex.core.common.util.UiMode
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.runtime.Composable
 
-fun UiMode.Companion.resolve(context: Context): UiMode {
+@Composable
+actual fun rememberColorTheme(): ColorTheme {
 
-    return when (context.resources.configuration.uiMode and UI_MODE_NIGHT_MASK) {
+    return if (isSystemInDarkTheme()) {
+        ColorTheme.DARK
+    } else {
+        ColorTheme.LIGHT
+    }
+}
+
+val Context.colorTheme
+    get() = when (resources.configuration.uiMode and UI_MODE_NIGHT_MASK) {
         UI_MODE_NIGHT_YES -> {
-            UiMode.DARK
+            ColorTheme.DARK
         }
 
         else -> {
-            UiMode.LIGHT
+            ColorTheme.LIGHT
         }
     }
-}
diff --git a/core/common/src/commonMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.kt b/core/common/src/commonMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.kt
index 520729c2..19446db1 100644
--- a/core/common/src/commonMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.kt
+++ b/core/common/src/commonMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.kt
@@ -18,12 +18,18 @@
 
 package com.neoutils.neoregex.core.common.platform
 
-enum class Platform {
-    DESKTOP,
-    ANDROID,
-    WEB;
+sealed class Platform {
 
-    companion object
+    sealed class Desktop : Platform() {
+        data object Windows : Desktop()
+        data object Linux : Desktop()
+        data object MacOS : Desktop()
+    }
+
+    data object Android : Platform()
+
+    // Experimental
+    data object Web : Platform()
 }
 
-expect val Platform.Companion.Current: Platform
\ No newline at end of file
+expect val platform: Platform
\ No newline at end of file
diff --git a/core/common/src/commonMain/kotlin/com/neoutils/neoregex/core/common/util/UiMode.kt b/core/common/src/commonMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.kt
similarity index 76%
rename from core/common/src/commonMain/kotlin/com/neoutils/neoregex/core/common/util/UiMode.kt
rename to core/common/src/commonMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.kt
index 3349e2de..dc45a3f3 100644
--- a/core/common/src/commonMain/kotlin/com/neoutils/neoregex/core/common/util/UiMode.kt
+++ b/core/common/src/commonMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.kt
@@ -18,12 +18,18 @@
 
 package com.neoutils.neoregex.core.common.util
 
-enum class UiMode {
+import androidx.compose.runtime.Composable
+
+enum class ColorTheme {
     LIGHT,
     DARK;
 
-    companion object
+    val isLight: Boolean
+        get() = this == LIGHT
+
+    val isDark: Boolean
+        get() = this == DARK
 }
 
-val UiMode.isDark: Boolean
-    get() = this == UiMode.DARK
+@Composable
+expect fun rememberColorTheme(): ColorTheme
\ No newline at end of file
diff --git a/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.desktop.kt b/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.desktop.kt
index 78ed80a8..c3f0e873 100644
--- a/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.desktop.kt
+++ b/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.desktop.kt
@@ -18,7 +18,12 @@
 
 package com.neoutils.neoregex.core.common.platform
 
-import com.neoutils.neoregex.core.common.platform.Platform
+import org.jetbrains.skiko.OS
+import org.jetbrains.skiko.hostOs
 
-actual val Platform.Companion.Current
-    get() = Platform.DESKTOP
\ No newline at end of file
+actual val platform: Platform = when (hostOs) {
+    OS.Linux -> Platform.Desktop.Linux
+    OS.Windows -> Platform.Desktop.Windows
+    OS.MacOS -> Platform.Desktop.MacOS
+    else -> error("Unsupported platform ${hostOs.name}")
+}
diff --git a/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/UiMode.desktop.kt b/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.desktop.kt
similarity index 55%
rename from core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/UiMode.desktop.kt
rename to core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.desktop.kt
index 41531ec9..8304fd77 100644
--- a/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/UiMode.desktop.kt
+++ b/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.desktop.kt
@@ -18,26 +18,29 @@
 
 package com.neoutils.neoregex.core.common.util
 
-import com.neoutils.neoregex.core.common.util.UiMode.DARK
-import com.neoutils.neoregex.core.common.util.UiMode.LIGHT
-import org.jetbrains.skiko.OS
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import com.neoutils.neoregex.core.common.platform.Platform
+import com.neoutils.neoregex.core.common.platform.platform
 import org.jetbrains.skiko.SystemTheme
 import org.jetbrains.skiko.currentSystemTheme
-import org.jetbrains.skiko.hostOs
 
-fun UiMode.Companion.resolve(): UiMode {
+@Composable
+actual fun rememberColorTheme(): ColorTheme {
 
-    return when (hostOs) {
-        OS.Linux -> {
-            XDGDesktopPortal().use {
-                it.getTheme()
+    return remember {
+        when (platform) {
+            Platform.Desktop.Linux -> {
+                XDGDesktopPortal().use {
+                    it.getTheme()
+                }
             }
-        }
 
-        else -> when (currentSystemTheme) {
-            SystemTheme.LIGHT -> LIGHT
-            SystemTheme.DARK -> DARK
-            SystemTheme.UNKNOWN -> LIGHT
+            else -> when (currentSystemTheme) {
+                SystemTheme.LIGHT -> ColorTheme.LIGHT
+                SystemTheme.DARK -> ColorTheme.DARK
+                SystemTheme.UNKNOWN -> ColorTheme.LIGHT
+            }
         }
     }
 }
diff --git a/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/XDGDesktopPortal.kt b/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/XDGDesktopPortal.kt
index 0e638983..e0087872 100644
--- a/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/XDGDesktopPortal.kt
+++ b/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/XDGDesktopPortal.kt
@@ -31,7 +31,7 @@ class XDGDesktopPortal(
         .build()
 ) : AutoCloseable {
 
-    fun getTheme(): UiMode {
+    fun getTheme(): ColorTheme {
 
         val settings = connection.getRemoteObject(
             BUS,
@@ -45,9 +45,9 @@ class XDGDesktopPortal(
         )
 
         return when (theme.value.value) {
-            Theme.LIGHT.value -> UiMode.LIGHT
-            Theme.DARK.value -> UiMode.DARK
-            else -> UiMode.LIGHT
+            Theme.LIGHT.value -> ColorTheme.LIGHT
+            Theme.DARK.value -> ColorTheme.DARK
+            else -> ColorTheme.LIGHT
         }
     }
 
diff --git a/core/common/src/webMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.web.kt b/core/common/src/webMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.web.kt
index 9a4c3d1a..ac771a5a 100644
--- a/core/common/src/webMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.web.kt
+++ b/core/common/src/webMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.web.kt
@@ -18,5 +18,4 @@
 
 package com.neoutils.neoregex.core.common.platform
 
-actual val Platform.Companion.Current: Platform
-    get() = Platform.WEB
\ No newline at end of file
+actual val platform: Platform = Platform.Web
\ No newline at end of file
diff --git a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/extension/Modifier.kt b/core/common/src/webMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.web.kt
similarity index 61%
rename from core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/extension/Modifier.kt
rename to core/common/src/webMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.web.kt
index e7b74021..a41cef72 100644
--- a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/extension/Modifier.kt
+++ b/core/common/src/webMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.web.kt
@@ -16,15 +16,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.neoutils.neoregex.core.sharedui.extension
+package com.neoutils.neoregex.core.common.util
 
-import androidx.compose.ui.Modifier
+import androidx.compose.runtime.Composable
+import org.jetbrains.skiko.SystemTheme
+import org.jetbrains.skiko.currentSystemTheme
 
-inline fun Modifier.applyIf(
-    mustApply: Boolean,
-    apply: Modifier. () -> Modifier
-): Modifier {
-    return if (mustApply) {
-        apply()
-    } else this
+@Composable
+actual fun rememberColorTheme(): ColorTheme {
+
+    return when (currentSystemTheme) {
+        SystemTheme.LIGHT -> ColorTheme.LIGHT
+        SystemTheme.DARK -> ColorTheme.DARK
+        SystemTheme.UNKNOWN -> ColorTheme.LIGHT
+    }
 }
diff --git a/core/design-system/build.gradle.kts b/core/design-system/build.gradle.kts
index cedbc197..d8438b49 100644
--- a/core/design-system/build.gradle.kts
+++ b/core/design-system/build.gradle.kts
@@ -31,6 +31,7 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             implementation(projects.core.resources)
+            implementation(projects.core.common)
         }
     }
 }
diff --git a/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/Dimensions.kt b/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/Dimensions.kt
index b4684a3d..38d8adaa 100644
--- a/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/Dimensions.kt
+++ b/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/Dimensions.kt
@@ -27,8 +27,9 @@ val LocalDimensions = compositionLocalOf<Dimensions> { error("Dimensions not def
 data class Dimensions(
     val micro: Dp = 2.dp,
     val tiny: Dp = 4.dp,
-    val small: Dp = 8.dp,
     val medium: Dp = 6.dp,
+    val small: Dp = 8.dp,
+    val short: Dp = 12.dp,
     val default: Dp = 16.dp,
     val large: Dp = 24.dp,
     val huge: Dp = 32.dp,
diff --git a/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/FontSizes.kt b/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/FontSizes.kt
index 2b56a4e1..0639ded8 100644
--- a/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/FontSizes.kt
+++ b/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/FontSizes.kt
@@ -30,4 +30,5 @@ data class FontSizes(
     val medium: TextUnit = 16.sp,
     val default: TextUnit = 14.sp,
     val small: TextUnit = 12.sp,
+    val tiny: TextUnit = 10.sp,
 )
\ No newline at end of file
diff --git a/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/Theme.kt b/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/Theme.kt
index 26e0bda9..26394932 100644
--- a/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/Theme.kt
+++ b/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/Theme.kt
@@ -18,7 +18,6 @@
 
 package com.neoutils.neoregex.core.designsystem.theme
 
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.*
 import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.runtime.Composable
@@ -26,6 +25,12 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontFamily
+import com.neoutils.neoregex.core.common.util.ColorTheme
+import com.neoutils.neoregex.core.common.util.rememberColorTheme
+import com.neoutils.neoregex.core.resources.Res
+import com.neoutils.neoregex.core.resources.roboto_mono
+import org.jetbrains.compose.resources.Font
 
 private val LightColors = lightColorScheme(
     primary = Blue700,
@@ -63,18 +68,33 @@ private val DarkColors = darkColorScheme(
 
 @Composable
 fun NeoTheme(
-    darkMode: Boolean = isSystemInDarkTheme(),
+    colorTheme: ColorTheme = rememberColorTheme(),
+    content: @Composable () -> Unit
+) {
+    NeoBaseTheme(
+        colorScheme = when (colorTheme) {
+            ColorTheme.LIGHT -> LightColors
+            ColorTheme.DARK -> DarkColors
+        },
+        fontSizes = FontSizes(),
+        dimensions = Dimensions(),
+        typography = NeoTypography(
+            fontFamily = FontFamily(Font(Res.font.roboto_mono))
+        ),
+        content = content
+    )
+}
+
+@Composable
+fun NeoBaseTheme(
+    colorScheme: ColorScheme,
     fontSizes: FontSizes = FontSizes(),
     dimensions: Dimensions = Dimensions(),
     typography: Typography = NeoTypography(),
     content: @Composable () -> Unit
 ) {
     MaterialTheme(
-        colorScheme = if (darkMode) {
-            DarkColors
-        } else {
-            LightColors
-        },
+        colorScheme = colorScheme,
         typography = typography,
     ) {
         CompositionLocalProvider(
diff --git a/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/Typhography.kt b/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/Typhography.kt
index 7ff613c3..d1c24db0 100644
--- a/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/Typhography.kt
+++ b/core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/Typhography.kt
@@ -24,117 +24,84 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
-import com.neoutils.neoregex.core.resources.Res
-import com.neoutils.neoregex.core.resources.roboto_mono
-import org.jetbrains.compose.resources.Font
 
 @Composable
-internal fun NeoTypography(
-    fontFamily: FontFamily = FontFamily(Font(Res.font.roboto_mono))
+fun NeoTypography(
+    fontFamily: FontFamily = FontFamily.Default
 ) = Typography(
     displayLarge = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Bold,
         fontSize = 57.sp,
-        lineHeight = 64.sp,
-        letterSpacing = 0.sp
     ),
     displayMedium = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Bold,
         fontSize = 45.sp,
-        lineHeight = 52.sp,
-        letterSpacing = 0.sp
     ),
     displaySmall = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Bold,
         fontSize = 36.sp,
-        lineHeight = 44.sp,
-        letterSpacing = 0.sp
     ),
     headlineLarge = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Normal,
         fontSize = 32.sp,
-        lineHeight = 40.sp,
-        letterSpacing = 0.sp
     ),
     headlineMedium = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Normal,
         fontSize = 28.sp,
-        lineHeight = 36.sp,
-        letterSpacing = 0.sp
     ),
     headlineSmall = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Normal,
         fontSize = 24.sp,
-        lineHeight = 32.sp,
-        letterSpacing = 0.sp
     ),
     titleLarge = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.SemiBold,
         fontSize = 22.sp,
-        lineHeight = 28.sp,
-        letterSpacing = 0.sp
     ),
     titleMedium = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Medium,
         fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.1.sp
     ),
     titleSmall = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Medium,
         fontSize = 14.sp,
-        lineHeight = 20.sp,
-        letterSpacing = 0.1.sp
     ),
     bodyLarge = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Normal,
         fontSize = 16.sp,
-        lineHeight = 25.sp,
-        letterSpacing = 0.5.sp
     ),
     bodyMedium = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Normal,
         fontSize = 14.sp,
-        lineHeight = 20.sp,
-        letterSpacing = 0.25.sp
     ),
     bodySmall = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Normal,
         fontSize = 12.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.4.sp
     ),
     labelLarge = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Medium,
         fontSize = 14.sp,
-        lineHeight = 20.sp,
-        letterSpacing = 0.1.sp
     ),
     labelMedium = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Medium,
         fontSize = 12.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp
     ),
     labelSmall = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Medium,
         fontSize = 11.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp
     )
 )
\ No newline at end of file
diff --git a/core/resources/src/commonMain/composeResources/values/strings.xml b/core/resources/src/commonMain/composeResources/values/strings.xml
index de0b0229..65d00603 100644
--- a/core/resources/src/commonMain/composeResources/values/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values/strings.xml
@@ -18,5 +18,21 @@
 
 <resources>
     <string name="app_name">NeoRegex</string>
+
+    <string name="matcher_footer_insert_regex_hint">Enter regular expression</string>
+
+    <string name="fatal_error_title">Fatal error: %1$s</string>
+    <string name="fatal_error_subtitle">Oops! Something went wrong.</string>
+    <string name="fatal_error_message">We'd love to fix this! If possible, please share what happened.</string>
+    <string name="fatal_error_copy_btn">Copy error</string>
+    <string name="fatal_error_copied_label">Copied!</string>
+    <string name="fatal_error_report_tab">Report error</string>
+    <string name="fatal_error_report_btn">Report error</string>
+    <string name="fatal_error_stack_trace_tab">Stack trace</string>
     <string name="insert_regex_hint">Enter regular expression</string>
-</resources>
\ No newline at end of file
+
+    <plurals name="match_result_infos">
+        <item quantity="one">%1$s match (%2$s)</item>
+        <item quantity="other">%1$s matches (%2$s)</item>
+    </plurals>
+</resources>
diff --git a/core/shared-ui/src/androidMain/kotlin/com/neoutils/neoregex/core/sharedui/component/TextEditor.android.kt b/core/shared-ui/src/androidMain/kotlin/com/neoutils/neoregex/core/sharedui/component/TextEditor.android.kt
index adc48d55..b635e35b 100644
--- a/core/shared-ui/src/androidMain/kotlin/com/neoutils/neoregex/core/sharedui/component/TextEditor.android.kt
+++ b/core/shared-ui/src/androidMain/kotlin/com/neoutils/neoregex/core/sharedui/component/TextEditor.android.kt
@@ -30,11 +30,8 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.MaterialTheme.typography
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawBehind
@@ -42,15 +39,12 @@ import androidx.compose.ui.focus.FocusState
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.LineHeightStyle
-import androidx.compose.ui.text.style.TextOverflow
-import com.neoutils.neoregex.core.sharedui.component.LineNumbers
 import com.neoutils.neoregex.core.designsystem.theme.NeoTheme.dimensions
 import com.neoutils.neoregex.core.sharedui.extension.getBoundingBoxes
 import com.neoutils.neoregex.core.sharedui.model.Match
diff --git a/core/shared-ui/src/commonMain/kotlin/com/neoutils/neoregex/core/sharedui/component/MatchesInfos.kt b/core/shared-ui/src/commonMain/kotlin/com/neoutils/neoregex/core/sharedui/component/MatchesInfos.kt
new file mode 100644
index 00000000..9ac4e5a7
--- /dev/null
+++ b/core/shared-ui/src/commonMain/kotlin/com/neoutils/neoregex/core/sharedui/component/MatchesInfos.kt
@@ -0,0 +1,237 @@
+/*
+ * NeoRegex.
+ *
+ * Copyright (C) 2024 Irineu A. Silva.
+ *
+ * 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.
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
+package com.neoutils.neoregex.core.sharedui.component
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.VectorConverter
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.gestures.detectDragGestures
+import androidx.compose.foundation.hoverable
+import androidx.compose.foundation.indication
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme.colorScheme
+import androidx.compose.material3.MaterialTheme.typography
+import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.boundsInParent
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.round
+import com.neoutils.neoregex.core.common.platform.Platform
+import com.neoutils.neoregex.core.common.platform.platform
+import com.neoutils.neoregex.core.designsystem.theme.NeoTheme.dimensions
+import com.neoutils.neoregex.core.designsystem.theme.NeoTheme.fontSizes
+import com.neoutils.neoregex.core.resources.Res
+import com.neoutils.neoregex.core.resources.match_result_infos
+import kotlinx.coroutines.launch
+import org.jetbrains.compose.resources.pluralStringResource
+import kotlin.time.Duration
+import kotlin.time.DurationUnit
+
+@Composable
+fun BoxWithConstraintsScope.MatchesInfos(infos: MatchesInfos) {
+
+    val density = LocalDensity.current
+
+    var isRunning by remember { mutableStateOf(false) }
+
+    val animateOffset = remember { Animatable(Offset.Zero, Offset.VectorConverter) }
+
+    var alignments by remember { mutableStateOf<Map<Alignment, Rect>>(mapOf()) }
+
+    var current by remember { mutableStateOf(Alignment.BottomEnd) }
+
+    // It needs to be a state to update the reference in pointerInput()
+    val halfHeight by rememberUpdatedState(density.run { maxHeight.toPx() / 2f })
+
+    var targetRect by remember { mutableStateOf(Rect.Zero) }
+
+    var destination by remember { mutableStateOf(current) }
+
+    val scope = rememberCoroutineScope()
+
+    listOf(
+        Alignment.TopEnd,
+        Alignment.BottomEnd
+    ).forEach { alignment ->
+        AlignmentTarget(
+            alignment = alignment,
+            isVisible = isRunning,
+            isTarget = alignment == destination,
+            modifier = Modifier
+                .padding(dimensions.tiny)
+                .size(density.run { targetRect.size.toDpSize() })
+                .onGloballyPositioned {
+                    alignments = alignments + mapOf(
+                        alignment to it.boundsInParent()
+                    )
+                }
+        )
+    }
+
+    Text(
+        text = pluralStringResource(
+            Res.plurals.match_result_infos,
+            infos.matches,
+            infos.matches,
+            infos.duration.toString(
+                unit = DurationUnit.MILLISECONDS,
+                decimals = 3
+            )
+        ),
+        fontSize = fontSizes.tiny,
+        style = typography.labelSmall,
+        modifier = Modifier
+            .align(current)
+            .offset { animateOffset.value.round() }
+            .padding(dimensions.tiny) // external
+            .background(
+                color = colorScheme.surfaceVariant,
+                shape = RoundedCornerShape(dimensions.tiny)
+            )
+            .onGloballyPositioned {
+                targetRect = it.boundsInParent()
+            }
+            .run {
+                val hover = remember { MutableInteractionSource() }
+
+                hoverable(hover)
+                    .indication(
+                        interactionSource = hover,
+                        indication = ripple()
+                    )
+            }
+            .pointerInput(Unit) {
+                detectDragGestures(
+                    onDragStart = {
+                        isRunning = true
+                    },
+                    onDragEnd = {
+                        scope.launch {
+
+                            alignments[destination]?.let {
+                                animateOffset.snapTo(
+                                    targetValue = targetRect.topLeft - it.topLeft
+                                )
+                            }
+
+                            current = destination
+
+                            animateOffset.animateTo(Offset.Zero)
+                        }
+
+                        isRunning = false
+                    },
+                    onDrag = { changes, dragAmount ->
+                        changes.consume()
+
+                        scope.launch {
+                            animateOffset.snapTo(
+                                targetValue = animateOffset.value + dragAmount
+                            )
+                        }
+
+                        destination = when {
+                            current == Alignment.TopEnd &&
+                                    targetRect.center.y > halfHeight -> Alignment.BottomEnd
+
+                            current == Alignment.BottomEnd &&
+                                    targetRect.center.y < halfHeight -> Alignment.TopEnd
+
+                            else -> current
+                        }
+                    },
+                    onDragCancel = {
+                        scope.launch {
+                            animateOffset.animateTo(Offset.Zero)
+                        }
+
+                        isRunning = false
+                    }
+                )
+            }
+            .padding(dimensions.micro) // internal
+    )
+}
+
+@Composable
+private fun BoxScope.AlignmentTarget(
+    isVisible: Boolean,
+    alignment: Alignment,
+    isTarget: Boolean,
+    modifier: Modifier = Modifier
+) = AnimatedVisibility(
+    visible = isVisible,
+    enter = fadeIn(),
+    exit = fadeOut(),
+    modifier = modifier.align(alignment)
+) {
+    Box(
+        modifier = Modifier
+            .background(
+                color = colorScheme.primary.copy(
+                    alpha = 0.2f
+                ),
+                shape = RoundedCornerShape(dimensions.tiny)
+            ).run {
+                if (isTarget) {
+                    border(
+                        width = 1.dp,
+                        color = colorScheme.primary,
+                        shape = RoundedCornerShape(dimensions.tiny)
+                    )
+                } else this
+            }
+    )
+}
+
+data class MatchesInfos(
+    val duration: Duration,
+    val matches: Int
+) {
+    companion object {
+        fun create(
+            duration: Duration = Duration.ZERO,
+            matches: Int = 0
+        ): MatchesInfos? = when (platform) {
+            is Platform.Android,
+            is Platform.Desktop -> {
+                MatchesInfos(
+                    duration = duration,
+                    matches = matches
+                )
+            }
+
+            Platform.Web -> null
+        }
+    }
+}
diff --git a/core/shared-ui/src/commonMain/kotlin/com/neoutils/neoregex/core/sharedui/model/Match.kt b/core/shared-ui/src/commonMain/kotlin/com/neoutils/neoregex/core/sharedui/model/Match.kt
index 3b11a83c..ceb5a1f3 100644
--- a/core/shared-ui/src/commonMain/kotlin/com/neoutils/neoregex/core/sharedui/model/Match.kt
+++ b/core/shared-ui/src/commonMain/kotlin/com/neoutils/neoregex/core/sharedui/model/Match.kt
@@ -22,5 +22,5 @@ data class Match(
     val number: Int,
     val text: String,
     val range: IntRange,
-    val groups: List<String> = emptyList()
+    val groups: List<String> = emptyList(),
 )
\ No newline at end of file
diff --git a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/DefaultHeader.kt b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/DefaultHeader.kt
index 1b9b6928..b3af553a 100644
--- a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/DefaultHeader.kt
+++ b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/DefaultHeader.kt
@@ -28,9 +28,9 @@ import androidx.compose.material.icons.rounded.Close
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -44,17 +44,14 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.FrameWindowScope
 import androidx.compose.ui.window.WindowScope
 import com.jetbrains.JBR
+import com.neoutils.neoregex.core.common.util.ColorTheme
 import com.neoutils.neoregex.core.common.util.DragHandler
-import com.neoutils.neoregex.core.common.util.UiMode
-import com.neoutils.neoregex.core.common.util.isDark
-import com.neoutils.neoregex.core.common.util.resolve
+import com.neoutils.neoregex.core.common.util.rememberColorTheme
 import com.neoutils.neoregex.core.designsystem.theme.NeoTheme.dimensions
 import com.neoutils.neoregex.core.sharedui.remember.CompleteWindowState
 import com.neoutils.neoregex.core.sharedui.remember.WindowFocus
 import com.neoutils.neoregex.core.sharedui.remember.rememberCompleteWindowState
 import com.neoutils.neoregex.core.sharedui.remember.rememberWindowFocus
-import org.jetbrains.skiko.OS
-import org.jetbrains.skiko.hostOs
 import java.awt.Frame
 import java.awt.event.MouseEvent
 import java.awt.event.WindowEvent
@@ -62,11 +59,10 @@ import java.awt.event.WindowEvent
 private val DefaultHeaderHeight = 40.dp
 
 @Composable
-fun FrameWindowScope.DefaultHeader(
-    title: String,
+fun FrameWindowScope.NeoHeader(
     modifier: Modifier = Modifier,
-    options: @Composable RowScope.() -> Unit = {},
-    uiMode: UiMode = UiMode.resolve(),
+    colorTheme: ColorTheme = rememberColorTheme(),
+    content: @Composable BoxScope.(padding: PaddingValues) -> Unit = {},
 ) {
 
     val focus = rememberWindowFocus()
@@ -81,9 +77,9 @@ fun FrameWindowScope.DefaultHeader(
 
     val density = LocalDensity.current
 
-    LaunchedEffect(window, uiMode) {
+    LaunchedEffect(window, colorTheme) {
         customTitleBar?.height = density.run { DefaultHeaderHeight.toPx() }
-        customTitleBar?.putProperty("controls.dark", uiMode.isDark)
+        customTitleBar?.putProperty("controls.dark", colorTheme.isDark)
         JBR.windowDecorations?.setCustomTitleBar(window, customTitleBar)
     }
 
@@ -148,34 +144,40 @@ fun FrameWindowScope.DefaultHeader(
                 )
             }
         }
-
     ) {
         Box(
             modifier = Modifier
                 .padding(dimensions.medium)
-                .fillMaxWidth(),
+                .fillMaxSize(),
             contentAlignment = Alignment.Center
         ) {
-            Text(text = title)
 
             if (customTitleBar == null) {
+
+                val width = remember { mutableStateOf(0.dp) }
+
                 Buttons(
-                    modifier = Modifier.align(
-                        Alignment.CenterEnd
-                    )
+                    modifier = Modifier
+                        .align(Alignment.CenterEnd)
+                        .onSizeChanged {
+                            width.value = it.width.dp
+                        }
                 )
-            }
 
-            Row(
-                modifier = Modifier.align(
-                    alignment = when (hostOs) {
-                        OS.Linux, OS.Windows -> Alignment.CenterStart
-                        OS.MacOS -> Alignment.CenterEnd
-                        else -> error("Invalid")
+                content(
+                    PaddingValues(
+                        end = width.value + dimensions.short,
+                    )
+                )
+            } else {
+                content(
+                    density.run {
+                        PaddingValues(
+                            start = customTitleBar.leftInset.toDp(),
+                            end = customTitleBar.rightInset.toDp()
+                        )
                     }
                 )
-            ) {
-                options()
             }
         }
     }
diff --git a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/FatalErrorWindow.kt b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/FatalErrorWindow.kt
new file mode 100644
index 00000000..27cc4b9b
--- /dev/null
+++ b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/FatalErrorWindow.kt
@@ -0,0 +1,105 @@
+/*
+ * NeoRegex.
+ *
+ * Copyright (C) 2024 Irineu A. Silva.
+ *
+ * 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.
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
+package com.neoutils.neoregex.core.sharedui.component
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.twotone.Error
+import androidx.compose.material3.Tab
+import androidx.compose.material3.TabRow
+import androidx.compose.material3.Text
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.unit.DpSize
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.ApplicationScope
+import androidx.compose.ui.window.DialogWindow
+import androidx.compose.ui.window.WindowPosition
+import androidx.compose.ui.window.rememberDialogState
+import com.neoutils.neoregex.core.resources.Res
+import com.neoutils.neoregex.core.resources.fatal_error_report_tab
+import com.neoutils.neoregex.core.resources.fatal_error_stack_trace_tab
+import com.neoutils.neoregex.core.resources.fatal_error_title
+import org.jetbrains.compose.resources.StringResource
+import org.jetbrains.compose.resources.stringResource
+
+@Composable
+fun ApplicationScope.FatalErrorWindow(
+    throwable: Throwable
+) {
+    val state = rememberDialogState(
+        position = WindowPosition.Aligned(Alignment.Center),
+        size = DpSize(500.dp, 400.dp)
+    )
+
+    DialogWindow(
+        onCloseRequest = ::exitApplication,
+        state = state,
+        title = stringResource(
+            Res.string.fatal_error_title,
+            throwable::class.java.name
+        ),
+        icon = rememberVectorPainter(Icons.TwoTone.Error)
+    ) {
+        Column(Modifier.fillMaxSize()) {
+
+            var current by remember { mutableStateOf(Tab.REPORT_ERROR) }
+
+            val selectedTabIndex = remember(current) { Tab.entries.indexOf(current) }
+
+            TabRow(
+                selectedTabIndex = selectedTabIndex,
+            ) {
+                Tab.entries.forEach { tab ->
+                    Tab(
+                        text = { Text(stringResource(tab.title)) },
+                        selected = current == tab,
+                        onClick = {
+                            current = tab
+                        }
+                    )
+                }
+            }
+
+            when (current) {
+                Tab.REPORT_ERROR -> {
+                    ReportScreen(
+                        throwable = throwable,
+                        modifier = Modifier.fillMaxSize()
+                    )
+                }
+
+                Tab.STACK_TRACE -> {
+                    StackTraceBox(
+                        throwable = throwable,
+                        modifier = Modifier.fillMaxSize()
+                    )
+                }
+            }
+        }
+    }
+}
+
+enum class Tab(val title: StringResource) {
+    REPORT_ERROR(title = Res.string.fatal_error_report_tab),
+    STACK_TRACE(title = Res.string.fatal_error_stack_trace_tab);
+}
diff --git a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/NeoWindow.kt b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/NeoWindow.kt
index 3c2d355e..ba74bed4 100644
--- a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/NeoWindow.kt
+++ b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/NeoWindow.kt
@@ -18,16 +18,18 @@
 
 package com.neoutils.neoregex.core.sharedui.component
 
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.height
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.*
@@ -35,21 +37,29 @@ import com.jetbrains.JBR
 import com.neoutils.neoregex.core.resources.Res
 import com.neoutils.neoregex.core.resources.app_name
 import com.neoutils.neoregex.core.resources.flavicon
-import com.neoutils.neoregex.core.sharedui.extension.applyIf
 import com.neoutils.neoregex.core.sharedui.remember.CompleteWindowState
 import com.neoutils.neoregex.core.sharedui.remember.rememberCompleteWindowState
+import com.neoutils.neoregex.core.sharedui.util.NeoRegexWindowExceptionHandlerFactory
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun ApplicationScope.NeoWindow(
     icon: Painter = painterResource(Res.drawable.flavicon),
     title: String = stringResource(Res.string.app_name),
     undecorated: Boolean = JBR.windowDecorations == null,
+    border: BorderStroke = BorderStroke(1.dp, colorScheme.outline),
+    exceptionHandlerFactory: WindowExceptionHandlerFactory = NeoRegexWindowExceptionHandlerFactory,
     header: @Composable FrameWindowScope.() -> Unit = {
-        DefaultHeader(
-            title = title,
-        )
+        NeoHeader {
+            Text(
+                text = title,
+                modifier = Modifier.align(
+                    Alignment.Center
+                )
+            )
+        }
     },
     content: @Composable FrameWindowScope.() -> Unit
 ) {
@@ -59,40 +69,43 @@ fun ApplicationScope.NeoWindow(
         ),
     )
 
-    Window(
-        icon = icon,
-        title = title,
-        undecorated = undecorated,
-        onCloseRequest = ::exitApplication,
-        state = windowState
+    CompositionLocalProvider(
+        LocalWindowExceptionHandlerFactory
+            .provides(exceptionHandlerFactory)
     ) {
+        Window(
+            icon = icon,
+            title = title,
+            undecorated = undecorated,
+            onCloseRequest = ::exitApplication,
+            state = windowState
+        ) {
 
-        val completeWindowState = rememberCompleteWindowState()
+            val completeWindowState = rememberCompleteWindowState()
 
-        Surface(
-            color = colorScheme.background,
-            modifier = when (completeWindowState) {
-                CompleteWindowState.FLOATING,
-                CompleteWindowState.PINNED -> {
-                    Modifier.applyIf(undecorated) {
-                        border(
-                            width = 1.dp,
-                            color = colorScheme.outline,
-                            shape = RectangleShape,
-                        )
+            Surface(
+                color = colorScheme.background,
+                modifier = when (completeWindowState) {
+                    CompleteWindowState.FLOATING,
+                    CompleteWindowState.PINNED -> {
+                        if (undecorated) {
+                            Modifier.border(border)
+                        } else {
+                            Modifier
+                        }
                     }
-                }
 
-                else -> Modifier
-            }
-        ) {
-            Column {
+                    else -> Modifier
+                }
+            ) {
+                Column {
 
-                header()
+                    header()
 
-                HorizontalDivider()
+                    HorizontalDivider()
 
-                content()
+                    content()
+                }
             }
         }
     }
diff --git a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/ReportScreen.kt b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/ReportScreen.kt
new file mode 100644
index 00000000..612d95a2
--- /dev/null
+++ b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/ReportScreen.kt
@@ -0,0 +1,144 @@
+/*
+ * NeoRegex.
+ *
+ * Copyright (C) 2024 Irineu A. Silva.
+ *
+ * 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.
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
+package com.neoutils.neoregex.core.sharedui.component
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.ErrorOutline
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import com.neoutils.neoregex.core.designsystem.theme.NeoTheme.dimensions
+import com.neoutils.neoregex.core.resources.*
+import kotlinx.coroutines.delay
+import org.jetbrains.compose.resources.stringResource
+
+@Composable
+fun ReportScreen(
+    throwable: Throwable,
+    modifier: Modifier = Modifier
+) = Scaffold(
+    modifier = modifier,
+    bottomBar = {
+        BottomButtons(
+            throwable = throwable,
+            modifier = Modifier
+                .padding(bottom = dimensions.default)
+                .fillMaxWidth()
+        )
+    }
+) { contentPadding ->
+    Column(
+        modifier = Modifier
+            .padding(contentPadding)
+            .padding(dimensions.default)
+            .fillMaxSize(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(
+            space = dimensions.small,
+            alignment = Alignment.CenterVertically
+        )
+    ) {
+        Icon(
+            Icons.Rounded.ErrorOutline,
+            contentDescription = null,
+            modifier = Modifier.size(40.dp),
+            tint = MaterialTheme.colorScheme.error
+        )
+
+        Text(
+            text = stringResource(Res.string.fatal_error_subtitle),
+            textAlign = TextAlign.Center,
+            style = MaterialTheme.typography.titleMedium
+        )
+
+        Text(
+            text = stringResource(Res.string.fatal_error_message),
+            textAlign = TextAlign.Center,
+        )
+    }
+}
+
+@Composable
+private fun BottomButtons(
+    throwable: Throwable,
+    modifier: Modifier = Modifier
+) = Row(
+    modifier = modifier,
+    horizontalArrangement = Arrangement.SpaceAround
+) {
+
+    val uriHandler = LocalUriHandler.current
+    val clipboard = LocalClipboardManager.current
+
+    var copied by remember { mutableStateOf(false) }
+
+    LaunchedEffect(copied) {
+        if (copied) {
+            delay(timeMillis = 1_000)
+            copied = false
+        }
+    }
+
+    Button(
+        onClick = {
+            clipboard.setText(
+                AnnotatedString(
+                    throwable.stackTraceToString()
+                )
+            )
+            copied = true
+        },
+        enabled = !copied,
+        modifier = Modifier.width(120.dp)
+    ) {
+        AnimatedContent(
+            targetState = copied,
+            transitionSpec = {
+                fadeIn() togetherWith fadeOut()
+            }
+        ) { copied ->
+            if (copied) {
+                Text(stringResource(Res.string.fatal_error_copied_label))
+            } else {
+                Text(stringResource(Res.string.fatal_error_copy_btn))
+            }
+        }
+    }
+
+    Button(
+        onClick = {
+            uriHandler.openUri(
+                uri = "https://github.com/NeoUtils/NeoRegex/issues/new?template=bug_report.md"
+            )
+        },
+    ) {
+        Text(stringResource(Res.string.fatal_error_report_btn))
+    }
+}
diff --git a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/StackTraceBox.kt b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/StackTraceBox.kt
new file mode 100644
index 00000000..c46d42d9
--- /dev/null
+++ b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/StackTraceBox.kt
@@ -0,0 +1,90 @@
+/*
+ * NeoRegex.
+ *
+ * Copyright (C) 2024 Irineu A. Silva.
+ *
+ * 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.
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
+package com.neoutils.neoregex.core.sharedui.component
+
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalDensity
+import com.neoutils.neoregex.core.designsystem.theme.NeoTheme
+import com.neoutils.neoregex.core.sharedui.util.Padding
+
+@Composable
+fun StackTraceBox(
+    throwable: Throwable,
+    modifier: Modifier = Modifier
+) = Box(
+    modifier = modifier,
+) {
+
+    val stackTrace = remember(throwable) {
+        throwable.stackTraceToString().trim()
+    }
+
+    val density = LocalDensity.current
+
+    val verticalScrollState = rememberScrollState()
+
+    val horizontalScrollState = rememberScrollState()
+
+    var padding by remember { mutableStateOf(Padding()) }
+
+    SelectionContainer {
+        Text(
+            text = stackTrace,
+            color = MaterialTheme.colorScheme.error,
+            modifier = Modifier
+                .padding(padding.values)
+                .horizontalScroll(horizontalScrollState)
+                .verticalScroll(verticalScrollState)
+                .padding(NeoTheme.dimensions.small)
+        )
+    }
+
+    VerticalScrollbar(
+        adapter = rememberScrollbarAdapter(verticalScrollState),
+        modifier = Modifier
+            .align(Alignment.TopEnd)
+            .padding(bottom = padding.bottom)
+            .onSizeChanged {
+                padding = padding.copy(
+                    end = with(density) { it.width.toDp() },
+                )
+            }
+    )
+
+    HorizontalScrollbar(
+        adapter = rememberScrollbarAdapter(horizontalScrollState),
+        modifier = Modifier
+            .align(Alignment.BottomStart)
+            .padding(end = padding.end)
+            .onSizeChanged {
+                padding = padding.copy(
+                    bottom = with(density) { it.height.toDp() },
+                )
+            }
+    )
+}
diff --git a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/TextEditor.desktop.kt b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/TextEditor.desktop.kt
index 94fd6572..b34c1800 100644
--- a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/TextEditor.desktop.kt
+++ b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/TextEditor.desktop.kt
@@ -54,7 +54,6 @@ import com.neoutils.neoregex.core.sharedui.extension.toText
 import com.neoutils.neoregex.core.sharedui.extension.tooltip
 import com.neoutils.neoregex.core.sharedui.model.Match
 import com.neoutils.neoregex.core.sharedui.model.MatchBox
-import com.neoutils.neoregex.core.sharedui.component.LineNumbers
 import kotlin.math.roundToInt
 
 @OptIn(ExperimentalFoundationApi::class, ExperimentalComposeUiApi::class)
diff --git a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/theme/NeoErrorTheme.kt b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/theme/NeoErrorTheme.kt
new file mode 100644
index 00000000..ffc69238
--- /dev/null
+++ b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/theme/NeoErrorTheme.kt
@@ -0,0 +1,53 @@
+/*
+ * NeoRegex.
+ *
+ * Copyright (C) 2024 Irineu A. Silva.
+ *
+ * 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.
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
+package com.neoutils.neoregex.core.sharedui.theme
+
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import com.neoutils.neoregex.core.designsystem.theme.*
+
+private val LightColors = lightColorScheme(
+    primary = Gray800,
+    onPrimary = Color.White,
+    background = Color.White,
+    onBackground = Color.Black,
+    surface = Color.White,
+    onSurface = Color.Black,
+    surfaceVariant = Gray200,
+    onSurfaceVariant = Color.Black,
+    surfaceTint = Color.White,
+    surfaceContainer = Gray100,
+    surfaceBright = Gray300,
+    inverseSurface = Gray800,
+    secondary = Blue100,
+    secondaryContainer = Gray300,
+    onSecondaryContainer = Color.Black,
+    error = Red700,
+)
+
+@Composable
+fun NeoErrorTheme(
+    content: @Composable () -> Unit
+) {
+    NeoBaseTheme(
+        colorScheme = LightColors,
+        content = content
+    )
+}
diff --git a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/util/NeoRegexWindowExceptionHandlerFactory.kt b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/util/NeoRegexWindowExceptionHandlerFactory.kt
new file mode 100644
index 00000000..2a265b68
--- /dev/null
+++ b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/util/NeoRegexWindowExceptionHandlerFactory.kt
@@ -0,0 +1,57 @@
+/*
+ * NeoRegex.
+ *
+ * Copyright (C) 2024 Irineu A. Silva.
+ *
+ * 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.
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
+package com.neoutils.neoregex.core.sharedui.util
+
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.window.WindowExceptionHandler
+import androidx.compose.ui.window.WindowExceptionHandlerFactory
+import androidx.compose.ui.window.launchApplication
+import com.neoutils.neoregex.core.sharedui.component.FatalErrorWindow
+import com.neoutils.neoregex.core.sharedui.theme.NeoErrorTheme
+import kotlinx.coroutines.CoroutineScope
+import org.jetbrains.skiko.MainUIDispatcher
+import java.awt.event.WindowEvent
+import javax.swing.SwingUtilities
+import java.awt.Window as AwtWindows
+
+@OptIn(ExperimentalComposeUiApi::class)
+object NeoRegexWindowExceptionHandlerFactory : WindowExceptionHandlerFactory {
+
+    override fun exceptionHandler(window: AwtWindows) = WindowExceptionHandler { throwable ->
+
+        SwingUtilities.invokeLater {
+
+            with(CoroutineScope(MainUIDispatcher)) {
+                launchApplication {
+                    NeoErrorTheme {
+                        FatalErrorWindow(throwable)
+                    }
+                }
+            }
+
+            window.dispatchEvent(
+                WindowEvent(
+                    window, WindowEvent.WINDOW_CLOSING
+                )
+            )
+        }
+
+        throw throwable
+    }
+}
diff --git a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/util/Padding.kt b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/util/Padding.kt
new file mode 100644
index 00000000..a342aa91
--- /dev/null
+++ b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/util/Padding.kt
@@ -0,0 +1,37 @@
+/*
+ * NeoRegex.
+ *
+ * Copyright (C) 2024 Irineu . Silva.
+ *
+ * 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.
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
+package com.neoutils.neoregex.core.sharedui.util
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+data class Padding(
+    val start: Dp = 0.dp,
+    val top: Dp = 0.dp,
+    val end: Dp = 0.dp,
+    val bottom: Dp = 0.dp
+) {
+    val values = PaddingValues(
+        top = top,
+        start = start,
+        end = end,
+        bottom = bottom,
+    )
+}
diff --git a/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/MatcherScreen.kt b/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/MatcherScreen.kt
index 29b917e3..0ac8ed28 100644
--- a/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/MatcherScreen.kt
+++ b/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/MatcherScreen.kt
@@ -31,7 +31,6 @@ import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.VerticalDivider
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -49,6 +48,11 @@ import cafe.adriel.voyager.core.screen.Screen
 import com.neoutils.neoregex.core.common.util.Command
 import com.neoutils.neoregex.core.designsystem.textfield.NeoTextField
 import com.neoutils.neoregex.core.designsystem.theme.NeoTheme.dimensions
+import com.neoutils.neoregex.core.resources.Res
+import com.neoutils.neoregex.core.resources.ic_redo_24
+import com.neoutils.neoregex.core.resources.ic_undo_24
+import com.neoutils.neoregex.core.resources.matcher_footer_insert_regex_hint
+import com.neoutils.neoregex.core.sharedui.component.MatchesInfos
 import com.neoutils.neoregex.core.sharedui.component.TextEditor
 import com.neoutils.neoregex.feature.matcher.action.MatcherAction
 import com.neoutils.neoregex.feature.matcher.extension.onLongHold
@@ -57,10 +61,6 @@ import com.neoutils.neoregex.feature.matcher.model.Target
 import com.neoutils.neoregex.feature.matcher.state.MatcherUiState
 import com.neoutils.neoregex.feature.matcher.state.error
 import com.neoutils.neoregex.feature.matcher.state.matches
-import com.neoutils.neoregex.core.resources.Res
-import com.neoutils.neoregex.core.resources.ic_redo_24
-import com.neoutils.neoregex.core.resources.ic_undo_24
-import com.neoutils.neoregex.core.resources.insert_regex_hint
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 
@@ -77,27 +77,28 @@ class MatcherScreen : Screen {
 
         val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-        TextEditor(
-            value = uiState.text,
-            onValueChange = {
-                viewModel.onAction(
-                    MatcherAction.Input.UpdateText(it.toTextState())
-                )
-            },
-            onFocusChange = {
-                if (it.isFocused) {
+        BoxWithConstraints(modifier = Modifier.weight(weight = 1f)) {
+
+            TextEditor(
+                value = uiState.text,
+                onValueChange = {
                     viewModel.onAction(
-                        MatcherAction.TargetChange(Target.TEXT)
+                        MatcherAction.Input.UpdateText(it.toTextState())
                     )
-                }
-            },
-            textStyle = TextStyle(
-                letterSpacing = 1.sp,
-                fontSize = 16.sp,
-            ),
-            modifier = Modifier
-                .weight(weight = 1f)
-                .onPreviewKeyEvent {
+                },
+                onFocusChange = {
+                    if (it.isFocused) {
+                        viewModel.onAction(
+                            MatcherAction.TargetChange(Target.TEXT)
+                        )
+                    }
+                },
+                textStyle = TextStyle(
+                    letterSpacing = 1.sp,
+                    fontSize = 16.sp,
+                ),
+                matches = uiState.matchResult.matches,
+                modifier = Modifier.onPreviewKeyEvent {
                     when (Command.from(it)) {
                         Command.UNDO -> {
                             viewModel.onAction(
@@ -116,8 +117,14 @@ class MatcherScreen : Screen {
                         else -> false
                     }
                 },
-            matches = uiState.matchResult.matches,
-        )
+            )
+
+            uiState.matchResult.infos?.let { infos ->
+                MatchesInfos(
+                    infos = infos,
+                )
+            }
+        }
 
         Footer(
             uiState = uiState,
@@ -178,7 +185,7 @@ class MatcherScreen : Screen {
                             else -> false
                         }
                     },
-                hint = stringResource(Res.string.insert_regex_hint),
+                hint = stringResource(Res.string.matcher_footer_insert_regex_hint),
                 error = uiState.matchResult.error
             )
 
diff --git a/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/MatcherViewModel.kt b/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/MatcherViewModel.kt
index 64cf14d5..eb87b00f 100644
--- a/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/MatcherViewModel.kt
+++ b/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/MatcherViewModel.kt
@@ -20,6 +20,7 @@ package com.neoutils.neoregex.feature.matcher
 
 import cafe.adriel.voyager.core.model.ScreenModel
 import cafe.adriel.voyager.core.model.screenModelScope
+import com.neoutils.neoregex.core.sharedui.component.MatchesInfos
 import com.neoutils.neoregex.core.sharedui.model.Match
 import com.neoutils.neoregex.feature.matcher.action.MatcherAction
 import com.neoutils.neoregex.feature.matcher.extension.toTextFieldValue
@@ -30,6 +31,8 @@ import com.neoutils.neoregex.feature.matcher.model.TextState
 import com.neoutils.neoregex.feature.matcher.state.MatcherUiState
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.*
+import kotlin.time.Duration
+import kotlin.time.measureTime
 
 @OptIn(FlowPreview::class)
 class MatcherViewModel : ScreenModel {
@@ -47,31 +50,47 @@ class MatcherViewModel : ScreenModel {
     )
 
     private val matchResult = combine(
-        inputs[Target.TEXT].map { it.text },
-        inputs[Target.REGEX].map { it.text }
+        inputs[Target.TEXT].map { it.text }.distinctUntilChanged(),
+        inputs[Target.REGEX].map { it.text }.distinctUntilChanged()
     ) { text, pattern ->
 
+        if (pattern.isEmpty()) {
+            return@combine MatcherUiState.MatchResult.Success()
+        }
+
         val regex = try {
             Regex(pattern)
-        } catch (exception: Throwable) {
+        } catch (t: Throwable) {
             return@combine MatcherUiState.MatchResult.Failure(
-                error = exception.message ?: "Invalid regex pattern"
+                error = t.message ?: "Invalid regex pattern"
             )
         }
 
+        val duration: Duration
+        val result: Sequence<MatchResult>
+
+        // TODO: don't support web target
+        duration = measureTime {
+            result = regex.findAll(text)
+        }
+
         MatcherUiState.MatchResult.Success(
             matches = buildList {
-                regex.findAll(text).forEachIndexed { index, match ->
+                result.forEachIndexed { index, match ->
                     add(
                         Match(
                             text = match.value,
                             range = match.range,
                             groups = match.groupValues.drop(n = 1),
-                            number = index.inc()
+                            number = index.inc(),
                         )
                     )
                 }
-            }
+            },
+            infos = MatchesInfos.create(
+                duration = duration,
+                matches = result.count()
+            )
         )
     }
 
diff --git a/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/state/MatcherUiState.kt b/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/state/MatcherUiState.kt
index ceb588d6..8f298e3b 100644
--- a/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/state/MatcherUiState.kt
+++ b/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/state/MatcherUiState.kt
@@ -19,6 +19,7 @@
 package com.neoutils.neoregex.feature.matcher.state
 
 import androidx.compose.ui.text.input.TextFieldValue
+import com.neoutils.neoregex.core.sharedui.component.MatchesInfos
 import com.neoutils.neoregex.core.sharedui.model.Match
 import com.neoutils.neoregex.feature.matcher.model.Target
 
@@ -27,7 +28,7 @@ data class MatcherUiState(
     val text: TextFieldValue = TextFieldValue(),
     val regex: TextFieldValue = TextFieldValue(),
     val history: History = History(),
-    val matchResult: MatchResult = MatchResult.Success(listOf()),
+    val matchResult: MatchResult = MatchResult.Success(),
 ) {
     data class History(
         val canUndo: Boolean = false,
@@ -35,12 +36,17 @@ data class MatcherUiState(
     )
 
     sealed class MatchResult {
+
+        abstract val infos: MatchesInfos?
+
         data class Success(
-            val matches: List<Match>
+            val matches: List<Match> = listOf(),
+            override val infos: MatchesInfos? = MatchesInfos.create(),
         ) : MatchResult()
 
         data class Failure(
-            val error: String
+            val error: String,
+            override val infos: MatchesInfos? = MatchesInfos.create()
         ) : MatchResult()
     }
 }