From e9bba8129c8e751448d5d2d60e44f7eb34c57e8e Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Fri, 13 Mar 2026 01:21:20 +0000
Subject: [PATCH] Rework

---
 .../io/xpipe/app/comp/base/AppLayoutComp.java |  1 +
 .../java/io/xpipe/app/prefs/McpCategory.java  |  1 -
 .../io/xpipe/app/resources/style/category.css |  5 +++
 .../resources/style/toggle-switch-comp.css    | 42 ++++++++++++-------
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java b/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java
index 70f64c7a8..24ded7573 100644
--- a/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java
@@ -74,6 +74,7 @@ public class AppLayoutComp extends RegionStructureBuilder<BorderPane, AppLayoutC
                         modal.addButton(new ModalButton("restart", () -> AppRestart.restart(), true, true));
                         modal.show();
                     }, Duration.ofSeconds(1));
+                    AppPrefs.get().getRequiresRestart().set(false);
                 }
             }
 
diff --git a/app/src/main/java/io/xpipe/app/prefs/McpCategory.java b/app/src/main/java/io/xpipe/app/prefs/McpCategory.java
index 9ce21f39c..f296f9037 100644
--- a/app/src/main/java/io/xpipe/app/prefs/McpCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/McpCategory.java
@@ -135,7 +135,6 @@ public class McpCategory extends AppPrefsCategory {
                         .addToggle(prefs.enableMcpServer)
                         .nameAndDescription("mcpClientConfigurationDetails")
                         .addComp(tabComp)
-                        .hide(prefs.enableMcpServer.not())
                         .pref(prefs.enableMcpMutationTools)
                         .addToggle(prefs.enableMcpMutationTools)
                         .hide(prefs.enableMcpServer.not())
diff --git a/app/src/main/resources/io/xpipe/app/resources/style/category.css b/app/src/main/resources/io/xpipe/app/resources/style/category.css
index 60c6219a9..adce3663c 100644
--- a/app/src/main/resources/io/xpipe/app/resources/style/category.css
+++ b/app/src/main/resources/io/xpipe/app/resources/style/category.css
@@ -7,6 +7,11 @@
     -fx-background-insets: 0;
 }
 
+.root:nord .category-button {
+    -fx-background-radius: 0;
+    -fx-border-radius: 0;
+}
+
 .category-button .name .text-field {
     -fx-padding: 0.25em 0.1em;
     -fx-background-color: transparent;
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 e70d21328..1e16fea57 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
@@ -20,10 +20,11 @@
 
 .root:windows .toggle-switch-comp > .thumb-area {
     -fx-padding: 0.65em 1.5em;
+    -fx-background-insets: 0, 1;
 }
 
 .root:windows .toggle-switch-comp > .thumb {
-    -fx-background-insets: 0.25em;
+    -fx-background-insets: 0.2em;
     -fx-background-radius: 1em;
     -fx-padding: 0.7em;
 }
@@ -32,26 +33,19 @@
     -fx-background-radius: 0em;
 }
 
-.root:macos .toggle-switch-comp > .thumb-area {
-    -fx-padding: 0.8em 1.4em;
-}
-
-.root:macos .toggle-switch-comp > .thumb {
-    -fx-background-insets: 0.15em;
-    -fx-background-radius: 1em;
-    -fx-padding: 0.8em;
-}
-
-.root:macos:nord .toggle-switch-comp > .thumb {
-    -fx-background-radius: 0em;
+.root:windows:nord .toggle-switch-comp > .thumb-area {
+    -fx-border-radius: 0;
 }
 
 .root:light .toggle-switch-comp > .thumb {
-    -fx-background-color: -color-neutral-emphasis;
+    -fx-background-color: -color-fg-emphasis;
 }
 
 .root:light .toggle-switch-comp > .thumb-area {
-    -fx-background-color: -color-border-default, -color-bg-subtle;
+    -fx-border-radius: 1em;
+    -fx-border-width: 1;
+    -fx-border-color: derive(-color-border-default, -5%);
+    -fx-background-color: derive(-color-neutral-muted, -8%);
 }
 
 .root:light .toggle-switch:selected > .thumb {
@@ -62,3 +56,21 @@
 .root:light .toggle-switch:selected > .thumb-area {
     -fx-background-color: -color-accent-emphasis, -color-accent-emphasis;
 }
+
+.root:macos .toggle-switch-comp > .thumb-area {
+    -fx-padding: 0.8em 1.4em;
+}
+
+.root:macos .toggle-switch-comp > .thumb {
+    -fx-background-insets: 0.15em;
+    -fx-background-radius: 1em;
+    -fx-padding: 0.8em 1.2em 0.8em 1.2em;
+}
+
+.root:macos:nord .toggle-switch-comp > .thumb {
+    -fx-background-radius: 0em;
+}
+
+.root:macos:nord .toggle-switch-comp > .thumb-area {
+    -fx-border-radius: 0;
+}