diff --git a/.woodpecker.yml b/.woodpecker.yml
index 0f77c96..138b08a 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -3,7 +3,7 @@
 
 pipeline:
   export_metadata:
-    image: gradle:jdk19-jammy
+    image: gradle:jdk20-jammy
     pull: true
     commands:
       - mkdir public
@@ -15,20 +15,20 @@ pipeline:
     commands:
       - ./platform_jars.sh
   build_wrapper:
-    image: gradle:jdk19-jammy
+    image: gradle:jdk20-jammy
     commands:
       - gradle --build-cache :wrapper:build -Pflavor=windows -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
       - cp wrapper/build/libs/*.exe public/wrapper.exe
       - cp wrapper/build/libs/*-all.jar public/wrapper.jar
   publish_debug:
-    image: gradle:jdk19-jammy
+    image: gradle:jdk20-jammy
     commands:
       - gradle --build-cache build publish -Pflavor=maven -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
     secrets: [ maven_token, maven_name ]
     when:
       - branch: master
   publish_release:
-    image: gradle:jdk19-jammy
+    image: gradle:jdk20-jammy
     commands:
       - gradle --build-cache build publish -Pflavor=maven -Ppublic -Prelease
     secrets: [ maven_token, maven_name ]
diff --git a/build.gradle.kts b/build.gradle.kts
index 7ef8e81..c49a8ca 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,7 @@ val jbAnnotationsVersion by extra("24.0.1")
 val lwjglVersion by extra("3.3.2")
 val imguiVersion by extra("1.86.10")
 // launcher-gtk
-val javagiVersion by extra("0.6.1")
+val javagiVersion by extra("0.7.2")
 
 val flavorProp: String by extra(prop("flavor", "custom"))
 if (!setOf("custom", "maven", "fat", "windows", "linux", "macos").contains(flavorProp)) throw IllegalStateException("Unsupported flavor: $flavorProp")
diff --git a/buildSrc/src/main/kotlin/inceptum.java.gradle.kts b/buildSrc/src/main/kotlin/inceptum.java.gradle.kts
index af4cac0..f166941 100644
--- a/buildSrc/src/main/kotlin/inceptum.java.gradle.kts
+++ b/buildSrc/src/main/kotlin/inceptum.java.gradle.kts
@@ -3,12 +3,6 @@ plugins {
     `maven-publish`
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(20))
-    }
-}
-
 repositories {
     mavenCentral()
     maven("https://maven.frohnmeyer-wds.de/artifacts")
@@ -42,7 +36,6 @@ afterEvaluate {
     if (hasProperty("offline")) {
         tasks.withType(JavaExec::class) {
             environment("G_ORIGINAL_EXECUTABLE", executable ?: "java")
-            //TODO once we are not using a toolchain, just do executable(rootDir.resolve("buildSrc/java-offline"))
             val originalMetadata = javaLauncher.get().metadata
             val field = org.gradle.api.internal.provider.AbstractProperty::class.java.getDeclaredField("value")
             field.isAccessible = true
diff --git a/launcher-gtk/build.gradle.kts b/launcher-gtk/build.gradle.kts
index 8cabde0..6368c1e 100644
--- a/launcher-gtk/build.gradle.kts
+++ b/launcher-gtk/build.gradle.kts
@@ -17,20 +17,14 @@ samWithReceiver {
 
 repositories {
     mavenLocal()
-    maven("https://jitpack.io") {
-        content {
-            includeGroup("com.github.jwharm.java-gi")
-            includeGroup("com.github.jwharm")
-        }
-    }
 }
 
 dependencies {
     val javagiVersion: String by rootProject.extra
 
-    implementation("com.github.jwharm.java-gi:glib:$javagiVersion")
-    implementation("com.github.jwharm.java-gi:gtk:$javagiVersion")
-    implementation("com.github.jwharm.java-gi:adwaita:$javagiVersion")
+    //implementation("io.github.jwharm.javagi:glib:$javagiVersion")
+    //implementation("io.github.jwharm.javagi:gtk:$javagiVersion")
+    implementation("io.github.jwharm.javagi:adw:$javagiVersion")
     implementation(project(":launcher"))
 }
 
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.kt
index 333680e..bc11618 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.kt
@@ -1,7 +1,6 @@
 package io.gitlab.jfronny.inceptum.gtk
 
 import io.gitlab.jfronny.commons.StringFormatter
-import io.gitlab.jfronny.inceptum.common.Utils
 import io.gitlab.jfronny.inceptum.gtk.util.I18n
 import io.gitlab.jfronny.inceptum.gtk.util.Log
 import io.gitlab.jfronny.inceptum.gtk.window.dialog.MicrosoftLoginDialog
@@ -75,33 +74,29 @@ object GtkEnvBackend : EnvBackend {
         ok: Runnable?,
         cancel: Runnable?
     ) {
-        val dialog = AlertDialog("")
-        dialog.message = title
-        dialog.detail = markup
-        dialog.modal = true
+        val dialog = AlertDialog.builder()
+            .message(title)
+            .detail(markup)
+            .modal(true)
         when {
-            cancel == null -> {
-                dialog.setButtons(arrayOf(I18n["ok"]))
-                dialog.defaultButton = 0
-                dialog.cancelButton = -1
-            }
-            ok == null -> {
-                dialog.setButtons(arrayOf("Cancel"))
-                dialog.defaultButton = -1
-                dialog.cancelButton = 0
-            }
-            else -> {
-                dialog.setButtons(arrayOf("OK", "Cancel"))
-                dialog.defaultButton = 0
-                dialog.cancelButton = 1
-            }
+            cancel == null -> dialog.buttons(arrayOf(I18n["ok"]))
+                .defaultButton(0)
+                .cancelButton(-1)
+            ok == null -> dialog.buttons(arrayOf("Cancel"))
+                .defaultButton(-1)
+                .cancelButton(0)
+            else -> dialog.buttons(arrayOf("OK", "Cancel"))
+                .defaultButton(0)
+                .cancelButton(1)
         }
-        dialog.choose(parent, Cancellable()) { _, res, _ ->
-            val result = dialog.chooseFinish(res)
-            val cancelIdx = dialog.cancelButton
-            val defaultIdx = dialog.defaultButton
-            if (result == cancelIdx) cancel?.run()
-            if (result == defaultIdx) ok?.run()
+        dialog.build().apply {
+            choose(parent, Cancellable()) { _, res, _ ->
+                val result = chooseFinish(res)
+                val cancelIdx = cancelButton
+                val defaultIdx = defaultButton
+                if (result == cancelIdx) cancel?.run()
+                if (result == defaultIdx) ok?.run()
+            }
         }
     }
 
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMain.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMain.kt
index 24fb435..04d0240 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMain.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMain.kt
@@ -2,7 +2,6 @@ package io.gitlab.jfronny.inceptum.gtk
 
 import io.gitlab.jfronny.inceptum.common.BuildMetadata
 import io.gitlab.jfronny.inceptum.common.MetaHolder
-import io.gitlab.jfronny.inceptum.common.Utils
 import io.gitlab.jfronny.inceptum.gtk.util.Log
 import io.gitlab.jfronny.inceptum.gtk.window.MainWindow
 import io.gitlab.jfronny.inceptum.launcher.LauncherEnv
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.kt
index 83db82b..a32a086 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.kt
@@ -3,7 +3,6 @@ package io.gitlab.jfronny.inceptum.gtk
 import io.gitlab.jfronny.commons.OSUtils
 import io.gitlab.jfronny.commons.io.JFiles
 import io.gitlab.jfronny.inceptum.common.MetaHolder
-import io.gitlab.jfronny.inceptum.common.Utils
 import io.gitlab.jfronny.inceptum.gtk.menu.MenuBuilder
 import io.gitlab.jfronny.inceptum.gtk.util.I18n
 import io.gitlab.jfronny.inceptum.gtk.util.Log
@@ -22,8 +21,8 @@ import io.gitlab.jfronny.inceptum.launcher.system.launch.InstanceLauncher
 import io.gitlab.jfronny.inceptum.launcher.system.launch.LaunchType
 import io.gitlab.jfronny.inceptum.launcher.system.setup.Steps
 import io.gitlab.jfronny.inceptum.launcher.util.ProcessState
-import org.gnome.gdk.Clipboard
 import org.gnome.gio.Cancellable
+import org.gnome.gio.Menu
 import org.gnome.gtk.*
 import java.awt.Toolkit
 import java.awt.datatransfer.DataFlavor
@@ -69,7 +68,7 @@ object GtkMenubar {
         file.button("exit") { app.quit() }
         launchMenu = menu.submenu("launch")
         generateLaunchMenu(app)
-        accountsMenu = menu.submenu("account")
+        accountsMenu = MenuBuilder(app, Menu(), "account") // this should ideally be menu.submenu("account"), but that causes a segfault
         generateAccountsMenu(app)
         val help = menu.submenu("help")
         help.button("about") { AboutWindow.createAndShow() }
@@ -81,7 +80,7 @@ object GtkMenubar {
     @JvmStatic
     fun generateNewMenu(app: Application) {
         newMenu!!.clear()
-        newMenu!!.button("new") { NewInstanceWindow(app).show() }
+        newMenu!!.button("new") { NewInstanceWindow(app).visible = true }
         newMenu!!.button("file") {
             val dialog = FileChooserNative(
                 I18n["menu.file.new.file"],
@@ -204,11 +203,11 @@ object GtkMenubar {
     @JvmStatic
     fun generateAccountsMenu(app: Application) {
         accountsMenu!!.clear()
-        accountsMenu!!.button("new") { MicrosoftLoginDialog(GtkEnvBackend.dialogParent).show() }
+        accountsMenu!!.button("new") { MicrosoftLoginDialog(GtkEnvBackend.dialogParent).visible = true }
         accountsMenu!!.button("manage") {
             val window = LauncherSettingsWindow(app)
             window.activePage = "settings.accounts"
-            window.show()
+            window.visible = true
         }
         val accounts: MutableList<MicrosoftAccount?> = ArrayList(AccountManager.getAccounts())
         accounts.add(null)
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/KDropDown.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/KDropDown.kt
index 85252f5..fa3c4e7 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/KDropDown.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/KDropDown.kt
@@ -6,7 +6,6 @@ import org.gnome.gtk.PropertyExpression
 import org.gnome.gtk.StringList
 import org.gnome.gtk.StringObject
 import org.jetbrains.annotations.PropertyKey
-import java.util.ArrayList
 import java.util.function.IntConsumer
 
 class KDropDown<T>(options: Array<T>, private val stringify: (T) -> String, selected: Int): DropDown(options.toModel(stringify), null) {
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/KSignalListItemFactory.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/KSignalListItemFactory.kt
index 4942a72..7d60899 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/KSignalListItemFactory.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/KSignalListItemFactory.kt
@@ -1,13 +1,13 @@
 package io.gitlab.jfronny.inceptum.gtk.control
 
-import io.github.jwharm.javagi.base.Signal
+import io.github.jwharm.javagi.gobject.SignalConnection
 import org.gnome.gtk.ListItem
 import org.gnome.gtk.SignalListItemFactory
 import org.gnome.gtk.StringObject
 import org.gnome.gtk.Widget
 
 abstract class KSignalListItemFactory<TData, TWidget : Widget> : SignalListItemFactory() {
-    private val toDisconnect: MutableMap<String, MutableSet<Signal<*>>> = HashMap()
+    private val toDisconnect: MutableMap<String, MutableSet<SignalConnection<*>>> = HashMap()
     init {
         onSetup {
             val li = it as ListItem
@@ -41,14 +41,14 @@ abstract class KSignalListItemFactory<TData, TWidget : Widget> : SignalListItemF
     }
 
     interface BindContext: ActionContext {
-        fun registerForUnbind(signal: Signal<*>)
+        fun registerForUnbind(signal: SignalConnection<*>)
     }
 
     interface UnbindContext: ActionContext {
     }
 
     private inner class BindContextImpl(private val id: String, override val listItem: ListItem) : BindContext {
-        override fun registerForUnbind(signal: Signal<*>) {
+        override fun registerForUnbind(signal: SignalConnection<*>) {
             toDisconnect.computeIfAbsent(id) { _ -> HashSet() }
                 .add(signal)
         }
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/assistant/KAssistant.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/assistant/KAssistant.kt
index ba094af..f784510 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/assistant/KAssistant.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/assistant/KAssistant.kt
@@ -1,6 +1,5 @@
 package io.gitlab.jfronny.inceptum.gtk.control.assistant
 
-import io.gitlab.jfronny.inceptum.common.Utils
 import io.gitlab.jfronny.inceptum.gtk.util.Log
 import org.gnome.gtk.Application
 import org.gnome.gtk.Assistant
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.kt
index 32a2cc5..667f10d 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.kt
@@ -1,12 +1,11 @@
 package io.gitlab.jfronny.inceptum.gtk.menu
 
+import io.github.jwharm.javagi.glib.types.VariantTypes
 import io.gitlab.jfronny.commons.throwable.ThrowingRunnable
-import io.gitlab.jfronny.inceptum.common.Utils
 import io.gitlab.jfronny.inceptum.gtk.util.I18n
 import io.gitlab.jfronny.inceptum.gtk.util.Log
 import org.gnome.gio.*
 import org.gnome.glib.Variant
-import org.gnome.glib.VariantType
 import org.gnome.gtk.Application
 import org.gnome.gtk.MenuButton
 import org.gnome.gtk.PopoverMenu
@@ -89,7 +88,7 @@ class MenuBuilder private constructor(map: ActionMap, menu: Menu, prefix: String
     ): BuiltRadioItem<T> {
         var name = name
         name = prefix + name
-        val action = SimpleAction.newStateful(name, VariantType("i"), Variant.newInt32(options.indexOf(initial)))
+        val action = SimpleAction.newStateful(name, VariantTypes.INT32, Variant.newInt32(options.indexOf(initial)))
         addAction(name, action)
         action.onActivate { variant: Variant? ->
             action.state = variant
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/util/Memory.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/util/Memory.kt
index cdf41d2..f9fa510 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/util/Memory.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/util/Memory.kt
@@ -1,7 +1,6 @@
 package io.gitlab.jfronny.inceptum.gtk.util
 
 import io.gitlab.jfronny.commons.OSUtils
-import io.gitlab.jfronny.inceptum.common.Utils
 import java.io.IOException
 import java.nio.file.Files
 import java.nio.file.Path
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/util/UIExt.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/util/UIExt.kt
index 7465271..ca03727 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/util/UIExt.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/util/UIExt.kt
@@ -2,11 +2,7 @@ package io.gitlab.jfronny.inceptum.gtk.util
 
 import io.gitlab.jfronny.inceptum.gtk.control.ILabel
 import org.gnome.adw.ActionRow
-import org.gnome.gtk.Entry
-import org.gnome.gtk.EntryBuffer
-import org.gnome.gtk.Label
-import org.gnome.gtk.MessageDialog
-import org.gnome.gtk.Widget
+import org.gnome.gtk.*
 
 var Widget.margin: Int
     set(value) {
@@ -35,12 +31,4 @@ var MessageDialog.markup: String
 
 fun ActionRow.fixSubtitle() = ILabel.theme(firstChild!!.lastChild!!.prevSibling!!.lastChild as Label, ILabel.Mode.SUBTITLE)
 
-// Work around a segfault with empty entries
-var Entry.kText: String?
-    get() = text
-    set(value) {
-        if (value == "") buffer.clear()
-        else text = value
-    }
-
 fun EntryBuffer.clear() = deleteText(0, length)
\ No newline at end of file
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/AboutWindow.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/AboutWindow.kt
index 19e41f1..07e80af 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/AboutWindow.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/AboutWindow.kt
@@ -25,7 +25,7 @@ class AboutWindow : AboutDialog() {
     companion object {
         @JvmStatic
         fun createAndShow() {
-            AboutWindow().show()
+            AboutWindow().visible = true
         }
     }
 }
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/MainWindow.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/MainWindow.kt
index 7e4aae7..8de4852 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/MainWindow.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/MainWindow.kt
@@ -54,7 +54,7 @@ class MainWindow(app: Application) : ApplicationWindow(app) {
 
         val uiMenu = MenuBuilder(app, Menu(), "hamburger")
         uiMenu.button("support") { Utils.openWebBrowser(URI("https://git.frohnmeyer-wds.de/JfMods/Inceptum/issues")) }
-        uiMenu.button("preferences") { LauncherSettingsWindow(app).show() }
+        uiMenu.button("preferences") { LauncherSettingsWindow(app).visible = true }
         uiMenu.button("about") { AboutWindow.createAndShow() }
         val menuButton = MenuButton()
         menuButton.iconName = "open-menu-symbolic"
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/create/NewInstanceWindow.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/create/NewInstanceWindow.kt
index 92c350f..534d212 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/create/NewInstanceWindow.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/create/NewInstanceWindow.kt
@@ -1,17 +1,13 @@
 package io.gitlab.jfronny.inceptum.gtk.window.create
 
 import io.gitlab.jfronny.commons.StringFormatter
-import io.gitlab.jfronny.commons.io.JFiles
 import io.gitlab.jfronny.inceptum.common.InceptumConfig
-import io.gitlab.jfronny.inceptum.common.MetaHolder
-import io.gitlab.jfronny.inceptum.common.Utils
 import io.gitlab.jfronny.inceptum.gtk.control.KDropDown
 import io.gitlab.jfronny.inceptum.gtk.control.KEntry
 import io.gitlab.jfronny.inceptum.gtk.control.assistant.KAssistant
 import io.gitlab.jfronny.inceptum.gtk.schedule
 import io.gitlab.jfronny.inceptum.gtk.util.I18n
 import io.gitlab.jfronny.inceptum.gtk.util.Log
-import io.gitlab.jfronny.inceptum.gtk.util.kText
 import io.gitlab.jfronny.inceptum.gtk.util.toTypedArray
 import io.gitlab.jfronny.inceptum.gtk.window.dialog.ProcessStateWatcherDialog
 import io.gitlab.jfronny.inceptum.launcher.api.FabricMetaApi
@@ -24,7 +20,6 @@ import io.gitlab.jfronny.inceptum.launcher.system.setup.SetupStepInfo
 import io.gitlab.jfronny.inceptum.launcher.system.setup.Steps
 import org.gnome.glib.GLib
 import org.gnome.gtk.*
-import java.io.IOException
 
 
 class NewInstanceWindow(app: Application) : KAssistant(app) {
@@ -105,7 +100,7 @@ class NewInstanceWindow(app: Application) : KAssistant(app) {
             append(entry)
             onOpen {
                 name = InstanceNameTool.getDefaultName(gameVersion!!.id, useFabric)
-                entry.kText = name
+                entry.text = name
             }
 
             setComplete(true)
@@ -145,21 +140,19 @@ class NewInstanceWindow(app: Application) : KAssistant(app) {
                     try {
                         for (step in Steps.STEPS) {
                             if (state.isCancelled) {
-                                try {
-                                    JFiles.deleteRecursive(MetaHolder.INSTANCE_DIR.resolve(state.name))
-                                } catch (e: IOException) {
-                                    Log.error("Could not delete instance dir", e)
-                                }
+                                state.tryRemoveInstance()
                                 return@Thread
                             }
                             pState.incrementStep(step.name)
                             step.execute(state)
                         }
+                        state.clearSetupLock()
                     } catch (e: Throwable) {
                         pState.cancel()
                         Log.error("Could not create instance")
                         failureMessage = StringFormatter.toString(e)
                         isFailure = true
+                        state.tryRemoveInstance()
                     } finally {
                         finished = true
                         schedule { setComplete(true) }
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/ProcessStateWatcherDialog.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/ProcessStateWatcherDialog.kt
index bea2b63..29b6e53 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/ProcessStateWatcherDialog.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/ProcessStateWatcherDialog.kt
@@ -2,7 +2,6 @@ package io.gitlab.jfronny.inceptum.gtk.window.dialog
 
 import io.gitlab.jfronny.commons.StringFormatter
 import io.gitlab.jfronny.commons.throwable.ThrowingRunnable
-import io.gitlab.jfronny.inceptum.common.Utils
 import io.gitlab.jfronny.inceptum.gtk.GtkEnvBackend
 import io.gitlab.jfronny.inceptum.gtk.schedule
 import io.gitlab.jfronny.inceptum.gtk.util.I18n
@@ -96,7 +95,7 @@ class ProcessStateWatcherDialog(
             executor: ThrowingRunnable<*>
         ): ProcessStateWatcherDialog {
             val dialog = ProcessStateWatcherDialog(parent, title, errorMessage, state, executor)
-            dialog.show()
+            dialog.visible = true
             return dialog
         }
     }
diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/GeneralTab.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/GeneralTab.kt
index aeecef3..c072d44 100644
--- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/GeneralTab.kt
+++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/GeneralTab.kt
@@ -40,7 +40,7 @@ class GeneralTab(window: InstanceSettingsWindow) : SectionedSettingsTab<Instance
                         val newPath = MetaHolder.INSTANCE_DIR.resolve(InstanceNameTool.getNextValid(entry.text))
                         Files.move(instance.path, newPath)
                         window.close()
-                        InstanceSettingsWindow(window.application, InstanceList.read(newPath)).show()
+                        InstanceSettingsWindow(window.application, InstanceList.read(newPath)).visible = true
                     } catch (e: IOException) {
                         showError("Could not rename", e)
                     }
@@ -230,7 +230,7 @@ class GeneralTab(window: InstanceSettingsWindow) : SectionedSettingsTab<Instance
                             else -> {}
                         }
                     }
-                    dialog.show()
+                    dialog.visible = true
                 }
             }
             row("instance.directory", "instance.directory.subtitle") {
diff --git a/launcher-gtk/src/main/kotlin/module-info.java b/launcher-gtk/src/main/kotlin/module-info.java
index 5d1a639..ccd720a 100644
--- a/launcher-gtk/src/main/kotlin/module-info.java
+++ b/launcher-gtk/src/main/kotlin/module-info.java
@@ -4,7 +4,8 @@ module io.gitlab.jfronny.inceptum.launcher.gtk {
     requires kotlin.stdlib;
     requires org.gnome.glib;
     requires org.gnome.gtk;
-    requires org.gnome.adwaita;
+    requires org.gnome.adw;
+    requires org.gnome.pango;
 
     // Should theoretically already be included transitively through inceptum.launcher and inceptum.common
     requires io.gitlab.jfronny.commons;
diff --git a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/AddModWindow.java b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/AddModWindow.java
index 6f334a3..cf9a6fc 100644
--- a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/AddModWindow.java
+++ b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/AddModWindow.java
@@ -93,7 +93,7 @@ public class AddModWindow extends Window {
                                 ImGui.text("Installed");
                             } else {
                                 if (ImGui.button("Add##" + projectId)) {
-                                    ModrinthVersion latest = ModrinthApi.getLatestVersion(projectId, instance.getGameVersion());
+                                    ModrinthVersion latest = ModrinthApi.getLatestVersions(projectId, instance.getGameVersion()).latest();
                                     if (latest == null) {
                                         LauncherEnv.showError("No valid version could be identified for this mod", "No version found");
                                     } else {
diff --git a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/GuiUtil.java b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/GuiUtil.java
index 9f95881..f0bfe27 100644
--- a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/GuiUtil.java
+++ b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/GuiUtil.java
@@ -2,7 +2,6 @@ package io.gitlab.jfronny.inceptum.imgui.window;
 
 import io.gitlab.jfronny.commons.io.JFiles;
 import io.gitlab.jfronny.inceptum.common.MetaHolder;
-import io.gitlab.jfronny.inceptum.common.Utils;
 import io.gitlab.jfronny.inceptum.imgui.GuiMain;
 import io.gitlab.jfronny.inceptum.imgui.window.dialog.ProcessStateWatcherWindow;
 import io.gitlab.jfronny.inceptum.launcher.LauncherEnv;
@@ -44,17 +43,14 @@ public class GuiUtil {
         GuiMain.open(new ProcessStateWatcherWindow("Creating Instance", "Could not create instance", pState, () -> {
             for (Step step : Steps.STEPS) {
                 if (state.isCancelled()) {
-                    try {
-                        JFiles.deleteRecursive(MetaHolder.INSTANCE_DIR.resolve(state.name()));
-                    } catch (IOException e) {
-                        Utils.LOGGER.error("Could not delete instance dir", e);
-                    }
+                    state.tryRemoveInstance();
                     return;
                 }
                 pState.incrementStep(step.getName());
                 step.execute(state);
             }
+            state.clearSetupLock();
             LauncherEnv.showInfo("The instance was successfully created. You can now launch it using the main menu", "Successfully installed");
-        }));
+        }, t -> state.tryRemoveInstance()));
     }
 }
diff --git a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/dialog/ProcessStateWatcherWindow.java b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/dialog/ProcessStateWatcherWindow.java
index 652ca24..5aa1649 100644
--- a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/dialog/ProcessStateWatcherWindow.java
+++ b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/dialog/ProcessStateWatcherWindow.java
@@ -1,16 +1,22 @@
 package io.gitlab.jfronny.inceptum.imgui.window.dialog;
 
 import imgui.ImGui;
+import io.gitlab.jfronny.commons.ref.R;
 import io.gitlab.jfronny.commons.throwable.ThrowingRunnable;
 import io.gitlab.jfronny.inceptum.imgui.window.Window;
 import io.gitlab.jfronny.inceptum.launcher.LauncherEnv;
 import io.gitlab.jfronny.inceptum.launcher.util.ProcessState;
 
+import java.util.function.Consumer;
+
 public class ProcessStateWatcherWindow extends Window {
     private final ProcessState state;
     private boolean finished;
-
     public ProcessStateWatcherWindow(String title, String errorMessage, ProcessState state, ThrowingRunnable<?> executor) {
+        this(title, errorMessage, state, executor, R::nop);
+    }
+
+    public ProcessStateWatcherWindow(String title, String errorMessage, ProcessState state, ThrowingRunnable<?> executor, Consumer<Throwable> onFail) {
         super(title);
         this.state = state;
         new Thread(() -> {
@@ -18,6 +24,7 @@ public class ProcessStateWatcherWindow extends Window {
                 executor.run();
             } catch (Throwable e) {
                 state.cancel();
+                onFail.accept(e);
                 LauncherEnv.showError(errorMessage, e);
             } finally {
                 finished = true;
diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/SetupStepInfo.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/SetupStepInfo.java
index 07e3f18..7fcb0d7 100644
--- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/SetupStepInfo.java
+++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/SetupStepInfo.java
@@ -1,9 +1,16 @@
 package io.gitlab.jfronny.inceptum.launcher.system.setup;
 
+import io.gitlab.jfronny.commons.io.JFiles;
+import io.gitlab.jfronny.inceptum.common.MetaHolder;
+import io.gitlab.jfronny.inceptum.common.Utils;
 import io.gitlab.jfronny.inceptum.launcher.model.mojang.VersionInfo;
+import io.gitlab.jfronny.inceptum.launcher.system.instance.Instance;
 import io.gitlab.jfronny.inceptum.launcher.system.instance.LoaderInfo;
 import io.gitlab.jfronny.inceptum.launcher.util.ProcessState;
 
+import java.io.IOException;
+import java.nio.file.Files;
+
 public record SetupStepInfo(VersionInfo version,
                             LoaderInfo loader,
                             String name,
@@ -15,4 +22,23 @@ public record SetupStepInfo(VersionInfo version,
     public boolean isCancelled() {
         return currentState.isCancelled();
     }
+
+    public void tryRemoveInstance() {
+        try {
+            removeInstance();
+        } catch (IOException e) {
+            Utils.LOGGER.error("Could not delete instance dir", e);
+        }
+    }
+
+    public void removeInstance() throws IOException {
+        JFiles.deleteRecursive(MetaHolder.INSTANCE_DIR.resolve(name));
+    }
+
+    public void clearSetupLock() {
+        try {
+            Files.deleteIfExists(MetaHolder.INSTANCE_DIR.resolve(name).resolve(Instance.SETUP_LOCK_NAME));
+        } catch (IOException ignored) {
+        }
+    }
 }
diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/Steps.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/Steps.java
index 2ca6f4b..28a7e44 100644
--- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/Steps.java
+++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/Steps.java
@@ -15,11 +15,11 @@ import java.util.*;
 public class Steps {
     public static Set<Step> STEPS = new LinkedHashSet<>(List.of(
             new SetupDirsStep(),
+            new WriteMetadataStep(),
             new DownloadJavaStep(),
             new DownloadClientStep(),
             new DownloadLibrariesStep(),
             new DownloadAssetsStep(),
-            new WriteMetadataStep(),
             new RunMdsStep()
     ));
 
@@ -29,24 +29,28 @@ public class Steps {
 
     public static void reDownload(Instance instance, ProcessState state) throws IOException {
         if (instance.isLocked()) return;
-        boolean found = false;
-        for (VersionsListInfo version : McApi.getVersions().versions()) {
-            if (version.id.equals(instance.getGameVersion())) {
-                found = true;
-                VersionInfo vi = McApi.getVersionInfo(version);
-                if (instance.isFabric())
-                    vi = FabricMetaApi.addFabric(vi, instance.getLoaderVersion(), FabricMetaApi.FabricVersionInfoType.Both);
-                LoaderInfo li = instance.isFabric()
-                        ? new LoaderInfo(LoaderInfo.Type.Fabric, instance.getLoaderVersion())
-                        : LoaderInfo.NONE;
-                SetupStepInfo info = new SetupStepInfo(vi, li, instance.getName(), state);
-                for (Step step : Steps.STEPS) {
-                    state.incrementStep(step.getName());
-                    step.execute(info);
-                    if (state.isCancelled()) return;
+        try {
+            boolean found = false;
+            for (VersionsListInfo version : McApi.getVersions().versions()) {
+                if (version.id.equals(instance.getGameVersion())) {
+                    found = true;
+                    VersionInfo vi = McApi.getVersionInfo(version);
+                    if (instance.isFabric())
+                        vi = FabricMetaApi.addFabric(vi, instance.getLoaderVersion(), FabricMetaApi.FabricVersionInfoType.Both);
+                    LoaderInfo li = instance.isFabric()
+                            ? new LoaderInfo(LoaderInfo.Type.Fabric, instance.getLoaderVersion())
+                            : LoaderInfo.NONE;
+                    SetupStepInfo info = new SetupStepInfo(vi, li, instance.getName(), state);
+                    for (Step step : Steps.STEPS) {
+                        state.incrementStep(step.getName());
+                        step.execute(info);
+                        if (state.isCancelled()) return;
+                    }
                 }
             }
+            if (!found) throw new IOException("Could not identify minecraft version " + instance.getGameVersion());
+        } finally {
+            instance.setSetupLock(false);
         }
-        if (!found) throw new IOException("Could not identify minecraft version " + instance.getGameVersion());
     }
 }
diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/WriteMetadataStep.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/WriteMetadataStep.java
index 0a6b19d..cd1cc0a 100644
--- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/WriteMetadataStep.java
+++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/WriteMetadataStep.java
@@ -22,7 +22,6 @@ public class WriteMetadataStep implements Step {
             meta.gameVersion = info.version().id;
             GC_InstanceMeta.write(meta, metaPath);
         }
-        Instance.setSetupLock(instance, false);
         if (!Files.exists(instance.resolve(".gitignore"))) {
             Files.writeString(instance.resolve(".gitignore"), """
                     realms_persistence.json