start sticky

2026-07-03 14:07:49 +02:00 · 2025-02-22 07:52:16 -05:00
201 changed files with 4378 additions and 5653 deletions
@@ -4,7 +4,7 @@ WG Tunnel

 <div align="center">

-An alternative Android client app for [WireGuard](https://www.wireguard.com/)
+An alternative Android client app for [WireGuard®](https://www.wireguard.com/)
 and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <br />
 <br />
@@ -23,14 +23,14 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 [![Google Play](https://img.shields.io/badge/Google_Play-414141?style=for-the-badge&logo=google-play&logoColor=white)](https://play.google.com/store/apps/details?id=com.zaneschepke.wireguardautotunnel)
 [![F-Droid](https://img.shields.io/static/v1?style=for-the-badge&message=F-Droid&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://f-droid.org/packages/com.zaneschepke.wireguardautotunnel/)
 [![Personal](https://img.shields.io/static/v1?style=for-the-badge&message=Personal&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://github.com/zaneschepke/fdroid)
-[![Obtainium](https://img.shields.io/badge/Obtainium-414141?style=for-the-badge&logo=Obtainium&logoColor=white)](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.zaneschepke.wireguardautotunnel%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fzaneschepke%2Fwgtunnel%22%2C%22author%22%3A%22zaneschepke%22%2C%22name%22%3A%22WG%20Tunnel%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Afalse%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22filterReleaseNotesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22verifyLatestTag%5C%22%3Atrue%2C%5C%22sortMethodChoice%5C%22%3A%5C%22date%5C%22%2C%5C%22useLatestAssetDateAsReleaseDate%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Atrue%2C%5C%22releaseDateAsVersion%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22WG%20Tunnel%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22Zane%20Schepke%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Afalse%7D%22%2C%22overrideSource%22%3Anull%7D)

 </div>

 <div align="center">

-[<img  src="https://img.shields.io/badge/Telegram-26A5E4.svg?style=for-the-badge&logo=Telegram&logoColor=white">](https://t.me/wgtunnel)
-[<img src="https://img.shields.io/badge/Matrix-000000.svg?style=for-the-badge&logo=Matrix&logoColor=white">](https://matrix.to/#/#wg-tunnel-space:matrix.org)
+[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rbRRNh6H7V)
+[![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
+
 </div>

 <details open="open">
@@ -49,7 +49,7 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <div style="text-align: left;">

 ## About
-Inspired by the official [wireguard-android](https://github.com/WireGuard/wireguard-android) app, WG Tunnel was created to address features and support missing from the official app. This app combines support for both [WireGuard](https://www.wireguard.com/)
+Inspired by the official [wireguard-android](https://github.com/WireGuard/wireguard-android) app, WG Tunnel was created to address features and support missing from the official app. This app combines support for both [WireGuard®](https://www.wireguard.com/)
 and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/), with its primary feature of auto-tunneling (on-demand tunneling).

 </div>
@@ -61,14 +61,14 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/), with its pr
 Thank you to the following:

 - All of the users that have helped contribute to the project with ideas, translations, feedback, bug reports, testing, and donations.
- [WireGuard](https://www.wireguard.com/) - Jason A. Donenfeld (https://github.com/WireGuard/wireguard-android)
+- [WireGuard®](https://www.wireguard.com/) - © Jason A. Donenfeld (https://github.com/WireGuard/wireguard-android)

 - [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) - Amnezia Team (https://github.com/amnezia-vpn/amneziawg-android)

 ## Screenshots

 </div>
-<div style="display: flex; flex-wrap: wrap; justify-content: left; gap: 10px;">
+<div style="display: flex; flex-wrap: wrap; justify-content: center; gap: 10px;">
 <img label="Main" src="fastlane/metadata/android/en-US/images/phoneScreenshots/main_screen.png" width="200" />
 <img label="Settings" src="fastlane/metadata/android/en-US/images/phoneScreenshots/settings_screen.png" width="200" />
  <img label="Auto" src="fastlane/metadata/android/en-US/images/phoneScreenshots/auto_screen.png" width="200" />
@@ -144,8 +144,8 @@ android {
 }

 dependencies {
+
 	implementation(project(":logcatter"))
-	implementation(project(":networkmonitor"))

 	implementation(libs.androidx.core.ktx)
 	implementation(libs.androidx.lifecycle.runtime.ktx)
@@ -2,41 +2,4 @@

 -keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
    <fields>;
-}
-
-# Keep all classes in the org.xbill.DNS package and subpackages
-keep class org.xbill.DNS.** { *; }
-dontwarn org.xbill.DNS.**
-
-# Preserve JNA classes if used (e.g., for IPHlpAPI on Windows)
-keep class com.sun.jna.** { *; }
-dontwarn com.sun.jna.**
-
-# Keep DNS resolver configuration classes that might be loaded dynamically
-keep class org.xbill.DNS.config.** { *; }
-dontwarn org.xbill.DNS.config.**
-
-keep class org.xbill.DNS.** { *; }
-
-# Prevent optimization issues with native or reflection-based calls
-dontoptimize
-dontshrink
-# Uncomment the above if errors persist, but use sparingly as they’re broad
-
-# Suppress warnings about missing classes if not all features are used
-dontwarn java.lang.management.**
-dontwarn sun.nio.ch.**
-
-dontwarn com.google.api.client.http.GenericUrl
-dontwarn com.google.api.client.http.HttpHeaders
-dontwarn com.google.api.client.http.HttpRequest
-dontwarn com.google.api.client.http.HttpRequestFactory
-dontwarn com.google.api.client.http.HttpResponse
-dontwarn com.google.api.client.http.HttpTransport
-dontwarn com.google.api.client.http.javanet.NetHttpTransport$Builder
-dontwarn com.google.api.client.http.javanet.NetHttpTransport
-dontwarn javax.lang.model.element.Modifier
-dontwarn org.joda.time.Instant
-dontwarn org.slf4j.impl.StaticLoggerBinder
-dontwarn org.slf4j.impl.StaticMDCBinder
-dontwarn org.slf4j.impl.StaticMarkerBinder
+}
@@ -21,41 +21,4 @@
 #-renamesourcefileattribute SourceFile
 -keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
    <fields>;
-}
-
-# Keep all classes in the org.xbill.DNS package and subpackages
-keep class org.xbill.DNS.** { *; }
-dontwarn org.xbill.DNS.**
-
-# Preserve JNA classes if used (e.g., for IPHlpAPI on Windows)
-keep class com.sun.jna.** { *; }
-dontwarn com.sun.jna.**
-
-# Keep DNS resolver configuration classes that might be loaded dynamically
-keep class org.xbill.DNS.config.** { *; }
-dontwarn org.xbill.DNS.config.**
-
-keep class org.xbill.DNS.** { *; }
-
-# Prevent optimization issues with native or reflection-based calls
-dontoptimize
-dontshrink
-# Uncomment the above if errors persist, but use sparingly as they’re broad
-
-# Suppress warnings about missing classes if not all features are used
-dontwarn java.lang.management.**
-dontwarn sun.nio.ch.**
-
-dontwarn com.google.api.client.http.GenericUrl
-dontwarn com.google.api.client.http.HttpHeaders
-dontwarn com.google.api.client.http.HttpRequest
-dontwarn com.google.api.client.http.HttpRequestFactory
-dontwarn com.google.api.client.http.HttpResponse
-dontwarn com.google.api.client.http.HttpTransport
-dontwarn com.google.api.client.http.javanet.NetHttpTransport$Builder
-dontwarn com.google.api.client.http.javanet.NetHttpTransport
-dontwarn javax.lang.model.element.Modifier
-dontwarn org.joda.time.Instant
-dontwarn org.slf4j.impl.StaticLoggerBinder
-dontwarn org.slf4j.impl.StaticMDCBinder
-dontwarn org.slf4j.impl.StaticMarkerBinder
+}
@@ -3,8 +3,13 @@
    xmlns:tools="http://schemas.android.com/tools">

    <uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
    <!--foreground service exempt android 14-->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
@@ -163,17 +168,25 @@
 		</service>

        <receiver
-            android:name=".core.broadcast.RestartReceiver"
+            android:name=".core.broadcast.BootReceiver"
            android:enabled="true"
-            android:exported="true">
+            android:exported="false">
            <intent-filter>
                <category android:name="android.intent.category.DEFAULT" />
+
                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.ACTION_BOOT_COMPLETED" />
                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
-				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
            </intent-filter>
        </receiver>
+		<receiver
+			android:name=".core.broadcast.AppUpdateReceiver"
+			android:exported="false">
+			<intent-filter>
+				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+			</intent-filter>
+		</receiver>
 		<receiver
 			android:name=".core.broadcast.KernelReceiver"
 			android:exported="false"
@@ -1,8 +1,6 @@
 package com.zaneschepke.wireguardautotunnel

-import android.Manifest
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
@@ -12,6 +10,9 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -31,30 +32,30 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
-import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.core.shortcut.ShortcutManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.core.worker.ServiceWorker
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarControllerProvider
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.OptionsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.PinLockScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.ScannerScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.SplitTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.TunnelAutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.SplitTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.AdvancedScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.AppearanceScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.DisplayScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.KillSwitchScreen
@@ -62,14 +63,13 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.settings.LanguageScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.LocationDisclosureScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.AutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.advanced.AdvancedScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.support.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import dagger.hilt.android.AndroidEntryPoint
-import timber.log.Timber
 import javax.inject.Inject
 import kotlin.system.exitProcess

@@ -83,9 +83,7 @@ class MainActivity : AppCompatActivity() {
 	lateinit var tunnelManager: TunnelManager

 	@Inject
-	lateinit var networkMonitor: NetworkMonitor
-
-	private var lastLocationPermissionState: Boolean? = null
+	lateinit var shortcutManager: ShortcutManager

 	override fun onCreate(savedInstanceState: Bundle?) {
 		enableEdgeToEdge(
@@ -101,44 +99,44 @@ class MainActivity : AppCompatActivity() {

 		installSplashScreen().apply {
 			setKeepOnScreenCondition {
-				!viewModel.appState.value.isAppReady
+				!viewModel.isAppReady.value
 			}
 		}

 		setContent {
 			val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
-			val appState by viewModel.appState.collectAsStateWithLifecycle()
-
-			if (!appState.isAppReady) {
-				Box(modifier = Modifier.fillMaxSize())
-				return@setContent
-			}
-
+			val configurationChange by viewModel.configurationChange.collectAsStateWithLifecycle()
 			val navController = rememberNavController()
-			val snackbarController = SnackbarController.current

-			with(appState) {
-				LaunchedEffect(isConfigChanged) {
-					if (isConfigChanged) {
-						Intent(this@MainActivity, MainActivity::class.java).also {
-							startActivity(it)
-							exitProcess(0)
-						}
-					}
-				}
-				LaunchedEffect(errorMessage) {
-					errorMessage?.let {
-						snackbarController.showMessage(it.asString(this@MainActivity))
-					}
-				}
-				LaunchedEffect(popBackStack) {
-					if (popBackStack) {
-						navController.popBackStack()
-						viewModel.handleEvent(AppEvent.BackStackPopped)
+			LaunchedEffect(configurationChange) {
+				if (configurationChange) {
+					Intent(this@MainActivity, MainActivity::class.java).also {
+						startActivity(it)
+						exitProcess(0)
 					}
 				}
 			}

+			LaunchedEffect(Unit) {
+				viewModel.getEmitSplitTunnelApps(this@MainActivity)
+			}
+
+			LaunchedEffect(appUiState.autoTunnelActive) {
+				requestAutoTunnelTileServiceUpdate()
+			}
+
+			with(appUiState.appSettings) {
+				LaunchedEffect(isAutoTunnelEnabled) {
+					this@MainActivity.requestAutoTunnelTileServiceUpdate()
+				}
+				LaunchedEffect(isShortcutsEnabled) {
+					if (!isShortcutsEnabled) return@LaunchedEffect shortcutManager.removeShortcuts()
+					shortcutManager.addShortcuts()
+				}
+			}
+
+			ServiceWorker.start(this)
+
 			CompositionLocalProvider(LocalNavController provides navController) {
 				SnackbarControllerProvider { host ->
 					WireguardAutoTunnelTheme(theme = appUiState.generalState.theme) {
@@ -182,19 +180,28 @@ class MainActivity : AppCompatActivity() {
 							Box(modifier = Modifier.Companion.fillMaxSize().padding(padding)) {
 								NavHost(
 									navController,
+									enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+									exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
 									startDestination = (if (appUiState.generalState.isPinLockEnabled) Route.Lock else Route.Main),
 								) {
 									composable<Route.Main> {
-										MainScreen(appUiState, viewModel)
+										MainScreen(
+											uiState = appUiState,
+										)
 									}
 									composable<Route.Settings> {
-										SettingsScreen(appUiState, viewModel)
+										SettingsScreen(
+											appViewModel = viewModel,
+											uiState = appUiState,
+										)
 									}
 									composable<Route.LocationDisclosure> {
-										LocationDisclosureScreen(appUiState, viewModel)
+										LocationDisclosureScreen(viewModel, appUiState)
 									}
 									composable<Route.AutoTunnel> {
-										AutoTunnelScreen(appUiState.appSettings, viewModel)
+										AutoTunnelScreen(
+											appUiState.appSettings,
+										)
 									}
 									composable<Route.Appearance> {
 										AppearanceScreen()
@@ -203,45 +210,46 @@ class MainActivity : AppCompatActivity() {
 										LanguageScreen(appUiState, viewModel)
 									}
 									composable<Route.Display> {
-										DisplayScreen(appUiState, viewModel)
+										DisplayScreen(appUiState)
 									}
 									composable<Route.Support> {
 										SupportScreen(appUiState, viewModel)
 									}
 									composable<Route.AutoTunnelAdvanced> {
-										AdvancedScreen(appUiState)
+										AdvancedScreen(appUiState.appSettings, viewModel)
 									}
 									composable<Route.Logs> {
 										LogsScreen()
 									}
-									composable<Route.Config> { backStack ->
-										val args = backStack.toRoute<Route.Config>()
-										val config = appUiState.tunnels.firstOrNull { it.id == args.id }
-										ConfigScreen(config)
+									composable<Route.Config> {
+										val args = it.toRoute<Route.Config>()
+										val config =
+											appUiState.tunnels.firstOrNull { it.id == args.id }
+										ConfigScreen(config, viewModel)
 									}
-									composable<Route.TunnelOptions> { backStack ->
-										val args = backStack.toRoute<Route.TunnelOptions>()
-										appUiState.tunnels.firstOrNull { it.id == args.id }?.let { config ->
-											OptionsScreen(config, appUiState, viewModel)
-										}
+									composable<Route.TunnelOptions> {
+										val args = it.toRoute<Route.TunnelOptions>()
+										val config = appUiState.tunnels.first { it.id == args.id }
+										OptionsScreen(config)
 									}
 									composable<Route.Lock> {
 										PinLockScreen(viewModel)
 									}
 									composable<Route.Scanner> {
-										ScannerScreen(viewModel)
+										ScannerScreen()
 									}
 									composable<Route.KillSwitch> {
 										KillSwitchScreen(appUiState, viewModel)
 									}
 									composable<Route.SplitTunnel> {
-										SplitTunnelScreen()
+										val args = it.toRoute<Route.SplitTunnel>()
+										val config = appUiState.tunnels.first { it.id == args.id }
+										SplitTunnelScreen(config, viewModel)
 									}
-									composable<Route.TunnelAutoTunnel> { backStack ->
-										val args = backStack.toRoute<Route.TunnelOptions>()
-										appUiState.tunnels.firstOrNull { it.id == args.id }?.let {
-											TunnelAutoTunnelScreen(it, appUiState.appSettings, viewModel)
-										}
+									composable<Route.TunnelAutoTunnel> {
+										val args = it.toRoute<Route.TunnelOptions>()
+										val config = appUiState.tunnels.first { it.id == args.id }
+										TunnelAutoTunnelScreen(config, appUiState.appSettings)
 									}
 								}
 								BackHandler {
@@ -256,22 +264,4 @@ class MainActivity : AppCompatActivity() {
 			}
 		}
 	}
-	override fun onResume() {
-		super.onResume()
-		checkPermissionAndNotify()
-	}
-
-	private fun checkPermissionAndNotify() {
-		val hasLocation = ContextCompat.checkSelfPermission(
-			this,
-			Manifest.permission.ACCESS_FINE_LOCATION,
-		) == PackageManager.PERMISSION_GRANTED
-		if (lastLocationPermissionState != hasLocation) {
-			Timber.d("Location permission changed to: $hasLocation")
-			if (hasLocation) {
-				networkMonitor.sendLocationPermissionsGrantedBroadcast()
-			}
-			lastLocationPermissionState = hasLocation
-		}
-	}
 }
@@ -11,7 +11,6 @@ import androidx.work.Configuration
 import com.wireguard.android.backend.GoBackend
 import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.core.worker.ServiceWorker
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
@@ -92,11 +91,9 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
 			}
 		}

-		ServiceWorker.start(this)
-
 		applicationScope.launch {
 			withContext(mainDispatcher) {
-				if (appDataRepository.appState.isLocalLogsEnabled() && !isRunningOnTv()) logReader.start()
+				if (appDataRepository.appState.isLocalLogsEnabled() && !isRunningOnTv()) logReader.initialize()
 			}
 			if (!appDataRepository.settings.get().isKernelEnabled) {
 				tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
@@ -0,0 +1,45 @@
+package com.zaneschepke.wireguardautotunnel.core.broadcast
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AppUpdateReceiver : BroadcastReceiver() {
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	lateinit var tunnelManager: TunnelManager
+
+	override fun onReceive(context: Context, intent: Intent) {
+		if (intent.action != Intent.ACTION_MY_PACKAGE_REPLACED) return
+		serviceManager.updateTunnelTile()
+		serviceManager.updateAutoTunnelTile()
+		applicationScope.launch {
+			with(appDataRepository.settings.get()) {
+				if (isRestoreOnBootEnabled) {
+					// If auto tunnel is enabled, just start it and let auto tunnel start appropriate tun
+					if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@launch serviceManager.startAutoTunnel(true)
+					tunnelManager.restorePreviousState()
+				}
+			}
+		}
+	}
+}
@@ -0,0 +1,44 @@
+package com.zaneschepke.wireguardautotunnel.core.broadcast
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class BootReceiver : BroadcastReceiver() {
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	lateinit var tunnelManager: TunnelManager
+
+	override fun onReceive(context: Context, intent: Intent) {
+		if (Intent.ACTION_BOOT_COMPLETED != intent.action) return
+		serviceManager.updateTunnelTile()
+		serviceManager.updateAutoTunnelTile()
+		applicationScope.launch {
+			with(appDataRepository.settings.get()) {
+				if (isRestoreOnBootEnabled) {
+					// If auto tunnel is enabled, just start it and let auto tunnel start appropriate tun
+					if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@launch serviceManager.startAutoTunnel(true)
+					tunnelManager.restorePreviousState()
+				}
+			}
+		}
+	}
+}
@@ -3,10 +3,10 @@ package com.zaneschepke.wireguardautotunnel.core.broadcast
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -32,8 +32,8 @@ class KernelReceiver : BroadcastReceiver() {
 		val action = intent.action ?: return
 		applicationScope.launch {
 			if (action == REFRESH_TUNNELS_ACTION) {
-				tunnelManager.runningTunnelNames().forEach { name ->
-					val tunnel = tunnelRepository.findByTunnelName(name)
+				tunnelManager.runningTunnelNames().forEach {
+					val tunnel = tunnelRepository.findByTunnelName(it)
 					tunnel?.let {
 						tunnelRepository.save(it.copy(isActive = true))
 					}
@@ -4,9 +4,9 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
@@ -1,64 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.broadcast
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class RestartReceiver : BroadcastReceiver() {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	@Inject
-	lateinit var tunnelManager: TunnelManager
-
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
-
-	override fun onReceive(context: Context, intent: Intent) {
-		val action = intent.action ?: return
-		if (action != Intent.ACTION_BOOT_COMPLETED &&
-			action != Intent.ACTION_MY_PACKAGE_REPLACED &&
-			action != "com.htc.intent.action.QUICKBOOT_POWERON"
-		) {
-			return
-		}
-
-		Timber.d("RestartReceiver triggered with action: ${intent.action}")
-		applicationScope.launch(ioDispatcher) {
-			serviceManager.updateTunnelTile()
-			serviceManager.updateAutoTunnelTile()
-			val settings = appDataRepository.settings.get()
-			if (settings.isRestoreOnBootEnabled) {
-				if (settings.isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) {
-					Timber.d("Starting auto-tunnel on boot/update")
-					serviceManager.startAutoTunnel()
-				} else {
-					Timber.d("Restoring previous tunnel state")
-					tunnelManager.restorePreviousState()
-				}
-			} else {
-				Timber.d("Restore on boot disabled, skipping")
-			}
-		}
-	}
-}
@@ -0,0 +1,161 @@
+package com.zaneschepke.wireguardautotunnel.core.network
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import android.net.wifi.SupplicantState
+import android.net.wifi.WifiManager
+import android.os.Build
+import com.zaneschepke.wireguardautotunnel.domain.state.ConnectivityState
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.flowOn
+import javax.inject.Inject
+
+class InternetConnectivityMonitor
+@Inject
+constructor(
+	@ApplicationContext private val context: Context,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : NetworkMonitor {
+
+	private val connectivityManager =
+		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+	@get:Synchronized @set:Synchronized
+	private var wifiCapabilities: NetworkCapabilities? = null
+
+	@get:Synchronized @set:Synchronized
+	private var wifiNetworkChanged: Boolean = false
+
+	override val didWifiChangeSinceLastCapabilitiesQuery: Boolean
+		get() = wifiNetworkChanged
+
+	override val status = callbackFlow {
+
+		var wifiState: Boolean = false
+		var ethernetState: Boolean = false
+		var cellularState: Boolean = false
+
+		fun emitState() {
+			trySend(ConnectivityState(wifiState, ethernetState, cellularState))
+		}
+
+		val currentNetwork = connectivityManager.activeNetwork
+		if (currentNetwork == null) {
+			emitState()
+		}
+
+		fun updateCapabilityState(up: Boolean, network: Network) {
+			with(connectivityManager.getNetworkCapabilities(network)) {
+				when {
+					this == null -> return
+					hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> wifiState = up
+					hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ->
+						cellularState = up
+
+					hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) ->
+						ethernetState = up
+				}
+			}
+		}
+
+		fun onWifiChange(network: Network, callback: () -> Unit) {
+			if (connectivityManager.getNetworkCapabilities(network)?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true) {
+				callback()
+			}
+		}
+
+		fun onAvailable(network: Network) {
+			onWifiChange(network) {
+				wifiNetworkChanged = true
+			}
+		}
+
+		fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+			onWifiChange(network) {
+				wifiCapabilities = networkCapabilities
+			}
+			updateCapabilityState(true, network)
+			emitState()
+		}
+
+		val networkStatusCallback =
+			when (Build.VERSION.SDK_INT) {
+				in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
+					object :
+						ConnectivityManager.NetworkCallback(
+							FLAG_INCLUDE_LOCATION_INFO,
+						) {
+						override fun onAvailable(network: Network) {
+							onAvailable(network)
+						}
+
+						override fun onLost(network: Network) {
+							updateCapabilityState(false, network)
+							emitState()
+						}
+
+						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+							onCapabilitiesChanged(network, networkCapabilities)
+						}
+					}
+				}
+
+				else -> {
+					object : ConnectivityManager.NetworkCallback() {
+						override fun onAvailable(network: Network) {
+							onAvailable(network)
+						}
+
+						override fun onLost(network: Network) {
+							updateCapabilityState(false, network)
+							emitState()
+						}
+
+						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+							onCapabilitiesChanged(network, networkCapabilities)
+						}
+					}
+				}
+			}
+		val request =
+			NetworkRequest.Builder()
+				.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
+				.addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
+				.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
+				.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+				.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+				.build()
+		connectivityManager.registerNetworkCallback(request, networkStatusCallback)
+
+		awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
+	}.flowOn(ioDispatcher)
+
+	override fun getWifiCapabilities(): NetworkCapabilities? {
+		wifiNetworkChanged = false
+		return wifiCapabilities
+	}
+
+	companion object {
+		fun getNetworkName(networkCapabilities: NetworkCapabilities, context: Context): String? {
+			var ssid = networkCapabilities.getWifiName()
+			if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+				val wifiManager =
+					context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+
+				@Suppress("DEPRECATION")
+				val info = wifiManager.connectionInfo
+				if (info.supplicantState === SupplicantState.COMPLETED) {
+					ssid = info.ssid
+				}
+			}
+			return ssid?.trim('"')
+		}
+	}
+}
@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.core.network
+
+import android.net.NetworkCapabilities
+import android.net.wifi.WifiInfo
+import android.os.Build
+
+fun NetworkCapabilities.getWifiName(): String? {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+		val info: WifiInfo
+		if (transportInfo is WifiInfo) {
+			info = transportInfo as WifiInfo
+			return info.ssid
+		}
+	}
+	return null
+}
@@ -0,0 +1,13 @@
+package com.zaneschepke.wireguardautotunnel.core.network
+
+import android.net.NetworkCapabilities
+import com.zaneschepke.wireguardautotunnel.domain.state.ConnectivityState
+import kotlinx.coroutines.flow.Flow
+
+interface NetworkMonitor {
+	val status: Flow<ConnectivityState>
+
+	// util to help limit location queries
+	val didWifiChangeSinceLastCapabilitiesQuery: Boolean
+	fun getWifiCapabilities(): NetworkCapabilities?
+}
@@ -4,8 +4,8 @@ import android.app.Notification
 import android.app.NotificationManager
 import android.content.Context
 import androidx.core.app.NotificationCompat
-import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification.NotificationChannels
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
+import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification.NotificationChannels
 import com.zaneschepke.wireguardautotunnel.util.StringValue

 interface NotificationManager {
@@ -12,9 +12,9 @@ import android.graphics.Color
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.broadcast.NotificationActionReceiver
+import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager.Companion.EXTRA_ID
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.util.StringValue
@@ -3,37 +3,35 @@ package com.zaneschepke.wireguardautotunnel.core.service
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.core.service.tile.AutoTunnelControlTile
+import com.zaneschepke.wireguardautotunnel.core.service.tile.TunnelControlTile
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import jakarta.inject.Inject
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withTimeoutOrNull
+import kotlinx.coroutines.withContext
 import timber.log.Timber

-class ServiceManager @Inject constructor(
-	private val context: Context,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	private val appDataRepository: AppDataRepository,
-) {
+@OptIn(ExperimentalCoroutinesApi::class)
+class ServiceManager
+@Inject constructor(private val context: Context, private val ioDispatcher: CoroutineDispatcher, private val appDataRepository: AppDataRepository) {

 	private val _autoTunnelActive = MutableStateFlow(false)
+
 	val autoTunnelActive = _autoTunnelActive.asStateFlow()

 	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
 	var backgroundService = CompletableDeferred<TunnelForegroundService>()
+	var autoTunnelTile = CompletableDeferred<AutoTunnelControlTile>()
+	var tunnelControlTile = CompletableDeferred<TunnelControlTile>()

 	private fun <T : Service> startService(cls: Class<T>, background: Boolean) {
 		runCatching {
@@ -46,98 +44,76 @@ class ServiceManager @Inject constructor(
 		}.onFailure { Timber.e(it) }
 	}

-	fun startAutoTunnel() {
-		applicationScope.launch(ioDispatcher) {
-			val settings = appDataRepository.settings.get()
-			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
-			if (autoTunnelService.isCompleted) {
-				_autoTunnelActive.update { true }
-				return@launch
-			}
-			runCatching {
-				autoTunnelService = CompletableDeferred()
-				startService(AutoTunnelService::class.java, !WireGuardAutoTunnel.isForeground())
-				_autoTunnelActive.update { true }
-			}.onFailure {
-				Timber.e(it)
-				_autoTunnelActive.update { false }
-			}
-		}
-		updateAutoTunnelTile()
-	}
-
-	fun startTunnelForegroundService(tunnelConf: TunnelConf) {
-		applicationScope.launch(ioDispatcher) {
-			if (backgroundService.isCompleted) return@launch
-			runCatching {
-				backgroundService = CompletableDeferred()
-				startService(TunnelForegroundService::class.java, !WireGuardAutoTunnel.isForeground())
-				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { backgroundService.await() }
-					?: throw IllegalStateException("Background service start timed out")
-				service.start(tunnelConf)
-			}.onFailure {
-				Timber.e(it)
-			}
+	suspend fun startAutoTunnel(background: Boolean) {
+		val settings = appDataRepository.settings.get()
+		appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
+		if (autoTunnelService.isCompleted) return _autoTunnelActive.update { true }
+		runCatching {
+			startService(AutoTunnelService::class.java, background)
+			autoTunnelService.await()
+			autoTunnelService.getCompleted().start()
+			_autoTunnelActive.update { true }
+			updateAutoTunnelTile()
+		}.onFailure {
+			Timber.e(it)
 		}
 	}

-	fun updateTunnelForegroundServiceNotification(tunnelConf: TunnelConf) {
-		applicationScope.launch(ioDispatcher) {
-			if (!backgroundService.isCompleted) return@launch
-			runCatching {
-				val service = backgroundService.await()
-				service.start(tunnelConf)
-			}.onFailure {
-				Timber.e(it)
-			}
+	suspend fun startBackgroundService(tunnelConf: TunnelConf) {
+		if (backgroundService.isCompleted) return
+		runCatching {
+			startService(TunnelForegroundService::class.java, true)
+			backgroundService.await()
+			backgroundService.getCompleted().start(tunnelConf)
+		}.onFailure {
+			Timber.e(it)
 		}
 	}

-	fun stopTunnelForegroundService() {
-		applicationScope.launch(ioDispatcher) {
-			if (!backgroundService.isCompleted) return@launch
-			runCatching {
-				val service = backgroundService.await()
-				service.stop()
-				backgroundService = CompletableDeferred()
-			}.onFailure {
-				Timber.e(it)
-			}
+	fun stopBackgroundService() {
+		if (!backgroundService.isCompleted) return
+		runCatching {
+			backgroundService.getCompleted().stop()
+		}.onFailure {
+			Timber.e(it)
 		}
 	}

-	fun toggleAutoTunnel() {
-		applicationScope.launch(ioDispatcher) {
-			if (_autoTunnelActive.value) stopAutoTunnel() else startAutoTunnel()
+	suspend fun toggleAutoTunnel(background: Boolean) {
+		withContext(ioDispatcher) {
+			if (_autoTunnelActive.value) return@withContext stopAutoTunnel()
+			startAutoTunnel(background)
 		}
 	}

 	fun updateAutoTunnelTile() {
-		context.requestAutoTunnelTileServiceUpdate()
+		if (autoTunnelTile.isCompleted) {
+			autoTunnelTile.getCompleted().updateTileState()
+		} else {
+			context.requestAutoTunnelTileServiceUpdate()
+		}
 	}

 	fun updateTunnelTile() {
-		context.requestTunnelTileServiceStateUpdate()
+		if (tunnelControlTile.isCompleted) {
+			tunnelControlTile.getCompleted().updateTileState()
+		} else {
+			context.requestTunnelTileServiceStateUpdate()
+		}
 	}

-	fun stopAutoTunnel() {
-		applicationScope.launch(ioDispatcher) {
+	suspend fun stopAutoTunnel() {
+		withContext(ioDispatcher) {
 			val settings = appDataRepository.settings.get()
 			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
-			if (!autoTunnelService.isCompleted) return@launch
+			if (!autoTunnelService.isCompleted) return@withContext
 			runCatching {
-				val service = autoTunnelService.await()
-				service.stop()
+				autoTunnelService.getCompleted().stop()
 				_autoTunnelActive.update { false }
-				autoTunnelService = CompletableDeferred()
 				updateAutoTunnelTile()
 			}.onFailure {
 				Timber.e(it)
 			}
 		}
 	}
-
-	companion object {
-		const val SERVICE_START_TIMEOUT = 5_000L
-	}
 }
@@ -5,30 +5,14 @@ import android.content.Intent
 import android.os.IBinder
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.networkmonitor.NetworkStatus
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
-import timber.log.Timber
 import javax.inject.Inject

@AndroidEntryPoint
@@ -40,18 +24,6 @@ class TunnelForegroundService : LifecycleService() {
 	@Inject
 	lateinit var serviceManager: ServiceManager

-	@Inject
-	lateinit var networkMonitor: NetworkMonitor
-
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
-
-	@Inject
-	lateinit var tunnelRepo: TunnelRepository
-
-	private val isNetworkConnected = MutableStateFlow(true)
-
 	override fun onCreate() {
 		super.onCreate()
 		serviceManager.backgroundService.complete(this)
@@ -63,99 +35,27 @@ class TunnelForegroundService : LifecycleService() {
 	}

 	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+		super.onStartCommand(intent, flags, startId)
 		serviceManager.backgroundService.complete(this)
-		return super.onStartCommand(intent, flags, startId)
+		return START_NOT_STICKY
 	}

 	fun start(tunnelConf: TunnelConf) {
-		Timber.d("Service starting with TunnelConf instance: ${tunnelConf.hashCode()}")
 		ServiceCompat.startForeground(
 			this@TunnelForegroundService,
 			NotificationManager.KERNEL_SERVICE_NOTIFICATION_ID,
 			createNotification(tunnelConf),
 			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
 		)
-		// monitor if we have internet connectivity
-		startNetworkMonitorJob()
-
-		// job to trigger stats emit on interval
-		startTunnelStatsJob(tunnelConf)
-
-		// monitor changes to the tunnel config
-		startTunnelConfChangesJob(tunnelConf)
-
-		startPingJob(tunnelConf)
-	}
-
-	private fun startTunnelConfChangesJob(tunnelConf: TunnelConf) = lifecycleScope.launch(ioDispatcher) {
-		tunnelRepo.flow
-			.flowOn(ioDispatcher)
-			.map { storedTunnels ->
-				storedTunnels.firstOrNull { it.id == tunnelConf.id }
-			}
-			.filterNotNull()
-			// only emit when one of these 3 values change
-			.distinctUntilChanged { old, new ->
-				old.tunName == new.tunName && old.wgQuick == new.wgQuick && old.amQuick == new.amQuick
-			}
-			.collect { storedTunnel ->
-				if (tunnelConf.isTunnelConfigChanged(storedTunnel)) {
-					Timber.d("Config changed for ${storedTunnel.tunName}, bouncing")
-					tunnelConf.bounceTunnel(storedTunnel)
-				}
-			}
-	}
-
-	private fun startNetworkMonitorJob() = lifecycleScope.launch(ioDispatcher) {
-		networkMonitor.networkStatusFlow
-			.flowOn(ioDispatcher)
-			.collectLatest { status ->
-				val isAvailable = status !is NetworkStatus.Disconnected
-				isNetworkConnected.value = isAvailable
-				Timber.d("Network available: $status")
-			}
-	}
-
-	private fun startTunnelStatsJob(tunnel: TunnelConf) = lifecycleScope.launch(ioDispatcher) {
-		while (isActive) {
-			tunnel.onUpdateStatistics()
-			delay(STATS_DELAY)
-		}
-	}
-
-	private fun startPingJob(tunnel: TunnelConf) = lifecycleScope.launch(ioDispatcher) {
-		delay(PING_START_DELAY)
-		while (isActive) {
-			val shouldBounce = shouldBounceTunnel(tunnel)
-			val delayMs = if (shouldBounce) {
-				tunnel.bounceTunnel(tunnel)
-				tunnel.pingCooldown ?: Constants.PING_COOLDOWN
-			} else {
-				tunnel.pingInterval ?: Constants.PING_INTERVAL
-			}
-			delay(delayMs)
-		}
-	}
-
-	private suspend fun shouldBounceTunnel(tunnel: TunnelConf): Boolean {
-		if (!isNetworkConnected.value) {
-			Timber.d("Network disconnected, skipping ping for ${tunnel.tunName}")
-			return false
-		}
-		return runCatching {
-			!tunnel.isTunnelPingable(ioDispatcher)
-		}.onFailure { e ->
-			Timber.e(e, "Ping check failed for ${tunnel.tunName}")
-		}.getOrDefault(true)
 	}

 	fun stop() {
+		stopForeground(STOP_FOREGROUND_REMOVE)
 		stopSelf()
 	}

 	override fun onDestroy() {
 		serviceManager.backgroundService = CompletableDeferred()
-		ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
 		super.onDestroy()
 	}

@@ -168,13 +68,4 @@ class TunnelForegroundService : LifecycleService() {
 			),
 		)
 	}
-
-	companion object {
-		const val STATS_DELAY = 1_000L
-		const val PING_START_DELAY = 30_000L
-		// ipv6 disabled or block on network
-// 		const val userspaceStartFailed = "Failed to send handshake initiation: write udp [::]"
-// 		const val ipv6Fails = "Failed to send data packets: write udp [::]"
-// 		const val ipv4Fails = "Failed to send data packets: write udp 0.0.0.0:51820"
-	}
 }
@@ -1,42 +1,44 @@
 package com.zaneschepke.wireguardautotunnel.core.service.autotunnel

 import android.content.Intent
+import android.net.NetworkCapabilities
 import android.os.IBinder
 import android.os.PowerManager
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.networkmonitor.NetworkStatus
+import com.wireguard.android.util.RootShell
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
-import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.AppShell
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.di.MainImmediateDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.domain.state.AutoTunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
+import com.zaneschepke.wireguardautotunnel.core.network.InternetConnectivityMonitor
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.domain.state.ConnectivityState
+import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
+import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
+import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
@@ -47,6 +49,10 @@ import javax.inject.Provider
@AndroidEntryPoint
 class AutoTunnelService : LifecycleService() {

+	@Inject
+	@AppShell
+	lateinit var rootShell: Provider<RootShell>
+
 	@Inject
 	lateinit var networkMonitor: NetworkMonitor

@@ -97,8 +103,7 @@ class AutoTunnelService : LifecycleService() {
 		super.onStartCommand(intent, flags, startId)
 		Timber.d("onStartCommand executed with startId: $startId")
 		serviceManager.autoTunnelService.complete(this)
-		start()
-		return START_STICKY
+		return START_NOT_STICKY
 	}

 	fun start() {
@@ -157,54 +162,49 @@ class AutoTunnelService : LifecycleService() {
 		}
 	}

-	private fun buildNetworkState(networkStatus: NetworkStatus): NetworkState {
+	private suspend fun buildNetworkState(connectivityState: ConnectivityState): NetworkState {
 		return with(autoTunnelStateFlow.value.networkState) {
-			val wifiName = when (networkStatus) {
-				is NetworkStatus.Connected -> {
-					networkStatus.wifiSsid
+			val wifiName = when {
+				connectivityState.wifiAvailable &&
+					(wifiName == null || wifiName == Constants.UNREADABLE_SSID || networkMonitor.didWifiChangeSinceLastCapabilitiesQuery) -> {
+					networkMonitor.getWifiCapabilities()?.let { getWifiName(it) } ?: wifiName
 				}
-				else -> null
+				!connectivityState.wifiAvailable -> null
+				else -> wifiName
 			}
 			copy(
-				isWifiConnected = networkStatus.wifiConnected,
-				isMobileDataConnected = networkStatus.cellularConnected,
-				isEthernetConnected = networkStatus.ethernetConnected,
+				isWifiConnected = connectivityState.wifiAvailable,
+				isMobileDataConnected = connectivityState.cellularAvailable,
+				isEthernetConnected = isEthernetConnected,
 				wifiName = wifiName,
 			)
 		}
 	}

-	@OptIn(ExperimentalCoroutinesApi::class)
 	private fun startAutoTunnelStateJob() = lifecycleScope.launch(ioDispatcher) {
 		combine(
 			combineSettings(),
-			appDataRepository.get().settings.flow
-				.distinctUntilChanged { old, new -> old.isKernelEnabled == new.isKernelEnabled } // Only emit when isKernelEnabled changes
-				.flatMapLatest {
-					networkMonitor.networkStatusFlow
-						.flowOn(ioDispatcher)
-						.map { buildNetworkState(it) }
-				}
-				.distinctUntilChanged(),
+			networkMonitor.status.map {
+				buildNetworkState(it)
+			}.distinctUntilChanged(),
 		) { double, networkState ->
-			AutoTunnelState(
-				tunnelManager.activeTunnels.value,
-				networkState,
-				double.first,
-				double.second,
-			)
+			AutoTunnelState(tunnelManager.activeTunnels().value, networkState, double.first, double.second)
 		}.collect { state ->
 			autoTunnelStateFlow.update {
-				it.copy(
-					activeTunnels = state.activeTunnels,
-					networkState = state.networkState,
-					settings = state.settings,
-					tunnels = state.tunnels,
-				)
+				it.copy(activeTunnels = state.activeTunnels, networkState = state.networkState, settings = state.settings, tunnels = state.tunnels)
 			}
 		}
 	}

+	private suspend fun getWifiName(wifiCapabilities: NetworkCapabilities): String? {
+		val setting = appDataRepository.get().settings.get()
+		return if (setting.isWifiNameByShellEnabled) {
+			rootShell.get().getCurrentWifiName()
+		} else {
+			InternetConnectivityMonitor.getNetworkName(wifiCapabilities, this@AutoTunnelService)
+		}
+	}
+
 	private fun combineSettings(): Flow<Pair<AppSettings, Tunnels>> {
 		return combine(
 			appDataRepository.get().settings.flow,
@@ -241,7 +241,7 @@ class AutoTunnelService : LifecycleService() {
 		Timber.d("Starting with debounce delay of: ${settings.debounceDelaySeconds} seconds")
 		autoTunnelStateFlow.debounce(settings.debounceDelayMillis()).collect { watcherState ->
 			if (watcherState == defaultState) return@collect
-			Timber.d("New auto tunnel state emitted ${watcherState.networkState}")
+			Timber.d("New auto tunnel state emitted")
 			when (val event = watcherState.asAutoTunnelEvent()) {
 				is AutoTunnelEvent.Start -> (event.tunnelConf ?: appDataRepository.get().getPrimaryOrFirstTunnel())?.let {
 					tunnelManager.startTunnel(it)
@@ -4,66 +4,62 @@ import android.content.Intent
 import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject

@AndroidEntryPoint
-class AutoTunnelControlTile : TileService(), LifecycleOwner {
+class AutoTunnelControlTile : TileService() {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository

 	@Inject
 	lateinit var serviceManager: ServiceManager

-	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope

 	override fun onCreate() {
 		super.onCreate()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+		serviceManager.autoTunnelTile.complete(this)
 	}

 	override fun onDestroy() {
 		super.onDestroy()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+		serviceManager.autoTunnelTile = CompletableDeferred()
 	}

 	override fun onStartListening() {
 		super.onStartListening()
-		Timber.d("Start listening called for auto tunnel tile")
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
-		lifecycleScope.launch {
-			serviceManager.autoTunnelActive.collect {
-				if (it) setActive() else setInactive()
-			}
+		serviceManager.autoTunnelTile.complete(this)
+		applicationScope.launch {
+			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
+			updateTileState()
 		}
-		lifecycleScope.launch {
-			appDataRepository.tunnels.flow.collect {
-				if (it.isEmpty()) {
-					setUnavailable()
-				} else {
-					if (qsTile.state == Tile.STATE_ACTIVE) setInactive()
-				}
-			}
+	}
+
+	fun updateTileState() {
+		serviceManager.autoTunnelActive.value.let {
+			if (it) setActive() else setInactive()
 		}
 	}

 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
-			lifecycleScope.launch {
+			applicationScope.launch {
 				if (serviceManager.autoTunnelActive.value) {
 					serviceManager.stopAutoTunnel()
 					setInactive()
 				} else {
-					serviceManager.startAutoTunnel()
+					serviceManager.startAutoTunnel(true)
 					setActive()
 				}
 			}
@@ -101,7 +97,4 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 			qsTile.updateTile()
 		}
 	}
-
-	override val lifecycle: Lifecycle
-		get() = lifecycleRegistry
 }
@@ -5,66 +5,56 @@ import android.os.Build
 import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject

@AndroidEntryPoint
-class TunnelControlTile : TileService(), LifecycleOwner {
+class TunnelControlTile : TileService() {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository

+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
 	@Inject
 	lateinit var serviceManager: ServiceManager

 	@Inject
 	lateinit var tunnelManager: TunnelManager

-	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
-
-	private var isCollecting = false
-
 	override fun onCreate() {
 		super.onCreate()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+		serviceManager.tunnelControlTile.complete(this)
 	}

 	override fun onDestroy() {
 		super.onDestroy()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+		serviceManager.tunnelControlTile = CompletableDeferred()
 	}

 	override fun onStartListening() {
 		super.onStartListening()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
-		Timber.d("Start listening called for tunnel tile")
-		if (isCollecting) return
-		isCollecting = true
-		lifecycleScope.launch {
-			tunnelManager.activeTunnels.collect {
-				updateTileState()
-			}
+		Timber.d("Start listening called")
+		serviceManager.tunnelControlTile.complete(this)
+		applicationScope.launch {
+			updateTileState()
 		}
 	}

-	private fun updateTileState() = lifecycleScope.launch {
-		val tunnels = appDataRepository.tunnels.getAll()
-		if (tunnels.isEmpty()) return@launch setUnavailable()
-		with(tunnelManager.activeTunnels.value) {
-			if (isNotEmpty()) if (size == 1) {
-				tunnels.firstOrNull { it.id == keys.first().id }?.let { return@launch updateTile(it.tunName, true) }
-			} else {
-				return@launch updateTile(getString(R.string.multiple), true)
-			}
+	fun updateTileState() = applicationScope.launch {
+		if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
+		with(tunnelManager.activeTunnels().value) {
+			if (isNotEmpty()) return@launch updateTile(if (size == 1) first().tunName else getString(R.string.multiple), true)
 		}
 		appDataRepository.getStartTunnelConfig()?.let {
 			updateTile(it.tunName, false)
@@ -74,8 +64,8 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
-			lifecycleScope.launch {
-				if (tunnelManager.activeTunnels.value.isNotEmpty()) return@launch tunnelManager.stopTunnel()
+			applicationScope.launch {
+				if (tunnelManager.activeTunnels().value.isNotEmpty()) return@launch tunnelManager.stopTunnel()
 				appDataRepository.getStartTunnelConfig()?.let {
 					tunnelManager.startTunnel(it)
 				}
@@ -137,6 +127,4 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 			Timber.e(it)
 		}
 	}
-	override val lifecycle: Lifecycle
-		get() = lifecycleRegistry
 }
@@ -2,12 +2,11 @@ package com.zaneschepke.wireguardautotunnel.core.shortcut

 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -22,9 +21,6 @@ class ShortcutsActivity : ComponentActivity() {
 	@Inject
 	lateinit var serviceManager: ServiceManager

-	@Inject
-	lateinit var tunnelManager: TunnelManager
-
 	@Inject
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
@@ -43,17 +39,17 @@ class ShortcutsActivity : ComponentActivity() {
 								.firstOrNull { it.tunName == tunnelName }
 						} ?: appDataRepository.getStartTunnelConfig()
 						Timber.d("Shortcut action on name: ${tunnelConfig?.tunName}")
-						tunnelConfig?.let {
-							when (intent.action) {
-								Action.START.name -> tunnelManager.startTunnel(it)
-								Action.STOP.name -> tunnelManager.stopTunnel()
-								else -> Unit
-							}
-						}
+// 						tunnelConfig?.let {
+// 							when (intent.action) {
+// 								Action.START.name -> tunnelService.get().startTunnel(it)
+// 								Action.STOP.name -> tunnelService.get().stopTunnel()
+// 								else -> Unit
+// 							}
+// 						}
 					}
 					AutoTunnelService::class.java.simpleName, LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
 						when (intent.action) {
-							Action.START.name -> serviceManager.startAutoTunnel()
+							Action.START.name -> serviceManager.startAutoTunnel(true)
 							Action.STOP.name -> serviceManager.stopAutoTunnel()
 						}
 					}
@@ -1,70 +1,187 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel

-import com.wireguard.android.backend.BackendException
-import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider.Companion.CHECK_INTERVAL
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.StringValue
-import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
+import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicBoolean

-abstract class BaseTunnel(
+open class BaseTunnel(
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 	@ApplicationScope private val applicationScope: CoroutineScope,
+	private val networkMonitor: NetworkMonitor,
 	private val appDataRepository: AppDataRepository,
 	private val serviceManager: ServiceManager,
 	private val notificationManager: NotificationManager,
 ) : TunnelProvider {

-	private val activeTuns = MutableStateFlow<Map<TunnelConf, TunnelState>>(emptyMap())
-	override val activeTunnels = activeTuns.asStateFlow()
+	internal val tunnels = MutableStateFlow<List<TunnelConf>>(emptyList())

-	private val isBounce = AtomicBoolean(false)
+	private val tunnelJobs = mutableMapOf<TunnelConf, Job>()

-	private val mutex = Mutex()
+	private val isNetworkAvailable = AtomicBoolean(false)

-	abstract suspend fun startBackend(tunnel: TunnelConf)
+	init {
+		applicationScope.launch(ioDispatcher) {
+			launch {
+				startNetworkJob()
+			}
+			tunnels.collect { tuns ->
+				val previousTuns = tunnelJobs.keys.toSet()
+				val newTuns = tuns - previousTuns
+				val removedItems = previousTuns - tuns.toSet()

-	abstract fun stopBackend(tunnel: TunnelConf)
+				newTuns.forEach { tun ->
+					Timber.d("Starting tunnel jobs for tun ${tun.name}")
+					tunnelJobs[tun] = startTunnelJobs(tun)
+				}

-	private fun findActiveTunnel(id: Int): TunnelConf? = activeTuns.value.keys.find { it.id == id }
-
-	private fun isTunnelActive(id: Int) = (activeTuns.value.any { it.key.id == id })
-
-	private fun handleBackendThrowable(throwable: Throwable) {
-		val backendError = when (throwable) {
-			is BackendException -> throwable.toBackendError()
-			is org.amnezia.awg.backend.BackendException -> throwable.toBackendError()
-			else -> BackendError.Unknown
+				removedItems.forEach { tun ->
+					tunnelJobs[tun]?.cancelWithMessage("Canceling tunnel jobs for tunnel: ${tun.name}")
+					tunnelJobs.remove(tun)
+				}
+				serviceManager.updateTunnelTile()
+			}
 		}
+	}
+
+	private fun startTunnelJobs(tunnel: TunnelConf) = applicationScope.launch(ioDispatcher) {
+		launch {
+			startTunnelStatisticsJob(tunnel)
+		}
+		launch {
+			startPingJob(tunnel)
+		}
+		launch {
+			startTunnelConfigChangeJob(tunnel)
+		}
+	}
+
+	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
+		if (tunnels.value.any { it.id == tunnelConf.id }) {
+			toggleTunnel(tunnelConf, TunnelStatus.DOWN)
+			toggleTunnel(tunnelConf, TunnelStatus.UP)
+		}
+	}
+
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+	}
+
+	override suspend fun runningTunnelNames(): Set<String> {
+		return emptySet()
+	}
+
+	override suspend fun activeTunnels(): StateFlow<List<TunnelConf>> {
+		return tunnels.asStateFlow()
+	}
+
+	override suspend fun startTunnel(tunnelConf: TunnelConf) {
+		if (tunnels.value.any { it.id == tunnelConf.id }) return Timber.w("Tunnel already running")
+		serviceManager.startBackgroundService(tunnelConf)
+		appDataRepository.tunnels.save(tunnelConf.copy(isActive = true))
+	}
+
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
+	}
+
+	open suspend fun toggleTunnel(tunnelConf: TunnelConf, state: TunnelStatus) {
+	}
+
+	open suspend fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+		throw NotImplementedError("Get statistics not implemented in base class")
+	}
+
+	internal suspend fun onTunnelStop(tunnelConf: TunnelConf) {
+		appDataRepository.tunnels.save(tunnelConf.copy(isActive = false))
+		removeFromActiveTunnels(tunnelConf)
+		if (tunnels.value.isEmpty()) serviceManager.stopBackgroundService()
+	}
+
+	internal suspend fun stopAllTunnels() {
+		tunnels.value.forEach {
+			stopTunnel(it)
+		}
+	}
+
+	internal fun addToActiveTunnels(conf: TunnelConf) {
+		tunnels.update {
+			it.toMutableList().apply {
+				add(conf)
+			}
+		}
+	}
+
+	private fun removeFromActiveTunnels(conf: TunnelConf) {
+		tunnels.update {
+			it.toMutableList().apply {
+				remove(conf)
+			}
+		}
+	}
+
+	private suspend fun startNetworkJob() = coroutineScope {
+		networkMonitor.status.distinctUntilChanged().collect {
+			isNetworkAvailable.set(!it.allOffline)
+		}
+	}
+
+	private suspend fun startPingJob(tunnel: TunnelConf) = coroutineScope {
+		while (isActive) {
+			if (isNetworkAvailable.get() && tunnel.isActive) {
+				val pingResult = tunnel.pingTunnel(ioDispatcher)
+				handlePingResult(tunnel, pingResult)
+			}
+			delay(CHECK_INTERVAL)
+		}
+	}
+
+	private suspend fun handlePingResult(tunnel: TunnelConf, pingResult: List<Boolean>) {
+		if (pingResult.contains(false)) {
+			if (isNetworkAvailable.get()) {
+				Timber.i("Ping result: target was not reachable, bouncing the tunnel")
+				bounceTunnel(tunnel)
+				delay(tunnel.pingCooldown ?: Constants.PING_COOLDOWN)
+			} else {
+				Timber.i("Ping result: target was not reachable, but no network available")
+			}
+		} else {
+			Timber.i("Ping result: all ping targets were reached successfully")
+		}
+	}
+
+	internal fun handleBackendThrowable(backendError: BackendError) {
 		val message = when (backendError) {
 			BackendError.Config -> StringValue.StringResource(R.string.start_failed_config)
 			BackendError.DNS -> StringValue.StringResource(R.string.dns_error)
 			BackendError.Unauthorized -> StringValue.StringResource(R.string.unauthorized)
-			BackendError.Unknown -> StringValue.StringResource(R.string.unknown_error)
 		}
 		if (WireGuardAutoTunnel.isForeground()) {
 			SnackbarController.showMessage(message)
@@ -80,134 +197,23 @@ abstract class BaseTunnel(
 		}
 	}

-	private fun updateTunnelState(tunnelConf: TunnelConf, state: TunnelStatus? = null, stats: TunnelStatistics? = null) {
-		applicationScope.launch(ioDispatcher) {
-			mutex.withLock {
-				activeTuns.update { current ->
-					val originalConf = current.getKeyById(tunnelConf.id) ?: tunnelConf
-					val existingState = current.getValueById(tunnelConf.id) ?: TunnelState()
-					val newState = state ?: existingState.state
-					if (newState == TunnelStatus.DOWN) {
-						Timber.d("Removing tunnel ${tunnelConf.id} from activeTunnels as state is DOWN")
-						current - originalConf
-					} else if (existingState.state == newState && stats == null) {
-						Timber.d("Skipping redundant state update for ${tunnelConf.id}: $newState")
-						current
-					} else {
-						val updated = existingState.copy(
-							state = newState,
-							statistics = stats ?: existingState.statistics,
-						)
-						current + (originalConf to updated)
-					}
+	private suspend fun startTunnelConfigChangeJob(tunnel: TunnelConf) = coroutineScope {
+		appDataRepository.tunnels.flow.collect { storageTuns ->
+			storageTuns.firstOrNull { it.id == tunnel.id }?.let { storageTun ->
+				if (tunnel.isQuickConfigChanged(storageTun) || tunnel.isPingConfigMatching(storageTun)) {
+					bounceTunnel(tunnel)
 				}
 			}
 		}
 	}

-	protected suspend fun stopActiveTunnels() {
-		activeTunnels.value.forEach { (config, state) ->
-			if (state.state.isUp()) {
-				stopTunnel(config)
-				delay(300)
+	private suspend fun startTunnelStatisticsJob(tunnel: TunnelConf) = coroutineScope {
+		while (isActive) {
+			val stats = getStatistics(tunnel)
+			tunnel.state.update {
+				it.copy(statistics = stats)
 			}
+			delay(CHECK_INTERVAL)
 		}
 	}
-
-	private fun configureTunnelCallbacks(tunnelConf: TunnelConf) {
-		Timber.d("Configuring TunnelConf instance: ${tunnelConf.hashCode()}")
-
-		tunnelConf.setStateChangeCallback { state ->
-			Timber.d("State change callback triggered for tunnel ${tunnelConf.id}: ${tunnelConf.tunName} with state $state at ${System.currentTimeMillis()}")
-			when (state) {
-				is Tunnel.State -> updateTunnelState(tunnelConf, state.asTunnelState())
-				is org.amnezia.awg.backend.Tunnel.State -> updateTunnelState(tunnelConf, state.asTunnelState())
-			}
-			serviceManager.updateTunnelTile()
-		}
-		tunnelConf.setTunnelStatsCallback {
-			val stats = getStatistics(tunnelConf)
-			updateTunnelState(tunnelConf, null, stats)
-		}
-		tunnelConf.setBounceTunnelCallback(::bounceTunnel)
-	}
-
-	override fun startTunnel(tunnelConf: TunnelConf) {
-		applicationScope.launch(ioDispatcher) {
-			runCatching {
-				if (isTunnelActive(tunnelConf.id)) return@launch
-				saveTunnelActiveState(tunnelConf, true)
-				startTunnelInner(tunnelConf)
-			}.onFailure { exception ->
-				Timber.e(exception, "Failed to start tunnel ${tunnelConf.id} userspace")
-				stopTunnel(tunnelConf)
-				handleBackendThrowable(exception)
-			}.onSuccess {
-				Timber.i("Tunnel ${tunnelConf.id} started successfully")
-			}
-		}
-	}
-
-	private suspend fun startTunnelInner(tunnelConf: TunnelConf) {
-		mutex.withLock {
-			configureTunnelCallbacks(tunnelConf)
-			startBackend(tunnelConf)
-			if (!isBounce.get()) serviceManager.startTunnelForegroundService(tunnelConf)
-		}
-	}
-
-	private suspend fun saveTunnelActiveState(tunnelConf: TunnelConf, active: Boolean) {
-		val tunnelCopy = tunnelConf.copyWithCallback(isActive = active)
-		appDataRepository.tunnels.save(tunnelCopy)
-	}
-
-	override fun stopTunnel(tunnelConf: TunnelConf?) {
-		applicationScope.launch(ioDispatcher) {
-			runCatching {
-				if (tunnelConf == null) return@launch stopActiveTunnels()
-				stopTunnelInner(tunnelConf)
-			}.onFailure { e ->
-				Timber.e(e, "Failed to stop tunnel ${tunnelConf?.id}")
-			}
-		}
-	}
-
-	private suspend fun stopTunnelInner(tunnelConf: TunnelConf) {
-		mutex.withLock {
-			val tunnel = findActiveTunnel(tunnelConf.id) ?: return
-			saveTunnelActiveState(tunnelConf, false)
-			stopBackend(tunnel)
-			removeActiveTunnel(tunnel)
-			// use latest tunnel
-			handleServiceChangesOnStop()
-		}
-	}
-
-	private fun handleServiceChangesOnStop() {
-		if (activeTuns.value.isEmpty() && !isBounce.get()) return serviceManager.stopTunnelForegroundService()
-		val nextActive = activeTuns.value.keys.firstOrNull()
-		if (nextActive != null) {
-			Timber.d("Next active tunnel: ${nextActive.id}")
-			serviceManager.updateTunnelForegroundServiceNotification(nextActive)
-		}
-	}
-
-	private fun removeActiveTunnel(tunnelConf: TunnelConf) {
-		activeTuns.update { current ->
-			current.toMutableMap().apply { remove(tunnelConf) }
-		}
-	}
-
-	override fun bounceTunnel(tunnelConf: TunnelConf) {
-		applicationScope.launch(ioDispatcher) {
-			Timber.i("Bounce tunnel ${tunnelConf.name}")
-			isBounce.set(true)
-			stopTunnel(tunnelConf)
-			delay(300)
-			startTunnel(tunnelConf)
-			isBounce.set(false)
-		}
-	}
-
-	override suspend fun runningTunnelNames(): Set<String> = activeTuns.value.keys.map { it.tunName }.toSet()
 }
@@ -1,25 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
-
-fun Map<TunnelConf, TunnelState>.allDown(): Boolean {
-	return this.all { it.value.state.isDown() }
-}
-
-fun Map<TunnelConf, TunnelState>.hasActive(): Boolean {
-	return this.any { it.value.state.isUp() }
-}
-
-fun Map<TunnelConf, TunnelState>.getValueById(id: Int): TunnelState? {
-	val key = this.keys.find { it.id == id }
-	return key?.let { this@getValueById[it] }
-}
-
-fun Map<TunnelConf, TunnelState>.getKeyById(id: Int): TunnelConf? {
-	return this.keys.find { it.id == id }
-}
-
-fun Map<TunnelConf, TunnelState>.isUp(tunnelConf: TunnelConf): Boolean {
-	return this.getValueById(tunnelConf.id)?.state?.isUp() ?: false
-}
@@ -1,18 +1,23 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel

 import com.wireguard.android.backend.Backend
+import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 import javax.inject.Inject

@@ -23,24 +28,49 @@ class KernelTunnel @Inject constructor(
 	appDataRepository: AppDataRepository,
 	notificationManager: NotificationManager,
 	private val backend: Backend,
-) : BaseTunnel(ioDispatcher, applicationScope, appDataRepository, serviceManager, notificationManager) {
+	networkMonitor: NetworkMonitor,
+) : BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {

-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-		return try {
-			WireGuardStatistics(backend.getStatistics(tunnelConf))
-		} catch (e: Exception) {
-			Timber.e(e)
-			null
+	override suspend fun startTunnel(tunnelConf: TunnelConf) {
+		withContext(ioDispatcher) {
+			super.startTunnel(tunnelConf)
+			runCatching {
+				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toWgConfig())
+				addToActiveTunnels(tunnelConf)
+			}.onFailure {
+				onTunnelStop(tunnelConf)
+				if (it is BackendException) {
+					handleBackendThrowable(it.toBackendError())
+				} else {
+					Timber.e(it)
+				}
+			}
 		}
 	}

-	override suspend fun startBackend(tunnel: TunnelConf) {
-		backend.setState(tunnel, Tunnel.State.UP, tunnel.toWgConfig())
+	override suspend fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+		return WireGuardStatistics(backend.getStatistics(tunnelConf))
 	}

-	override fun stopBackend(tunnel: TunnelConf) {
-		Timber.i("Stopping tunnel ${tunnel.id} kernel")
-		backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toWgConfig())
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
+		withContext(ioDispatcher) {
+			val tunnel = tunnels.value.firstOrNull { it.id == tunnelConf?.id }
+			runCatching {
+				tunnel?.let {
+					backend.setState(it, Tunnel.State.DOWN, it.toWgConfig())
+					onTunnelStop(it)
+				} ?: stopAllTunnels()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	override suspend fun toggleTunnel(tunnelConf: TunnelConf, status: TunnelStatus) {
+		when (status) {
+			TunnelStatus.UP -> backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toWgConfig())
+			TunnelStatus.DOWN -> backend.setState(tunnelConf, Tunnel.State.DOWN, tunnelConf.toWgConfig())
+		}
 	}

 	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
@@ -4,20 +4,20 @@ import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.di.Kernel
 import com.zaneschepke.wireguardautotunnel.di.Userspace
+import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.util.extensions.withData
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
+import kotlinx.coroutines.withContext
 import javax.inject.Inject

 class TunnelManager @Inject constructor(
@@ -28,69 +28,71 @@ class TunnelManager @Inject constructor(
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : TunnelProvider {

-	@OptIn(ExperimentalCoroutinesApi::class)
-	private val tunnelProviderFlow = appDataRepository.settings.flow
-		.filterNotNull()
-		.flatMapLatest { settings ->
-			MutableStateFlow(if (settings.isKernelEnabled) kernelTunnel else userspaceTunnel)
-		}
-		.stateIn(
-			scope = applicationScope.plus(ioDispatcher),
-			started = SharingStarted.Eagerly,
-			initialValue = userspaceTunnel,
-		)
+	val appSettings: StateFlow<AppSettings?> = appDataRepository.settings.flow.stateIn(
+		scope = applicationScope.plus(ioDispatcher),
+		started = SharingStarted.Eagerly,
+		initialValue = null,
+	)

-	@OptIn(ExperimentalCoroutinesApi::class)
-	override val activeTunnels = appDataRepository.settings.flow
-		.filterNotNull()
-		.flatMapLatest { settings ->
-			if (settings.isKernelEnabled) {
-				kernelTunnel.activeTunnels
-			} else {
-				userspaceTunnel.activeTunnels
+	override suspend fun activeTunnels(): StateFlow<List<TunnelConf>> {
+		return withContext(ioDispatcher) {
+			appSettings.filterNotNull().first().let {
+				if (it.isKernelEnabled) return@withContext kernelTunnel.activeTunnels()
+				userspaceTunnel.activeTunnels()
 			}
 		}
-		.stateIn(
-			scope = applicationScope.plus(ioDispatcher),
-			started = SharingStarted.Eagerly,
-			initialValue = emptyMap(),
-		)
-
-	override fun startTunnel(tunnelConf: TunnelConf) {
-		tunnelProviderFlow.value.startTunnel(tunnelConf)
 	}

-	override fun stopTunnel(tunnelConf: TunnelConf?) {
-		tunnelProviderFlow.value.stopTunnel(tunnelConf)
+	override suspend fun startTunnel(tunnelConf: TunnelConf) {
+		appSettings.withData {
+			if (it.isKernelEnabled) return@withData kernelTunnel.startTunnel(tunnelConf)
+			userspaceTunnel.startTunnel(tunnelConf)
+		}
 	}

-	override fun bounceTunnel(tunnelConf: TunnelConf) {
-		tunnelProviderFlow.value.bounceTunnel(tunnelConf)
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
+		appSettings.withData {
+			if (it.isKernelEnabled) return@withData kernelTunnel.stopTunnel(tunnelConf)
+			userspaceTunnel.stopTunnel(tunnelConf)
+		}
+	}
+
+	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
+		appSettings.withData {
+			if (it.isKernelEnabled) return@withData kernelTunnel.stopTunnel(tunnelConf)
+			userspaceTunnel.stopTunnel(tunnelConf)
+		}
 	}

 	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		tunnelProviderFlow.value.setBackendState(backendState, allowedIps)
+		appSettings.withData {
+			if (it.isKernelEnabled) return@withData kernelTunnel.setBackendState(backendState, allowedIps)
+			userspaceTunnel.setBackendState(backendState, allowedIps)
+		}
 	}

 	override suspend fun runningTunnelNames(): Set<String> {
-		return tunnelProviderFlow.value.runningTunnelNames()
+		appSettings.filterNotNull().first().let {
+			if (it.isKernelEnabled) return kernelTunnel.runningTunnelNames()
+			return userspaceTunnel.runningTunnelNames()
+		}
 	}

-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-		return tunnelProviderFlow.value.getStatistics(tunnelConf)
-	}
-
-	fun restorePreviousState() = applicationScope.launch(ioDispatcher) {
-		val settings = appDataRepository.settings.get()
-		if (settings.isRestoreOnBootEnabled) {
-			val previouslyActiveTuns = appDataRepository.tunnels.getActive()
-			val tunsToStart = previouslyActiveTuns.filterNot { tun -> activeTunnels.value.any { tun.id == it.key.id } }
-			if (settings.isKernelEnabled) {
-				return@launch tunsToStart.forEach {
-					startTunnel(it)
+	suspend fun restorePreviousState() {
+		withContext(ioDispatcher) {
+			with(appDataRepository.settings.get()) {
+				if (isRestoreOnBootEnabled) {
+					val previouslyActiveTuns = appDataRepository.tunnels.getActive()
+					// handle kernel mode
+					val tunsToStart = previouslyActiveTuns.filterNot { tun -> activeTunnels().value.any { tun.id == it.id } }
+					if (isKernelEnabled) {
+						return@withContext tunsToStart.forEach {
+							startTunnel(it)
+						}
+					}
+					// handle userspace
+					if (activeTunnels().value.isEmpty()) tunsToStart.firstOrNull()?.let { startTunnel(it) }
 				}
-			} else {
-				tunsToStart.firstOrNull()?.let { startTunnel(it) }
 			}
 		}
 	}
@@ -2,16 +2,23 @@ package com.zaneschepke.wireguardautotunnel.core.tunnel

 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import kotlinx.coroutines.flow.StateFlow

 interface TunnelProvider {
-	fun startTunnel(tunnelConf: TunnelConf)
-	fun stopTunnel(tunnelConf: TunnelConf? = null)
-	fun bounceTunnel(tunnelConf: TunnelConf)
+
+	suspend fun activeTunnels(): StateFlow<List<TunnelConf>>
+
+	suspend fun startTunnel(tunnelConf: TunnelConf)
+
+	suspend fun stopTunnel(tunnelConf: TunnelConf? = null)
+
+	suspend fun bounceTunnel(tunnelConf: TunnelConf)
+
 	suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
+
 	suspend fun runningTunnelNames(): Set<String>
-	fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics?
-	val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>>
+
+	companion object {
+		const val CHECK_INTERVAL = 1_000L
+	}
 }
@@ -1,17 +1,22 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel

+import com.wireguard.android.backend.BackendException
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AmneziaStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendState
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.withContext
 import org.amnezia.awg.backend.Backend
 import org.amnezia.awg.backend.Tunnel
 import timber.log.Timber
@@ -24,33 +29,55 @@ class UserspaceTunnel @Inject constructor(
 	appDataRepository: AppDataRepository,
 	notificationManager: NotificationManager,
 	private val backend: Backend,
-) : BaseTunnel(ioDispatcher, applicationScope, appDataRepository, serviceManager, notificationManager) {
+	networkMonitor: NetworkMonitor,
+) : TunnelProvider, BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {

-	override suspend fun startBackend(tunnel: TunnelConf) {
-		stopActiveTunnels()
-		backend.setState(tunnel, Tunnel.State.UP, tunnel.toAmConfig())
+	override suspend fun startTunnel(tunnelConf: TunnelConf) {
+		withContext(ioDispatcher) {
+			super.startTunnel(tunnelConf)
+			runCatching {
+				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toAmConfig())
+				addToActiveTunnels(tunnelConf)
+			}.onFailure {
+				onTunnelStop(tunnelConf)
+				if (it is BackendException) {
+					handleBackendThrowable(it.toBackendError())
+				} else {
+					Timber.e(it)
+				}
+			}
+		}
 	}

-	override fun stopBackend(tunnel: TunnelConf) {
-		Timber.i("Stopping tunnel ${tunnel.id} userspace")
-		backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toAmConfig())
+	override suspend fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+		return AmneziaStatistics(backend.getStatistics(tunnelConf))
+	}
+
+	override suspend fun toggleTunnel(tunnelConf: TunnelConf, status: TunnelStatus) {
+		when (status) {
+			TunnelStatus.UP -> backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toAmConfig())
+			TunnelStatus.DOWN -> backend.setState(tunnelConf, Tunnel.State.DOWN, tunnelConf.toAmConfig())
+		}
+	}
+
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
+		withContext(ioDispatcher) {
+			runCatching {
+				tunnels.value.firstOrNull { it.id == tunnelConf?.id }?.let {
+					backend.setState(it, Tunnel.State.DOWN, it.toAmConfig())
+					onTunnelStop(it)
+				} ?: stopAllTunnels()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
 	}

 	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		Timber.d("Setting backend state: $backendState with allowedIps: $allowedIps")
 		backend.setBackendState(backendState.asAmBackendState(), allowedIps)
 	}

 	override suspend fun runningTunnelNames(): Set<String> {
 		return backend.runningTunnelNames
 	}
-
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-		return try {
-			AmneziaStatistics(backend.getStatistics(tunnelConf))
-		} catch (e: Exception) {
-			Timber.e(e, "Failed to get stats for ${tunnelConf.tunName}")
-			null
-		}
-	}
 }
@@ -52,8 +52,8 @@ class ServiceWorker @AssistedInject constructor(
 	override suspend fun doWork(): Result = withContext(ioDispatcher) {
 		Timber.i("Service worker started")
 		with(appDataRepository.settings.get()) {
-			if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@with serviceManager.startAutoTunnel()
-			if (tunnelManager.activeTunnels.value.isEmpty()) tunnelManager.restorePreviousState()
+			if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@with serviceManager.startAutoTunnel(true)
+			if (tunnelManager.activeTunnels().value.isEmpty()) tunnelManager.restorePreviousState()
 		}
 		Result.success()
 	}
@@ -1,6 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.data

 import androidx.room.TypeConverter
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json

 class DatabaseListConverters {
@@ -1,10 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data.repository

-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import javax.inject.Inject

 class AppDataRoomRepository
@@ -1,8 +1,8 @@
 package com.zaneschepke.wireguardautotunnel.data.repository

 import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -1,10 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data.repository

 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import com.zaneschepke.wireguardautotunnel.data.model.Settings
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
@@ -1,10 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data.repository

 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.flowOn
@@ -30,12 +30,6 @@ class RoomTunnelRepository(
 		}
 	}

-	override suspend fun saveAll(tunnelConfs: List<TunnelConf>) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.saveAll(tunnelConfs.map(TunnelConfig::from))
-		}
-	}
-
 	override suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?) {
 		withContext(ioDispatcher) {
 			tunnelConfigDao.resetPrimaryTunnel()
@@ -4,17 +4,17 @@ import android.content.Context
 import androidx.room.Room
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
+import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRoomRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.DataStoreAppStateRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.RoomSettingsRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.RoomTunnelRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.Module
 import dagger.Provides
@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.di
+
+import com.zaneschepke.wireguardautotunnel.core.network.InternetConnectivityMonitor
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class ServiceModule {
+
+	@Binds
+	abstract fun provideInternetConnectivityService(wifiService: InternetConnectivityMonitor): NetworkMonitor
+}
@@ -4,8 +4,7 @@ import android.content.Context
 import com.wireguard.android.backend.WgQuickBackend
 import com.wireguard.android.util.RootShell
 import com.wireguard.android.util.ToolsInstaller
-import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
-import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.KernelTunnel
@@ -13,7 +12,6 @@ import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
 import com.zaneschepke.wireguardautotunnel.core.tunnel.UserspaceTunnel
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -21,7 +19,6 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.runBlocking
 import org.amnezia.awg.backend.Backend
 import org.amnezia.awg.backend.GoBackend
 import org.amnezia.awg.backend.RootTunnelActionHandler
@@ -67,10 +64,11 @@ class TunnelModule {
 		@ApplicationScope applicationScope: CoroutineScope,
 		serviceManager: ServiceManager,
 		appDataRepository: AppDataRepository,
+		networkMonitor: NetworkMonitor,
 		notificationManager: NotificationManager,
 		backend: com.wireguard.android.backend.Backend,
 	): TunnelProvider {
-		return KernelTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend)
+		return KernelTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend, networkMonitor)
 	}

 	@Provides
@@ -82,9 +80,10 @@ class TunnelModule {
 		serviceManager: ServiceManager,
 		appDataRepository: AppDataRepository,
 		notificationManager: NotificationManager,
+		networkMonitor: NetworkMonitor,
 		backend: Backend,
 	): TunnelProvider {
-		return UserspaceTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend)
+		return UserspaceTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend, networkMonitor)
 	}

 	@Provides
@@ -99,20 +98,13 @@ class TunnelModule {
 		return TunnelManager(kernelTunnel, userspaceTunnel, appDataRepository, applicationScope, ioDispatcher)
 	}

-	@Provides
-	@Singleton
-	fun provideNetworkMonitor(@ApplicationContext context: Context, settingsRepository: AppSettingRepository): NetworkMonitor {
-		return AndroidNetworkMonitor(context) { runBlocking { settingsRepository.get().isWifiNameByShellEnabled } }
-	}
-
 	@Singleton
 	@Provides
 	fun provideServiceManager(
 		@ApplicationContext context: Context,
 		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-		@ApplicationScope applicationScope: CoroutineScope,
 		appDataRepository: AppDataRepository,
 	): ServiceManager {
-		return ServiceManager(context, ioDispatcher, applicationScope, appDataRepository)
+		return ServiceManager(context, ioDispatcher, appDataRepository)
 	}
 }
@@ -1,18 +1,18 @@
 package com.zaneschepke.wireguardautotunnel.domain.entity

-import com.wireguard.android.backend.Tunnel
 import com.wireguard.config.Config
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.defaultName
-import com.zaneschepke.wireguardautotunnel.util.extensions.extractNameAndNumber
-import com.zaneschepke.wireguardautotunnel.util.extensions.hasNumberInParentheses
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
 import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
 import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.withContext
+import org.amnezia.awg.backend.Tunnel
 import timber.log.Timber
 import java.io.InputStream
 import java.net.InetAddress
-import java.nio.charset.StandardCharsets
 import kotlin.coroutines.CoroutineContext

 data class TunnelConf(
@@ -29,61 +29,10 @@ data class TunnelConf(
 	val pingCooldown: Long? = null,
 	val pingIp: String? = null,
 	val isEthernetTunnel: Boolean = false,
-	val isIpv4Preferred: Boolean = true,
-	@Transient
-	private var stateChangeCallback: ((Any) -> Unit)? = null,
-	@Transient
-	private var tunnelStatsCallback: (() -> Unit)? = null,
-	@Transient
-	private var bounceTunnelCallback: ((TunnelConf) -> Unit)? = null,
-) : Tunnel, org.amnezia.awg.backend.Tunnel {
+	val isIpv4Preferred: Boolean = false,
+) : Tunnel, com.wireguard.android.backend.Tunnel {

-	fun setStateChangeCallback(callback: (Any) -> Unit) {
-		stateChangeCallback = callback
-	}
-
-	fun setTunnelStatsCallback(callback: (() -> Unit)) {
-		tunnelStatsCallback = callback
-	}
-
-	fun setBounceTunnelCallback(callback: (TunnelConf) -> Unit) {
-		bounceTunnelCallback = callback
-	}
-
-	fun copyWithCallback(
-		id: Int = this.id,
-		tunName: String = this.tunName,
-		wgQuick: String = this.wgQuick,
-		tunnelNetworks: List<String> = this.tunnelNetworks,
-		isMobileDataTunnel: Boolean = this.isMobileDataTunnel,
-		isPrimaryTunnel: Boolean = this.isPrimaryTunnel,
-		amQuick: String = this.amQuick,
-		isActive: Boolean = this.isActive,
-		isPingEnabled: Boolean = this.isPingEnabled,
-		pingInterval: Long? = this.pingInterval,
-		pingCooldown: Long? = this.pingCooldown,
-		pingIp: String? = this.pingIp,
-		isEthernetTunnel: Boolean = this.isEthernetTunnel,
-		isIpv4Preferred: Boolean = this.isIpv4Preferred,
-	): TunnelConf {
-		return TunnelConf(
-			id, tunName, wgQuick, tunnelNetworks, isMobileDataTunnel, isPrimaryTunnel,
-			amQuick, isActive, isPingEnabled, pingInterval, pingCooldown, pingIp,
-			isEthernetTunnel, isIpv4Preferred,
-		).apply {
-			stateChangeCallback = this@TunnelConf.stateChangeCallback
-			tunnelStatsCallback = this@TunnelConf.tunnelStatsCallback
-			bounceTunnelCallback = this@TunnelConf.bounceTunnelCallback
-		}
-	}
-
-	fun onUpdateStatistics() {
-		tunnelStatsCallback?.invoke()
-	}
-
-	fun bounceTunnel(tunnelConf: TunnelConf) {
-		bounceTunnelCallback?.invoke(tunnelConf)
-	}
+	val state = MutableStateFlow(TunnelState())

 	fun toAmConfig(): org.amnezia.awg.config.Config {
 		return configFromAmQuick(amQuick.ifBlank { wgQuick })
@@ -93,50 +42,49 @@ data class TunnelConf(
 		return configFromWgQuick(wgQuick)
 	}

-	override fun getName(): String = tunName
+	override fun getName(): String {
+		return tunName
+	}

-	override fun isIpv4ResolutionPreferred(): Boolean = isIpv4Preferred
-
-	override fun onStateChange(newState: org.amnezia.awg.backend.Tunnel.State) {
-		stateChangeCallback?.invoke(newState)
+	override fun isIpv4ResolutionPreferred(): Boolean {
+		return isIpv4Preferred
 	}

 	override fun onStateChange(newState: Tunnel.State) {
-		stateChangeCallback?.invoke(newState)
-	}
-
-	fun isTunnelConfigChanged(updatedConf: TunnelConf): Boolean {
-		return updatedConf.wgQuick != wgQuick || updatedConf.amQuick != amQuick || updatedConf.name != name
-	}
-
-	fun generateUniqueName(tunnelNames: List<String>): String {
-		var tunnelName = this.tunName
-		var num = 1
-		while (tunnelNames.any { it == tunnelName }) {
-			tunnelName = if (!tunnelName.hasNumberInParentheses()) {
-				"$name($num)"
-			} else {
-				val pair = tunnelName.extractNameAndNumber()
-				"${pair?.first}($num)"
-			}
-			num++
+		state.update {
+			it.copy(state = newState.asTunnelState())
 		}
-		return tunnelName
 	}

-	suspend fun isTunnelPingable(context: CoroutineContext): Boolean {
+	override fun onStateChange(newState: com.wireguard.android.backend.Tunnel.State) {
+		state.update {
+			it.copy(state = newState.asTunnelState())
+		}
+	}
+
+	fun isQuickConfigChanged(updatedConf: TunnelConf): Boolean {
+		return updatedConf.wgQuick != wgQuick ||
+			updatedConf.amQuick != amQuick
+	}
+
+	fun isPingConfigMatching(updatedConf: TunnelConf): Boolean {
+		return updatedConf.isPingEnabled == isPingEnabled &&
+			pingIp == updatedConf.pingIp &&
+			updatedConf.pingCooldown == pingCooldown &&
+			updatedConf.pingInterval == pingInterval
+	}
+
+	suspend fun pingTunnel(context: CoroutineContext): List<Boolean> {
 		return withContext(context) {
 			val config = toWgConfig()
 			if (pingIp != null) {
-				return@withContext InetAddress.getByName(pingIp)
-					.isReachable(Constants.PING_TIMEOUT.toInt()).also {
-						Timber.i("Ping reachable $pingIp: $it")
-					}
-			}
-			config.peers.map { peer ->
-				peer.isReachable()
-			}.all { true }.also {
-				Timber.i("Ping of all peers reachable: $it")
+				Timber.i("Pinging custom ip")
+				listOf(InetAddress.getByName(pingIp).isReachable(Constants.PING_TIMEOUT.toInt()))
+			} else {
+				Timber.i("Pinging all peers")
+				config.peers.map { peer ->
+					peer.isReachable(isIpv4Preferred)
+				}
 			}
 		}
 	}
@@ -144,22 +92,22 @@ data class TunnelConf(
 	companion object {
 		fun configFromWgQuick(wgQuick: String): Config {
 			val inputStream: InputStream = wgQuick.byteInputStream()
-			return inputStream.bufferedReader(StandardCharsets.UTF_8).use {
+			return inputStream.bufferedReader(Charsets.UTF_8).use {
 				Config.parse(it)
 			}
 		}

 		fun configFromAmQuick(amQuick: String): org.amnezia.awg.config.Config {
 			val inputStream: InputStream = amQuick.byteInputStream()
-			return inputStream.bufferedReader(StandardCharsets.UTF_8).use {
+			return inputStream.bufferedReader(Charsets.UTF_8).use {
 				org.amnezia.awg.config.Config.parse(it)
 			}
 		}

-		fun tunnelConfigFromAmConfig(config: org.amnezia.awg.config.Config, name: String? = null): TunnelConf {
+		fun tunnelConfigFromAmConfig(config: org.amnezia.awg.config.Config, name: String): TunnelConf {
 			val amQuick = config.toAwgQuickString(true)
 			val wgQuick = config.toWgQuickString()
-			return TunnelConf(tunName = name ?: config.defaultName(), wgQuick = wgQuick, amQuick = amQuick)
+			return TunnelConf(tunName = name, wgQuick = wgQuick, amQuick = amQuick)
 		}

 		private const val IPV6_ALL_NETWORKS = "::/0"
@@ -4,5 +4,4 @@ sealed class BackendError() {
 	data object DNS : BackendError()
 	data object Unauthorized : BackendError()
 	data object Config : BackendError()
-	data object Unknown : BackendError()
 }
@@ -3,8 +3,6 @@ package com.zaneschepke.wireguardautotunnel.domain.enums
 enum class TunnelStatus {
 	UP,
 	DOWN,
-	STARTING,
-	STOPPING,
 	;

 	fun isDown(): Boolean {
@@ -11,8 +11,6 @@ interface TunnelRepository {

 	suspend fun save(tunnelConf: TunnelConf)

-	suspend fun saveAll(tunnelConfList: List<TunnelConf>)
-
 	suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?)

 	suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?)
@@ -1,16 +1,13 @@
 package com.zaneschepke.wireguardautotunnel.domain.state

-import com.zaneschepke.wireguardautotunnel.core.tunnel.allDown
-import com.zaneschepke.wireguardautotunnel.core.tunnel.hasActive
-import com.zaneschepke.wireguardautotunnel.core.tunnel.isUp
+import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
 import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
 import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList

 data class AutoTunnelState(
-	val activeTunnels: Map<TunnelConf, TunnelState> = emptyMap(),
+	val activeTunnels: List<TunnelConf> = emptyList(),
 	val networkState: NetworkState = NetworkState(),
 	val settings: AppSettings = AppSettings(),
 	val tunnels: List<TunnelConf> = emptyList(),
@@ -23,12 +20,12 @@ data class AutoTunnelState(
 	private fun isMobileTunnelDataChangeNeeded(): Boolean {
 		val preferredTunnel = preferredMobileDataTunnel()
 		return preferredTunnel != null &&
-			activeTunnels.isNotEmpty() && !activeTunnels.isUp(preferredTunnel)
+			activeTunnels.isNotEmpty() && !activeTunnels.any { it.id == preferredTunnel.id }
 	}

 	private fun isEthernetTunnelChangeNeeded(): Boolean {
 		val preferredTunnel = preferredEthernetTunnel()
-		return preferredTunnel != null && activeTunnels.isNotEmpty() && !activeTunnels.isUp(preferredTunnel)
+		return preferredTunnel != null && activeTunnels.isNotEmpty() && !activeTunnels.any { it.id == preferredTunnel.id }
 	}

 	private fun preferredMobileDataTunnel(): TunnelConf? {
@@ -48,11 +45,11 @@ data class AutoTunnelState(
 	}

 	private fun startOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && activeTunnels.allDown()
+		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && activeTunnels.isEmpty()
 	}

 	private fun stopOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && !settings.isTunnelOnEthernetEnabled && activeTunnels.hasActive()
+		return networkState.isEthernetConnected && !settings.isTunnelOnEthernetEnabled && activeTunnels.isNotEmpty()
 	}

 	// TODO test removed kill switch state check
@@ -65,16 +62,16 @@ data class AutoTunnelState(
 		return settings.isVpnKillSwitchEnabled && (!settings.isDisableKillSwitchOnTrustedEnabled || !isCurrentSSIDTrusted())
 	}

-	private fun isNoConnectivity(): Boolean {
+	fun isNoConnectivity(): Boolean {
 		return !networkState.isEthernetConnected && !networkState.isWifiConnected && !networkState.isMobileDataConnected
 	}

 	private fun stopOnMobileData(): Boolean {
-		return isMobileDataActive() && !settings.isTunnelOnMobileDataEnabled && activeTunnels.hasActive()
+		return isMobileDataActive() && !settings.isTunnelOnMobileDataEnabled && activeTunnels.isNotEmpty()
 	}

 	private fun startOnMobileData(): Boolean {
-		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && activeTunnels.allDown()
+		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && activeTunnels.isEmpty()
 	}

 	private fun changeOnMobileData(): Boolean {
@@ -86,24 +83,24 @@ data class AutoTunnelState(
 	}

 	private fun stopOnWifi(): Boolean {
-		return isWifiActive() && !settings.isTunnelOnWifiEnabled && activeTunnels.hasActive()
+		return isWifiActive() && !settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty()
 	}

 	private fun stopOnTrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.hasActive() && isCurrentSSIDTrusted()
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty() && isCurrentSSIDTrusted()
 	}

 	private fun startOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.allDown() && !isCurrentSSIDTrusted()
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isEmpty() && !isCurrentSSIDTrusted()
 	}

 	private fun changeOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.hasActive() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
 	}

 	private fun isWifiTunnelPreferred(): Boolean {
 		val preferred = preferredWifiTunnel()
-		return preferred?.let { activeTunnels.isUp(it) } ?: true
+		return activeTunnels.any { it.id == preferred?.id }
 	}

 	fun asAutoTunnelEvent(): AutoTunnelEvent {
@@ -52,11 +52,7 @@ sealed class Route {
 	@Serializable
 	data class SplitTunnel(
 		val id: Int,
-	) : Route() {
-		companion object {
-			const val KEY_ID = "id"
-		}
-	}
+	) : Route()

 	@Serializable
 	data class TunnelAutoTunnel(
@@ -1,60 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowDropDown
-import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-
-@Composable
-fun <T> DropdownSelector(
-	currentValue: T,
-	options: List<T>,
-	onValueSelected: (T) -> Unit,
-	modifier: Modifier = Modifier,
-	label: @Composable (() -> Unit)? = null,
-	isExpanded: Boolean = false,
-	onDismiss: () -> Unit = {},
-) {
-	Row(
-		horizontalArrangement = Arrangement.spacedBy(5.dp),
-		verticalAlignment = Alignment.CenterVertically,
-	) {
-		if (label != null) label()
-		Text(
-			text = currentValue.toString(),
-			style = MaterialTheme.typography.bodyMedium,
-		)
-		Icon(Icons.Default.ArrowDropDown, contentDescription = stringResource(R.string.dropdown))
-	}
-	DropdownMenu(
-		modifier = modifier.height(250.dp.scaledHeight()),
-		scrollState = rememberScrollState(),
-		containerColor = MaterialTheme.colorScheme.surface,
-		expanded = isExpanded,
-		onDismissRequest = onDismiss,
-	) {
-		options.forEach { option ->
-			DropdownMenuItem(
-				text = { Text(text = option.toString()) },
-				onClick = {
-					onValueSelected(option)
-					onDismiss() // Close dropdown after selection
-				},
-			)
-		}
-	}
-}
@@ -1,37 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.animation
-
-import androidx.compose.animation.core.LinearEasing
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.tween
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-
-@Composable
-fun ShimmerEffect(modifier: Modifier = Modifier): Brush {
-	val shimmerColors = listOf(
-		Color.LightGray.copy(alpha = 0.9f),
-		Color.LightGray.copy(alpha = 0.3f),
-		Color.LightGray.copy(alpha = 0.9f),
-	)
-
-	val transition = rememberInfiniteTransition()
-	val translateAnim by transition.animateFloat(
-		initialValue = 0f,
-		targetValue = 1000f,
-		animationSpec = infiniteRepeatable(
-			animation = tween(durationMillis = 1200, easing = LinearEasing),
-		),
-	)
-
-	return Brush.linearGradient(
-		colors = shimmerColors,
-		start = Offset(0f, 0f),
-		end = Offset(translateAnim, translateAnim),
-	)
-}
@@ -1,20 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.button.surface
-
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-
-@Composable
-fun SelectionItemLabel(
-	textResId: Int,
-	style: androidx.compose.ui.text.TextStyle = MaterialTheme.typography.bodyMedium,
-	isDescription: Boolean = false,
-) {
-	Text(
-		text = stringResource(textResId),
-		style = style.copy(
-			color = if (isDescription) MaterialTheme.colorScheme.outline else MaterialTheme.colorScheme.onSurface,
-		),
-	)
-}
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.support.components
+package com.zaneschepke.wireguardautotunnel.ui.common.label

 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state
+package com.zaneschepke.wireguardautotunnel.ui.enums

 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
@@ -8,7 +8,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.util.StringValue

-enum class SplitOption {
+enum class SplitOptions {
 	INCLUDE,
 	ALL,
 	EXCLUDE,
@@ -0,0 +1,808 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.focusGroup
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Save
+import androidx.compose.material.icons.rounded.ContentCopy
+import androidx.compose.material.icons.rounded.Delete
+import androidx.compose.material.icons.rounded.MoreVert
+import androidx.compose.material.icons.rounded.Refresh
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.toMutableStateList
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.platform.ClipboardManager
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
+import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
+import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.ui.enums.InterfaceActions
+import com.zaneschepke.wireguardautotunnel.ui.enums.PeerActions
+import com.zaneschepke.wireguardautotunnel.ui.state.InterfaceProxy
+import com.zaneschepke.wireguardautotunnel.ui.state.PeerProxy
+import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+import org.amnezia.awg.crypto.KeyPair
+
+@Composable
+fun ConfigScreen(tunnelConf: TunnelConf?, appViewModel: AppViewModel) {
+	val context = LocalContext.current
+	val snackbar = SnackbarController.current
+	val clipboardManager: ClipboardManager = LocalClipboardManager.current
+	val keyboardController = LocalSoftwareKeyboardController.current
+	val navController = LocalNavController.current
+
+	var isInterfaceDropDownExpanded by remember {
+		mutableStateOf(false)
+	}
+
+	val popBackStack by appViewModel.popBackStack.collectAsStateWithLifecycle(false)
+
+	val configPair = Pair(tunnelConf?.tunName ?: "", tunnelConf?.toAmConfig())
+
+	var tunnelName by remember {
+		mutableStateOf(configPair.first)
+	}
+
+	var interfaceState by remember {
+		mutableStateOf(configPair.second?.let { InterfaceProxy.from(it.`interface`) } ?: InterfaceProxy())
+	}
+
+	var showAmneziaValues by remember {
+		mutableStateOf(configPair.second?.`interface`?.junkPacketCount?.isPresent == true)
+	}
+
+	var showScripts by remember {
+		mutableStateOf(false)
+	}
+
+	val peersState = remember {
+		(configPair.second?.peers?.map { PeerProxy.from(it) } ?: listOf(PeerProxy())).toMutableStateList()
+	}
+
+	var showAuthPrompt by remember { mutableStateOf(false) }
+	var isAuthenticated by remember { mutableStateOf(false) }
+
+	val keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() })
+	val keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
+
+	if (showAuthPrompt) {
+		AuthorizationPrompt(
+			onSuccess = {
+				showAuthPrompt = false
+				isAuthenticated = true
+			},
+			onError = {
+				showAuthPrompt = false
+				snackbar.showMessage(
+					context.getString(R.string.error_authentication_failed),
+				)
+			},
+			onFailure = {
+				showAuthPrompt = false
+				snackbar.showMessage(
+					context.getString(R.string.error_authorization_failed),
+				)
+			},
+		)
+	}
+
+	LaunchedEffect(popBackStack) {
+		if (popBackStack) navController.popBackStack()
+	}
+
+	Scaffold(
+		topBar = {
+			TopNavBar(stringResource(R.string.edit_tunnel), trailing = {
+				IconButton(onClick = {
+					tunnelConf?.let {
+						appViewModel.updateExistingTunnelConfig(
+							it,
+							tunnelName,
+							peersState,
+							interfaceState,
+						)
+					} ?: appViewModel.saveNewTunnel(tunnelName, peersState, interfaceState)
+				}) {
+					val icon = Icons.Outlined.Save
+					Icon(
+						imageVector = icon,
+						contentDescription = icon.name,
+					)
+				}
+			})
+		},
+	) { padding ->
+		Column(
+			horizontalAlignment = Alignment.Start,
+			verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
+			modifier =
+			Modifier
+				.fillMaxSize()
+				.padding(padding)
+				.imePadding()
+				.verticalScroll(rememberScrollState())
+				.padding(top = 24.dp.scaledHeight())
+				.padding(horizontal = 24.dp.scaledWidth()),
+		) {
+			Surface(
+				shape = RoundedCornerShape(12.dp),
+				color = MaterialTheme.colorScheme.surface,
+			) {
+				Column(
+					horizontalAlignment = Alignment.Start,
+					verticalArrangement = Arrangement.spacedBy(5.dp, Alignment.Top),
+					modifier = Modifier
+						.padding(16.dp.scaledWidth())
+						.focusGroup(),
+				) {
+					Row(
+						horizontalArrangement = Arrangement.SpaceBetween,
+						verticalAlignment = Alignment.CenterVertically,
+						modifier =
+						Modifier.fillMaxWidth(),
+					) {
+						GroupLabel(
+							stringResource(R.string.interface_),
+						)
+						Column {
+							IconButton(
+								modifier = Modifier.size(iconSize),
+								onClick = {
+									isInterfaceDropDownExpanded = true
+								},
+							) {
+								val icon = Icons.Rounded.MoreVert
+								Icon(icon, icon.name)
+							}
+							DropdownMenu(
+								containerColor = MaterialTheme.colorScheme.surface,
+								expanded = isInterfaceDropDownExpanded,
+								modifier = Modifier.shadow(12.dp).background(MaterialTheme.colorScheme.surface),
+								onDismissRequest = {
+									isInterfaceDropDownExpanded = false
+								},
+							) {
+								val isAmneziaCompatibilitySet = interfaceState.isAmneziaCompatibilityModeSet()
+								InterfaceActions.entries.forEach { action ->
+									DropdownMenuItem(
+										text = {
+											Text(
+												text = when (action) {
+													InterfaceActions.TOGGLE_SHOW_SCRIPTS -> if (showScripts) {
+														stringResource(R.string.hide_scripts)
+													} else {
+														stringResource(R.string.show_scripts)
+													}
+													InterfaceActions.TOGGLE_AMNEZIA_VALUES -> if (showAmneziaValues) {
+														stringResource(R.string.hide_amnezia_properties)
+													} else {
+														stringResource(R.string.show_amnezia_properties)
+													}
+
+													InterfaceActions.SET_AMNEZIA_COMPATIBILITY -> if (isAmneziaCompatibilitySet) {
+														stringResource(R.string.remove_amnezia_compatibility)
+													} else {
+														stringResource(R.string.enable_amnezia_compatibility)
+													}
+												},
+											)
+										},
+										onClick = {
+											isInterfaceDropDownExpanded = false
+											when (action) {
+												InterfaceActions.TOGGLE_AMNEZIA_VALUES -> showAmneziaValues = !showAmneziaValues
+												InterfaceActions.TOGGLE_SHOW_SCRIPTS -> showScripts = !showScripts
+												InterfaceActions.SET_AMNEZIA_COMPATIBILITY -> if (isAmneziaCompatibilitySet) {
+													showAmneziaValues = false
+													interfaceState = interfaceState.resetAmneziaProperties()
+												} else {
+													showAmneziaValues = true
+													interfaceState = interfaceState.toAmneziaCompatibilityConfig()
+												}
+											}
+										},
+									)
+								}
+							}
+						}
+					}
+					ConfigurationTextBox(
+						value = tunnelName,
+						onValueChange = { tunnelName = it },
+						keyboardActions = keyboardActions,
+						label = stringResource(R.string.name),
+						hint = stringResource(R.string.tunnel_name).lowercase(),
+						modifier =
+						Modifier
+							.fillMaxWidth(),
+					)
+					val privateKeyEnabled = (tunnelConf == null) || isAuthenticated
+					OutlinedTextField(
+						textStyle = MaterialTheme.typography.labelLarge,
+						modifier =
+						Modifier
+							.fillMaxWidth()
+							.clickable { showAuthPrompt = true },
+						value = interfaceState.privateKey,
+						visualTransformation =
+						if (privateKeyEnabled) {
+							VisualTransformation.None
+						} else {
+							PasswordVisualTransformation()
+						},
+						enabled = privateKeyEnabled,
+						onValueChange = { interfaceState = interfaceState.copy(privateKey = it) },
+						trailingIcon = {
+							IconButton(
+								enabled = privateKeyEnabled,
+								modifier = Modifier.focusRequester(FocusRequester.Default).size(iconSize),
+								onClick = {
+									val keypair = KeyPair()
+									interfaceState = interfaceState.copy(
+										privateKey = keypair.privateKey.toBase64(),
+										publicKey = keypair.publicKey.toBase64(),
+									)
+								},
+							) {
+								Icon(
+									Icons.Rounded.Refresh,
+									stringResource(R.string.rotate_keys),
+									tint = if (privateKeyEnabled) MaterialTheme.colorScheme.onSurface else MaterialTheme.colorScheme.outline,
+								)
+							}
+						},
+						label = {
+							Text(
+								stringResource(R.string.private_key),
+								color = MaterialTheme.colorScheme.onSurface,
+								style = MaterialTheme.typography.labelMedium,
+							)
+						},
+						singleLine = true,
+						placeholder = {
+							Text(
+								stringResource(R.string.base64_key),
+								style = MaterialTheme.typography.labelLarge,
+								color = MaterialTheme.colorScheme.outline,
+							)
+						},
+						keyboardOptions = keyboardOptions,
+						keyboardActions = keyboardActions,
+					)
+					OutlinedTextField(
+						textStyle = MaterialTheme.typography.labelLarge,
+						modifier =
+						Modifier
+							.fillMaxWidth()
+							.focusRequester(FocusRequester.Default),
+						value = interfaceState.publicKey,
+						enabled = false,
+						onValueChange = {
+							interfaceState = interfaceState.copy(publicKey = it)
+						},
+						trailingIcon = {
+							IconButton(
+								modifier = Modifier.focusRequester(FocusRequester.Default).size(iconSize),
+								onClick = {
+									clipboardManager.setText(
+										AnnotatedString(interfaceState.publicKey),
+									)
+								},
+							) {
+								Icon(
+									Icons.Rounded.ContentCopy,
+									stringResource(R.string.copy_public_key),
+									tint = MaterialTheme.colorScheme.onSurface,
+								)
+							}
+						},
+						label = {
+							Text(
+								stringResource(R.string.public_key),
+								color = MaterialTheme.colorScheme.onSurface,
+								style = MaterialTheme.typography.labelMedium,
+							)
+						},
+						singleLine = true,
+						placeholder = {
+							Text(
+								stringResource(R.string.base64_key),
+								style = MaterialTheme.typography.labelLarge,
+								color = MaterialTheme.colorScheme.outline,
+							)
+						},
+						keyboardOptions = keyboardOptions,
+						keyboardActions = keyboardActions,
+					)
+					ConfigurationTextBox(
+						value = interfaceState.addresses,
+						onValueChange = {
+							interfaceState = interfaceState.copy(addresses = it)
+						},
+						keyboardActions = keyboardActions,
+						label = stringResource(R.string.addresses),
+						hint = stringResource(R.string.comma_separated_list),
+						modifier =
+						Modifier
+							.fillMaxWidth()
+							.padding(end = 5.dp),
+					)
+					ConfigurationTextBox(
+						value = interfaceState.listenPort,
+						onValueChange = {
+							interfaceState = interfaceState.copy(listenPort = it)
+						},
+						keyboardActions = keyboardActions,
+						label = stringResource(R.string.listen_port),
+						hint = stringResource(R.string.random),
+						modifier = Modifier.fillMaxWidth(),
+					)
+					Row(
+						modifier = Modifier.fillMaxWidth(),
+						horizontalArrangement = Arrangement.spacedBy(5.dp),
+					) {
+						ConfigurationTextBox(
+							value = interfaceState.dnsServers,
+							onValueChange = {
+								interfaceState = interfaceState.copy(dnsServers = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.dns_servers),
+							hint = stringResource(R.string.comma_separated_list),
+							modifier =
+							Modifier
+								.fillMaxWidth(3 / 5f)
+								.padding(end = 5.dp),
+						)
+						ConfigurationTextBox(
+							value = interfaceState.mtu,
+							onValueChange = {
+								interfaceState = interfaceState.copy(mtu = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.mtu),
+							hint = stringResource(R.string.auto),
+							modifier = Modifier.width(IntrinsicSize.Min),
+						)
+					}
+					if (showScripts) {
+						ConfigurationTextBox(
+							value = interfaceState.preUp,
+							onValueChange = {
+								interfaceState = interfaceState.copy(preUp = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.pre_up),
+							hint = stringResource(R.string.comma_separated_list).lowercase(),
+							modifier = Modifier.fillMaxWidth(),
+						)
+						ConfigurationTextBox(
+							value = interfaceState.postUp,
+							onValueChange = {
+								interfaceState = interfaceState.copy(postUp = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.post_up),
+							hint = stringResource(R.string.comma_separated_list).lowercase(),
+							modifier = Modifier.fillMaxWidth(),
+						)
+						ConfigurationTextBox(
+							value = interfaceState.preDown,
+							onValueChange = {
+								interfaceState = interfaceState.copy(preDown = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.pre_down),
+							hint = stringResource(R.string.comma_separated_list).lowercase(),
+							modifier = Modifier.fillMaxWidth(),
+						)
+						ConfigurationTextBox(
+							value = interfaceState.postDown,
+							onValueChange = {
+								interfaceState = interfaceState.copy(postDown = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.post_down),
+							hint = stringResource(R.string.comma_separated_list).lowercase(),
+							modifier = Modifier.fillMaxWidth(),
+						)
+					}
+					if (showAmneziaValues) {
+						ConfigurationTextBox(
+							value = interfaceState.junkPacketCount,
+							onValueChange = {
+								interfaceState = interfaceState.copy(junkPacketCount = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.junk_packet_count),
+							hint = stringResource(R.string.junk_packet_count).lowercase(),
+							modifier =
+							Modifier
+								.fillMaxWidth(),
+						)
+						ConfigurationTextBox(
+							value = interfaceState.junkPacketMinSize,
+							onValueChange = {
+								interfaceState = interfaceState.copy(junkPacketMinSize = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.junk_packet_minimum_size),
+							hint =
+							stringResource(
+								R.string.junk_packet_minimum_size,
+							).lowercase(),
+							modifier =
+							Modifier
+								.fillMaxWidth(),
+						)
+						ConfigurationTextBox(
+							value = interfaceState.junkPacketMaxSize,
+							onValueChange = {
+								interfaceState = interfaceState.copy(junkPacketMaxSize = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.junk_packet_maximum_size),
+							hint =
+							stringResource(
+								R.string.junk_packet_maximum_size,
+							).lowercase(),
+							modifier =
+							Modifier
+								.fillMaxWidth(),
+						)
+						ConfigurationTextBox(
+							value = interfaceState.initPacketJunkSize,
+							onValueChange = {
+								interfaceState = interfaceState.copy(initPacketJunkSize = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.init_packet_junk_size),
+							hint = stringResource(R.string.init_packet_junk_size).lowercase(),
+							modifier =
+							Modifier
+								.fillMaxWidth(),
+						)
+						ConfigurationTextBox(
+							value = interfaceState.responsePacketJunkSize,
+							onValueChange = {
+								interfaceState = interfaceState.copy(responsePacketJunkSize = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.response_packet_junk_size),
+							hint =
+							stringResource(
+								R.string.response_packet_junk_size,
+							).lowercase(),
+							modifier =
+							Modifier
+								.fillMaxWidth(),
+						)
+						ConfigurationTextBox(
+							value = interfaceState.initPacketMagicHeader,
+							onValueChange = {
+								interfaceState = interfaceState.copy(initPacketMagicHeader = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.init_packet_magic_header),
+							hint =
+							stringResource(
+								R.string.init_packet_magic_header,
+							).lowercase(),
+							modifier =
+							Modifier
+								.fillMaxWidth(),
+						)
+						ConfigurationTextBox(
+							value = interfaceState.responsePacketMagicHeader,
+							onValueChange = {
+								interfaceState = interfaceState.copy(responsePacketMagicHeader = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.response_packet_magic_header),
+							hint =
+							stringResource(
+								R.string.response_packet_magic_header,
+							).lowercase(),
+							modifier =
+							Modifier
+								.fillMaxWidth(),
+						)
+						ConfigurationTextBox(
+							value = interfaceState.underloadPacketMagicHeader,
+							onValueChange = {
+								interfaceState = interfaceState.copy(underloadPacketMagicHeader = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.underload_packet_magic_header),
+							hint =
+							stringResource(
+								R.string.underload_packet_magic_header,
+							).lowercase(),
+							modifier =
+							Modifier
+								.fillMaxWidth(),
+						)
+						ConfigurationTextBox(
+							value = interfaceState.transportPacketMagicHeader,
+							onValueChange = {
+								interfaceState = interfaceState.copy(transportPacketMagicHeader = it)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.transport_packet_magic_header),
+							hint =
+							stringResource(
+								R.string.transport_packet_magic_header,
+							).lowercase(),
+							modifier =
+							Modifier
+								.fillMaxWidth(),
+						)
+					}
+				}
+			}
+			peersState.forEachIndexed { index, peer ->
+				var isPeerDropDownExpanded by remember {
+					mutableStateOf(false)
+				}
+				val isLanExcluded = peer.isLanExcluded()
+				Surface(
+					shape = RoundedCornerShape(12.dp),
+					color = MaterialTheme.colorScheme.surface,
+				) {
+					Column(
+						horizontalAlignment = Alignment.Start,
+						verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.Top),
+						modifier = Modifier
+							.padding(16.dp.scaledWidth())
+							.focusGroup(),
+					) {
+						Row(
+							horizontalArrangement = Arrangement.SpaceBetween,
+							verticalAlignment = Alignment.CenterVertically,
+							modifier =
+							Modifier.fillMaxWidth(),
+						) {
+							GroupLabel(
+								stringResource(R.string.peer),
+							)
+							Row(
+								horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End),
+								verticalAlignment = Alignment.CenterVertically,
+							) {
+								IconButton(
+									modifier = Modifier.size(iconSize),
+									onClick = {
+										// TODO make a dialog to confirm this
+										peersState.removeAt(index)
+									},
+								) {
+									val icon = Icons.Rounded.Delete
+									Icon(icon, icon.name)
+								}
+								Column {
+									IconButton(
+										modifier = Modifier.size(iconSize),
+										onClick = {
+											isPeerDropDownExpanded = true
+										},
+									) {
+										val icon = Icons.Rounded.MoreVert
+										Icon(icon, icon.name)
+									}
+									DropdownMenu(
+										containerColor = MaterialTheme.colorScheme.surface,
+										expanded = isPeerDropDownExpanded,
+										modifier = Modifier.shadow(12.dp).background(MaterialTheme.colorScheme.surface),
+										onDismissRequest = {
+											isPeerDropDownExpanded = false
+										},
+									) {
+										PeerActions.entries.forEach { action ->
+											DropdownMenuItem(
+												text = {
+													Text(
+														text = when (action) {
+															PeerActions.EXCLUDE_LAN -> if (isLanExcluded) {
+																stringResource(R.string.include_lan)
+															} else {
+																stringResource(R.string.exclude_lan)
+															}
+														},
+													)
+												},
+												onClick = {
+													isPeerDropDownExpanded = false
+													when (action) {
+														PeerActions.EXCLUDE_LAN -> if (isLanExcluded) {
+															peersState[index] = peer.includeLan()
+														} else {
+															peersState[index] = peer.excludeLan()
+														}
+													}
+												},
+											)
+										}
+									}
+								}
+							}
+						}
+
+						ConfigurationTextBox(
+							value = peer.publicKey,
+							onValueChange = { value ->
+								peersState[index] = peersState[index].copy(publicKey = value)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.public_key),
+							hint = stringResource(R.string.base64_key),
+							modifier = Modifier.fillMaxWidth(),
+						)
+						val presharedKeyEnabled = (tunnelConf == null) || isAuthenticated ||
+							with(configPair.second?.peers[index]?.preSharedKey) { this?.isEmpty == true || this?.isPresent == false }
+						OutlinedTextField(
+							textStyle = MaterialTheme.typography.labelLarge,
+							modifier =
+							Modifier
+								.fillMaxWidth()
+								.clickable { showAuthPrompt = true },
+							value = peer.preSharedKey,
+							visualTransformation =
+							if (presharedKeyEnabled) {
+								VisualTransformation.None
+							} else {
+								PasswordVisualTransformation()
+							},
+							enabled = presharedKeyEnabled,
+							onValueChange = { value -> peersState[index] = peersState[index].copy(preSharedKey = value) },
+							label = {
+								Text(
+									stringResource(R.string.preshared_key),
+									color = MaterialTheme.colorScheme.onSurface,
+									style = MaterialTheme.typography.labelMedium,
+								)
+							},
+							singleLine = true,
+							placeholder = {
+								Text(
+									stringResource(R.string.optional),
+									style = MaterialTheme.typography.labelLarge,
+									color = MaterialTheme.colorScheme.outline,
+								)
+							},
+							keyboardOptions = keyboardOptions,
+							keyboardActions = keyboardActions,
+						)
+						OutlinedTextField(
+							textStyle = MaterialTheme.typography.labelLarge,
+							modifier = Modifier.fillMaxWidth(),
+							value = peer.persistentKeepalive,
+							enabled = true,
+							onValueChange = { value ->
+								peersState[index] = peersState[index].copy(persistentKeepalive = value)
+							},
+							trailingIcon = {
+								Text(
+									stringResource(R.string.seconds),
+									modifier = Modifier.padding(end = 10.dp),
+									style = MaterialTheme.typography.labelMedium,
+								)
+							},
+							label = {
+								Text(stringResource(R.string.persistent_keepalive), color = MaterialTheme.colorScheme.onSurface, style = MaterialTheme.typography.labelMedium)
+							},
+							singleLine = true,
+							placeholder = {
+								Text(stringResource(R.string.optional_no_recommend), style = MaterialTheme.typography.labelLarge, color = MaterialTheme.colorScheme.outline)
+							},
+							keyboardOptions = keyboardOptions,
+							keyboardActions = keyboardActions,
+						)
+						ConfigurationTextBox(
+							value = peer.endpoint,
+							onValueChange = { value ->
+								peersState[index] = peersState[index].copy(endpoint = value)
+							},
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.endpoint),
+							hint = stringResource(R.string.endpoint).lowercase(),
+							modifier = Modifier.fillMaxWidth(),
+						)
+						OutlinedTextField(
+							textStyle = MaterialTheme.typography.labelLarge,
+							modifier = Modifier.fillMaxWidth(),
+							value = peer.allowedIps,
+							enabled = true,
+							onValueChange = { value ->
+								peersState[index] = peersState[index].copy(allowedIps = value)
+							},
+							label = {
+								Text(
+									stringResource(R.string.allowed_ips),
+									color = MaterialTheme.colorScheme.onSurface,
+									style = MaterialTheme.typography.labelMedium,
+								)
+							},
+							singleLine = true,
+							placeholder = {
+								Text(stringResource(R.string.comma_separated_list), style = MaterialTheme.typography.labelLarge, color = MaterialTheme.colorScheme.outline)
+							},
+							keyboardOptions = keyboardOptions,
+							keyboardActions = keyboardActions,
+						)
+					}
+				}
+			}
+			Row(
+				horizontalArrangement = Arrangement.SpaceEvenly,
+				verticalAlignment = Alignment.CenterVertically,
+				modifier =
+				Modifier
+					.fillMaxSize()
+					.padding(bottom = 140.dp),
+			) {
+				Row(
+					verticalAlignment = Alignment.CenterVertically,
+					horizontalArrangement = Arrangement.Center,
+				) {
+					TextButton(onClick = {
+						peersState.add(PeerProxy())
+					}) {
+						Text(stringResource(R.string.add_peer))
+					}
+				}
+			}
+		}
+	}
+}
@@ -2,9 +2,23 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.main

 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.gestures.ScrollableDefaults
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.overscroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material3.FabPosition
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -13,34 +27,45 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.NestedScrollListener
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
 import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberFileImportLauncherForResult
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.permission.vpn.withVpnPermission
 import com.zaneschepke.wireguardautotunnel.ui.common.permission.withIgnoreBatteryOpt
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.AddTunnelFab
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.AutoTunnelRowItem
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.GettingStartedLabel
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ScrollDismissFab
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelImportSheet
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelList
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.UrlImportDialog
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelRowItem
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+import com.zaneschepke.wireguardautotunnel.viewmodel.MainViewModel
+import java.text.Collator
+import java.util.Locale

+@OptIn(ExperimentalFoundationApi::class)
@Composable
-fun MainScreen(appUiState: AppUiState, viewModel: AppViewModel) {
+fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState) {
 	val context = LocalContext.current
 	val navController = LocalNavController.current
 	val clipboard = LocalClipboardManager.current
@@ -50,35 +75,53 @@ fun MainScreen(appUiState: AppUiState, viewModel: AppViewModel) {
 	var isFabVisible by rememberSaveable { mutableStateOf(true) }
 	var showDeleteTunnelAlertDialog by remember { mutableStateOf(false) }
 	var selectedTunnel by remember { mutableStateOf<TunnelConf?>(null) }
-	var showUrlImportDialog by remember { mutableStateOf(false) }
 	val isRunningOnTv = remember { context.isRunningOnTv() }

-	val startAutoTunnel = withVpnPermission<Unit> { viewModel.handleEvent(AppEvent.ToggleAutoTunnel) }
-	val startTunnel = withVpnPermission<TunnelConf> { viewModel.handleEvent(AppEvent.StartTunnel(it)) }
-	val autoTunnelToggleBattery = withIgnoreBatteryOpt(appUiState.generalState.isBatteryOptimizationDisableShown) {
-		if (!appUiState.generalState.isBatteryOptimizationDisableShown) viewModel.handleEvent(AppEvent.SetBatteryOptimizeDisableShown)
-		if (appUiState.appSettings.isKernelEnabled) viewModel.handleEvent(AppEvent.ToggleAutoTunnel) else startAutoTunnel.invoke(Unit)
+	val activeTunnels by viewModel.activeTunnels.collectAsStateWithLifecycle(emptyList())
+
+	val collator = Collator.getInstance(Locale.getDefault())
+
+	val sortedTunnels = remember(uiState.tunnels) {
+		uiState.tunnels.sortedWith(compareBy(collator) { it.tunName })
 	}

-	val tunnelFileImportResultLauncher = rememberFileImportLauncherForResult(
-		onNoFileExplorer = { snackbar.showMessage(context.getString(R.string.error_no_file_explorer)) },
-		onData = { data -> viewModel.handleEvent(AppEvent.ImportTunnelFromFile(data)) },
-	)
-
-	val requestPermissionLauncher = rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
-		if (!isGranted) return@rememberLauncherForActivityResult snackbar.showMessage("Camera permission required")
-		navController.navigate(Route.Scanner)
+	val startAutoTunnel = withVpnPermission<Unit> { viewModel.onToggleAutoTunnel() }
+	val startTunnel = withVpnPermission<TunnelConf> {
+		viewModel.onTunnelStart(it)
+	}
+	val autoTunnelToggleBattery = withIgnoreBatteryOpt(uiState.generalState.isBatteryOptimizationDisableShown) {
+		if (!uiState.generalState.isBatteryOptimizationDisableShown) viewModel.setBatteryOptimizeDisableShown()
+		if (uiState.appSettings.isKernelEnabled) {
+			viewModel.onToggleAutoTunnel()
+		} else {
+			startAutoTunnel.invoke(Unit)
+		}
 	}

 	val nestedScrollConnection = remember {
 		NestedScrollListener({ isFabVisible = false }, { isFabVisible = true })
 	}

-	if (showDeleteTunnelAlertDialog && selectedTunnel != null) {
+	val tunnelFileImportResultLauncher = rememberFileImportLauncherForResult(onNoFileExplorer = {
+		snackbar.showMessage(
+			context.getString(R.string.error_no_file_explorer),
+		)
+	}, onData = { data ->
+		viewModel.onTunnelFileSelected(data, context)
+	})
+
+	val requestPermissionLauncher = rememberLauncherForActivityResult(
+		ActivityResultContracts.RequestPermission(),
+	) { isGranted ->
+		if (!isGranted) return@rememberLauncherForActivityResult snackbar.showMessage("Camera permission required")
+		navController.navigate(Route.Scanner)
+	}
+
+	if (showDeleteTunnelAlertDialog) {
 		InfoDialog(
 			onDismiss = { showDeleteTunnelAlertDialog = false },
 			onAttest = {
-				selectedTunnel?.let { viewModel.handleEvent(AppEvent.DeleteTunnel(it)) }
+				selectedTunnel?.let { viewModel.onDelete(it) }
 				showDeleteTunnelAlertDialog = false
 				selectedTunnel = null
 			},
@@ -88,22 +131,59 @@ fun MainScreen(appUiState: AppUiState, viewModel: AppViewModel) {
 		)
 	}

+	fun onTunnelToggle(checked: Boolean, tunnel: TunnelConf) {
+		if (!checked) {
+			viewModel.onTunnelStop(tunnel)
+			return
+		}
+		if (uiState.appSettings.isKernelEnabled) {
+			viewModel.onTunnelStart(tunnel)
+		} else {
+			startTunnel.invoke(tunnel)
+		}
+	}
+
 	Scaffold(
+		modifier =
+		Modifier.pointerInput(Unit) {
+			if (uiState.tunnels.isEmpty()) return@pointerInput
+			detectTapGestures(
+				onTap = {
+					selectedTunnel = null
+				},
+			)
+		},
 		floatingActionButtonPosition = FabPosition.End,
 		floatingActionButton = {
 			if (!isRunningOnTv) {
-				AddTunnelFab(
-					isVisible = isFabVisible,
-					onClick = { showBottomSheet = true },
-				)
+				ScrollDismissFab({
+					val icon = Icons.Filled.Add
+					Icon(
+						imageVector = icon,
+						contentDescription = icon.name,
+						tint = MaterialTheme.colorScheme.onPrimary,
+					)
+				}, isVisible = isFabVisible, onClick = {
+					showBottomSheet = true
+				})
 			}
 		},
 		topBar = {
 			if (isRunningOnTv) {
-				AddTunnelFab(
-					isVisible = isFabVisible,
-					isTv = true,
-					onClick = { showBottomSheet = true },
+				TopNavBar(
+					showBack = false,
+					title = stringResource(R.string.app_name),
+					trailing = {
+						IconButton(onClick = {
+							showBottomSheet = true
+						}) {
+							val icon = Icons.Outlined.Add
+							Icon(
+								imageVector = icon,
+								contentDescription = icon.name,
+							)
+						}
+					},
 				)
 			}
 		},
@@ -113,41 +193,60 @@ fun MainScreen(appUiState: AppUiState, viewModel: AppViewModel) {
 			onDismiss = { showBottomSheet = false },
 			onFileClick = { tunnelFileImportResultLauncher.launch(Constants.ALLOWED_TV_FILE_TYPES) },
 			onQrClick = { requestPermissionLauncher.launch(android.Manifest.permission.CAMERA) },
-			onClipboardClick = { clipboard.getText()?.text?.let { viewModel.handleEvent(AppEvent.ImportTunnelFromClipboard(it)) } },
-			onManualImportClick = { navController.navigate(Route.Config(Constants.MANUAL_TUNNEL_CONFIG_ID)) },
-			onUrlClick = { showUrlImportDialog = true },
+			onClipboardClick = {
+				clipboard.getText()?.text?.let {
+					viewModel.onClipboardImport(it)
+				}
+			},
+			onManualImportClick = {
+				navController.navigate(
+					Route.Config(Constants.MANUAL_TUNNEL_CONFIG_ID),
+				)
+			},
 		)
-
-		if (showUrlImportDialog) {
-			UrlImportDialog(
-				onDismiss = { showUrlImportDialog = false },
-				onConfirm = { url ->
-					viewModel.handleEvent(AppEvent.ImportTunnelFromUrl(url))
-					showUrlImportDialog = false
-				},
-			)
+		LazyColumn(
+			horizontalAlignment = Alignment.Start,
+			verticalArrangement = Arrangement.spacedBy(5.dp, Alignment.Top),
+			modifier =
+			Modifier
+				.fillMaxSize().padding(padding).padding(top = 24.dp.scaledHeight())
+				.overscroll(ScrollableDefaults.overscrollEffect())
+				.nestedScroll(nestedScrollConnection),
+			state = rememberLazyListState(0, uiState.tunnels.count()),
+			userScrollEnabled = true,
+			reverseLayout = false,
+			flingBehavior = ScrollableDefaults.flingBehavior(),
+		) {
+			if (uiState.tunnels.isEmpty()) {
+				item {
+					GettingStartedLabel(onClick = { context.openWebUrl(it) })
+				}
+			} else {
+				item {
+					AutoTunnelRowItem(uiState) {
+						autoTunnelToggleBattery.invoke()
+					}
+				}
+			}
+			items(
+				sortedTunnels,
+				key = { tunnel -> tunnel.id },
+			) { tunnel ->
+				val expanded = uiState.generalState.isTunnelStatsExpanded
+				val tunnelState = activeTunnels.firstOrNull { it.id == tunnel.id }?.state?.collectAsStateWithLifecycle()
+				TunnelRowItem(
+					tunnel.isActive,
+					expanded,
+					selectedTunnel?.id == tunnel.id,
+					tunnel,
+					tunnelState = tunnelState?.value ?: TunnelState(),
+					{ selectedTunnel = tunnel },
+					{ viewModel.onExpandedChanged(!expanded) },
+					onDelete = { showDeleteTunnelAlertDialog = true },
+					onCopy = { viewModel.onCopyTunnel(tunnel) },
+					onSwitchClick = { onTunnelToggle(it, tunnel) },
+				)
+			}
 		}
-
-		TunnelList(
-			appUiState = appUiState,
-			activeTunnels = appUiState.activeTunnels,
-			selectedTunnel = selectedTunnel,
-			onTunnelSelected = { selectedTunnel = it },
-			onDeleteTunnel = {
-				selectedTunnel = it
-				showDeleteTunnelAlertDialog = true
-			},
-			onToggleAutoTunnel = { autoTunnelToggleBattery.invoke() },
-			onToggleTunnel = { tunnel, checked ->
-				if (checked) startTunnel(tunnel) else viewModel.handleEvent(AppEvent.StopTunnel(tunnel))
-			},
-			onExpandStats = { viewModel.handleEvent(AppEvent.ToggleTunnelStatsExpanded) },
-			onCopyTunnel = { viewModel.handleEvent(AppEvent.CopyTunnel(it)) },
-			nestedScrollConnection,
-			modifier = Modifier
-				.fillMaxSize()
-				.padding(padding)
-				.padding(top = 24.dp.scaledHeight()),
-		)
 	}
 }
@@ -6,17 +6,16 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import xyz.teamgravity.pin_lock_compose.PinLock

@Composable
-fun PinLockScreen(viewModel: AppViewModel) {
+fun PinLockScreen(appViewModel: AppViewModel) {
 	val context = LocalContext.current
 	val navController = LocalNavController.current
 	val snackbar = SnackbarController.current
@@ -58,7 +57,7 @@ fun PinLockScreen(viewModel: AppViewModel) {
 			snackbar.showMessage(
 				StringValue.StringResource(R.string.pin_created).asString(context),
 			)
-			viewModel.handleEvent(AppEvent.TogglePinLock)
+			appViewModel.onPinLockEnabled()
 		},
 	)
 }
@@ -3,16 +3,26 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.main
 import android.app.Activity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.journeyapps.barcodescanner.CompoundBarcodeView
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.viewmodel.ScannerViewModel

@Composable
-fun ScannerScreen(viewModel: AppViewModel) {
+fun ScannerScreen(viewModel: ScannerViewModel = hiltViewModel()) {
 	val context = LocalContext.current
+	val navController = LocalNavController.current
+
+	val success = viewModel.success.collectAsStateWithLifecycle(null)
+
+	LaunchedEffect(success.value) {
+		if (success.value != null) navController.popBackStack()
+	}

 	val barcodeView = remember {
 		CompoundBarcodeView(context).apply {
@@ -20,7 +30,7 @@ fun ScannerScreen(viewModel: AppViewModel) {
 			this.setStatusText("")
 			this.decodeSingle { result ->
 				result.text?.let { barCodeOrQr ->
-					viewModel.handleEvent(AppEvent.ImportTunnelFromQrCode(barCodeOrQr))
+					viewModel.onTunnelQrResult(barCodeOrQr)
 				}
 			}
 		}
@@ -0,0 +1,269 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material.icons.outlined.Save
+import androidx.compose.material.icons.outlined.Search
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.MultiChoiceSegmentedButtonRow
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SegmentedButton
+import androidx.compose.material3.SegmentedButtonDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.toMutableStateList
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.google.accompanist.drawablepainter.rememberDrawablePainter
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.common.button.SelectionItemButton
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
+import com.zaneschepke.wireguardautotunnel.ui.common.textbox.CustomTextField
+import com.zaneschepke.wireguardautotunnel.ui.enums.SplitOptions
+import com.zaneschepke.wireguardautotunnel.ui.state.InterfaceProxy
+import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+import java.text.Collator
+import java.util.Locale
+
+@Composable
+fun SplitTunnelScreen(tunnelConf: TunnelConf, viewModel: AppViewModel) {
+	val context = LocalContext.current
+	val navController = LocalNavController.current
+
+	val inputHeight = 45.dp
+
+	val collator = Collator.getInstance(Locale.getDefault())
+
+	val popBackStack by viewModel.popBackStack.collectAsStateWithLifecycle(false)
+
+	LaunchedEffect(popBackStack) {
+		if (popBackStack) navController.popBackStack()
+	}
+
+	val splitTunnelApps by viewModel.splitTunnelApps.collectAsStateWithLifecycle()
+
+	var proxyInterface by remember { mutableStateOf(InterfaceProxy()) }
+
+	var selectedSplitOption by remember { mutableStateOf(SplitOptions.ALL) }
+
+	val selectedPackages = remember { mutableStateListOf<String>() }
+
+	LaunchedEffect(Unit) {
+		proxyInterface = InterfaceProxy.from(tunnelConf.toAmConfig().`interface`)
+		val pair = when {
+			proxyInterface.excludedApplications.isNotEmpty() -> Pair(SplitOptions.EXCLUDE, proxyInterface.excludedApplications)
+			proxyInterface.includedApplications.isNotEmpty() -> Pair(SplitOptions.INCLUDE, proxyInterface.includedApplications)
+			else -> Pair(SplitOptions.ALL, mutableSetOf())
+		}
+		selectedSplitOption = pair.first
+		selectedPackages.addAll(pair.second)
+	}
+
+	var query: String by remember { mutableStateOf("") }
+
+	val sortedPackages by remember {
+		derivedStateOf {
+			splitTunnelApps.sortedWith(compareBy(collator) { it.name }).filter { it.name.lowercase().contains(query.lowercase()) }.toMutableStateList()
+		}
+	}
+
+	LaunchedEffect(Unit) {
+		// clean up any split tunnel packages for apps that were uninstalled
+		viewModel.cleanUpUninstalledApps(tunnelConf, splitTunnelApps.map { it.`package` })
+	}
+
+	Scaffold(
+		topBar = {
+			TopNavBar(stringResource(R.string.tunneling_apps), trailing = {
+				IconButton(onClick = {
+					proxyInterface.apply {
+						includedApplications.clear()
+						excludedApplications.clear()
+					}
+					when (selectedSplitOption) {
+						SplitOptions.INCLUDE -> proxyInterface.includedApplications.apply {
+							addAll(selectedPackages)
+						}
+						SplitOptions.EXCLUDE -> proxyInterface.excludedApplications.apply {
+							addAll(selectedPackages)
+						}
+						SplitOptions.ALL -> Unit
+					}
+					viewModel.updateExistingTunnelConfig(tunnelConf, `interface` = proxyInterface)
+				}) {
+					val icon = Icons.Outlined.Save
+					Icon(
+						imageVector = icon,
+						contentDescription = icon.name,
+					)
+				}
+			})
+		},
+	) { padding ->
+
+		Column(
+			verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.CenterVertically),
+			horizontalAlignment = Alignment.CenterHorizontally,
+			modifier = Modifier
+				.fillMaxWidth()
+				.padding(padding)
+				.padding(top = 24.dp.scaledHeight()),
+		) {
+			MultiChoiceSegmentedButtonRow(
+				modifier = Modifier.background(color = MaterialTheme.colorScheme.background).fillMaxWidth()
+					.padding(horizontal = 24.dp.scaledWidth()).height(inputHeight),
+			) {
+				SplitOptions.entries.forEachIndexed { index, entry ->
+					val active = selectedSplitOption == entry
+					SegmentedButton(
+						shape = SegmentedButtonDefaults.itemShape(index = index, count = SplitOptions.entries.size, baseShape = RoundedCornerShape(8.dp)),
+						icon = {
+							SegmentedButtonDefaults.Icon(active = active, activeContent = {
+								val icon = Icons.Outlined.Check
+								Icon(imageVector = icon, icon.name, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(SegmentedButtonDefaults.IconSize))
+							}) {
+								Icon(
+									imageVector = entry.icon(),
+									contentDescription = entry.icon().name,
+									modifier = Modifier.size(SegmentedButtonDefaults.IconSize),
+								)
+							}
+						},
+						colors = SegmentedButtonDefaults.colors().copy(
+							activeContainerColor = MaterialTheme.colorScheme.surface,
+							inactiveContainerColor = MaterialTheme.colorScheme.background,
+						),
+						onCheckedChange = {
+							selectedSplitOption = entry
+						},
+						checked = active,
+					) {
+						Text(
+							entry.text().asString(context)
+								.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() },
+							color = MaterialTheme.colorScheme.onBackground,
+							style = MaterialTheme.typography.labelMedium,
+						)
+					}
+				}
+			}
+			if (selectedSplitOption != SplitOptions.ALL) {
+				Column(
+					verticalArrangement = Arrangement.Center,
+					horizontalAlignment = Alignment.CenterHorizontally,
+					modifier = Modifier
+						.fillMaxWidth(),
+				) {
+					CustomTextField(
+						textStyle = MaterialTheme.typography.labelMedium.copy(
+							color = MaterialTheme.colorScheme.onBackground,
+						),
+						value = query,
+						onValueChange = { input ->
+							query = input
+						},
+						interactionSource = remember { MutableInteractionSource() },
+						label = {},
+						leading = {
+							val icon = Icons.Outlined.Search
+							Icon(icon, icon.name)
+						},
+						containerColor = MaterialTheme.colorScheme.background,
+						modifier =
+						Modifier
+							.fillMaxWidth().height(inputHeight).padding(horizontal = 24.dp.scaledWidth()),
+						singleLine = true,
+						keyboardOptions =
+						KeyboardOptions(
+							capitalization = KeyboardCapitalization.None,
+							imeAction = ImeAction.Done,
+						),
+						keyboardActions = KeyboardActions(),
+					)
+					LazyColumn(
+						horizontalAlignment = Alignment.CenterHorizontally,
+						verticalArrangement = Arrangement.Top,
+						contentPadding = PaddingValues(top = 10.dp),
+					) {
+						items(sortedPackages, key = { it.`package` }) { app ->
+							val checked = selectedPackages.contains(app.`package`)
+							val onClick = {
+								if (checked) selectedPackages.remove(app.`package`) else selectedPackages.add(app.`package`)
+							}
+							SelectionItemButton(
+								{
+									Image(
+										rememberDrawablePainter(app.icon),
+										app.name,
+										modifier =
+										Modifier
+											.padding(horizontal = 24.dp.scaledWidth())
+											.size(
+												iconSize,
+											),
+									)
+								},
+								buttonText = app.name,
+								onClick = {
+									onClick()
+								},
+								trailing = {
+									Row(
+										modifier = Modifier
+											.fillMaxWidth(),
+										horizontalArrangement = Arrangement.End,
+										verticalAlignment = Alignment.CenterVertically,
+									) {
+										Checkbox(
+											checked = checked,
+											onCheckedChange = {
+												onClick()
+											},
+										)
+									}
+								},
+							)
+						}
+					}
+				}
+			}
+		}
+	}
+}
@@ -27,6 +27,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
@@ -39,11 +40,10 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.compon
 import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+import com.zaneschepke.wireguardautotunnel.viewmodel.TunnelAutoTunnelViewModel

@Composable
-fun TunnelAutoTunnelScreen(tunnelConf: TunnelConf, appSettings: AppSettings, viewModel: AppViewModel) {
+fun TunnelAutoTunnelScreen(tunnelConf: TunnelConf, appSettings: AppSettings, tunnelAutoTunnelViewModel: TunnelAutoTunnelViewModel = hiltViewModel()) {
 	var currentText by remember { mutableStateOf("") }

 	LaunchedEffect(tunnelConf.tunnelNetworks) {
@@ -86,10 +86,10 @@ fun TunnelAutoTunnelScreen(tunnelConf: TunnelConf, appSettings: AppSettings, vie
 								trailing = {
 									ScaledSwitch(
 										tunnelConf.isMobileDataTunnel,
-										onClick = { viewModel.handleEvent(AppEvent.ToggleMobileDataTunnel(tunnelConf)) },
+										onClick = { tunnelAutoTunnelViewModel.onToggleIsMobileDataTunnel(tunnelConf) },
 									)
 								},
-								onClick = { viewModel.handleEvent(AppEvent.ToggleMobileDataTunnel(tunnelConf)) },
+								onClick = { tunnelAutoTunnelViewModel.onToggleIsMobileDataTunnel(tunnelConf) },
 							),
 							SelectionItem(
 								Icons.Outlined.SettingsEthernet,
@@ -108,10 +108,10 @@ fun TunnelAutoTunnelScreen(tunnelConf: TunnelConf, appSettings: AppSettings, vie
 								trailing = {
 									ScaledSwitch(
 										tunnelConf.isEthernetTunnel,
-										onClick = { viewModel.handleEvent(AppEvent.ToggleEthernetTunnel(tunnelConf)) },
+										onClick = { tunnelAutoTunnelViewModel.onToggleIsEthernetTunnel(tunnelConf) },
 									)
 								},
-								onClick = { viewModel.handleEvent(AppEvent.ToggleEthernetTunnel(tunnelConf)) },
+								onClick = { tunnelAutoTunnelViewModel.onToggleIsEthernetTunnel(tunnelConf) },
 							),
 						),
 					)
@@ -155,9 +155,9 @@ fun TunnelAutoTunnelScreen(tunnelConf: TunnelConf, appSettings: AppSettings, vie
 							description = {
 								TrustedNetworkTextBox(
 									tunnelConf.tunnelNetworks,
-									onDelete = { viewModel.handleEvent(AppEvent.DeleteTunnelRunSSID(it, tunnelConf)) },
+									onDelete = { tunnelAutoTunnelViewModel.onDeleteRunSSID(it, tunnelConf) },
 									currentText = currentText,
-									onSave = { viewModel.handleEvent(AppEvent.AddTunnelRunSSID(it, tunnelConf)) },
+									onSave = { tunnelAutoTunnelViewModel.onSaveRunSSID(it, tunnelConf) },
 									onValueChange = { currentText = it },
 									supporting = {
 										if (appSettings.isWildcardsEnabled) {
@@ -30,27 +30,28 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.core.tunnel.isUp
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 import com.zaneschepke.wireguardautotunnel.ui.common.config.SubmitConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.isValidIpv4orIpv6Address
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+import com.zaneschepke.wireguardautotunnel.viewmodel.TunnelOptionsViewModel
+import kotlin.text.isBlank
+import kotlin.text.isNullOrBlank
+import kotlin.text.toLong

@Composable
-fun OptionsScreen(tunnelConf: TunnelConf, appUiState: AppUiState, viewModel: AppViewModel) {
+fun OptionsScreen(tunnelConf: TunnelConf, viewModel: TunnelOptionsViewModel = hiltViewModel()) {
 	val navController = LocalNavController.current

 	var currentText by remember { mutableStateOf("") }
@@ -59,6 +60,10 @@ fun OptionsScreen(tunnelConf: TunnelConf, appUiState: AppUiState, viewModel: App
 		currentText = ""
 	}

+	val onPingToggle = {
+		viewModel.saveTunnel(tunnelConf.copy(isPingEnabled = !tunnelConf.isPingEnabled))
+	}
+
 	Scaffold(
 		topBar = {
 			TopNavBar(tunnelConf.tunName)
@@ -95,10 +100,10 @@ fun OptionsScreen(tunnelConf: TunnelConf, appUiState: AppUiState, viewModel: App
 						trailing = {
 							ScaledSwitch(
 								tunnelConf.isPrimaryTunnel,
-								onClick = { viewModel.handleEvent(AppEvent.TogglePrimaryTunnel(tunnelConf)) },
+								onClick = { viewModel.onTogglePrimaryTunnel(tunnelConf) },
 							)
 						},
-						onClick = { viewModel.handleEvent(AppEvent.TogglePrimaryTunnel(tunnelConf)) },
+						onClick = { viewModel.onTogglePrimaryTunnel(tunnelConf) },
 					),
 					SelectionItem(
 						Icons.Outlined.Bolt,
@@ -153,10 +158,10 @@ fun OptionsScreen(tunnelConf: TunnelConf, appUiState: AppUiState, viewModel: App
 						trailing = {
 							ScaledSwitch(
 								tunnelConf.isIpv4Preferred,
-								onClick = { viewModel.handleEvent(AppEvent.ToggleIpv4Preferred(tunnelConf)) },
+								onClick = { viewModel.onToggleIpv4(tunnelConf) },
 							)
 						},
-						onClick = { viewModel.handleEvent(AppEvent.ToggleIpv4Preferred(tunnelConf)) },
+						onClick = { viewModel.onToggleIpv4(tunnelConf) },
 					),
 					SelectionItem(
 						Icons.AutoMirrored.Outlined.CallSplit,
@@ -189,11 +194,10 @@ fun OptionsScreen(tunnelConf: TunnelConf, appUiState: AppUiState, viewModel: App
 							trailing = {
 								ScaledSwitch(
 									checked = tunnelConf.isPingEnabled,
-									enabled = !appUiState.activeTunnels.isUp(tunnelConf),
-									onClick = { viewModel.handleEvent(AppEvent.TogglePingTunnelEnabled(tunnelConf)) },
+									onClick = { onPingToggle() },
 								)
 							},
-							onClick = { viewModel.handleEvent(AppEvent.TogglePingTunnelEnabled(tunnelConf)) },
+							onClick = { onPingToggle() },
 						),
 					)
 					if (tunnelConf.isPingEnabled) {
@@ -205,9 +209,11 @@ fun OptionsScreen(tunnelConf: TunnelConf, appUiState: AppUiState, viewModel: App
 										tunnelConf.pingIp,
 										stringResource(R.string.set_custom_ping_ip),
 										stringResource(R.string.default_ping_ip),
-										isErrorValue = { error -> !error.isNullOrBlank() && !error.isValidIpv4orIpv6Address() },
-										onSubmit = { ip ->
-											viewModel.handleEvent(AppEvent.SetTunnelPingIp(tunnelConf, ip))
+										isErrorValue = { !it.isNullOrBlank() && !it.isValidIpv4orIpv6Address() },
+										onSubmit = {
+											viewModel.saveTunnel(
+												tunnelConf.copy(pingIp = it.ifBlank { null }),
+											)
 										},
 									)
 									fun isSecondsError(seconds: String?): Boolean {
@@ -222,8 +228,8 @@ fun OptionsScreen(tunnelConf: TunnelConf, appUiState: AppUiState, viewModel: App
 											imeAction = ImeAction.Done,
 										),
 										isErrorValue = ::isSecondsError,
-										onSubmit = { interval ->
-											viewModel.handleEvent(AppEvent.SetTunnelPingInterval(tunnelConf, interval))
+										onSubmit = {
+											viewModel.onPingIntervalChange(tunnelConf, it)
 										},
 									)
 									SubmitConfigurationTextBox(
@@ -234,7 +240,7 @@ fun OptionsScreen(tunnelConf: TunnelConf, appUiState: AppUiState, viewModel: App
 											keyboardType = KeyboardType.Number,
 										),
 										isErrorValue = ::isSecondsError,
-										onSubmit = { cooldown -> viewModel.handleEvent(AppEvent.SetTunnelPingCooldown(tunnelConf, cooldown)) },
+										onSubmit = { viewModel.onPingCoolDownChange(tunnelConf, it) },
 									)
 								},
 							),
@@ -1,39 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
-
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.outlined.Add
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
-
-@Composable
-fun AddTunnelFab(isVisible: Boolean = true, isTv: Boolean = false, onClick: () -> Unit) {
-	if (isTv) {
-		TopNavBar(
-			showBack = false,
-			title = stringResource(R.string.app_name),
-			trailing = {
-				IconButton(onClick = onClick) {
-					Icon(Icons.Outlined.Add, stringResource(R.string.add_tunnel))
-				}
-			},
-		)
-	} else {
-		ScrollDismissFab(
-			icon = {
-				Icon(
-					Icons.Filled.Add,
-					stringResource(R.string.add_tunnel),
-					tint = MaterialTheme.colorScheme.onPrimary,
-				)
-			},
-			isVisible = isVisible,
-			onClick = onClick,
-		)
-	}
-}
@@ -12,9 +12,9 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.common.ExpandingRowListItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.theme.SilverTree
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv

@@ -8,7 +8,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ContentPasteGo
 import androidx.compose.material.icons.filled.Create
 import androidx.compose.material.icons.filled.FileOpen
-import androidx.compose.material.icons.filled.Link
 import androidx.compose.material.icons.filled.QrCode
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
@@ -34,7 +33,6 @@ fun TunnelImportSheet(
 	onQrClick: () -> Unit,
 	onManualImportClick: () -> Unit,
 	onClipboardClick: () -> Unit,
-	onUrlClick: () -> Unit,
 ) {
 	val sheetState = rememberModalBottomSheetState()

@@ -112,27 +110,6 @@ fun TunnelImportSheet(
 				}
 			}
 			HorizontalDivider()
-			Row(
-				modifier =
-				Modifier
-					.fillMaxWidth()
-					.clickable {
-						onDismiss()
-						onUrlClick()
-					}
-					.padding(10.dp),
-			) {
-				Icon(
-					Icons.Filled.Link,
-					contentDescription = stringResource(id = R.string.add_from_url),
-					modifier = Modifier.padding(10.dp),
-				)
-				Text(
-					stringResource(id = R.string.add_from_url),
-					modifier = Modifier.padding(10.dp),
-				)
-			}
-			HorizontalDivider()
 			Row(
 				modifier =
 				Modifier
@@ -1,88 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
-
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.gestures.ScrollableDefaults
-import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.overscroll
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.core.tunnel.getValueById
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
-import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
-import java.text.Collator
-import java.util.*
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun TunnelList(
-	appUiState: AppUiState,
-	activeTunnels: Map<TunnelConf, TunnelState>,
-	selectedTunnel: TunnelConf?,
-	onTunnelSelected: (TunnelConf) -> Unit,
-	onDeleteTunnel: (TunnelConf) -> Unit,
-	onToggleAutoTunnel: () -> Unit,
-	onToggleTunnel: (TunnelConf, Boolean) -> Unit,
-	onExpandStats: () -> Unit,
-	onCopyTunnel: (TunnelConf) -> Unit,
-	nestedScrollConnection: NestedScrollConnection,
-	modifier: Modifier = Modifier,
-) {
-	val context = LocalContext.current
-	val collator = Collator.getInstance(Locale.getDefault())
-	val sortedTunnels = remember(appUiState.tunnels) {
-		appUiState.tunnels.sortedWith(compareBy(collator) { it.tunName })
-	}
-
-	LazyColumn(
-		horizontalAlignment = Alignment.Start,
-		verticalArrangement = Arrangement.spacedBy(5.dp, Alignment.Top),
-		modifier = modifier
-			.pointerInput(Unit) {
-				if (appUiState.tunnels.isEmpty()) return@pointerInput
-			}
-			.overscroll(ScrollableDefaults.overscrollEffect())
-			.nestedScroll(nestedScrollConnection),
-		state = rememberLazyListState(0, appUiState.tunnels.count()),
-		userScrollEnabled = true,
-		reverseLayout = false,
-		flingBehavior = ScrollableDefaults.flingBehavior(),
-	) {
-		if (appUiState.tunnels.isEmpty()) {
-			item {
-				GettingStartedLabel(onClick = { context.openWebUrl(it) })
-			}
-		} else {
-			item {
-				AutoTunnelRowItem(appUiState, onToggleAutoTunnel)
-			}
-		}
-		items(sortedTunnels, key = { it.id }) { tunnel ->
-			val tunnelState = activeTunnels.getValueById(tunnel.id) ?: TunnelState()
-			TunnelRowItem(
-				isActive = tunnel.isActive,
-				expanded = appUiState.generalState.isTunnelStatsExpanded,
-				isSelected = selectedTunnel?.id == tunnel.id,
-				tunnel = tunnel,
-				tunnelState = tunnelState,
-				onHold = { onTunnelSelected(tunnel) },
-				onClick = onExpandStats,
-				onCopy = { onCopyTunnel(tunnel) },
-				onDelete = { onDeleteTunnel(tunnel) },
-				onSwitchClick = { checked -> onToggleTunnel(tunnel, checked) },
-			)
-		}
-	}
-}
@@ -46,28 +46,25 @@ fun TunnelRowItem(
 	onClick: () -> Unit,
 	onCopy: () -> Unit,
 	onDelete: () -> Unit,
-	onSwitchClick: (Boolean) -> Unit,
+	onSwitchClick: (checked: Boolean) -> Unit,
 ) {
+	val leadingIconColor = if (!isActive) Color.Gray else tunnelState.statistics.asColor()
 	val context = LocalContext.current
+	val snackbar = SnackbarController.current
 	val navController = LocalNavController.current
 	val haptic = LocalHapticFeedback.current
-	val snackbar = SnackbarController.current
 	val itemFocusRequester = remember { FocusRequester() }
-	val isTv = context.isRunningOnTv()
-
-	val leadingIconColor = if (!isActive) Color.Gray else tunnelState.statistics.asColor()
-	val leadingIcon = when {
-		tunnel.isPrimaryTunnel -> Icons.Rounded.Star
-		tunnel.isMobileDataTunnel -> Icons.Rounded.Smartphone
-		tunnel.isEthernetTunnel -> Icons.Rounded.SettingsEthernet
-		else -> Icons.Rounded.Circle
-	}
-
 	ExpandingRowListItem(
 		leading = {
+			val icon = when {
+				tunnel.isPrimaryTunnel -> Icons.Rounded.Star
+				tunnel.isMobileDataTunnel -> Icons.Rounded.Smartphone
+				tunnel.isEthernetTunnel -> Icons.Rounded.SettingsEthernet
+				else -> Icons.Rounded.Circle
+			}
 			Icon(
-				leadingIcon,
-				leadingIcon.name,
+				icon,
+				icon.name,
 				tint = leadingIconColor,
 				modifier = Modifier.size(16.dp),
 			)
@@ -78,8 +75,10 @@ fun TunnelRowItem(
 			onHold()
 		},
 		onClick = {
-			if (!isTv) {
-				if (isActive) onClick()
+			if (!context.isRunningOnTv()) {
+				if (isActive) {
+					onClick()
+				}
 			} else {
 				onHold()
 				itemFocusRequester.requestFocus()
@@ -88,56 +87,108 @@ fun TunnelRowItem(
 		isExpanded = expanded && isActive,
 		expanded = { if (isActive && expanded) TunnelStatisticsRow(tunnelState.statistics, tunnel) },
 		trailing = {
-			if (isSelected && !isTv) {
+			if (
+				isSelected &&
+				!context.isRunningOnTv()
+			) {
 				Row {
-					IconButton(onClick = { navController.navigate(Route.TunnelOptions(tunnel.id)) }) {
-						Icon(Icons.Rounded.Settings, "Settings")
+					IconButton(
+						onClick = {
+							navController.navigate(
+								Route.TunnelOptions(tunnel.id),
+							)
+						},
+					) {
+						val icon = Icons.Rounded.Settings
+						Icon(
+							icon,
+							icon.name,
+						)
 					}
-					IconButton(modifier = Modifier.focusable(), onClick = onCopy) {
-						Icon(Icons.Rounded.CopyAll, "Copy")
+					IconButton(
+						modifier = Modifier.focusable(),
+						onClick = { onCopy() },
+					) {
+						val icon = Icons.Rounded.CopyAll
+						Icon(icon, icon.name)
 					}
-					IconButton(modifier = Modifier.focusable(), enabled = !isActive, onClick = onDelete) {
-						Icon(Icons.Rounded.Delete, "Delete")
+					IconButton(
+						enabled = !isActive,
+						modifier = Modifier.focusable(),
+						onClick = { onDelete() },
+					) {
+						val icon = Icons.Rounded.Delete
+						Icon(icon, icon.name)
 					}
 				}
-			} else if (isTv) {
-				Row {
-					IconButton(onClick = {
-						onHold()
-						navController.navigate(Route.TunnelOptions(tunnel.id))
-					}) {
-						Icon(Icons.Rounded.Settings, "Settings")
-					}
-					IconButton(onClick = {
-						if (isActive) onClick() else snackbar.showMessage(context.getString(R.string.turn_on_tunnel))
-					}) {
-						Icon(Icons.Rounded.Info, "Info")
-					}
-					IconButton(onClick = onCopy) {
-						Icon(Icons.Rounded.CopyAll, "Copy")
-					}
-					IconButton(onClick = {
-						if (isActive) {
-							snackbar.showMessage(context.getString(R.string.turn_off_tunnel))
-						} else {
-							onHold()
-							onDelete()
+			} else {
+				if (context.isRunningOnTv()) {
+					Row {
+						IconButton(
+							onClick = {
+								onHold()
+								navController.navigate(
+									Route.TunnelOptions(tunnel.id),
+								)
+							},
+						) {
+							val icon = Icons.Rounded.Settings
+							Icon(
+								icon,
+								icon.name,
+							)
 						}
-					}) {
-						Icon(Icons.Rounded.Delete, "Delete")
+						IconButton(
+							onClick = {
+								if (isActive) {
+									onClick()
+								} else {
+									snackbar.showMessage(
+										context.getString(R.string.turn_on_tunnel),
+									)
+								}
+							},
+						) {
+							val icon = Icons.Rounded.Info
+							Icon(icon, icon.name)
+						}
+						IconButton(
+							onClick = { onCopy() },
+						) {
+							val icon = Icons.Rounded.CopyAll
+							Icon(icon, icon.name)
+						}
+						IconButton(
+							onClick = {
+								if (isActive) {
+									snackbar.showMessage(
+										context.getString(R.string.turn_off_tunnel),
+									)
+								} else {
+									onHold()
+									onDelete()
+								}
+							},
+						) {
+							val icon = Icons.Rounded.Delete
+							Icon(
+								icon,
+								icon.name,
+							)
+						}
+						ScaledSwitch(
+							modifier = Modifier.focusRequester(itemFocusRequester),
+							checked = isActive,
+							onClick = onSwitchClick,
+						)
 					}
+				} else {
 					ScaledSwitch(
 						modifier = Modifier.focusRequester(itemFocusRequester),
 						checked = isActive,
 						onClick = onSwitchClick,
 					)
 				}
-			} else {
-				ScaledSwitch(
-					modifier = Modifier.focusRequester(itemFocusRequester),
-					checked = isActive,
-					onClick = onSwitchClick,
-				)
 			}
 		},
 	)
@@ -1,55 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-
-@Composable
-fun UrlImportDialog(onDismiss: () -> Unit, onConfirm: (String) -> Unit) {
-	var url by remember { mutableStateOf("") }
-
-	AlertDialog(
-		onDismissRequest = onDismiss,
-		title = { Text(stringResource(R.string.add_from_url)) },
-		text = {
-			Column(
-				modifier = Modifier
-					.fillMaxWidth()
-					.padding(vertical = 8.dp),
-			) {
-				OutlinedTextField(
-					value = url,
-					onValueChange = { url = it },
-					label = { Text(stringResource(R.string.enter_config_url)) },
-					modifier = Modifier.fillMaxWidth(),
-				)
-			}
-		},
-		confirmButton = {
-			TextButton(
-				onClick = { onConfirm(url) },
-				enabled = url.isNotBlank(),
-			) {
-				Text(stringResource(R.string.okay))
-			}
-		},
-		dismissButton = {
-			TextButton(onClick = onDismiss) {
-				Text(stringResource(R.string.cancel))
-			}
-		},
-	)
-}
@@ -1,124 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.config
-
-import android.view.WindowManager
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.imePadding
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Save
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.Scaffold
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.zaneschepke.wireguardautotunnel.MainActivity
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
-import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components.AddPeerButton
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components.InterfaceSection
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components.PeersSection
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-
-@Composable
-fun ConfigScreen(tunnelConf: TunnelConf?, viewModel: ConfigViewModel = hiltViewModel()) {
-	val context = LocalContext.current
-	val snackbar = SnackbarController.current
-	val keyboardController = LocalSoftwareKeyboardController.current
-
-	val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-
-	val activity = context as? MainActivity
-
-	// Secure screen due to sensitive information
-	DisposableEffect(Unit) {
-		activity?.window?.setFlags(
-			WindowManager.LayoutParams.FLAG_SECURE,
-			WindowManager.LayoutParams.FLAG_SECURE,
-		)
-		onDispose {
-			activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-		}
-	}
-
-	LaunchedEffect(tunnelConf) {
-		viewModel.initFromTunnel(tunnelConf)
-	}
-
-	LaunchedEffect(uiState.message) {
-		uiState.message?.let { message ->
-			snackbar.showMessage(message.asString(context))
-			viewModel.setMessage(null)
-		}
-	}
-
-	if (uiState.showAuthPrompt) {
-		AuthorizationPrompt(
-			onSuccess = {
-				viewModel.toggleShowAuthPrompt()
-				viewModel.onAuthenticated()
-			},
-			onError = {
-				viewModel.toggleShowAuthPrompt()
-				snackbar.showMessage(
-					context.getString(R.string.error_authentication_failed),
-				)
-			},
-			onFailure = {
-				viewModel.toggleShowAuthPrompt()
-				snackbar.showMessage(
-					context.getString(R.string.error_authorization_failed),
-				)
-			},
-		)
-	}
-
-	Scaffold(
-		topBar = {
-			TopNavBar(
-				title = stringResource(R.string.edit_tunnel),
-				trailing = {
-					IconButton(onClick = {
-						keyboardController?.hide()
-						viewModel.save(tunnelConf)
-					}) {
-						Icon(Icons.Outlined.Save, contentDescription = stringResource(R.string.save))
-					}
-				},
-			)
-		},
-	) { padding ->
-		Column(
-			verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
-			modifier = Modifier
-				.fillMaxSize()
-				.padding(padding)
-				.imePadding()
-				.verticalScroll(rememberScrollState())
-				.padding(top = 24.dp.scaledHeight())
-				.padding(horizontal = 24.dp.scaledWidth()),
-		) {
-			InterfaceSection(uiState, viewModel)
-			PeersSection(uiState, viewModel)
-			AddPeerButton(viewModel)
-		}
-	}
-}
@@ -1,172 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.config
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.state.ConfigUiState
-import com.zaneschepke.wireguardautotunnel.ui.state.ConfigProxy
-import com.zaneschepke.wireguardautotunnel.ui.state.InterfaceProxy
-import com.zaneschepke.wireguardautotunnel.ui.state.PeerProxy
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-class ConfigViewModel @Inject constructor(
-	private val tunnelRepository: TunnelRepository,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : ViewModel() {
-
-	private val _uiState = MutableStateFlow(ConfigUiState())
-	val uiState: StateFlow<ConfigUiState> = _uiState.asStateFlow()
-
-	fun initFromTunnel(tunnelConf: TunnelConf?) {
-		if (tunnelConf == null) return
-		_uiState.update {
-			val proxy = ConfigProxy.from(tunnelConf.toAmConfig())
-			it.copy(
-				tunnelName = tunnelConf.name,
-				configProxy = proxy,
-				showScripts = proxy.hasScripts(),
-				showAmneziaValues = proxy.`interface`.junkPacketCount.isNotBlank(),
-				isAuthenticated = false,
-			)
-		}
-	}
-
-	fun updateTunnelName(name: String) {
-		_uiState.update {
-			it.copy(tunnelName = name)
-		}
-	}
-
-	fun updateInterface(newInterface: InterfaceProxy) {
-		_uiState.update {
-			it.copy(
-				configProxy = it.configProxy.copy(
-					`interface` = newInterface,
-				),
-			)
-		}
-	}
-
-	fun toggleAmneziaValues() {
-		_uiState.update {
-			it.copy(showAmneziaValues = !it.showAmneziaValues)
-		}
-	}
-
-	fun toggleScripts() {
-		_uiState.update {
-			it.copy(showScripts = !it.showScripts)
-		}
-	}
-
-	fun toggleAmneziaCompatibility() {
-		val (show, `interface`) = with(_uiState.value.configProxy) {
-			if (`interface`.isAmneziaCompatibilityModeSet()) {
-				Pair(false, `interface`.resetAmneziaProperties())
-			} else {
-				Pair(true, `interface`.toAmneziaCompatibilityConfig())
-			}
-		}
-		_uiState.update {
-			it.copy(
-				showScripts = show,
-				configProxy = it.configProxy.copy(
-					`interface` = `interface`,
-				),
-			)
-		}
-	}
-
-	fun addPeer() {
-		_uiState.update { currentState ->
-			currentState.copy(
-				configProxy = currentState.configProxy.copy(
-					peers = currentState.configProxy.peers + PeerProxy(),
-				),
-			)
-		}
-	}
-
-	fun removePeer(index: Int) {
-		_uiState.update { currentState ->
-			currentState.copy(
-				configProxy = currentState.configProxy.copy(
-					peers = currentState.configProxy.peers.toMutableList().apply { removeAt(index) },
-				),
-			)
-		}
-	}
-
-	fun updatePeer(index: Int, peer: PeerProxy) {
-		_uiState.update { currentState ->
-			currentState.copy(
-				configProxy = currentState.configProxy.copy(
-					peers = currentState.configProxy.peers.toMutableList().apply { set(index, peer) },
-				),
-			)
-		}
-	}
-
-	fun toggleLanExclusion(index: Int) {
-		val peer = _uiState.value.configProxy.peers[index]
-		val updated = if (peer.isLanExcluded()) peer.includeLan() else peer.excludeLan()
-		updatePeer(index, updated)
-	}
-
-	fun setMessage(message: StringValue?) {
-		_uiState.update {
-			it.copy(message = message)
-		}
-	}
-
-	// TODO improve error messaging
-	fun save(tunnelConf: TunnelConf?) = viewModelScope.launch(ioDispatcher) {
-		val message = try {
-			val saveConfig = buildTunnelConfFromState(tunnelConf)
-			tunnelRepository.save(saveConfig)
-			StringValue.StringResource(R.string.config_changes_saved)
-		} catch (e: Exception) {
-			e.message?.let { message ->
-				(StringValue.DynamicString(message))
-			} ?: StringValue.StringResource(R.string.unknown_error)
-		}
-		setMessage(message)
-	}
-
-	private fun buildTunnelConfFromState(tunnelConf: TunnelConf?): TunnelConf {
-		val (wg, am) = _uiState.value.configProxy.buildConfigs()
-		val name = _uiState.value.tunnelName
-		return tunnelConf?.copyWithCallback(
-			tunName = name,
-			amQuick = am.toAwgQuickString(true),
-			wgQuick = wg.toWgQuickString(true),
-		) ?: TunnelConf(
-			tunName = name, amQuick = am.toAwgQuickString(true),
-			wgQuick = wg.toWgQuickString(true),
-		)
-	}
-
-	fun onAuthenticated() {
-		_uiState.update {
-			it.copy(isAuthenticated = true)
-		}
-	}
-
-	fun toggleShowAuthPrompt() {
-		_uiState.update {
-			it.copy(showAuthPrompt = !it.showAuthPrompt)
-		}
-	}
-}
@@ -1,28 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigViewModel
-
-@Composable
-fun AddPeerButton(viewModel: ConfigViewModel) {
-	Row(
-		horizontalArrangement = Arrangement.Center,
-		verticalAlignment = Alignment.CenterVertically,
-		modifier = Modifier.fillMaxWidth().padding(bottom = 140.dp),
-	) {
-		TextButton(onClick = { viewModel.addPeer() }) {
-			Text(stringResource(R.string.add_peer))
-		}
-	}
-}
@@ -1,72 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.MoreVert
-import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
-
-@Composable
-fun InterfaceDropdown(
-	expanded: Boolean,
-	onExpandedChange: (Boolean) -> Unit,
-	showScripts: Boolean,
-	showAmneziaValues: Boolean,
-	isAmneziaCompatibilitySet: Boolean,
-	onToggleScripts: () -> Unit,
-	onToggleAmneziaValues: () -> Unit,
-	onToggleAmneziaCompatibility: () -> Unit,
-) {
-	Column {
-		IconButton(
-			modifier = Modifier.size(iconSize),
-			onClick = { onExpandedChange(true) },
-		) {
-			Icon(Icons.Rounded.MoreVert, contentDescription = "More")
-		}
-		DropdownMenu(
-			expanded = expanded,
-			onDismissRequest = { onExpandedChange(false) },
-			modifier = Modifier.shadow(12.dp).background(MaterialTheme.colorScheme.surface),
-		) {
-			DropdownMenuItem(
-				text = { Text(if (showScripts) stringResource(R.string.hide_scripts) else stringResource(R.string.show_scripts)) },
-				onClick = {
-					onToggleScripts()
-					onExpandedChange(false)
-				},
-			)
-			DropdownMenuItem(
-				text = { Text(if (showAmneziaValues) stringResource(R.string.hide_amnezia_properties) else stringResource(R.string.show_amnezia_properties)) },
-				onClick = {
-					onToggleAmneziaValues()
-					onExpandedChange(false)
-				},
-			)
-			DropdownMenuItem(
-				text = {
-					Text(
-						if (isAmneziaCompatibilitySet) stringResource(R.string.remove_amnezia_compatibility) else stringResource(R.string.enable_amnezia_compatibility),
-					)
-				},
-				onClick = {
-					onToggleAmneziaCompatibility()
-					onExpandedChange(false)
-				},
-			)
-		}
-	}
-}
@@ -1,220 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.ContentCopy
-import androidx.compose.material.icons.rounded.Refresh
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.PasswordVisualTransformation
-import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
-import com.zaneschepke.wireguardautotunnel.ui.state.InterfaceProxy
-
-@Composable
-fun InterfaceFields(
-	interfaceState: InterfaceProxy,
-	showAuthPrompt: () -> Unit,
-	isAuthenticated: Boolean,
-	showScripts: Boolean,
-	showAmneziaValues: Boolean,
-	onInterfaceChange: (InterfaceProxy) -> Unit,
-) {
-	val keyboardController = LocalSoftwareKeyboardController.current
-	val clipboardManager = LocalClipboardManager.current
-	val keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() })
-	val keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
-
-	OutlinedTextField(
-		value = interfaceState.privateKey,
-		onValueChange = { onInterfaceChange(interfaceState.copy(privateKey = it)) },
-		label = { Text(stringResource(R.string.private_key)) },
-		modifier = Modifier.fillMaxWidth().clickable {
-			if (!isAuthenticated) showAuthPrompt()
-		},
-		visualTransformation = if (isAuthenticated) VisualTransformation.None else PasswordVisualTransformation(),
-		trailingIcon = {
-			IconButton(enabled = isAuthenticated, onClick = {
-				val keypair = com.wireguard.crypto.KeyPair()
-				onInterfaceChange(
-					interfaceState.copy(
-						privateKey = keypair.privateKey.toBase64(),
-						publicKey = keypair.publicKey.toBase64(),
-					),
-				)
-			}) {
-				Icon(
-					Icons.Rounded.Refresh,
-					stringResource(R.string.rotate_keys),
-					tint = if (isAuthenticated) MaterialTheme.colorScheme.onSurface else MaterialTheme.colorScheme.outline,
-				)
-			}
-		},
-		enabled = isAuthenticated,
-		singleLine = true,
-		keyboardOptions = keyboardOptions,
-		keyboardActions = keyboardActions,
-	)
-	OutlinedTextField(
-		value = interfaceState.publicKey,
-		onValueChange = { onInterfaceChange(interfaceState.copy(publicKey = it)) },
-		label = { Text(stringResource(R.string.public_key)) },
-		enabled = false,
-		modifier = Modifier.fillMaxWidth(),
-		singleLine = true,
-		trailingIcon = {
-			IconButton(onClick = {
-				clipboardManager.setText(AnnotatedString(interfaceState.publicKey))
-			}) {
-				Icon(Icons.Rounded.ContentCopy, stringResource(R.string.copy_public_key))
-			}
-		},
-		keyboardOptions = keyboardOptions,
-		keyboardActions = keyboardActions,
-	)
-	ConfigurationTextBox(
-		value = interfaceState.addresses,
-		onValueChange = { onInterfaceChange(interfaceState.copy(addresses = it)) },
-		label = stringResource(R.string.addresses),
-		hint = stringResource(R.string.comma_separated_list),
-		modifier = Modifier.fillMaxWidth(),
-	)
-	ConfigurationTextBox(
-		value = interfaceState.listenPort,
-		onValueChange = { onInterfaceChange(interfaceState.copy(listenPort = it)) },
-		label = stringResource(R.string.listen_port),
-		hint = stringResource(R.string.random),
-		modifier = Modifier.fillMaxWidth(),
-	)
-	Row(
-		modifier = Modifier.fillMaxWidth(),
-		horizontalArrangement = Arrangement.spacedBy(5.dp),
-	) {
-		ConfigurationTextBox(
-			value = interfaceState.dnsServers,
-			onValueChange = { onInterfaceChange(interfaceState.copy(dnsServers = it)) },
-			label = stringResource(R.string.dns_servers),
-			hint = stringResource(R.string.comma_separated_list),
-			modifier = Modifier.weight(3f),
-		)
-		ConfigurationTextBox(
-			value = interfaceState.mtu,
-			onValueChange = { onInterfaceChange(interfaceState.copy(mtu = it)) },
-			label = stringResource(R.string.mtu),
-			hint = stringResource(R.string.auto),
-			modifier = Modifier.weight(2f),
-		)
-	}
-	if (showScripts) {
-		ConfigurationTextBox(
-			value = interfaceState.preUp,
-			onValueChange = { onInterfaceChange(interfaceState.copy(preUp = it)) },
-			label = stringResource(R.string.pre_up),
-			hint = stringResource(R.string.comma_separated_list).lowercase(),
-			modifier = Modifier.fillMaxWidth(),
-		)
-		ConfigurationTextBox(
-			value = interfaceState.postUp,
-			onValueChange = { onInterfaceChange(interfaceState.copy(postUp = it)) },
-			label = stringResource(R.string.post_up),
-			hint = stringResource(R.string.comma_separated_list).lowercase(),
-			modifier = Modifier.fillMaxWidth(),
-		)
-		ConfigurationTextBox(
-			value = interfaceState.preDown,
-			onValueChange = { onInterfaceChange(interfaceState.copy(preDown = it)) },
-			label = stringResource(R.string.pre_down),
-			hint = stringResource(R.string.comma_separated_list).lowercase(),
-			modifier = Modifier.fillMaxWidth(),
-		)
-		ConfigurationTextBox(
-			value = interfaceState.postDown,
-			onValueChange = { onInterfaceChange(interfaceState.copy(postDown = it)) },
-			label = stringResource(R.string.post_down),
-			hint = stringResource(R.string.comma_separated_list).lowercase(),
-			modifier = Modifier.fillMaxWidth(),
-		)
-	}
-	if (showAmneziaValues) {
-		ConfigurationTextBox(
-			value = interfaceState.junkPacketCount,
-			onValueChange = { onInterfaceChange(interfaceState.copy(junkPacketCount = it)) },
-			label = stringResource(R.string.junk_packet_count),
-			hint = stringResource(R.string.junk_packet_count).lowercase(),
-			modifier = Modifier.fillMaxWidth(),
-		)
-		ConfigurationTextBox(
-			value = interfaceState.junkPacketMinSize,
-			onValueChange = { onInterfaceChange(interfaceState.copy(junkPacketMinSize = it)) },
-			label = stringResource(R.string.junk_packet_minimum_size),
-			hint = stringResource(R.string.junk_packet_minimum_size).lowercase(),
-			modifier = Modifier.fillMaxWidth(),
-		)
-		ConfigurationTextBox(
-			value = interfaceState.junkPacketMaxSize,
-			onValueChange = { onInterfaceChange(interfaceState.copy(junkPacketMaxSize = it)) },
-			label = stringResource(R.string.junk_packet_maximum_size),
-			hint = stringResource(R.string.junk_packet_maximum_size).lowercase(),
-			modifier = Modifier.fillMaxWidth(),
-		)
-		ConfigurationTextBox(
-			value = interfaceState.initPacketJunkSize,
-			onValueChange = { onInterfaceChange(interfaceState.copy(initPacketJunkSize = it)) },
-			label = stringResource(R.string.init_packet_junk_size),
-			hint = stringResource(R.string.init_packet_junk_size).lowercase(),
-			modifier = Modifier.fillMaxWidth(),
-		)
-		ConfigurationTextBox(
-			value = interfaceState.responsePacketJunkSize,
-			onValueChange = { onInterfaceChange(interfaceState.copy(responsePacketJunkSize = it)) },
-			label = stringResource(R.string.response_packet_junk_size),
-			hint = stringResource(R.string.response_packet_junk_size).lowercase(),
-			modifier = Modifier.fillMaxWidth(),
-		)
-		ConfigurationTextBox(
-			value = interfaceState.initPacketMagicHeader,
-			onValueChange = { onInterfaceChange(interfaceState.copy(initPacketMagicHeader = it)) },
-			label = stringResource(R.string.init_packet_magic_header),
-			hint = stringResource(R.string.init_packet_magic_header).lowercase(),
-			modifier = Modifier.fillMaxWidth(),
-		)
-		ConfigurationTextBox(
-			value = interfaceState.responsePacketMagicHeader,
-			onValueChange = { onInterfaceChange(interfaceState.copy(responsePacketMagicHeader = it)) },
-			label = stringResource(R.string.response_packet_magic_header),
-			hint = stringResource(R.string.response_packet_magic_header).lowercase(),
-			modifier = Modifier.fillMaxWidth(),
-		)
-		ConfigurationTextBox(
-			value = interfaceState.underloadPacketMagicHeader,
-			onValueChange = { onInterfaceChange(interfaceState.copy(underloadPacketMagicHeader = it)) },
-			label = stringResource(R.string.underload_packet_magic_header),
-			hint = stringResource(R.string.underload_packet_magic_header).lowercase(),
-			modifier = Modifier.fillMaxWidth(),
-		)
-		ConfigurationTextBox(
-			value = interfaceState.transportPacketMagicHeader,
-			onValueChange = { onInterfaceChange(interfaceState.copy(transportPacketMagicHeader = it)) },
-			label = stringResource(R.string.transport_packet_magic_header),
-			hint = stringResource(R.string.transport_packet_magic_header).lowercase(),
-			modifier = Modifier.fillMaxWidth(),
-		)
-	}
-}
@@ -1,74 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components
-
-import androidx.compose.foundation.focusGroup
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
-import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigViewModel
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.state.ConfigUiState
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-
-@Composable
-fun InterfaceSection(uiState: ConfigUiState, viewModel: ConfigViewModel) {
-	var isDropDownExpanded by remember { mutableStateOf(false) }
-
-	Surface(
-		shape = RoundedCornerShape(12.dp),
-		color = MaterialTheme.colorScheme.surface,
-	) {
-		Column(
-			verticalArrangement = Arrangement.spacedBy(5.dp),
-			modifier = Modifier.padding(16.dp.scaledWidth()).focusGroup(),
-		) {
-			Row(
-				horizontalArrangement = Arrangement.SpaceBetween,
-				verticalAlignment = Alignment.CenterVertically,
-				modifier = Modifier.fillMaxWidth(),
-			) {
-				GroupLabel(stringResource(R.string.interface_))
-				InterfaceDropdown(
-					expanded = isDropDownExpanded,
-					onExpandedChange = { isDropDownExpanded = it },
-					showScripts = uiState.showScripts,
-					showAmneziaValues = uiState.showAmneziaValues,
-					isAmneziaCompatibilitySet = uiState.configProxy.`interface`.isAmneziaCompatibilityModeSet(),
-					onToggleScripts = viewModel::toggleScripts,
-					onToggleAmneziaValues = viewModel::toggleAmneziaValues,
-					onToggleAmneziaCompatibility = viewModel::toggleAmneziaCompatibility,
-				)
-			}
-			ConfigurationTextBox(
-				value = uiState.tunnelName,
-				onValueChange = viewModel::updateTunnelName,
-				label = stringResource(R.string.name),
-				hint = stringResource(R.string.tunnel_name).lowercase(),
-				modifier = Modifier.fillMaxWidth(),
-			)
-			InterfaceFields(
-				interfaceState = uiState.configProxy.`interface`,
-				showAuthPrompt = { viewModel.toggleShowAuthPrompt() },
-				showScripts = uiState.showScripts,
-				showAmneziaValues = uiState.showAmneziaValues,
-				onInterfaceChange = viewModel::updateInterface,
-				isAuthenticated = uiState.isAuthenticated,
-			)
-		}
-	}
-}
@@ -1,73 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.PasswordVisualTransformation
-import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
-import com.zaneschepke.wireguardautotunnel.ui.state.PeerProxy
-
-@Composable
-fun PeerFields(peer: PeerProxy, onPeerChange: (PeerProxy) -> Unit, showAuthPrompt: () -> Unit, isAuthenticated: Boolean) {
-	val keyboardController = LocalSoftwareKeyboardController.current
-	val keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() })
-	val keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
-
-	ConfigurationTextBox(
-		value = peer.publicKey,
-		onValueChange = { onPeerChange(peer.copy(publicKey = it)) },
-		label = stringResource(R.string.public_key),
-		hint = stringResource(R.string.base64_key),
-		modifier = Modifier.fillMaxWidth(),
-	)
-	OutlinedTextField(
-		visualTransformation = if (isAuthenticated) VisualTransformation.None else PasswordVisualTransformation(),
-		value = peer.preSharedKey,
-		enabled = isAuthenticated,
-		onValueChange = { onPeerChange(peer.copy(preSharedKey = it)) },
-		label = { Text(stringResource(R.string.preshared_key)) },
-		placeholder = { Text(stringResource(R.string.optional)) },
-		modifier = Modifier.fillMaxWidth().clickable { if (!isAuthenticated) showAuthPrompt() },
-		keyboardOptions = keyboardOptions,
-		keyboardActions = keyboardActions,
-		singleLine = true,
-	)
-	OutlinedTextField(
-		value = peer.persistentKeepalive,
-		onValueChange = { onPeerChange(peer.copy(persistentKeepalive = it)) },
-		label = { Text(stringResource(R.string.persistent_keepalive)) },
-		placeholder = { Text(stringResource(R.string.optional_no_recommend)) },
-		trailingIcon = { Text(stringResource(R.string.seconds), modifier = Modifier.padding(end = 10.dp)) },
-		modifier = Modifier.fillMaxWidth(),
-		keyboardOptions = keyboardOptions,
-		keyboardActions = keyboardActions,
-	)
-	ConfigurationTextBox(
-		value = peer.endpoint,
-		onValueChange = { onPeerChange(peer.copy(endpoint = it)) },
-		label = stringResource(R.string.endpoint),
-		hint = stringResource(R.string.endpoint).lowercase(),
-		modifier = Modifier.fillMaxWidth(),
-	)
-	OutlinedTextField(
-		value = peer.allowedIps,
-		onValueChange = { onPeerChange(peer.copy(allowedIps = it)) },
-		label = { Text(stringResource(R.string.allowed_ips)) },
-		placeholder = { Text(stringResource(R.string.comma_separated_list)) },
-		modifier = Modifier.fillMaxWidth(),
-		keyboardOptions = keyboardOptions,
-		keyboardActions = keyboardActions,
-	)
-}
@@ -1,102 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.focusGroup
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.Delete
-import androidx.compose.material.icons.rounded.MoreVert
-import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigViewModel
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.state.ConfigUiState
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-
-@Composable
-fun PeersSection(uiState: ConfigUiState, viewModel: ConfigViewModel) {
-	uiState.configProxy.peers.forEachIndexed { index, peer ->
-		var isDropDownExpanded by remember { mutableStateOf(false) }
-
-		Surface(
-			shape = RoundedCornerShape(12.dp),
-			color = MaterialTheme.colorScheme.surface,
-		) {
-			Column(
-				verticalArrangement = Arrangement.spacedBy(10.dp),
-				modifier = Modifier.padding(16.dp.scaledWidth()).focusGroup(),
-			) {
-				Row(
-					horizontalArrangement = Arrangement.SpaceBetween,
-					verticalAlignment = Alignment.CenterVertically,
-					modifier = Modifier.fillMaxWidth(),
-				) {
-					GroupLabel(stringResource(R.string.peer))
-					Row(
-						horizontalArrangement = Arrangement.spacedBy(10.dp),
-						verticalAlignment = Alignment.CenterVertically,
-					) {
-						IconButton(
-							modifier = Modifier.size(iconSize),
-							onClick = { viewModel.removePeer(index) },
-						) {
-							Icon(Icons.Rounded.Delete, contentDescription = "Delete")
-						}
-						Column {
-							IconButton(
-								modifier = Modifier.size(iconSize),
-								onClick = { isDropDownExpanded = true },
-							) {
-								Icon(Icons.Rounded.MoreVert, contentDescription = "More")
-							}
-							DropdownMenu(
-								expanded = isDropDownExpanded,
-								onDismissRequest = { isDropDownExpanded = false },
-								modifier = Modifier.shadow(12.dp).background(MaterialTheme.colorScheme.surface),
-							) {
-								DropdownMenuItem(
-									text = {
-										Text(if (peer.isLanExcluded()) stringResource(R.string.include_lan) else stringResource(R.string.exclude_lan))
-									},
-									onClick = {
-										viewModel.toggleLanExclusion(index)
-										isDropDownExpanded = false
-									},
-								)
-							}
-						}
-					}
-				}
-				PeerFields(
-					peer = peer,
-					onPeerChange = { viewModel.updatePeer(index, it) },
-					showAuthPrompt = { viewModel.toggleShowAuthPrompt() },
-					isAuthenticated = uiState.isAuthenticated,
-				)
-			}
-		}
-	}
-}
@@ -1,16 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.config.state
-
-import com.zaneschepke.wireguardautotunnel.ui.state.ConfigProxy
-import com.zaneschepke.wireguardautotunnel.ui.state.InterfaceProxy
-import com.zaneschepke.wireguardautotunnel.ui.state.PeerProxy
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-
-data class ConfigUiState(
-	val tunnelName: String = "",
-	val configProxy: ConfigProxy = ConfigProxy(`interface` = InterfaceProxy(), peers = listOf(PeerProxy())),
-	val showAmneziaValues: Boolean = false,
-	val showScripts: Boolean = false,
-	val isAuthenticated: Boolean = true,
-	val showAuthPrompt: Boolean = false,
-	val message: StringValue? = null,
-)
@@ -1,60 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel
-
-import androidx.compose.animation.Crossfade
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Save
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.Scaffold
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.components.SplitTunnelContent
-
-@Composable
-fun SplitTunnelScreen(viewModel: SplitTunnelViewModel = hiltViewModel()) {
-	val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-
-	Scaffold(
-		topBar = {
-			TopNavBar(
-				title = stringResource(R.string.tunneling_apps),
-				trailing = {
-					IconButton(onClick = { viewModel.saveChanges() }) {
-						Icon(
-							imageVector = Icons.Outlined.Save,
-							contentDescription = stringResource(R.string.save),
-						)
-					}
-				},
-			)
-		},
-	) { padding ->
-		Crossfade(
-			targetState = uiState.loading,
-			animationSpec = tween(200),
-			modifier = Modifier
-				.fillMaxSize()
-				.padding(padding),
-		) { isLoading ->
-			if (isLoading) {
-				SplitTunnelSkeleton()
-			} else {
-				SplitTunnelContent(
-					uiState = uiState,
-					onSplitOptionChange = viewModel::updateSplitOption,
-					onAppSelectionToggle = viewModel::toggleAppSelection,
-					onQueryChange = viewModel::onSearchQuery,
-				)
-			}
-		}
-	}
-}
@@ -1,111 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.common.animation.ShimmerEffect
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-
-@Composable
-fun SplitTunnelSkeleton() {
-	val shimmerBrush = ShimmerEffect()
-
-	Column(
-		verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.CenterVertically),
-		horizontalAlignment = Alignment.CenterHorizontally,
-		modifier = Modifier
-			.fillMaxWidth()
-			.padding(top = 24.dp.scaledHeight()),
-	) {
-		Row(
-			modifier = Modifier
-				.fillMaxWidth()
-				.padding(horizontal = 24.dp.scaledWidth())
-				.height(45.dp),
-			horizontalArrangement = Arrangement.spacedBy(8.dp),
-		) {
-			repeat(3) {
-				Box(
-					modifier = Modifier
-						.weight(1f)
-						.height(45.dp)
-						.clip(RoundedCornerShape(8.dp))
-						.background(shimmerBrush),
-				)
-			}
-		}
-
-		Row(
-			modifier = Modifier
-				.fillMaxWidth()
-				.padding(horizontal = 24.dp.scaledWidth())
-				.height(45.dp),
-			horizontalArrangement = Arrangement.spacedBy(8.dp),
-		) {
-			Box(
-				modifier = Modifier
-					.height(45.dp)
-					.fillMaxWidth()
-					.clip(RoundedCornerShape(8.dp))
-					.background(shimmerBrush),
-			)
-		}
-
-		LazyColumn(
-			horizontalAlignment = Alignment.CenterHorizontally,
-			verticalArrangement = Arrangement.Top,
-			contentPadding = PaddingValues(top = 10.dp),
-			modifier = Modifier.fillMaxWidth(),
-		) {
-			items(20) {
-				Row(
-					modifier = Modifier
-						.fillMaxWidth()
-						.padding(horizontal = 24.dp.scaledWidth(), vertical = 8.dp),
-					verticalAlignment = Alignment.CenterVertically,
-				) {
-					Box(
-						modifier = Modifier
-							.size(iconSize)
-							.clip(CircleShape)
-							.background(shimmerBrush),
-					)
-					Spacer(modifier = Modifier.width(16.dp))
-					Box(
-						modifier = Modifier
-							.height(20.dp)
-							.weight(1f)
-							.clip(RoundedCornerShape(4.dp))
-							.background(shimmerBrush),
-					)
-					Spacer(modifier = Modifier.width(16.dp))
-					Box(
-						modifier = Modifier
-							.size(24.dp)
-							.clip(CircleShape)
-							.background(shimmerBrush),
-					)
-				}
-			}
-		}
-	}
-}
@@ -1,164 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel
-
-import android.content.Context
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state.SplitOption
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state.SplitTunnelUiState
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state.TunnelApp
-import com.zaneschepke.wireguardautotunnel.ui.state.ConfigProxy
-import com.zaneschepke.wireguardautotunnel.ui.state.InterfaceProxy
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-import com.zaneschepke.wireguardautotunnel.util.extensions.getAllInternetCapablePackages
-import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import java.text.Collator
-import java.util.*
-import javax.inject.Inject
-
-@HiltViewModel
-class SplitTunnelViewModel @Inject constructor(
-	@ApplicationContext private val context: Context,
-	private val tunnelRepository: TunnelRepository,
-	savedStateHandle: SavedStateHandle,
-) : ViewModel() {
-
-	private val _uiState = MutableStateFlow(SplitTunnelUiState())
-	val uiState: StateFlow<SplitTunnelUiState> = _uiState
-		.stateIn(
-			scope = viewModelScope,
-			started = SharingStarted.WhileSubscribed(5000L),
-			initialValue = SplitTunnelUiState(),
-		)
-
-	private val tunnelId: Int? = savedStateHandle.get<Int>(Route.SplitTunnel.KEY_ID)
-	private var allTunneledApps: List<Pair<TunnelApp, Boolean>> = emptyList()
-
-	init {
-		tunnelId?.let { loadInitialState(it) }
-	}
-
-	private fun loadInitialState(tunnelId: Int) = viewModelScope.launch {
-		val tunnel = tunnelRepository.getById(tunnelId) ?: return@launch
-		val proxyInterface = InterfaceProxy.from(tunnel.toAmConfig().`interface`)
-		val splitOption = when {
-			proxyInterface.excludedApplications.isNotEmpty() -> SplitOption.EXCLUDE
-			proxyInterface.includedApplications.isNotEmpty() -> SplitOption.INCLUDE
-			else -> SplitOption.ALL
-		}
-
-		val packages = context.getAllInternetCapablePackages()
-
-		val installedPackages = packages
-			.map { it.packageName }
-			.toSet()
-
-		// remove uninstalled apps
-		proxyInterface.includedApplications.retainAll { it in installedPackages }
-		proxyInterface.excludedApplications.retainAll { it in installedPackages }
-
-		var configProxy = ConfigProxy.from(tunnel.toAmConfig())
-		configProxy = configProxy.copy(`interface` = proxyInterface)
-		saveProxyConfig(configProxy, tunnel)
-
-		val collator = Collator.getInstance(Locale.getDefault())
-		val tunneledApps = packages
-			.filter { it.applicationInfo != null }
-			.map { pack ->
-				val selected = when (splitOption) {
-					SplitOption.INCLUDE -> proxyInterface.includedApplications.contains(pack.packageName)
-					SplitOption.ALL -> false
-					SplitOption.EXCLUDE -> proxyInterface.excludedApplications.contains(pack.packageName)
-				}
-				Pair(
-					TunnelApp(
-						name = context.packageManager.getApplicationLabel(pack.applicationInfo!!).toString(),
-						`package` = pack.packageName,
-					),
-					selected,
-				)
-			}.sortedWith(compareBy(collator) { it.first.name })
-
-		allTunneledApps = tunneledApps
-
-		delay(500)
-
-		_uiState.update {
-			SplitTunnelUiState(
-				loading = false,
-				tunnelConf = tunnel,
-				tunneledApps = tunneledApps,
-				splitOption = splitOption,
-			)
-		}
-	}
-
-	fun onSearchQuery(query: String) {
-		val filteredApps = if (query.isBlank()) {
-			allTunneledApps
-		} else {
-			allTunneledApps.filter {
-				it.first.name.contains(query, ignoreCase = true) ||
-					it.first.`package`.contains(query, ignoreCase = true)
-			}
-		}
-		_uiState.update {
-			it.copy(
-				searchQuery = query,
-				tunneledApps = filteredApps,
-			)
-		}
-	}
-
-	fun updateSplitOption(newOption: SplitOption) {
-		_uiState.value = _uiState.value.copy(splitOption = newOption)
-	}
-
-	fun toggleAppSelection(packageName: String) {
-		val currentState = _uiState.value
-		val updatedApps = currentState.tunneledApps.map { (app, selected) ->
-			if (app.`package` == packageName) Pair(app, !selected) else Pair(app, selected)
-		}
-		_uiState.value = currentState.copy(tunneledApps = updatedApps)
-	}
-
-	fun saveChanges() = viewModelScope.launch {
-		val state = _uiState.value
-		val tunnel = state.tunnelConf ?: return@launch
-		val configProxy = ConfigProxy.from(tunnel.toAmConfig())
-		val updatedApps = state.tunneledApps
-		with(configProxy.`interface`) {
-			includedApplications.clear()
-			excludedApplications.clear()
-			when (state.splitOption) {
-				SplitOption.INCLUDE -> {
-					includedApplications.addAll(updatedApps.filter { it.second }.map { it.first.`package` })
-				}
-				SplitOption.EXCLUDE -> {
-					excludedApplications.addAll(updatedApps.filter { it.second }.map { it.first.`package` })
-				}
-				SplitOption.ALL -> Unit
-			}
-		}
-		saveProxyConfig(configProxy, tunnel)
-		SnackbarController.showMessage(StringValue.StringResource(R.string.config_changes_saved))
-	}
-
-	private suspend fun saveProxyConfig(proxy: ConfigProxy, tunnel: TunnelConf) {
-		val (wg, am) = proxy.buildConfigs()
-		tunnelRepository.save(tunnel.copyWithCallback(amQuick = am.toAwgQuickString(true), wgQuick = wg.toWgQuickString(true)))
-	}
-}
@@ -1,59 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.components
-
-import android.content.pm.PackageManager
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.Checkbox
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import com.google.accompanist.drawablepainter.rememberDrawablePainter
-import com.zaneschepke.wireguardautotunnel.ui.common.button.SelectionItemButton
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state.TunnelApp
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-
-@Composable
-fun AppListItem(appInfo: TunnelApp, isSelected: Boolean, onToggle: () -> Unit) {
-	val context = LocalContext.current
-	val icon = remember(appInfo.`package`) {
-		try {
-			context.packageManager.getApplicationIcon(appInfo.`package`)
-		} catch (e: PackageManager.NameNotFoundException) {
-			null
-		}
-	}
-
-	SelectionItemButton(
-		leading = {
-			Image(
-				painter = rememberDrawablePainter(icon),
-				contentDescription = appInfo.name,
-				modifier = Modifier
-					.padding(horizontal = 24.dp.scaledWidth())
-					.size(iconSize),
-			)
-		},
-		buttonText = appInfo.name,
-		onClick = onToggle,
-		trailing = {
-			Row(
-				modifier = Modifier.fillMaxWidth(),
-				horizontalArrangement = Arrangement.End,
-				verticalAlignment = Alignment.CenterVertically,
-			) {
-				Checkbox(
-					checked = isSelected,
-					onCheckedChange = { onToggle() },
-				)
-			}
-		},
-	)
-}
@@ -1,77 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.components
-
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Search
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.textbox.CustomTextField
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state.TunnelApp
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-
-@Composable
-fun AppListSection(apps: List<Pair<TunnelApp, Boolean>>, onAppSelectionToggle: (String) -> Unit, onQueryChange: (String) -> Unit, query: String) {
-	val inputHeight = 45.dp
-
-	Column(
-		verticalArrangement = Arrangement.Center,
-		horizontalAlignment = Alignment.CenterHorizontally,
-		modifier = Modifier.fillMaxWidth(),
-	) {
-		CustomTextField(
-			textStyle = MaterialTheme.typography.labelMedium.copy(
-				color = MaterialTheme.colorScheme.onBackground,
-			),
-			value = query,
-			onValueChange = onQueryChange,
-			interactionSource = remember { MutableInteractionSource() },
-			label = {},
-			leading = {
-				Icon(Icons.Outlined.Search, stringResource(R.string.search))
-			},
-			containerColor = MaterialTheme.colorScheme.background,
-			modifier = Modifier
-				.fillMaxWidth()
-				.height(inputHeight)
-				.padding(horizontal = 24.dp.scaledWidth()),
-			singleLine = true,
-			keyboardOptions = KeyboardOptions(
-				capitalization = KeyboardCapitalization.None,
-				imeAction = ImeAction.Done,
-			),
-			keyboardActions = KeyboardActions(),
-		)
-		LazyColumn(
-			horizontalAlignment = Alignment.CenterHorizontally,
-			verticalArrangement = Arrangement.Top,
-			contentPadding = PaddingValues(top = 10.dp),
-		) {
-			items(apps, key = { it.first.`package` }) { app ->
-				AppListItem(
-					appInfo = app.first,
-					isSelected = app.second,
-					onToggle = { onAppSelectionToggle(app.first.`package`) },
-				)
-			}
-		}
-	}
-}
@@ -1,79 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.components
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Check
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.MultiChoiceSegmentedButtonRow
-import androidx.compose.material3.SegmentedButton
-import androidx.compose.material3.SegmentedButtonDefaults
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state.SplitOption
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-import java.util.*
-
-@Composable
-fun SplitOptionSelector(selectedOption: SplitOption, onOptionChange: (SplitOption) -> Unit) {
-	val context = LocalContext.current
-	val inputHeight = 45.dp
-
-	MultiChoiceSegmentedButtonRow(
-		modifier = Modifier
-			.background(color = MaterialTheme.colorScheme.background)
-			.fillMaxWidth()
-			.padding(horizontal = 24.dp.scaledWidth())
-			.height(inputHeight),
-	) {
-		SplitOption.entries.forEachIndexed { index, entry ->
-			val active = selectedOption == entry
-			SegmentedButton(
-				shape = SegmentedButtonDefaults.itemShape(
-					index = index,
-					count = SplitOption.entries.size,
-					baseShape = RoundedCornerShape(8.dp),
-				),
-				icon = {
-					SegmentedButtonDefaults.Icon(active = active, activeContent = {
-						Icon(
-							imageVector = Icons.Outlined.Check,
-							contentDescription = stringResource(R.string.select),
-							tint = MaterialTheme.colorScheme.primary,
-							modifier = Modifier.size(SegmentedButtonDefaults.IconSize),
-						)
-					}) {
-						Icon(
-							imageVector = entry.icon(),
-							contentDescription = entry.icon().name,
-							modifier = Modifier.size(SegmentedButtonDefaults.IconSize),
-						)
-					}
-				},
-				colors = SegmentedButtonDefaults.colors().copy(
-					activeContainerColor = MaterialTheme.colorScheme.surface,
-					inactiveContainerColor = MaterialTheme.colorScheme.background,
-				),
-				onCheckedChange = { onOptionChange(entry) },
-				checked = active,
-			) {
-				Text(
-					entry.text().asString(context)
-						.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() },
-					color = MaterialTheme.colorScheme.onBackground,
-					style = MaterialTheme.typography.labelMedium,
-				)
-			}
-		}
-	}
-}
@@ -1,42 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.components
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state.SplitOption
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state.SplitTunnelUiState
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-
-@Composable
-fun SplitTunnelContent(
-	uiState: SplitTunnelUiState,
-	onSplitOptionChange: (SplitOption) -> Unit,
-	onAppSelectionToggle: (String) -> Unit,
-	onQueryChange: (String) -> Unit,
-) {
-	Column(
-		verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.CenterVertically),
-		horizontalAlignment = Alignment.CenterHorizontally,
-		modifier = Modifier
-			.fillMaxWidth()
-			.padding(top = 24.dp.scaledHeight()),
-	) {
-		SplitOptionSelector(
-			selectedOption = uiState.splitOption,
-			onOptionChange = onSplitOptionChange,
-		)
-		if (uiState.splitOption != SplitOption.ALL) {
-			AppListSection(
-				apps = uiState.tunneledApps,
-				onAppSelectionToggle = onAppSelectionToggle,
-				onQueryChange = onQueryChange,
-				uiState.searchQuery,
-			)
-		}
-	}
-}
@@ -1,11 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-
-data class SplitTunnelUiState(
-	val loading: Boolean = true,
-	val tunnelConf: TunnelConf? = null,
-	val tunneledApps: SplitTunnelApps = emptyList(),
-	val splitOption: SplitOption = SplitOption.ALL,
-	val searchQuery: String = "",
-)
@@ -1,8 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state
-
-data class TunnelApp(
-	val name: String,
-	val `package`: String,
-)
-
-typealias SplitTunnelApps = List<Pair<TunnelApp, Boolean>>
@@ -0,0 +1,111 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material.icons.outlined.PauseCircle
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+
+@Composable
+fun AdvancedScreen(appSettings: AppSettings, appViewModel: AppViewModel) {
+	var isDropDownExpanded by remember {
+		mutableStateOf(false)
+	}
+
+	Scaffold(
+		topBar = {
+			TopNavBar(stringResource(R.string.advanced_settings))
+		},
+	) { padding ->
+		Column(
+			horizontalAlignment = Alignment.Start,
+			verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
+			modifier =
+			Modifier
+				.fillMaxSize()
+				.padding(padding)
+				.verticalScroll(rememberScrollState())
+				.padding(top = 24.dp.scaledHeight())
+				.padding(horizontal = 24.dp.scaledWidth()),
+		) {
+			SurfaceSelectionGroupButton(
+				listOf(
+					SelectionItem(
+						Icons.Outlined.PauseCircle,
+						title = {
+							Text(
+								stringResource(R.string.debounce_delay),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						onClick = {
+							isDropDownExpanded = true
+						},
+						trailing = {
+							Row(
+								horizontalArrangement = Arrangement.spacedBy(5.dp, Alignment.CenterHorizontally),
+								verticalAlignment = Alignment.CenterVertically,
+							) {
+								Text(text = appSettings.debounceDelaySeconds.toString(), style = MaterialTheme.typography.bodyMedium)
+								val icon = Icons.Default.ArrowDropDown
+								Icon(icon, icon.name)
+							}
+							DropdownMenu(
+								modifier = Modifier.height(250.dp.scaledHeight()),
+								scrollState = rememberScrollState(),
+								containerColor = MaterialTheme.colorScheme.surface,
+								expanded = isDropDownExpanded,
+								onDismissRequest = {
+									isDropDownExpanded = false
+								},
+							) {
+								(0..10).forEachIndexed { index, num ->
+									DropdownMenuItem(
+										text = {
+											Text(text = num.toString())
+										},
+										onClick = {
+											isDropDownExpanded = false
+											appViewModel.saveAppSettings(
+												appSettings.copy(debounceDelaySeconds = num),
+											)
+										},
+									)
+								}
+							}
+						},
+					),
+				),
+			)
+		}
+	}
+}
@@ -19,11 +19,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchNotificationSettings
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
@@ -10,18 +10,18 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.common.button.IconSurfaceButton
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+import com.zaneschepke.wireguardautotunnel.viewmodel.DisplayViewModel

@Composable
-fun DisplayScreen(appUiState: AppUiState, viewModel: AppViewModel) {
+fun DisplayScreen(appUiState: AppUiState, viewModel: DisplayViewModel = hiltViewModel()) {
 	Scaffold(
 		topBar = {
 			TopNavBar(stringResource(R.string.display_theme))
@@ -40,23 +40,23 @@ fun DisplayScreen(appUiState: AppUiState, viewModel: AppViewModel) {
 			IconSurfaceButton(
 				title = stringResource(R.string.automatic),
 				onClick = {
-					viewModel.handleEvent(AppEvent.SetTheme(Theme.AUTOMATIC))
+					viewModel.onThemeChange(Theme.AUTOMATIC)
 				},
 				selected = appUiState.generalState.theme == Theme.AUTOMATIC,
 			)
 			IconSurfaceButton(
 				title = stringResource(R.string.light),
-				onClick = { viewModel.handleEvent(AppEvent.SetTheme(Theme.LIGHT)) },
+				onClick = { viewModel.onThemeChange(Theme.LIGHT) },
 				selected = appUiState.generalState.theme == Theme.LIGHT,
 			)
 			IconSurfaceButton(
 				title = stringResource(R.string.dark),
-				onClick = { viewModel.handleEvent(AppEvent.SetTheme(Theme.DARK)) },
+				onClick = { viewModel.onThemeChange(Theme.DARK) },
 				selected = appUiState.generalState.theme == Theme.DARK,
 			)
 			IconSurfaceButton(
 				title = stringResource(R.string.dynamic),
-				onClick = { viewModel.handleEvent(AppEvent.SetTheme(Theme.DYNAMIC)) },
+				onClick = { viewModel.onThemeChange(Theme.DYNAMIC) },
 				selected = appUiState.generalState.theme == Theme.DYNAMIC,
 			)
 		}
@@ -18,24 +18,44 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
+import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.permission.vpn.withVpnPermission
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
+import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchVpnSettings
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent

@Composable
-fun KillSwitchScreen(uiState: AppUiState, viewModel: AppViewModel) {
+fun KillSwitchScreen(uiState: AppUiState, appViewModel: AppViewModel) {
 	val context = LocalContext.current
-	val toggleVpnSwitch = withVpnPermission<Boolean> { viewModel.handleEvent(AppEvent.ToggleVpnKillSwitch) }
+
+	val toggleVpnSwitch = withVpnPermission<Boolean> { appViewModel.onToggleVpnKillSwitch(it) }
+
+	fun toggleVpnKillSwitch() {
+		with(uiState.appSettings) {
+			// TODO improve this error message
+			if (isKernelEnabled) return SnackbarController.showMessage(StringValue.StringResource(R.string.kernel_not_supported))
+			if (isVpnKillSwitchEnabled) {
+				appViewModel.onToggleVpnKillSwitch(false)
+			} else {
+				toggleVpnSwitch.invoke(true)
+			}
+		}
+	}
+
+	fun toggleLanOnKillSwitch() {
+		with(uiState.appSettings) {
+			appViewModel.onToggleLanOnKillSwitch(!isLanOnKillSwitchEnabled)
+		}
+	}

 	Scaffold(
 		topBar = {
@@ -82,13 +102,13 @@ fun KillSwitchScreen(uiState: AppUiState, viewModel: AppViewModel) {
 								)
 							},
 							onClick = {
-								toggleVpnSwitch.invoke(true)
+								toggleVpnKillSwitch()
 							},
 							trailing = {
 								ScaledSwitch(
 									uiState.appSettings.isVpnKillSwitchEnabled,
 									onClick = {
-										toggleVpnSwitch.invoke(true)
+										toggleVpnKillSwitch()
 									},
 								)
 							},
@@ -104,7 +124,7 @@ fun KillSwitchScreen(uiState: AppUiState, viewModel: AppViewModel) {
 										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
 									)
 								},
-								onClick = { viewModel.handleEvent(AppEvent.ToggleLanOnKillSwitch) },
+								onClick = { toggleLanOnKillSwitch() },
 								description = {
 									Text(
 										stringResource(R.string.bypass_lan_for_kill_switch),
@@ -115,7 +135,7 @@ fun KillSwitchScreen(uiState: AppUiState, viewModel: AppViewModel) {
 									ScaledSwitch(
 										uiState.appSettings.isLanOnKillSwitchEnabled,
 										onClick = {
-											viewModel.handleEvent(AppEvent.ToggleLanOnKillSwitch)
+											toggleLanOnKillSwitch()
 										},
 									)
 								},
@@ -14,20 +14,19 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.ui.common.SelectedLabel
 import com.zaneschepke.wireguardautotunnel.ui.common.button.SelectionItemButton
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import java.text.Collator
-import java.util.*
+import java.util.Locale

@Composable
-fun LanguageScreen(appUiState: AppUiState, viewModel: AppViewModel) {
+fun LanguageScreen(appUiState: AppUiState, appViewModel: AppViewModel) {
 	val collator = Collator.getInstance(Locale.getDefault())

 	val locales = LocaleUtil.supportedLocales.map {
@@ -58,7 +57,7 @@ fun LanguageScreen(appUiState: AppUiState, viewModel: AppViewModel) {
 					SelectionItemButton(
 						buttonText = stringResource(R.string.automatic),
 						onClick = {
-							viewModel.handleEvent(AppEvent.SetLocale(LocaleUtil.OPTION_PHONE_LANGUAGE))
+							appViewModel.onLocaleChange(LocaleUtil.OPTION_PHONE_LANGUAGE)
 						},
 						trailing = {
 							with(appUiState.generalState.locale) {
@@ -81,7 +80,7 @@ fun LanguageScreen(appUiState: AppUiState, viewModel: AppViewModel) {
 							""
 						},
 					onClick = {
-						viewModel.handleEvent(AppEvent.SetLocale(locale.toLanguageTag()))
+						appViewModel.onLocaleChange(locale.toLanguageTag())
 					},
 					trailing = {
 						if (locale.toLanguageTag() == appUiState.generalState.locale) {
@@ -21,21 +21,20 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
 import com.zaneschepke.wireguardautotunnel.util.extensions.goFromRoot
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchAppSettings
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent

@Composable
-fun LocationDisclosureScreen(appUiState: AppUiState, viewModel: AppViewModel) {
+fun LocationDisclosureScreen(appViewModel: AppViewModel, appUiState: AppUiState) {
 	val context = LocalContext.current
 	val navController = LocalNavController.current

@@ -78,13 +77,13 @@ fun LocationDisclosureScreen(appUiState: AppUiState, viewModel: AppViewModel) {
 					},
 					onClick = {
 						context.launchAppSettings().also {
-							viewModel.handleEvent(AppEvent.SetLocationDisclosureShown)
+							appViewModel.setLocationDisclosureShown()
 						}
 					},
 					trailing = {
 						ForwardButton {
 							context.launchAppSettings().also {
-								viewModel.handleEvent(AppEvent.SetLocationDisclosureShown)
+								appViewModel.setLocationDisclosureShown()
 							}
 						}
 					},
@@ -95,9 +94,9 @@ fun LocationDisclosureScreen(appUiState: AppUiState, viewModel: AppViewModel) {
 			listOf(
 				SelectionItem(
 					title = { Text(stringResource(R.string.skip), style = MaterialTheme.typography.bodyLarge.copy(MaterialTheme.colorScheme.onSurface)) },
-					onClick = { viewModel.handleEvent(AppEvent.SetLocationDisclosureShown) },
+					onClick = { appViewModel.setLocationDisclosureShown() },
 					trailing = {
-						ForwardButton { viewModel.handleEvent(AppEvent.SetLocationDisclosureShown) }
+						ForwardButton { appViewModel.setLocationDisclosureShown() }
 					},
 				),
 			),
@@ -20,6 +20,7 @@ import androidx.compose.material.icons.filled.FolderZip
 import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.material.icons.outlined.Code
 import androidx.compose.material.icons.outlined.FolderZip
+import androidx.compose.material.icons.outlined.Notifications
 import androidx.compose.material.icons.outlined.Pin
 import androidx.compose.material.icons.outlined.Restore
 import androidx.compose.material.icons.outlined.VpnKeyOff
@@ -41,28 +42,30 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.domain.enums.ConfigType
+import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.launchNotificationSettings
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
 import com.zaneschepke.wireguardautotunnel.util.extensions.showToast
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+import com.zaneschepke.wireguardautotunnel.viewmodel.SettingsViewModel
 import xyz.teamgravity.pin_lock_compose.PinManager

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
+fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel: AppViewModel, uiState: AppUiState) {
 	val context = LocalContext.current
 	val navController = LocalNavController.current
 	val focusManager = LocalFocusManager.current
@@ -103,7 +106,7 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
 					.fillMaxWidth()
 					.clickable {
 						showExportSheet = false
-						viewModel.handleEvent(AppEvent.ExportTunnels(ConfigType.AMNEZIA))
+						viewModel.exportAllConfigs(context, ConfigType.AMNEZIA)
 					}
 					.padding(10.dp),
 			) {
@@ -124,7 +127,7 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
 					.fillMaxWidth()
 					.clickable {
 						showExportSheet = false
-						viewModel.handleEvent(AppEvent.ExportTunnels(ConfigType.WG))
+						viewModel.exportAllConfigs(context, ConfigType.WG)
 					}
 					.padding(10.dp),
 			) {
@@ -199,7 +202,7 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
 						{
 							ScaledSwitch(
 								uiState.appSettings.isShortcutsEnabled,
-								onClick = { viewModel.handleEvent(AppEvent.ToggleAppShortcuts) },
+								onClick = { appViewModel.onToggleShortcutsEnabled() },
 							)
 						},
 						title = {
@@ -208,7 +211,7 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
 								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
 							)
 						},
-						onClick = { viewModel.handleEvent(AppEvent.ToggleAppShortcuts) },
+						onClick = { appViewModel.onToggleShortcutsEnabled() },
 					),
 				)
 				if (!isRunningOnTv) {
@@ -225,7 +228,7 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
 											) &&
 											uiState.appSettings.isAutoTunnelEnabled
 										),
-									onClick = { viewModel.handleEvent(AppEvent.ToggleAlwaysOn) },
+									onClick = { appViewModel.onToggleAlwaysOnVPN() },
 									checked = uiState.appSettings.isAlwaysOnVpnEnabled,
 								)
 							},
@@ -235,7 +238,7 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
 									style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
 								)
 							},
-							onClick = { viewModel.handleEvent(AppEvent.ToggleAlwaysOn) },
+							onClick = { appViewModel.onToggleAlwaysOnVPN() },
 						),
 					)
 				}
@@ -263,7 +266,7 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
 						{
 							ScaledSwitch(
 								uiState.appSettings.isRestoreOnBootEnabled,
-								onClick = { viewModel.handleEvent(AppEvent.ToggleRestartAtBoot) },
+								onClick = { appViewModel.onToggleRestartAtBoot() },
 							)
 						},
 						title = {
@@ -272,21 +275,12 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
 								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
 							)
 						},
-						onClick = { viewModel.handleEvent(AppEvent.ToggleRestartAtBoot) },
+						onClick = { appViewModel.onToggleRestartAtBoot() },
 					),
 				)
 			},
 		)

-		fun onPinLockToggle() {
-			if (uiState.generalState.isPinLockEnabled) {
-				viewModel.handleEvent(AppEvent.TogglePinLock)
-			} else {
-				PinManager.initialize(context)
-				navController.navigate(Route.Lock)
-			}
-		}
-
 		SurfaceSelectionGroupButton(
 			listOf(
 				SelectionItem(
@@ -299,6 +293,16 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
 						ForwardButton { navController.navigate(Route.Appearance) }
 					},
 				),
+				SelectionItem(
+					Icons.Outlined.Notifications,
+					title = { Text(stringResource(R.string.notifications), style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface)) },
+					onClick = {
+						context.launchNotificationSettings()
+					},
+					trailing = {
+						ForwardButton { context.launchNotificationSettings() }
+					},
+				),
 				SelectionItem(
 					Icons.Outlined.Pin,
 					title = {
@@ -311,12 +315,22 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
 						ScaledSwitch(
 							uiState.generalState.isPinLockEnabled,
 							onClick = {
-								onPinLockToggle()
+								if (uiState.generalState.isPinLockEnabled) {
+									appViewModel.onPinLockDisabled()
+								} else {
+									PinManager.initialize(context)
+									navController.navigate(Route.Lock)
+								}
 							},
 						)
 					},
 					onClick = {
-						onPinLockToggle()
+						if (uiState.generalState.isPinLockEnabled) {
+							appViewModel.onPinLockDisabled()
+						} else {
+							PinManager.initialize(context)
+							navController.navigate(Route.Lock)
+						}
 					},
 				),
 			),
@@ -337,16 +351,16 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
 						trailing = {
 							ScaledSwitch(
 								uiState.appSettings.isKernelEnabled,
-								onClick = { viewModel.handleEvent(AppEvent.ToggleKernelMode) },
-								enabled = !(
-									uiState.appSettings.isAutoTunnelEnabled ||
-										uiState.appSettings.isAlwaysOnVpnEnabled ||
-										uiState.activeTunnels.isNotEmpty()
-									),
+								onClick = { appViewModel.onToggleKernelMode() },
+// 								enabled = !(
+// 									uiState.settings.isAutoTunnelEnabled ||
+// 										uiState.settings.isAlwaysOnVpnEnabled ||
+// 										(uiState.vpnState.status == TunnelState.UP)
+// 									),
 							)
 						},
 						onClick = {
-							viewModel.handleEvent(AppEvent.ToggleKernelMode)
+							appViewModel.onToggleKernelMode()
 						},
 					),
 				),
@@ -4,6 +4,7 @@ import android.Manifest
 import android.os.Build
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -37,13 +38,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
@@ -52,6 +53,7 @@ import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.components.TrustedNetworkTextBox
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.components.WildcardsLabel
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.BackgroundLocationDialog
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.LearnMoreLinkLabel
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.LocationServicesDialog
 import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
@@ -60,12 +62,11 @@ import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+import com.zaneschepke.wireguardautotunnel.viewmodel.AutoTunnelViewModel

-@OptIn(ExperimentalPermissionsApi::class)
+@OptIn(ExperimentalPermissionsApi::class, ExperimentalLayoutApi::class)
@Composable
-fun AutoTunnelScreen(appSettings: AppSettings, viewModel: AppViewModel) {
+fun AutoTunnelScreen(appSettings: AppSettings, viewModel: AutoTunnelViewModel = hiltViewModel()) {
 	val context = LocalContext.current
 	val navController = LocalNavController.current

@@ -158,12 +159,12 @@ fun AutoTunnelScreen(appSettings: AppSettings, viewModel: AppViewModel) {
 										enabled = !appSettings.isAlwaysOnVpnEnabled,
 										checked = appSettings.isTunnelOnWifiEnabled,
 										onClick = {
-											viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnWifi)
+											viewModel.onToggleTunnelOnWifi()
 										},
 									)
 								},
 								onClick = {
-									viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnWifi)
+									viewModel.onToggleTunnelOnWifi()
 								},
 							),
 							SelectionItem(
@@ -184,12 +185,12 @@ fun AutoTunnelScreen(appSettings: AppSettings, viewModel: AppViewModel) {
 									ScaledSwitch(
 										checked = appSettings.isWifiNameByShellEnabled,
 										onClick = {
-											viewModel.handleEvent(AppEvent.ToggleRootShellWifi)
+											viewModel.onRootShellWifiToggle()
 										},
 									)
 								},
 								onClick = {
-									viewModel.handleEvent(AppEvent.ToggleRootShellWifi)
+									viewModel.onRootShellWifiToggle()
 								},
 							),
 						),
@@ -212,12 +213,12 @@ fun AutoTunnelScreen(appSettings: AppSettings, viewModel: AppViewModel) {
 										ScaledSwitch(
 											checked = appSettings.isWildcardsEnabled,
 											onClick = {
-												viewModel.handleEvent(AppEvent.ToggleAutoTunnelWildcards)
+												viewModel.onToggleWildcards()
 											},
 										)
 									},
 									onClick = {
-										viewModel.handleEvent(AppEvent.ToggleAutoTunnelWildcards)
+										viewModel.onToggleWildcards()
 									},
 								),
 								SelectionItem(
@@ -257,10 +258,10 @@ fun AutoTunnelScreen(appSettings: AppSettings, viewModel: AppViewModel) {
 									description = {
 										TrustedNetworkTextBox(
 											appSettings.trustedNetworkSSIDs,
-											onDelete = { viewModel.handleEvent(AppEvent.DeleteTrustedSSID(it)) },
+											onDelete = { viewModel.onDeleteTrustedSSID(it) },
 											currentText = currentText,
 											onSave = { ssid ->
-												if (appSettings.isWifiNameByShellEnabled || isWifiNameReadable()) viewModel.handleEvent(AppEvent.SaveTrustedSSID(ssid))
+												if (appSettings.isWifiNameByShellEnabled || isWifiNameReadable()) viewModel.onSaveTrustedSSID(ssid)
 											},
 											onValueChange = { currentText = it },
 											supporting = {
@@ -286,12 +287,12 @@ fun AutoTunnelScreen(appSettings: AppSettings, viewModel: AppViewModel) {
 											enabled = appSettings.isVpnKillSwitchEnabled,
 											checked = appSettings.isDisableKillSwitchOnTrustedEnabled,
 											onClick = {
-												viewModel.handleEvent(AppEvent.ToggleStopKillSwitchOnTrusted)
+												viewModel.onToggleStopKillSwitchOnTrusted()
 											},
 										)
 									},
 									onClick = {
-										viewModel.handleEvent(AppEvent.ToggleStopKillSwitchOnTrusted)
+										viewModel.onToggleStopKillSwitchOnTrusted()
 									},
 								),
 							),
@@ -313,11 +314,11 @@ fun AutoTunnelScreen(appSettings: AppSettings, viewModel: AppViewModel) {
 							ScaledSwitch(
 								enabled = !appSettings.isAlwaysOnVpnEnabled,
 								checked = appSettings.isTunnelOnMobileDataEnabled,
-								onClick = { viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnCellular) },
+								onClick = { viewModel.onToggleTunnelOnMobileData() },
 							)
 						},
 						onClick = {
-							viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnCellular)
+							viewModel.onToggleTunnelOnMobileData()
 						},
 					),
 					SelectionItem(
@@ -332,11 +333,11 @@ fun AutoTunnelScreen(appSettings: AppSettings, viewModel: AppViewModel) {
 							ScaledSwitch(
 								enabled = !appSettings.isAlwaysOnVpnEnabled,
 								checked = appSettings.isTunnelOnEthernetEnabled,
-								onClick = { viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnEthernet) },
+								onClick = { viewModel.onToggleTunnelOnEthernet() },
 							)
 						},
 						onClick = {
-							viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnEthernet)
+							viewModel.onToggleTunnelOnEthernet()
 						},
 					),
 					SelectionItem(
@@ -356,11 +357,11 @@ fun AutoTunnelScreen(appSettings: AppSettings, viewModel: AppViewModel) {
 						trailing = {
 							ScaledSwitch(
 								checked = appSettings.isStopOnNoInternetEnabled,
-								onClick = { viewModel.handleEvent(AppEvent.ToggleStopTunnelOnNoInternet) },
+								onClick = { viewModel.onToggleStopOnNoInternet() },
 							)
 						},
 						onClick = {
-							viewModel.handleEvent(AppEvent.ToggleStopTunnelOnNoInternet)
+							viewModel.onToggleStopOnNoInternet()
 						},
 					),
 				),
@@ -1,49 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.advanced
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Scaffold
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.advanced.components.DebounceDelaySelector
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-
-@Composable
-fun AdvancedScreen(appUiState: AppUiState) {
-	val appViewModel: AppViewModel = hiltViewModel()
-
-	Scaffold(
-		topBar = {
-			TopNavBar(stringResource(R.string.advanced_settings))
-		},
-	) { padding ->
-		Column(
-			horizontalAlignment = Alignment.Start,
-			verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
-			modifier = Modifier
-				.fillMaxSize()
-				.padding(padding)
-				.verticalScroll(rememberScrollState())
-				.padding(top = 24.dp.scaledHeight())
-				.padding(horizontal = 24.dp.scaledWidth()),
-		) {
-			DebounceDelaySelector(
-				currentDelay = appUiState.appSettings.debounceDelaySeconds,
-				onEvent = appViewModel::handleEvent,
-			)
-		}
-	}
-}
@@ -1,48 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.advanced.components
-
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.PauseCircle
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.res.stringResource
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.DropdownSelector
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
-
-@Composable
-fun DebounceDelaySelector(currentDelay: Int, onEvent: (AppEvent) -> Unit) {
-	var isDropDownExpanded by remember { mutableStateOf(false) }
-
-	SurfaceSelectionGroupButton(
-		listOf(
-			SelectionItem(
-				leadingIcon = Icons.Outlined.PauseCircle,
-				title = {
-					Text(
-						stringResource(R.string.debounce_delay),
-						style = MaterialTheme.typography.bodyMedium.copy(
-							color = MaterialTheme.colorScheme.onSurface,
-						),
-					)
-				},
-				onClick = { isDropDownExpanded = true },
-				trailing = {
-					DropdownSelector(
-						currentValue = currentDelay,
-						options = (0..10).toList(),
-						onValueSelected = { num -> onEvent(AppEvent.SetDebounceDelay(num)) },
-						isExpanded = isDropDownExpanded,
-						onDismiss = { isDropDownExpanded = false },
-					)
-				},
-			),
-		),
-	)
-}
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.button
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components

 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.size
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.support.logs
+package com.zaneschepke.wireguardautotunnel.ui.screens.support

 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -30,26 +30,24 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ClipboardManager
 import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.zaneschepke.logcatter.model.LogMessage
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.text.LogTypeLabel
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+import com.zaneschepke.wireguardautotunnel.viewmodel.LogsViewModel

@Composable
-fun LogsScreen() {
-	val appViewModel = hiltViewModel<AppViewModel>()
-
-	val logs by appViewModel.logs.collectAsStateWithLifecycle()
+fun LogsScreen(viewModel: LogsViewModel = hiltViewModel()) {
+	val logs = viewModel.logs

+	val context = LocalContext.current
 	val clipboardManager: ClipboardManager = LocalClipboardManager.current

 	val lazyColumnListState = rememberLazyListState()
@@ -93,7 +91,7 @@ fun LogsScreen() {
 		floatingActionButton = {
 			FloatingActionButton(
 				onClick = {
-					appViewModel.handleEvent(AppEvent.ExportLogs)
+					viewModel.shareLogs(context)
 				},
 				shape = RoundedCornerShape(16.dp),
 				containerColor = MaterialTheme.colorScheme.primary,
@@ -7,49 +7,244 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AttachMoney
+import androidx.compose.material.icons.filled.Book
+import androidx.compose.material.icons.filled.Mail
+import androidx.compose.material.icons.filled.Policy
+import androidx.compose.material.icons.filled.ViewTimeline
+import androidx.compose.material.icons.outlined.ViewHeadline
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.BuildConfig
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.components.ContactSupportOptions
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.components.GeneralSupportOptions
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.components.VersionLabel
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
+import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
+import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
+import com.zaneschepke.wireguardautotunnel.ui.common.label.VersionLabel
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.launchSupportEmail
+import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent

@Composable
-fun SupportScreen(appUiState: AppUiState, viewModel: AppViewModel) {
+fun SupportScreen(appUiState: AppUiState, appViewModel: AppViewModel) {
 	val context = LocalContext.current
 	val navController = LocalNavController.current
-	val isTv = context.isRunningOnTv()
+
+	var showDialog by remember { mutableStateOf(false) }
+
+	if (showDialog) {
+		InfoDialog(onAttest = {
+			showDialog = false
+			appViewModel.onToggleLocalLogging()
+		}, onDismiss = {
+			showDialog = false
+		}, title = {
+			Text(stringResource(R.string.configuration_change))
+		}, body = { Text(stringResource(R.string.requires_app_relaunch)) }, confirmText = { Text(stringResource(R.string.yes)) })
+	}

 	Column(
-		modifier = Modifier
-			.fillMaxSize()
-			.systemBarsPadding()
-			.padding(top = 24.dp.scaledHeight()).padding(horizontal = 24.dp.scaledWidth())
-			.verticalScroll(rememberScrollState()),
 		horizontalAlignment = Alignment.Start,
 		verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
+		modifier =
+		Modifier
+			.fillMaxSize()
+			.systemBarsPadding().padding(top = 24.dp.scaledHeight())
+			.verticalScroll(rememberScrollState())
+			.padding(horizontal = 24.dp.scaledWidth()),
 	) {
 		GroupLabel(stringResource(R.string.thank_you))
-		GeneralSupportOptions(
-			context,
-			appUiState,
-			{ viewModel.handleEvent(AppEvent.ToggleLocalLogging) },
-			navController,
-			isTv,
+		SurfaceSelectionGroupButton(
+			buildList {
+				add(
+					SelectionItem(
+						Icons.Filled.Book,
+						title = {
+							Text(
+								stringResource(R.string.docs_description),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						trailing = {
+							ForwardButton { context.openWebUrl(context.getString(R.string.docs_url)) }
+						},
+						onClick = {
+							context.openWebUrl(context.getString(R.string.docs_url))
+						},
+					),
+				)
+				if (!context.isRunningOnTv()) {
+					add(
+						SelectionItem(
+							Icons.Outlined.ViewHeadline,
+							title = {
+								Text(
+									stringResource(R.string.local_logging),
+									style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+								)
+							},
+							description = {
+								Text(
+									stringResource(R.string.enable_local_logging),
+									style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.outline),
+								)
+							},
+							trailing = {
+								ScaledSwitch(
+									appUiState.generalState.isLocalLogsEnabled,
+									onClick = {
+										showDialog = true
+									},
+								)
+							},
+							onClick = {
+								showDialog = true
+							},
+						),
+					)
+					if (appUiState.generalState.isLocalLogsEnabled) {
+						add(
+							SelectionItem(
+								Icons.Filled.ViewTimeline,
+								title = {
+									Text(
+										stringResource(R.string.read_logs),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+									)
+								},
+								trailing = {
+									ForwardButton {
+										navController.navigate(Route.Logs)
+									}
+								},
+								onClick = {
+									navController.navigate(Route.Logs)
+								},
+							),
+						)
+					}
+				}
+				add(
+					SelectionItem(
+						Icons.Filled.Policy,
+						title = {
+							Text(
+								stringResource(R.string.privacy_policy),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						trailing = {
+							ForwardButton { context.openWebUrl(context.getString(R.string.privacy_policy_url)) }
+						},
+						onClick = {
+							context.openWebUrl(context.getString(R.string.privacy_policy_url))
+						},
+					),
+				)
+			},
+		)
+		SurfaceSelectionGroupButton(
+			buildList {
+				addAll(
+					listOf(
+						SelectionItem(
+							ImageVector.vectorResource(R.drawable.telegram),
+							title = {
+								Text(
+									stringResource(R.string.chat_description),
+									style = MaterialTheme.typography.bodySmall.copy(MaterialTheme.colorScheme.onSurface),
+								)
+							},
+							trailing = {
+								ForwardButton {
+									context.openWebUrl(context.getString(R.string.telegram_url))
+								}
+							},
+							onClick = {
+								context.openWebUrl(context.getString(R.string.telegram_url))
+							},
+						),
+						SelectionItem(
+							ImageVector.vectorResource(R.drawable.github),
+							title = {
+								Text(
+									stringResource(R.string.open_issue),
+									style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+								)
+							},
+							trailing = {
+								ForwardButton {
+									context.openWebUrl(context.getString(R.string.github_url))
+								}
+							},
+							onClick = {
+								context.openWebUrl(context.getString(R.string.github_url))
+							},
+						),
+						SelectionItem(
+							Icons.Filled.Mail,
+							title = {
+								Text(
+									stringResource(R.string.email_description),
+									style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+								)
+							},
+							trailing = {
+								ForwardButton {
+									context.launchSupportEmail()
+								}
+							},
+							onClick = {
+								context.launchSupportEmail()
+							},
+						),
+					),
+				)
+				if (BuildConfig.FLAVOR == "fdroid") {
+					add(
+						SelectionItem(
+							Icons.Filled.AttachMoney,
+							title = {
+								Text(
+									stringResource(R.string.donate),
+									style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+								)
+							},
+							trailing = {
+								ForwardButton {
+									context.openWebUrl(context.getString(R.string.donate_url))
+								}
+							},
+							onClick = {
+								context.openWebUrl(context.getString(R.string.donate_url))
+							},
+						),
+					)
+				}
+			},
 		)
-		ContactSupportOptions(context)
 		VersionLabel()
 	}
 }
@@ -1,68 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.support.components
-
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Favorite
-import androidx.compose.material.icons.filled.Mail
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.vectorResource
-import com.zaneschepke.wireguardautotunnel.BuildConfig
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItemLabel
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.launchSupportEmail
-import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
-
-@Composable
-fun ContactSupportOptions(context: android.content.Context) {
-	SurfaceSelectionGroupButton(
-		items = buildList {
-			add(
-				SelectionItem(
-					leadingIcon = ImageVector.vectorResource(R.drawable.matrix),
-					title = { SelectionItemLabel(R.string.join_matrix, style = MaterialTheme.typography.bodySmall) },
-					trailing = { ForwardButton { context.openWebUrl(context.getString(R.string.matrix_url)) } },
-					onClick = { context.openWebUrl(context.getString(R.string.matrix_url)) },
-				),
-			)
-			add(
-				SelectionItem(
-					leadingIcon = ImageVector.vectorResource(R.drawable.telegram),
-					title = { SelectionItemLabel(R.string.join_telegram, style = MaterialTheme.typography.bodySmall) },
-					trailing = { ForwardButton { context.openWebUrl(context.getString(R.string.telegram_url)) } },
-					onClick = { context.openWebUrl(context.getString(R.string.telegram_url)) },
-				),
-			)
-			add(
-				SelectionItem(
-					leadingIcon = ImageVector.vectorResource(R.drawable.github),
-					title = { SelectionItemLabel(R.string.open_issue) },
-					trailing = { ForwardButton { context.openWebUrl(context.getString(R.string.github_url)) } },
-					onClick = { context.openWebUrl(context.getString(R.string.github_url)) },
-				),
-			)
-			add(
-				SelectionItem(
-					leadingIcon = Icons.Filled.Mail,
-					title = { SelectionItemLabel(R.string.email_description) },
-					trailing = { ForwardButton { context.launchSupportEmail() } },
-					onClick = { context.launchSupportEmail() },
-				),
-			)
-			if (BuildConfig.FLAVOR == Constants.FDROID_FLAVOR) {
-				add(
-					SelectionItem(
-						leadingIcon = Icons.Filled.Favorite,
-						title = { SelectionItemLabel(R.string.donate) },
-						trailing = { ForwardButton { context.openWebUrl(context.getString(R.string.donate_url)) } },
-						onClick = { context.openWebUrl(context.getString(R.string.donate_url)) },
-					),
-				)
-			}
-		},
-	)
-}
@@ -1,73 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.support.components
-
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Book
-import androidx.compose.material.icons.filled.Policy
-import androidx.compose.material.icons.filled.ViewTimeline
-import androidx.compose.material.icons.outlined.ViewHeadline
-import androidx.compose.runtime.Composable
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItemLabel
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
-import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
-
-@Composable
-fun GeneralSupportOptions(
-	context: android.content.Context,
-	appUiState: AppUiState,
-	onToggleLocalLogging: () -> Unit,
-	navController: androidx.navigation.NavController,
-	isTv: Boolean,
-) {
-	SurfaceSelectionGroupButton(
-		items = buildList {
-			add(
-				SelectionItem(
-					leadingIcon = Icons.Filled.Book,
-					title = { SelectionItemLabel(R.string.docs_description) },
-					trailing = { ForwardButton { context.openWebUrl(context.getString(R.string.docs_url)) } },
-					onClick = { context.openWebUrl(context.getString(R.string.docs_url)) },
-				),
-			)
-			if (!isTv) {
-				add(
-					SelectionItem(
-						leadingIcon = Icons.Outlined.ViewHeadline,
-						title = { SelectionItemLabel(R.string.local_logging) },
-						description = { SelectionItemLabel(R.string.enable_local_logging, isDescription = true) },
-						trailing = {
-							ScaledSwitch(
-								checked = appUiState.generalState.isLocalLogsEnabled,
-								onClick = { onToggleLocalLogging() },
-							)
-						},
-						onClick = { onToggleLocalLogging() },
-					),
-				)
-				if (appUiState.generalState.isLocalLogsEnabled) {
-					add(
-						SelectionItem(
-							leadingIcon = Icons.Filled.ViewTimeline,
-							title = { SelectionItemLabel(R.string.read_logs) },
-							trailing = { ForwardButton { navController.navigate(Route.Logs) } },
-							onClick = { navController.navigate(Route.Logs) },
-						),
-					)
-				}
-			}
-			add(
-				SelectionItem(
-					leadingIcon = Icons.Filled.Policy,
-					title = { SelectionItemLabel(R.string.privacy_policy) },
-					trailing = { ForwardButton { context.openWebUrl(context.getString(R.string.privacy_policy_url)) } },
-					onClick = { context.openWebUrl(context.getString(R.string.privacy_policy_url)) },
-				),
-			)
-		},
-	)
-}
@@ -1,10 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.state
-
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-
-data class AppState(
-	val isConfigChanged: Boolean = false,
-	val errorMessage: StringValue? = null,
-	val popBackStack: Boolean = false,
-	val isAppReady: Boolean = false,
-)
@@ -3,14 +3,10 @@ package com.zaneschepke.wireguardautotunnel.ui.state
 import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
 import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState

 data class AppUiState(
 	val appSettings: AppSettings = AppSettings(),
 	val tunnels: List<TunnelConf> = emptyList(),
-	val activeTunnels: Map<TunnelConf, TunnelState> = emptyMap(),
 	val generalState: GeneralState = GeneralState(),
 	val autoTunnelActive: Boolean = false,
-	val appConfigurationChange: Boolean = false,
-	val isAppLoaded: Boolean = false,
 )
@@ -1,36 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.state
-
-import org.amnezia.awg.config.Config
-
-data class ConfigProxy(
-	val peers: List<PeerProxy>,
-	val `interface`: InterfaceProxy,
-) {
-
-	fun hasScripts(): Boolean {
-		return `interface`.preUp.isNotBlank() || `interface`.preDown.isNotBlank() ||
-			`interface`.postUp.isNotBlank() || `interface`.postDown.isNotBlank()
-	}
-
-	fun buildConfigs(): Pair<com.wireguard.config.Config, Config> {
-		return Pair(
-			com.wireguard.config.Config.Builder().apply {
-				addPeers(peers.map { it.toWgPeer() })
-				setInterface(`interface`.toWgInterface())
-			}.build(),
-			Config.Builder().apply {
-				addPeers(peers.map { it.toAmPeer() })
-				setInterface(`interface`.toAmInterface())
-			}.build(),
-		)
-	}
-
-	companion object {
-		fun from(amConfig: Config): ConfigProxy {
-			return ConfigProxy(
-				`interface` = InterfaceProxy.from(amConfig.`interface`),
-				peers = amConfig.peers.map { PeerProxy.from(it) },
-			)
-		}
-	}
-}
@@ -3,6 +3,7 @@ package com.zaneschepke.wireguardautotunnel.ui.state
 import com.wireguard.config.Interface
 import com.zaneschepke.wireguardautotunnel.util.extensions.joinAndTrim
 import com.zaneschepke.wireguardautotunnel.util.extensions.toTrimmedList
+import kotlin.ranges.contains

 data class InterfaceProxy(
 	val privateKey: String = "",
@@ -0,0 +1,9 @@
+package com.zaneschepke.wireguardautotunnel.ui.state
+
+import android.graphics.drawable.Drawable
+
+data class SplitTunnelApp(
+	val icon: Drawable,
+	val name: String,
+	val `package`: String,
+)
--- a/Show More
+++ b/Show More