diff --git a/.fleet/run.json b/.fleet/run.json
index 59eb629..a1c7ce3 100644
--- a/.fleet/run.json
+++ b/.fleet/run.json
@@ -6,7 +6,7 @@
             "type": "gradle",
             "workingDir": "$PROJECT_DIR$",
             "tasks": ["jvmRun"],
-            "args": ["-DmainClass=MainKt", "--quiet", "-p", "$PROJECT_DIR$/composeApp"],
+            "args": ["-DmainClass=Main_desktopKt", "--quiet", "-p", "$PROJECT_DIR$/composeApp"],
             "initScripts": {
                 "flmapper": "ext.mapPath = { path -> null }"
             }
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index b7e4222..ed301d0 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="deploymentTargetDropDown">
     <value>
-      <entry key="MainKt">
+      <entry key="Main_desktopKt">
         <State />
       </entry>
       <entry key="androidApp">
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
index 8574574..473c9c4 100644
--- a/composeApp/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -3,12 +3,16 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
 
+val enableIos = System.getProperty("os.name").lowercase().contains("mac")
+
 plugins {
     alias(libs.plugins.android)
     alias(libs.plugins.kotlin)
     alias(libs.plugins.compose.core)
     alias(libs.plugins.compose.compiler)
-    alias(libs.plugins.cocoapods)
+    if (enableIos) {
+        alias(libs.plugins.cocoapods)
+    }
     alias(libs.plugins.room)
     alias(libs.plugins.ksp)
 }
@@ -16,15 +20,17 @@ plugins {
 version = "1.0"
 
 kotlin {
-    cocoapods {
-        summary = "PlayZone iOS SDK"
-        homepage = "https://google.com"
-        ios.deploymentTarget = "14.0"
-
-        framework {
-            @OptIn(ExperimentalKotlinGradlePluginApi::class)
-            transitiveExport = false
-            baseName = "SharedSDK"
+    if (enableIos) {
+        cocoapods {
+            summary = "PlayZone iOS SDK"
+            homepage = "https://google.com"
+            ios.deploymentTarget = "14.0"
+
+            framework {
+                @OptIn(ExperimentalKotlinGradlePluginApi::class)
+                transitiveExport = false
+                baseName = "SharedSDK"
+            }
         }
     }
 
@@ -38,27 +44,28 @@ kotlin {
     }
     jvm()
 
-//    For now Room doesn't work with JS
-//    js {
-//        moduleName = "composeApp"
-//        browser {
-//            commonWebpackConfig {
-//                outputFileName = "composeApp.js"
-//            }
-//        }
-//        binaries.executable()
-//    }
-
-    listOf(
-        iosArm64(),
-        iosX64(),
-        iosSimulatorArm64()
-    ).forEach {
-        it.binaries.framework {
-            baseName = "ComposeApp"
-            isStatic = true
-            // Required when using NativeSQLiteDriver
-            linkerOpts.add("-lsqlite3")
+    js {
+        moduleName = "composeApp"
+        browser {
+            commonWebpackConfig {
+                outputFileName = "composeApp.js"
+            }
+        }
+        binaries.executable()
+    }
+
+    if (enableIos) {
+        listOf(
+            iosArm64(),
+            iosX64(),
+            iosSimulatorArm64()
+        ).forEach {
+            it.binaries.framework {
+                baseName = "ComposeApp"
+                isStatic = true
+                // Required when using NativeSQLiteDriver
+                linkerOpts.add("-lsqlite3")
+            }
         }
     }
 
@@ -119,8 +126,10 @@ kotlin {
             implementation(devNpm("copy-webpack-plugin", "9.1.0"))
         }
 
-        iosMain.dependencies {
-            implementation(libs.coil.multiplatform.network.ktor)
+        if (enableIos) {
+            maybeCreate("iosMain").dependencies {
+                implementation(libs.coil.multiplatform.network.ktor)
+            }
         }
 
         commonTest.dependencies {
@@ -220,12 +229,15 @@ compose.resources {
 dependencies {
     add("kspCommonMainMetadata", libs.room.compiler)
     add("kspAndroid", libs.room.compiler)
-//    add("kspIosX64", libs.room.compiler)
-//    add("kspIosArm64", libs.room.compiler)
-//    add("kspIosSimulatorArm64", libs.room.compiler)
+    if (enableIos) {
+        add("kspIosX64", libs.room.compiler)
+        add("kspIosArm64", libs.room.compiler)
+        add("kspIosSimulatorArm64", libs.room.compiler)
+    }
     add("kspJvm", libs.room.compiler)
+    add("kspJs", libs.room.compiler)
 }
 
 room {
     schemaDirectory("$projectDir/schemas")
-}
\ No newline at end of file
+}
diff --git a/composeApp/src/jvmMain/kotlin/Main.kt b/composeApp/src/jvmMain/kotlin/Main.kt
deleted file mode 100644
index 7b00029..0000000
--- a/composeApp/src/jvmMain/kotlin/Main.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-import androidx.compose.ui.unit.DpSize
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.WindowState
-import androidx.compose.ui.window.singleWindowApplication
-
-fun main() =
-    singleWindowApplication(
-        title = "Jet Habit",
-        state = WindowState(size = DpSize(800.dp, 800.dp))
-    ) {
-        MainView()
-    }
diff --git a/gradle.properties b/gradle.properties
index 4d64b7b..249f3c3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,4 +10,4 @@ android.useAndroidX=true
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.native.binary.memoryModel=experimental
-org.jetbrains.compose.experimental.jscanvas.enabled=true
\ No newline at end of file
+org.jetbrains.compose.experimental.jscanvas.enabled=true