From ada66ebf5044ddfe83bf8670f8bbfc5453e86106 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Fri, 20 Mar 2026 15:52:20 +0000
Subject: [PATCH] Rework

---
 .../io/xpipe/app/terminal/TerminalMultiplexerManager.java   | 6 ++++--
 .../io/xpipe/app/terminal/ZellijTerminalMultiplexer.java    | 5 +----
 .../io/xpipe/app/resources/style/toggle-switch-comp.css     | 4 ++--
 dist/changelog/22.0.md                                      | 1 +
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexerManager.java b/app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexerManager.java
index 215e1112b..9940456ff 100644
--- a/app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexerManager.java
+++ b/app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexerManager.java
@@ -77,8 +77,10 @@ public class TerminalMultiplexerManager {
 
                 ThreadHelper.sleep(100);
             }
-            // Give multiplexer a second to start in terminal
-            ThreadHelper.sleep(1000);
+
+            // We timed out
+            pendingMultiplexerLaunch = null;
+            runningMultiplexerContainer = null;
         }
 
         // Synchronize between multiple existing tab launches as well as some multiplexers might break there
diff --git a/app/src/main/java/io/xpipe/app/terminal/ZellijTerminalMultiplexer.java b/app/src/main/java/io/xpipe/app/terminal/ZellijTerminalMultiplexer.java
index 44450391d..dbeff58ab 100644
--- a/app/src/main/java/io/xpipe/app/terminal/ZellijTerminalMultiplexer.java
+++ b/app/src/main/java/io/xpipe/app/terminal/ZellijTerminalMultiplexer.java
@@ -89,10 +89,7 @@ public class ZellijTerminalMultiplexer implements TerminalMultiplexer {
                 "zellij -s xpipe action new-tab --name \"" + escape(config.getColoredTitle(), false, true) + "\"",
                 "zellij -s xpipe action write-chars -- " + escape(" " + firstCommand, true, true) + "\\;exit",
                 "zellij -s xpipe action write 10",
-                "zellij -s xpipe action clear",
-                "zellij -s xpipe action rename-tab \"" + escape(config.getColoredTitle(), false, true) + "\"",
-                "zellij -s xpipe action go-to-previous-tab",
-                "zellij -s xpipe action close-tab"));
+                "zellij -s xpipe action clear"));
 
         if (config.getPanes().size() > 1) {
             var splitIterator =
diff --git a/app/src/main/resources/io/xpipe/app/resources/style/toggle-switch-comp.css b/app/src/main/resources/io/xpipe/app/resources/style/toggle-switch-comp.css
index c3777b2d6..e3657c3d7 100644
--- a/app/src/main/resources/io/xpipe/app/resources/style/toggle-switch-comp.css
+++ b/app/src/main/resources/io/xpipe/app/resources/style/toggle-switch-comp.css
@@ -72,10 +72,10 @@
     -fx-padding: 0.7em 1.0em 0.7em 1.0em;
 }
 
-.root:macos:nord .toggle-switch-comp > .thumb {
+.root:light:nord .toggle-switch-comp > .thumb, .root:dark:nord .toggle-switch-comp > .thumb {
     -fx-background-radius: 0em;
 }
 
-.root:macos:nord .toggle-switch-comp > .thumb-area {
+.root:light:nord .toggle-switch-comp > .thumb-area, .root:dark:nord .toggle-switch-comp > .thumb-area {
     -fx-border-radius: 0;
 }
diff --git a/dist/changelog/22.0.md b/dist/changelog/22.0.md
index 89df6ecfd..1ac325e04 100644
--- a/dist/changelog/22.0.md
+++ b/dist/changelog/22.0.md
@@ -77,3 +77,4 @@ The filtering performance also has been improved, so any filter changes now upda
 - Improve timeout handling for shells to allow for a quicker shell init
 - Fix SSH being broken when a custom alias to a modified ssh command was set in a shell rc file
 - Fix shell scripts for mixed environments, e.g. a powershell script in cmd environment, not properly running
+- The SSH connection property `proxy` in the API has been renamed to `gateway` to be more consistent with other connections