174 files changed, 15 insertions, 15 deletions

diff --git a/sw-ui/build.gradle.kts b/sw-ui/build.gradle.kts
index 0b736e34..2efb54ab 100644
--- a/sw-ui/build.gradle.kts
+++ b/sw-ui/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
 
 plugins {
-    kotlin("js")
+    kotlin("multiplatform")
 }
 
 kotlin {
@@ -11,12 +11,11 @@ kotlin {
         useCommonJs()
     }
     sourceSets {
-        main {
+        val jsMain by getting {
             dependencies {
                 implementation(projects.swClient)
 
                 implementation(libs.kotlinx.coroutines.core)
-                implementation(libs.kotlinx.coroutines.test)
 
                 implementation(platform(libs.kotlin.wrappers.bom.get()))
                 implementation(libs.kotlin.wrappers.react.base)
@@ -28,23 +27,22 @@ kotlin {
                 implementation(libs.kotlin.wrappers.emotion)
             }
         }
-        test {
+        val jsTest by getting {
             dependencies {
                 implementation(kotlin("test-js"))
+                implementation(libs.kotlinx.coroutines.test)
             }
         }
     }
 }
 
-tasks {
-    "processResources"(ProcessResources::class) {
-        val webpack = project.tasks.withType(KotlinWebpack::class).first()
+tasks.named<ProcessResources>("jsProcessResources") {
+    val webpack = project.tasks.withType(KotlinWebpack::class).first()
 
-        val bundleFile = webpack.outputFileName
-        val publicPath = "./" // TODO get public path from webpack config
+    val bundleFile = webpack.outputFileName
+    val publicPath = "./" // TODO get public path from webpack config
 
-        filesMatching("*.html") {
-            expand("bundle" to bundleFile, "publicPath" to publicPath)
-        }
+    filesMatching("*.html") {
+        expand("bundle" to bundleFile, "publicPath" to publicPath)
     }
 }
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/SevenWondersUi.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/SevenWondersUi.kt
index 0bd3400e..44066b49 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/SevenWondersUi.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/SevenWondersUi.kt
@@ -27,9 +27,11 @@ private fun init() {
 
 private fun renderRoot(rootElement: HTMLElement) {
     val store = initRedux()
-    val connectedApp = Provider.create {
-        this.store = store
-        Application()
+    val connectedApp = StrictMode.create {
+        Provider {
+            this.store = store
+            Application()
+        }
     }
     createRoot(rootElement).render(connectedApp)
 }
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/Application.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/Application.kt
index 2cf8b4f1..2cf8b4f1 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/Application.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/Application.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/GlobalStyles.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/GlobalStyles.kt
index ee9c17ab..ee9c17ab 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/GlobalStyles.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/GlobalStyles.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/errors/ErrorDialog.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/errors/ErrorDialog.kt
index c728d405..c728d405 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/errors/ErrorDialog.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/errors/ErrorDialog.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Board.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/Board.kt
index 1eb5f6f0..1eb5f6f0 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Board.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/Board.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/BoardSummary.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/BoardSummary.kt
index 37de113c..37de113c 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/BoardSummary.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/BoardSummary.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/CardImage.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/CardImage.kt
index cffd509f..cffd509f 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/CardImage.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/CardImage.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt
index 622e3f6d..622e3f6d 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameStyles.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/GameStyles.kt
index f5ec475e..f5ec475e 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameStyles.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/GameStyles.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Hand.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/Hand.kt
index da71ea0b..da71ea0b 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Hand.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/Hand.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/HandRotationIndicator.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/HandRotationIndicator.kt
index 72cb6b65..72cb6b65 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/HandRotationIndicator.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/HandRotationIndicator.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/PlayerPreparedCardPresenter.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/PlayerPreparedCardPresenter.kt
index 627693e1..627693e1 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/PlayerPreparedCardPresenter.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/PlayerPreparedCardPresenter.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/PreparedMove.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/PreparedMove.kt
index 3ecdc741..3ecdc741 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/PreparedMove.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/PreparedMove.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/ScoreTable.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/ScoreTable.kt
index cd54446f..cd54446f 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/ScoreTable.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/ScoreTable.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Tokens.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/Tokens.kt
index 01975f7e..01975f7e 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Tokens.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/Tokens.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/TransactionsSelector.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/TransactionsSelector.kt
index cdf97ad9..cdf97ad9 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/TransactionsSelector.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/game/TransactionsSelector.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/CreateGameForm.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/CreateGameForm.kt
index e0f7dd21..e0f7dd21 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/CreateGameForm.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/CreateGameForm.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/GameBrowser.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/GameBrowser.kt
index 10fb9d81..10fb9d81 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/GameBrowser.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/GameBrowser.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/GameList.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/GameList.kt
index 2919b065..2919b065 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/GameList.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/GameList.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/PlayerInfo.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/PlayerInfo.kt
index d7a9a80f..d7a9a80f 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/PlayerInfo.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/gameBrowser/PlayerInfo.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/ChooseNameForm.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/home/ChooseNameForm.kt
index ba37c09d..ba37c09d 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/ChooseNameForm.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/home/ChooseNameForm.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/Home.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/home/Home.kt
index 81f4c736..81f4c736 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/Home.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/home/Home.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/HomeStyles.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/home/HomeStyles.kt
index 015e78d6..015e78d6 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/HomeStyles.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/home/HomeStyles.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/Lobby.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/lobby/Lobby.kt
index 0330a192..0330a192 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/Lobby.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/lobby/Lobby.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/LobbyStyles.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/lobby/LobbyStyles.kt
index 6b5dbe48..6b5dbe48 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/LobbyStyles.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/lobby/LobbyStyles.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/RadialList.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/lobby/RadialList.kt
index 1f88bebe..1f88bebe 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/RadialList.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/lobby/RadialList.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/RadialMath.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/lobby/RadialMath.kt
index 4b5eb509..4b5eb509 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/RadialMath.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/lobby/RadialMath.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/RadialPlayerList.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/lobby/RadialPlayerList.kt
index 645cf5f3..645cf5f3 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/RadialPlayerList.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/lobby/RadialPlayerList.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/Table.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/lobby/Table.kt
index bfa43aa4..bfa43aa4 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/Table.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/components/lobby/Table.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/names/RandomNameGenerator.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/names/RandomNameGenerator.kt
index 393df78d..393df78d 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/names/RandomNameGenerator.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/names/RandomNameGenerator.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Actions.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/Actions.kt
index b0c56a79..b0c56a79 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Actions.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/Actions.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/ApiActions.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/ApiActions.kt
index 87bacf62..87bacf62 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/ApiActions.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/ApiActions.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Reducers.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/Reducers.kt
index e79b063e..e79b063e 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Reducers.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/Reducers.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Store.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/Store.kt
index 71c5eec0..71c5eec0 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Store.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/Store.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Utils.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/Utils.kt
index eb182dc7..eb182dc7 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Utils.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/Utils.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/sagas/RouteBasedSagas.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/sagas/RouteBasedSagas.kt
index 3343e62e..3343e62e 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/sagas/RouteBasedSagas.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/sagas/RouteBasedSagas.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/sagas/Sagas.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/sagas/Sagas.kt
index 2ad98c8e..2ad98c8e 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/sagas/Sagas.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/sagas/Sagas.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/sagas/SagasFramework.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/sagas/SagasFramework.kt
index 05c03b13..05c03b13 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/sagas/SagasFramework.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/redux/sagas/SagasFramework.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/router/Router.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/router/Router.kt
index 1a0840cf..1a0840cf 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/router/Router.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/router/Router.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/utils/CoroutinesUtils.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/utils/CoroutinesUtils.kt
index 600f08d3..600f08d3 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/utils/CoroutinesUtils.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/utils/CoroutinesUtils.kt
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/utils/StyleUtils.kt b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/utils/StyleUtils.kt
index 7ca67be4..7ca67be4 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/utils/StyleUtils.kt
+++ b/sw-ui/src/jsMain/kotlin/org/luxons/sevenwonders/ui/utils/StyleUtils.kt
diff --git a/sw-ui/src/main/kotlin/webpack/WebpackUtils.kt b/sw-ui/src/jsMain/kotlin/webpack/WebpackUtils.kt
index dde1140a..dde1140a 100644
--- a/sw-ui/src/main/kotlin/webpack/WebpackUtils.kt
+++ b/sw-ui/src/jsMain/kotlin/webpack/WebpackUtils.kt
diff --git a/sw-ui/src/main/resources/favicon.ico b/sw-ui/src/jsMain/resources/favicon.ico
index 5c125de5..5c125de5 100644
--- a/sw-ui/src/main/resources/favicon.ico
+++ b/sw-ui/src/jsMain/resources/favicon.ico
diff --git a/sw-ui/src/main/resources/images/backgrounds/papyrus.jpg b/sw-ui/src/jsMain/resources/images/backgrounds/papyrus.jpg
index 90350045..90350045 100644
--- a/sw-ui/src/main/resources/images/backgrounds/papyrus.jpg
+++ b/sw-ui/src/jsMain/resources/images/backgrounds/papyrus.jpg
diff --git a/sw-ui/src/main/resources/images/backgrounds/zeus-temple.jpg b/sw-ui/src/jsMain/resources/images/backgrounds/zeus-temple.jpg
index 5a28e933..5a28e933 100644
--- a/sw-ui/src/main/resources/images/backgrounds/zeus-temple.jpg
+++ b/sw-ui/src/jsMain/resources/images/backgrounds/zeus-temple.jpg
diff --git a/sw-ui/src/main/resources/images/cards/academy.png b/sw-ui/src/jsMain/resources/images/cards/academy.png
index d2a75075..d2a75075 100644
--- a/sw-ui/src/main/resources/images/cards/academy.png
+++ b/sw-ui/src/jsMain/resources/images/cards/academy.png
diff --git a/sw-ui/src/main/resources/images/cards/altar.png b/sw-ui/src/jsMain/resources/images/cards/altar.png
index bbde8f2f..bbde8f2f 100644
--- a/sw-ui/src/main/resources/images/cards/altar.png
+++ b/sw-ui/src/jsMain/resources/images/cards/altar.png
diff --git a/sw-ui/src/main/resources/images/cards/apothecary.png b/sw-ui/src/jsMain/resources/images/cards/apothecary.png
index 01804c0a..01804c0a 100644
--- a/sw-ui/src/main/resources/images/cards/apothecary.png
+++ b/sw-ui/src/jsMain/resources/images/cards/apothecary.png
diff --git a/sw-ui/src/main/resources/images/cards/aqueduct.png b/sw-ui/src/jsMain/resources/images/cards/aqueduct.png
index c29d9566..c29d9566 100644
--- a/sw-ui/src/main/resources/images/cards/aqueduct.png
+++ b/sw-ui/src/jsMain/resources/images/cards/aqueduct.png
diff --git a/sw-ui/src/main/resources/images/cards/archeryrange.png b/sw-ui/src/jsMain/resources/images/cards/archeryrange.png
index 15c6edda..15c6edda 100644
--- a/sw-ui/src/main/resources/images/cards/archeryrange.png
+++ b/sw-ui/src/jsMain/resources/images/cards/archeryrange.png
diff --git a/sw-ui/src/main/resources/images/cards/arena.png b/sw-ui/src/jsMain/resources/images/cards/arena.png
index 7dc76961..7dc76961 100644
--- a/sw-ui/src/main/resources/images/cards/arena.png
+++ b/sw-ui/src/jsMain/resources/images/cards/arena.png
diff --git a/sw-ui/src/main/resources/images/cards/arsenal.png b/sw-ui/src/jsMain/resources/images/cards/arsenal.png
index fc3f4a27..fc3f4a27 100644
--- a/sw-ui/src/main/resources/images/cards/arsenal.png
+++ b/sw-ui/src/jsMain/resources/images/cards/arsenal.png
diff --git a/sw-ui/src/main/resources/images/cards/back/age1.png b/sw-ui/src/jsMain/resources/images/cards/back/age1.png
index a06332d7..a06332d7 100644
--- a/sw-ui/src/main/resources/images/cards/back/age1.png
+++ b/sw-ui/src/jsMain/resources/images/cards/back/age1.png
diff --git a/sw-ui/src/main/resources/images/cards/back/age2.png b/sw-ui/src/jsMain/resources/images/cards/back/age2.png
index 9b52aa4e..9b52aa4e 100644
--- a/sw-ui/src/main/resources/images/cards/back/age2.png
+++ b/sw-ui/src/jsMain/resources/images/cards/back/age2.png
diff --git a/sw-ui/src/main/resources/images/cards/back/age3.png b/sw-ui/src/jsMain/resources/images/cards/back/age3.png
index 86c983ee..86c983ee 100644
--- a/sw-ui/src/main/resources/images/cards/back/age3.png
+++ b/sw-ui/src/jsMain/resources/images/cards/back/age3.png
diff --git a/sw-ui/src/main/resources/images/cards/back/placeholder.png b/sw-ui/src/jsMain/resources/images/cards/back/placeholder.png
index 9bfcf9c6..9bfcf9c6 100644
--- a/sw-ui/src/main/resources/images/cards/back/placeholder.png
+++ b/sw-ui/src/jsMain/resources/images/cards/back/placeholder.png
diff --git a/sw-ui/src/main/resources/images/cards/barracks.png b/sw-ui/src/jsMain/resources/images/cards/barracks.png
index f5a68c17..f5a68c17 100644
--- a/sw-ui/src/main/resources/images/cards/barracks.png
+++ b/sw-ui/src/jsMain/resources/images/cards/barracks.png
diff --git a/sw-ui/src/main/resources/images/cards/baths.png b/sw-ui/src/jsMain/resources/images/cards/baths.png
index 3d99d59d..3d99d59d 100644
--- a/sw-ui/src/main/resources/images/cards/baths.png
+++ b/sw-ui/src/jsMain/resources/images/cards/baths.png
diff --git a/sw-ui/src/main/resources/images/cards/bazar.png b/sw-ui/src/jsMain/resources/images/cards/bazar.png
index f36e25c2..f36e25c2 100644
--- a/sw-ui/src/main/resources/images/cards/bazar.png
+++ b/sw-ui/src/jsMain/resources/images/cards/bazar.png
diff --git a/sw-ui/src/main/resources/images/cards/brickyard.png b/sw-ui/src/jsMain/resources/images/cards/brickyard.png
index ae0b7e9b..ae0b7e9b 100644
--- a/sw-ui/src/main/resources/images/cards/brickyard.png
+++ b/sw-ui/src/jsMain/resources/images/cards/brickyard.png
diff --git a/sw-ui/src/main/resources/images/cards/buildersguild.png b/sw-ui/src/jsMain/resources/images/cards/buildersguild.png
index f5402611..f5402611 100644
--- a/sw-ui/src/main/resources/images/cards/buildersguild.png
+++ b/sw-ui/src/jsMain/resources/images/cards/buildersguild.png
diff --git a/sw-ui/src/main/resources/images/cards/caravansery.png b/sw-ui/src/jsMain/resources/images/cards/caravansery.png
index 997bb102..997bb102 100644
--- a/sw-ui/src/main/resources/images/cards/caravansery.png
+++ b/sw-ui/src/jsMain/resources/images/cards/caravansery.png
diff --git a/sw-ui/src/main/resources/images/cards/chamberofcommerce.png b/sw-ui/src/jsMain/resources/images/cards/chamberofcommerce.png
index 44b5af28..44b5af28 100644
--- a/sw-ui/src/main/resources/images/cards/chamberofcommerce.png
+++ b/sw-ui/src/jsMain/resources/images/cards/chamberofcommerce.png
diff --git a/sw-ui/src/main/resources/images/cards/circus.png b/sw-ui/src/jsMain/resources/images/cards/circus.png
index b1ec4d8b..b1ec4d8b 100644
--- a/sw-ui/src/main/resources/images/cards/circus.png
+++ b/sw-ui/src/jsMain/resources/images/cards/circus.png
diff --git a/sw-ui/src/main/resources/images/cards/claypit.png b/sw-ui/src/jsMain/resources/images/cards/claypit.png
index 5442248e..5442248e 100644
--- a/sw-ui/src/main/resources/images/cards/claypit.png
+++ b/sw-ui/src/jsMain/resources/images/cards/claypit.png
diff --git a/sw-ui/src/main/resources/images/cards/claypool.png b/sw-ui/src/jsMain/resources/images/cards/claypool.png
index 873cad47..873cad47 100644
--- a/sw-ui/src/main/resources/images/cards/claypool.png
+++ b/sw-ui/src/jsMain/resources/images/cards/claypool.png
diff --git a/sw-ui/src/main/resources/images/cards/courthouse.png b/sw-ui/src/jsMain/resources/images/cards/courthouse.png
index 394901f2..394901f2 100644
--- a/sw-ui/src/main/resources/images/cards/courthouse.png
+++ b/sw-ui/src/jsMain/resources/images/cards/courthouse.png
diff --git a/sw-ui/src/main/resources/images/cards/craftsmensguild.png b/sw-ui/src/jsMain/resources/images/cards/craftsmensguild.png
index 09bff60e..09bff60e 100644
--- a/sw-ui/src/main/resources/images/cards/craftsmensguild.png
+++ b/sw-ui/src/jsMain/resources/images/cards/craftsmensguild.png
diff --git a/sw-ui/src/main/resources/images/cards/dispensary.png b/sw-ui/src/jsMain/resources/images/cards/dispensary.png
index 4917166b..4917166b 100644
--- a/sw-ui/src/main/resources/images/cards/dispensary.png
+++ b/sw-ui/src/jsMain/resources/images/cards/dispensary.png
diff --git a/sw-ui/src/main/resources/images/cards/easttradingpost.png b/sw-ui/src/jsMain/resources/images/cards/easttradingpost.png
index 0c67cc78..0c67cc78 100644
--- a/sw-ui/src/main/resources/images/cards/easttradingpost.png
+++ b/sw-ui/src/jsMain/resources/images/cards/easttradingpost.png
diff --git a/sw-ui/src/main/resources/images/cards/excavation.png b/sw-ui/src/jsMain/resources/images/cards/excavation.png
index 0fe1b01f..0fe1b01f 100644
--- a/sw-ui/src/main/resources/images/cards/excavation.png
+++ b/sw-ui/src/jsMain/resources/images/cards/excavation.png
diff --git a/sw-ui/src/main/resources/images/cards/forestcave.png b/sw-ui/src/jsMain/resources/images/cards/forestcave.png
index 262fffc6..262fffc6 100644
--- a/sw-ui/src/main/resources/images/cards/forestcave.png
+++ b/sw-ui/src/jsMain/resources/images/cards/forestcave.png
diff --git a/sw-ui/src/main/resources/images/cards/fortifications.png b/sw-ui/src/jsMain/resources/images/cards/fortifications.png
index 3e113473..3e113473 100644
--- a/sw-ui/src/main/resources/images/cards/fortifications.png
+++ b/sw-ui/src/jsMain/resources/images/cards/fortifications.png
diff --git a/sw-ui/src/main/resources/images/cards/forum.png b/sw-ui/src/jsMain/resources/images/cards/forum.png
index d6262158..d6262158 100644
--- a/sw-ui/src/main/resources/images/cards/forum.png
+++ b/sw-ui/src/jsMain/resources/images/cards/forum.png
diff --git a/sw-ui/src/main/resources/images/cards/foundry.png b/sw-ui/src/jsMain/resources/images/cards/foundry.png
index da95a48e..da95a48e 100644
--- a/sw-ui/src/main/resources/images/cards/foundry.png
+++ b/sw-ui/src/jsMain/resources/images/cards/foundry.png
diff --git a/sw-ui/src/main/resources/images/cards/gardens.png b/sw-ui/src/jsMain/resources/images/cards/gardens.png
index 9a49a0ad..9a49a0ad 100644
--- a/sw-ui/src/main/resources/images/cards/gardens.png
+++ b/sw-ui/src/jsMain/resources/images/cards/gardens.png
diff --git a/sw-ui/src/main/resources/images/cards/glassworks.png b/sw-ui/src/jsMain/resources/images/cards/glassworks.png
index 285d7d54..285d7d54 100644
--- a/sw-ui/src/main/resources/images/cards/glassworks.png
+++ b/sw-ui/src/jsMain/resources/images/cards/glassworks.png
diff --git a/sw-ui/src/main/resources/images/cards/guardtower.png b/sw-ui/src/jsMain/resources/images/cards/guardtower.png
index 524b06f3..524b06f3 100644
--- a/sw-ui/src/main/resources/images/cards/guardtower.png
+++ b/sw-ui/src/jsMain/resources/images/cards/guardtower.png
diff --git a/sw-ui/src/main/resources/images/cards/haven.png b/sw-ui/src/jsMain/resources/images/cards/haven.png
index e0b345b2..e0b345b2 100644
--- a/sw-ui/src/main/resources/images/cards/haven.png
+++ b/sw-ui/src/jsMain/resources/images/cards/haven.png
diff --git a/sw-ui/src/main/resources/images/cards/laboratory.png b/sw-ui/src/jsMain/resources/images/cards/laboratory.png
index 4c29e81f..4c29e81f 100644
--- a/sw-ui/src/main/resources/images/cards/laboratory.png
+++ b/sw-ui/src/jsMain/resources/images/cards/laboratory.png
diff --git a/sw-ui/src/main/resources/images/cards/library.png b/sw-ui/src/jsMain/resources/images/cards/library.png
index 7495a2ca..7495a2ca 100644
--- a/sw-ui/src/main/resources/images/cards/library.png
+++ b/sw-ui/src/jsMain/resources/images/cards/library.png
diff --git a/sw-ui/src/main/resources/images/cards/lighthouse.png b/sw-ui/src/jsMain/resources/images/cards/lighthouse.png
index 2124811b..2124811b 100644
--- a/sw-ui/src/main/resources/images/cards/lighthouse.png
+++ b/sw-ui/src/jsMain/resources/images/cards/lighthouse.png
diff --git a/sw-ui/src/main/resources/images/cards/lodge.png b/sw-ui/src/jsMain/resources/images/cards/lodge.png
index 22758688..22758688 100644
--- a/sw-ui/src/main/resources/images/cards/lodge.png
+++ b/sw-ui/src/jsMain/resources/images/cards/lodge.png
diff --git a/sw-ui/src/main/resources/images/cards/loom.png b/sw-ui/src/jsMain/resources/images/cards/loom.png
index 70bdf375..70bdf375 100644
--- a/sw-ui/src/main/resources/images/cards/loom.png
+++ b/sw-ui/src/jsMain/resources/images/cards/loom.png
diff --git a/sw-ui/src/main/resources/images/cards/lumberyard.png b/sw-ui/src/jsMain/resources/images/cards/lumberyard.png
index 8558af1a..8558af1a 100644
--- a/sw-ui/src/main/resources/images/cards/lumberyard.png
+++ b/sw-ui/src/jsMain/resources/images/cards/lumberyard.png
diff --git a/sw-ui/src/main/resources/images/cards/magistratesguild.png b/sw-ui/src/jsMain/resources/images/cards/magistratesguild.png
index d7deabb3..d7deabb3 100644
--- a/sw-ui/src/main/resources/images/cards/magistratesguild.png
+++ b/sw-ui/src/jsMain/resources/images/cards/magistratesguild.png
diff --git a/sw-ui/src/main/resources/images/cards/marketplace.png b/sw-ui/src/jsMain/resources/images/cards/marketplace.png
index cd3676d4..cd3676d4 100644
--- a/sw-ui/src/main/resources/images/cards/marketplace.png
+++ b/sw-ui/src/jsMain/resources/images/cards/marketplace.png
diff --git a/sw-ui/src/main/resources/images/cards/mine.png b/sw-ui/src/jsMain/resources/images/cards/mine.png
index 4062775c..4062775c 100644
--- a/sw-ui/src/main/resources/images/cards/mine.png
+++ b/sw-ui/src/jsMain/resources/images/cards/mine.png
diff --git a/sw-ui/src/main/resources/images/cards/observatory.png b/sw-ui/src/jsMain/resources/images/cards/observatory.png
index 1da3d7b4..1da3d7b4 100644
--- a/sw-ui/src/main/resources/images/cards/observatory.png
+++ b/sw-ui/src/jsMain/resources/images/cards/observatory.png
diff --git a/sw-ui/src/main/resources/images/cards/orevein.png b/sw-ui/src/jsMain/resources/images/cards/orevein.png
index fabea674..fabea674 100644
--- a/sw-ui/src/main/resources/images/cards/orevein.png
+++ b/sw-ui/src/jsMain/resources/images/cards/orevein.png
diff --git a/sw-ui/src/main/resources/images/cards/palace.png b/sw-ui/src/jsMain/resources/images/cards/palace.png
index 1a24890e..1a24890e 100644
--- a/sw-ui/src/main/resources/images/cards/palace.png
+++ b/sw-ui/src/jsMain/resources/images/cards/palace.png
diff --git a/sw-ui/src/main/resources/images/cards/pantheon.png b/sw-ui/src/jsMain/resources/images/cards/pantheon.png
index 264bae02..264bae02 100644
--- a/sw-ui/src/main/resources/images/cards/pantheon.png
+++ b/sw-ui/src/jsMain/resources/images/cards/pantheon.png
diff --git a/sw-ui/src/main/resources/images/cards/pawnshop.png b/sw-ui/src/jsMain/resources/images/cards/pawnshop.png
index 30bb3807..30bb3807 100644
--- a/sw-ui/src/main/resources/images/cards/pawnshop.png
+++ b/sw-ui/src/jsMain/resources/images/cards/pawnshop.png
diff --git a/sw-ui/src/main/resources/images/cards/philosophersguild.png b/sw-ui/src/jsMain/resources/images/cards/philosophersguild.png
index f72590f6..f72590f6 100644
--- a/sw-ui/src/main/resources/images/cards/philosophersguild.png
+++ b/sw-ui/src/jsMain/resources/images/cards/philosophersguild.png
diff --git a/sw-ui/src/main/resources/images/cards/press.png b/sw-ui/src/jsMain/resources/images/cards/press.png
index c932df06..c932df06 100644
--- a/sw-ui/src/main/resources/images/cards/press.png
+++ b/sw-ui/src/jsMain/resources/images/cards/press.png
diff --git a/sw-ui/src/main/resources/images/cards/quarry.png b/sw-ui/src/jsMain/resources/images/cards/quarry.png
index 8cdbdb22..8cdbdb22 100644
--- a/sw-ui/src/main/resources/images/cards/quarry.png
+++ b/sw-ui/src/jsMain/resources/images/cards/quarry.png
diff --git a/sw-ui/src/main/resources/images/cards/sawmill.png b/sw-ui/src/jsMain/resources/images/cards/sawmill.png
index 5abff473..5abff473 100644
--- a/sw-ui/src/main/resources/images/cards/sawmill.png
+++ b/sw-ui/src/jsMain/resources/images/cards/sawmill.png
diff --git a/sw-ui/src/main/resources/images/cards/school.png b/sw-ui/src/jsMain/resources/images/cards/school.png
index ab2218d0..ab2218d0 100644
--- a/sw-ui/src/main/resources/images/cards/school.png
+++ b/sw-ui/src/jsMain/resources/images/cards/school.png
diff --git a/sw-ui/src/main/resources/images/cards/scientistsguild.png b/sw-ui/src/jsMain/resources/images/cards/scientistsguild.png
index 7ee639e3..7ee639e3 100644
--- a/sw-ui/src/main/resources/images/cards/scientistsguild.png
+++ b/sw-ui/src/jsMain/resources/images/cards/scientistsguild.png
diff --git a/sw-ui/src/main/resources/images/cards/scriptorium.png b/sw-ui/src/jsMain/resources/images/cards/scriptorium.png
index 36dca27a..36dca27a 100644
--- a/sw-ui/src/main/resources/images/cards/scriptorium.png
+++ b/sw-ui/src/jsMain/resources/images/cards/scriptorium.png
diff --git a/sw-ui/src/main/resources/images/cards/senate.png b/sw-ui/src/jsMain/resources/images/cards/senate.png
index ee878ea6..ee878ea6 100644
--- a/sw-ui/src/main/resources/images/cards/senate.png
+++ b/sw-ui/src/jsMain/resources/images/cards/senate.png
diff --git a/sw-ui/src/main/resources/images/cards/shipownersguild.png b/sw-ui/src/jsMain/resources/images/cards/shipownersguild.png
index 3eecd2da..3eecd2da 100644
--- a/sw-ui/src/main/resources/images/cards/shipownersguild.png
+++ b/sw-ui/src/jsMain/resources/images/cards/shipownersguild.png
diff --git a/sw-ui/src/main/resources/images/cards/siegeworkshop.png b/sw-ui/src/jsMain/resources/images/cards/siegeworkshop.png
index bacf8309..bacf8309 100644
--- a/sw-ui/src/main/resources/images/cards/siegeworkshop.png
+++ b/sw-ui/src/jsMain/resources/images/cards/siegeworkshop.png
diff --git a/sw-ui/src/main/resources/images/cards/spiesguild.png b/sw-ui/src/jsMain/resources/images/cards/spiesguild.png
index 85e28d9e..85e28d9e 100644
--- a/sw-ui/src/main/resources/images/cards/spiesguild.png
+++ b/sw-ui/src/jsMain/resources/images/cards/spiesguild.png
diff --git a/sw-ui/src/main/resources/images/cards/stables.png b/sw-ui/src/jsMain/resources/images/cards/stables.png
index 48c963f0..48c963f0 100644
--- a/sw-ui/src/main/resources/images/cards/stables.png
+++ b/sw-ui/src/jsMain/resources/images/cards/stables.png
diff --git a/sw-ui/src/main/resources/images/cards/statue.png b/sw-ui/src/jsMain/resources/images/cards/statue.png
index 55aaa5cb..55aaa5cb 100644
--- a/sw-ui/src/main/resources/images/cards/statue.png
+++ b/sw-ui/src/jsMain/resources/images/cards/statue.png
diff --git a/sw-ui/src/main/resources/images/cards/stockade.png b/sw-ui/src/jsMain/resources/images/cards/stockade.png
index 37741429..37741429 100644
--- a/sw-ui/src/main/resources/images/cards/stockade.png
+++ b/sw-ui/src/jsMain/resources/images/cards/stockade.png
diff --git a/sw-ui/src/main/resources/images/cards/stonepit.png b/sw-ui/src/jsMain/resources/images/cards/stonepit.png
index 724900c7..724900c7 100644
--- a/sw-ui/src/main/resources/images/cards/stonepit.png
+++ b/sw-ui/src/jsMain/resources/images/cards/stonepit.png
diff --git a/sw-ui/src/main/resources/images/cards/strategistsguild.png b/sw-ui/src/jsMain/resources/images/cards/strategistsguild.png
index ae186a4b..ae186a4b 100644
--- a/sw-ui/src/main/resources/images/cards/strategistsguild.png
+++ b/sw-ui/src/jsMain/resources/images/cards/strategistsguild.png
diff --git a/sw-ui/src/main/resources/images/cards/study.png b/sw-ui/src/jsMain/resources/images/cards/study.png
index d8b9ebf9..d8b9ebf9 100644
--- a/sw-ui/src/main/resources/images/cards/study.png
+++ b/sw-ui/src/jsMain/resources/images/cards/study.png
diff --git a/sw-ui/src/main/resources/images/cards/tavern.png b/sw-ui/src/jsMain/resources/images/cards/tavern.png
index 418b0fb2..418b0fb2 100644
--- a/sw-ui/src/main/resources/images/cards/tavern.png
+++ b/sw-ui/src/jsMain/resources/images/cards/tavern.png
diff --git a/sw-ui/src/main/resources/images/cards/temple.png b/sw-ui/src/jsMain/resources/images/cards/temple.png
index 9a8d89dc..9a8d89dc 100644
--- a/sw-ui/src/main/resources/images/cards/temple.png
+++ b/sw-ui/src/jsMain/resources/images/cards/temple.png
diff --git a/sw-ui/src/main/resources/images/cards/theater.png b/sw-ui/src/jsMain/resources/images/cards/theater.png
index 0d5b2b01..0d5b2b01 100644
--- a/sw-ui/src/main/resources/images/cards/theater.png
+++ b/sw-ui/src/jsMain/resources/images/cards/theater.png
diff --git a/sw-ui/src/main/resources/images/cards/timberyard.png b/sw-ui/src/jsMain/resources/images/cards/timberyard.png
index 0f20547f..0f20547f 100644
--- a/sw-ui/src/main/resources/images/cards/timberyard.png
+++ b/sw-ui/src/jsMain/resources/images/cards/timberyard.png
diff --git a/sw-ui/src/main/resources/images/cards/townhall.png b/sw-ui/src/jsMain/resources/images/cards/townhall.png
index d0638739..d0638739 100644
--- a/sw-ui/src/main/resources/images/cards/townhall.png
+++ b/sw-ui/src/jsMain/resources/images/cards/townhall.png
diff --git a/sw-ui/src/main/resources/images/cards/tradersguild.png b/sw-ui/src/jsMain/resources/images/cards/tradersguild.png
index 15777e77..15777e77 100644
--- a/sw-ui/src/main/resources/images/cards/tradersguild.png
+++ b/sw-ui/src/jsMain/resources/images/cards/tradersguild.png
diff --git a/sw-ui/src/main/resources/images/cards/trainingground.png b/sw-ui/src/jsMain/resources/images/cards/trainingground.png
index d59ef4f8..d59ef4f8 100644
--- a/sw-ui/src/main/resources/images/cards/trainingground.png
+++ b/sw-ui/src/jsMain/resources/images/cards/trainingground.png
diff --git a/sw-ui/src/main/resources/images/cards/treefarm.png b/sw-ui/src/jsMain/resources/images/cards/treefarm.png
index 18cf228f..18cf228f 100644
--- a/sw-ui/src/main/resources/images/cards/treefarm.png
+++ b/sw-ui/src/jsMain/resources/images/cards/treefarm.png
diff --git a/sw-ui/src/main/resources/images/cards/university.png b/sw-ui/src/jsMain/resources/images/cards/university.png
index c9ca8a80..c9ca8a80 100644
--- a/sw-ui/src/main/resources/images/cards/university.png
+++ b/sw-ui/src/jsMain/resources/images/cards/university.png
diff --git a/sw-ui/src/main/resources/images/cards/vineyard.png b/sw-ui/src/jsMain/resources/images/cards/vineyard.png
index 58fa8ee1..58fa8ee1 100644
--- a/sw-ui/src/main/resources/images/cards/vineyard.png
+++ b/sw-ui/src/jsMain/resources/images/cards/vineyard.png
diff --git a/sw-ui/src/main/resources/images/cards/walls.png b/sw-ui/src/jsMain/resources/images/cards/walls.png
index 3823c62f..3823c62f 100644
--- a/sw-ui/src/main/resources/images/cards/walls.png
+++ b/sw-ui/src/jsMain/resources/images/cards/walls.png
diff --git a/sw-ui/src/main/resources/images/cards/westtradingpost.png b/sw-ui/src/jsMain/resources/images/cards/westtradingpost.png
index b536269f..b536269f 100644
--- a/sw-ui/src/main/resources/images/cards/westtradingpost.png
+++ b/sw-ui/src/jsMain/resources/images/cards/westtradingpost.png
diff --git a/sw-ui/src/main/resources/images/cards/workersguild.png b/sw-ui/src/jsMain/resources/images/cards/workersguild.png
index de4f452f..de4f452f 100644
--- a/sw-ui/src/main/resources/images/cards/workersguild.png
+++ b/sw-ui/src/jsMain/resources/images/cards/workersguild.png
diff --git a/sw-ui/src/main/resources/images/cards/workshop.png b/sw-ui/src/jsMain/resources/images/cards/workshop.png
index 8f585d61..8f585d61 100644
--- a/sw-ui/src/main/resources/images/cards/workshop.png
+++ b/sw-ui/src/jsMain/resources/images/cards/workshop.png
diff --git a/sw-ui/src/main/resources/images/gear-50.png b/sw-ui/src/jsMain/resources/images/gear-50.png
index 93a4a186..93a4a186 100644
--- a/sw-ui/src/main/resources/images/gear-50.png
+++ b/sw-ui/src/jsMain/resources/images/gear-50.png
diff --git a/sw-ui/src/main/resources/images/hand-cards5.png b/sw-ui/src/jsMain/resources/images/hand-cards5.png
index 1e2199cd..1e2199cd 100644
--- a/sw-ui/src/main/resources/images/hand-cards5.png
+++ b/sw-ui/src/jsMain/resources/images/hand-cards5.png
diff --git a/sw-ui/src/main/resources/images/logo-7-wonders.png b/sw-ui/src/jsMain/resources/images/logo-7-wonders.png
index 96974d3e..96974d3e 100644
--- a/sw-ui/src/main/resources/images/logo-7-wonders.png
+++ b/sw-ui/src/jsMain/resources/images/logo-7-wonders.png
diff --git a/sw-ui/src/main/resources/images/tokens/coin.png b/sw-ui/src/jsMain/resources/images/tokens/coin.png
index f4813042..f4813042 100644
--- a/sw-ui/src/main/resources/images/tokens/coin.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/coin.png
diff --git a/sw-ui/src/main/resources/images/tokens/laurel-blue.png b/sw-ui/src/jsMain/resources/images/tokens/laurel-blue.png
index 115bba91..115bba91 100644
--- a/sw-ui/src/main/resources/images/tokens/laurel-blue.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/laurel-blue.png
diff --git a/sw-ui/src/main/resources/images/tokens/military/defeat1.png b/sw-ui/src/jsMain/resources/images/tokens/military/defeat1.png
index 1c61bf4c..1c61bf4c 100644
--- a/sw-ui/src/main/resources/images/tokens/military/defeat1.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/military/defeat1.png
diff --git a/sw-ui/src/main/resources/images/tokens/military/shield.png b/sw-ui/src/jsMain/resources/images/tokens/military/shield.png
index 3a0e1dea..3a0e1dea 100644
--- a/sw-ui/src/main/resources/images/tokens/military/shield.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/military/shield.png
diff --git a/sw-ui/src/main/resources/images/tokens/military/victory1.png b/sw-ui/src/jsMain/resources/images/tokens/military/victory1.png
index 6b9aff29..6b9aff29 100644
--- a/sw-ui/src/main/resources/images/tokens/military/victory1.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/military/victory1.png
diff --git a/sw-ui/src/main/resources/images/tokens/resources/clay.png b/sw-ui/src/jsMain/resources/images/tokens/resources/clay.png
index 72fc0b0e..72fc0b0e 100644
--- a/sw-ui/src/main/resources/images/tokens/resources/clay.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/resources/clay.png
diff --git a/sw-ui/src/main/resources/images/tokens/resources/glass.png b/sw-ui/src/jsMain/resources/images/tokens/resources/glass.png
index 61fd2be5..61fd2be5 100644
--- a/sw-ui/src/main/resources/images/tokens/resources/glass.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/resources/glass.png
diff --git a/sw-ui/src/main/resources/images/tokens/resources/loom.png b/sw-ui/src/jsMain/resources/images/tokens/resources/loom.png
index 294adcb2..294adcb2 100644
--- a/sw-ui/src/main/resources/images/tokens/resources/loom.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/resources/loom.png
diff --git a/sw-ui/src/main/resources/images/tokens/resources/ore.png b/sw-ui/src/jsMain/resources/images/tokens/resources/ore.png
index c2149daa..c2149daa 100644
--- a/sw-ui/src/main/resources/images/tokens/resources/ore.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/resources/ore.png
diff --git a/sw-ui/src/main/resources/images/tokens/resources/papyrus.png b/sw-ui/src/jsMain/resources/images/tokens/resources/papyrus.png
index 91a59221..91a59221 100644
--- a/sw-ui/src/main/resources/images/tokens/resources/papyrus.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/resources/papyrus.png
diff --git a/sw-ui/src/main/resources/images/tokens/resources/stone.png b/sw-ui/src/jsMain/resources/images/tokens/resources/stone.png
index 674c40db..674c40db 100644
--- a/sw-ui/src/main/resources/images/tokens/resources/stone.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/resources/stone.png
diff --git a/sw-ui/src/main/resources/images/tokens/resources/wood.png b/sw-ui/src/jsMain/resources/images/tokens/resources/wood.png
index 09a4ede8..09a4ede8 100644
--- a/sw-ui/src/main/resources/images/tokens/resources/wood.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/resources/wood.png
diff --git a/sw-ui/src/main/resources/images/tokens/science/cog.png b/sw-ui/src/jsMain/resources/images/tokens/science/cog.png
index 61250d8a..61250d8a 100644
--- a/sw-ui/src/main/resources/images/tokens/science/cog.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/science/cog.png
diff --git a/sw-ui/src/main/resources/images/tokens/science/compass.png b/sw-ui/src/jsMain/resources/images/tokens/science/compass.png
index 6497e34f..6497e34f 100644
--- a/sw-ui/src/main/resources/images/tokens/science/compass.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/science/compass.png
diff --git a/sw-ui/src/main/resources/images/tokens/science/tablet.png b/sw-ui/src/jsMain/resources/images/tokens/science/tablet.png
index 954fd9ef..954fd9ef 100644
--- a/sw-ui/src/main/resources/images/tokens/science/tablet.png
+++ b/sw-ui/src/jsMain/resources/images/tokens/science/tablet.png
diff --git a/sw-ui/src/main/resources/images/wonder-upgrade-bright.png b/sw-ui/src/jsMain/resources/images/wonder-upgrade-bright.png
index 0f59c068..0f59c068 100644
--- a/sw-ui/src/main/resources/images/wonder-upgrade-bright.png
+++ b/sw-ui/src/jsMain/resources/images/wonder-upgrade-bright.png
diff --git a/sw-ui/src/main/resources/images/wonders/alexandriaA.png b/sw-ui/src/jsMain/resources/images/wonders/alexandriaA.png
index 0d4135f3..0d4135f3 100644
--- a/sw-ui/src/main/resources/images/wonders/alexandriaA.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/alexandriaA.png
diff --git a/sw-ui/src/main/resources/images/wonders/alexandriaB.png b/sw-ui/src/jsMain/resources/images/wonders/alexandriaB.png
index dd072f8a..dd072f8a 100644
--- a/sw-ui/src/main/resources/images/wonders/alexandriaB.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/alexandriaB.png
diff --git a/sw-ui/src/main/resources/images/wonders/babylonA.png b/sw-ui/src/jsMain/resources/images/wonders/babylonA.png
index ae323c78..ae323c78 100644
--- a/sw-ui/src/main/resources/images/wonders/babylonA.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/babylonA.png
diff --git a/sw-ui/src/main/resources/images/wonders/babylonB.png b/sw-ui/src/jsMain/resources/images/wonders/babylonB.png
index 3780dc9d..3780dc9d 100644
--- a/sw-ui/src/main/resources/images/wonders/babylonB.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/babylonB.png
diff --git a/sw-ui/src/main/resources/images/wonders/ephesosA.png b/sw-ui/src/jsMain/resources/images/wonders/ephesosA.png
index 307794ba..307794ba 100644
--- a/sw-ui/src/main/resources/images/wonders/ephesosA.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/ephesosA.png
diff --git a/sw-ui/src/main/resources/images/wonders/ephesosB.png b/sw-ui/src/jsMain/resources/images/wonders/ephesosB.png
index ec2e9cb7..ec2e9cb7 100644
--- a/sw-ui/src/main/resources/images/wonders/ephesosB.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/ephesosB.png
diff --git a/sw-ui/src/main/resources/images/wonders/extra/agrigentoA.jpg b/sw-ui/src/jsMain/resources/images/wonders/extra/agrigentoA.jpg
index 76ba8195..76ba8195 100644
--- a/sw-ui/src/main/resources/images/wonders/extra/agrigentoA.jpg
+++ b/sw-ui/src/jsMain/resources/images/wonders/extra/agrigentoA.jpg
diff --git a/sw-ui/src/main/resources/images/wonders/extra/angkorwatA.jpg b/sw-ui/src/jsMain/resources/images/wonders/extra/angkorwatA.jpg
index 32f52514..32f52514 100644
--- a/sw-ui/src/main/resources/images/wonders/extra/angkorwatA.jpg
+++ b/sw-ui/src/jsMain/resources/images/wonders/extra/angkorwatA.jpg
diff --git a/sw-ui/src/main/resources/images/wonders/extra/angkorwatB.jpg b/sw-ui/src/jsMain/resources/images/wonders/extra/angkorwatB.jpg
index c3f4304e..c3f4304e 100644
--- a/sw-ui/src/main/resources/images/wonders/extra/angkorwatB.jpg
+++ b/sw-ui/src/jsMain/resources/images/wonders/extra/angkorwatB.jpg
diff --git a/sw-ui/src/main/resources/images/wonders/extra/avalonA.jpg b/sw-ui/src/jsMain/resources/images/wonders/extra/avalonA.jpg
index 7f7f0678..7f7f0678 100644
--- a/sw-ui/src/main/resources/images/wonders/extra/avalonA.jpg
+++ b/sw-ui/src/jsMain/resources/images/wonders/extra/avalonA.jpg
diff --git a/sw-ui/src/main/resources/images/wonders/extra/ctesiphonB.jpg b/sw-ui/src/jsMain/resources/images/wonders/extra/ctesiphonB.jpg
index c00b40ac..c00b40ac 100644
--- a/sw-ui/src/main/resources/images/wonders/extra/ctesiphonB.jpg
+++ b/sw-ui/src/jsMain/resources/images/wonders/extra/ctesiphonB.jpg
diff --git a/sw-ui/src/main/resources/images/wonders/extra/iramA.jpg b/sw-ui/src/jsMain/resources/images/wonders/extra/iramA.jpg
index d2c24e95..d2c24e95 100644
--- a/sw-ui/src/main/resources/images/wonders/extra/iramA.jpg
+++ b/sw-ui/src/jsMain/resources/images/wonders/extra/iramA.jpg
diff --git a/sw-ui/src/main/resources/images/wonders/extra/persepolisA.jpg b/sw-ui/src/jsMain/resources/images/wonders/extra/persepolisA.jpg
index 2caa4f89..2caa4f89 100644
--- a/sw-ui/src/main/resources/images/wonders/extra/persepolisA.jpg
+++ b/sw-ui/src/jsMain/resources/images/wonders/extra/persepolisA.jpg
diff --git a/sw-ui/src/main/resources/images/wonders/extra/romaA.jpg b/sw-ui/src/jsMain/resources/images/wonders/extra/romaA.jpg
index c54bc820..c54bc820 100644
--- a/sw-ui/src/main/resources/images/wonders/extra/romaA.jpg
+++ b/sw-ui/src/jsMain/resources/images/wonders/extra/romaA.jpg
diff --git a/sw-ui/src/main/resources/images/wonders/extra/sangri-laA.jpg b/sw-ui/src/jsMain/resources/images/wonders/extra/sangri-laA.jpg
index 1c5dad97..1c5dad97 100644
--- a/sw-ui/src/main/resources/images/wonders/extra/sangri-laA.jpg
+++ b/sw-ui/src/jsMain/resources/images/wonders/extra/sangri-laA.jpg
diff --git a/sw-ui/src/main/resources/images/wonders/extra/spahanA.jpg b/sw-ui/src/jsMain/resources/images/wonders/extra/spahanA.jpg
index ab2cfc84..ab2cfc84 100644
--- a/sw-ui/src/main/resources/images/wonders/extra/spahanA.jpg
+++ b/sw-ui/src/jsMain/resources/images/wonders/extra/spahanA.jpg
diff --git a/sw-ui/src/main/resources/images/wonders/extra/the-great-wallA.jpg b/sw-ui/src/jsMain/resources/images/wonders/extra/the-great-wallA.jpg
index 4aacd39b..4aacd39b 100644
--- a/sw-ui/src/main/resources/images/wonders/extra/the-great-wallA.jpg
+++ b/sw-ui/src/jsMain/resources/images/wonders/extra/the-great-wallA.jpg
diff --git a/sw-ui/src/main/resources/images/wonders/extra/veniseA.jpg b/sw-ui/src/jsMain/resources/images/wonders/extra/veniseA.jpg
index 55ec00b5..55ec00b5 100644
--- a/sw-ui/src/main/resources/images/wonders/extra/veniseA.jpg
+++ b/sw-ui/src/jsMain/resources/images/wonders/extra/veniseA.jpg
diff --git a/sw-ui/src/main/resources/images/wonders/extra/veniseB.jpg b/sw-ui/src/jsMain/resources/images/wonders/extra/veniseB.jpg
index e18f3a12..e18f3a12 100644
--- a/sw-ui/src/main/resources/images/wonders/extra/veniseB.jpg
+++ b/sw-ui/src/jsMain/resources/images/wonders/extra/veniseB.jpg
diff --git a/sw-ui/src/main/resources/images/wonders/gizahA.png b/sw-ui/src/jsMain/resources/images/wonders/gizahA.png
index e66735fb..e66735fb 100644
--- a/sw-ui/src/main/resources/images/wonders/gizahA.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/gizahA.png
diff --git a/sw-ui/src/main/resources/images/wonders/gizahB.png b/sw-ui/src/jsMain/resources/images/wonders/gizahB.png
index ed55ed45..ed55ed45 100644
--- a/sw-ui/src/main/resources/images/wonders/gizahB.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/gizahB.png
diff --git a/sw-ui/src/main/resources/images/wonders/halikarnassusA.png b/sw-ui/src/jsMain/resources/images/wonders/halikarnassusA.png
index 659f706e..659f706e 100644
--- a/sw-ui/src/main/resources/images/wonders/halikarnassusA.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/halikarnassusA.png
diff --git a/sw-ui/src/main/resources/images/wonders/halikarnassusB.png b/sw-ui/src/jsMain/resources/images/wonders/halikarnassusB.png
index b6ae1f93..b6ae1f93 100644
--- a/sw-ui/src/main/resources/images/wonders/halikarnassusB.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/halikarnassusB.png
diff --git a/sw-ui/src/main/resources/images/wonders/olympiaA.png b/sw-ui/src/jsMain/resources/images/wonders/olympiaA.png
index 478ed503..478ed503 100644
--- a/sw-ui/src/main/resources/images/wonders/olympiaA.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/olympiaA.png
diff --git a/sw-ui/src/main/resources/images/wonders/olympiaB.png b/sw-ui/src/jsMain/resources/images/wonders/olympiaB.png
index a97a9524..a97a9524 100644
--- a/sw-ui/src/main/resources/images/wonders/olympiaB.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/olympiaB.png
diff --git a/sw-ui/src/main/resources/images/wonders/rhodosA.png b/sw-ui/src/jsMain/resources/images/wonders/rhodosA.png
index 0c11a71a..0c11a71a 100644
--- a/sw-ui/src/main/resources/images/wonders/rhodosA.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/rhodosA.png
diff --git a/sw-ui/src/main/resources/images/wonders/rhodosB.png b/sw-ui/src/jsMain/resources/images/wonders/rhodosB.png
index 43e5d594..43e5d594 100644
--- a/sw-ui/src/main/resources/images/wonders/rhodosB.png
+++ b/sw-ui/src/jsMain/resources/images/wonders/rhodosB.png
diff --git a/sw-ui/src/main/resources/index.html b/sw-ui/src/jsMain/resources/index.html
index b43c1428..b43c1428 100644
--- a/sw-ui/src/main/resources/index.html
+++ b/sw-ui/src/jsMain/resources/index.html
diff --git a/sw-ui/src/test/kotlin/org/luxons/sevenwonders/ui/redux/sagas/SagasFrameworkTest.kt b/sw-ui/src/jsTest/kotlin/org/luxons/sevenwonders/ui/redux/sagas/SagasFrameworkTest.kt
index f810c8b9..f810c8b9 100644
--- a/sw-ui/src/test/kotlin/org/luxons/sevenwonders/ui/redux/sagas/SagasFrameworkTest.kt
+++ b/sw-ui/src/jsTest/kotlin/org/luxons/sevenwonders/ui/redux/sagas/SagasFrameworkTest.kt
diff --git a/sw-ui/src/test/kotlin/org/luxons/sevenwonders/ui/utils/CoroutineUtilsTest.kt b/sw-ui/src/jsTest/kotlin/org/luxons/sevenwonders/ui/utils/CoroutineUtilsTest.kt
index ef8dfb62..ef8dfb62 100644
--- a/sw-ui/src/test/kotlin/org/luxons/sevenwonders/ui/utils/CoroutineUtilsTest.kt
+++ b/sw-ui/src/jsTest/kotlin/org/luxons/sevenwonders/ui/utils/CoroutineUtilsTest.kt