diff --git a/app/build.gradle b/app/build.gradle
index 71e450fef..bfc151a3f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,13 +48,10 @@ dependencies {
     api 'com.vladsch.flexmark:flexmark-ext-yaml-front-matter:0.64.8'
     api 'com.vladsch.flexmark:flexmark-ext-toc:0.64.8'
 
-    api ('io.modelcontextprotocol.sdk:mcp-core:0.17.2')  {
+    api ('io.modelcontextprotocol.sdk:mcp-core:1.0.0')  {
         exclude group: "com.ethlo.time", module: "itu"
     }
-    api ('io.modelcontextprotocol.sdk:mcp-json:0.17.2')  {
-        exclude group: "com.ethlo.time", module: "itu"
-    }
-    api ('io.modelcontextprotocol.sdk:mcp-json-jackson2:0.17.2')  {
+    api ('io.modelcontextprotocol.sdk:mcp-json-jackson2:1.0.0')  {
         exclude group: "com.ethlo.time", module: "itu"
         exclude group: "com.fasterxml.jackson.dataformat", module: "jackson-dataformat-yaml"
     }
@@ -72,7 +69,7 @@ dependencies {
     api 'info.picocli:picocli:4.7.7'
     api 'org.apache.commons:commons-lang3:3.20.0'
     api 'io.sentry:sentry:8.20.0'
-    api 'commons-io:commons-io:2.21.1'
+    api 'commons-io:commons-io:2.21.0'
     api "com.fasterxml.jackson.core:jackson-databind:2.21.1"
     api "com.fasterxml.jackson.core:jackson-annotations:2.21"
     api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.1"
diff --git a/app/src/main/java/io/xpipe/app/beacon/mcp/AppMcpServer.java b/app/src/main/java/io/xpipe/app/beacon/mcp/AppMcpServer.java
index 32d44c1ee..6ff52c427 100644
--- a/app/src/main/java/io/xpipe/app/beacon/mcp/AppMcpServer.java
+++ b/app/src/main/java/io/xpipe/app/beacon/mcp/AppMcpServer.java
@@ -1,5 +1,6 @@
 package io.xpipe.app.beacon.mcp;
 
+import io.modelcontextprotocol.json.jackson2.JacksonMcpJsonMapper;
 import io.xpipe.app.core.AppNames;
 import io.xpipe.app.core.AppProperties;
 import io.xpipe.app.issue.ErrorEventFactory;
@@ -10,7 +11,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import io.modelcontextprotocol.common.McpTransportContext;
-import io.modelcontextprotocol.json.jackson.JacksonMcpJsonMapper;
 import io.modelcontextprotocol.server.McpServerFeatures;
 import io.modelcontextprotocol.server.McpSyncServer;
 import io.modelcontextprotocol.spec.HttpHeaders;
diff --git a/app/src/main/java/io/xpipe/app/beacon/mcp/HttpStreamableServerTransportProvider.java b/app/src/main/java/io/xpipe/app/beacon/mcp/HttpStreamableServerTransportProvider.java
index e20b759d2..039122c9e 100644
--- a/app/src/main/java/io/xpipe/app/beacon/mcp/HttpStreamableServerTransportProvider.java
+++ b/app/src/main/java/io/xpipe/app/beacon/mcp/HttpStreamableServerTransportProvider.java
@@ -83,7 +83,7 @@ public class HttpStreamableServerTransportProvider implements McpStreamableServe
 
     public List<String> protocolVersions() {
         return List.of(
-                ProtocolVersions.MCP_2024_11_05, ProtocolVersions.MCP_2025_03_26, ProtocolVersions.MCP_2025_06_18);
+                ProtocolVersions.MCP_2024_11_05, ProtocolVersions.MCP_2025_03_26, ProtocolVersions.MCP_2025_06_18, ProtocolVersions.MCP_2025_11_25);
     }
 
     @Override
diff --git a/app/src/main/java/io/xpipe/app/beacon/mcp/McpTools.java b/app/src/main/java/io/xpipe/app/beacon/mcp/McpTools.java
index bb4772c17..0d5a4db9a 100644
--- a/app/src/main/java/io/xpipe/app/beacon/mcp/McpTools.java
+++ b/app/src/main/java/io/xpipe/app/beacon/mcp/McpTools.java
@@ -1,5 +1,6 @@
 package io.xpipe.app.beacon.mcp;
 
+import io.modelcontextprotocol.json.jackson2.JacksonMcpJsonMapper;
 import io.xpipe.app.beacon.AppBeaconServer;
 import io.xpipe.app.core.AppExtensionManager;
 import io.xpipe.app.core.AppNames;
@@ -18,7 +19,6 @@ import io.xpipe.core.FilePath;
 import io.xpipe.core.JacksonMapper;
 
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import io.modelcontextprotocol.json.jackson.JacksonMcpJsonMapper;
 import io.modelcontextprotocol.server.McpServerFeatures;
 import io.modelcontextprotocol.spec.McpSchema;
 import lombok.Builder;
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 16d92fdeb..f6272cb6b 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
@@ -38,19 +38,19 @@
     -fx-padding: 0.8em;
 }
 
-.root:light .toggle-switch-comp > .thumb {
+.root:light:windows .toggle-switch-comp > .thumb {
     -fx-background-color: -color-neutral-emphasis;
 }
 
-.root:light .toggle-switch-comp > .thumb-area {
+.root:light:windows .toggle-switch-comp > .thumb-area {
     -fx-background-color: -color-border-default, -color-bg-subtle;
 }
 
-.root:light .toggle-switch:selected > .thumb {
+.root:light:windows .toggle-switch:selected > .thumb {
     -fx-background-color: -color-accent-emphasis, -color-fg-emphasis;
     -fx-opacity: 1;
 }
 
-.root:light .toggle-switch:selected > .thumb-area {
+.root:light:windows .toggle-switch:selected > .thumb-area {
     -fx-background-color: -color-accent-emphasis, -color-accent-emphasis;
 }
diff --git a/gradle/gradle_scripts/extension.gradle b/gradle/gradle_scripts/extension.gradle
index adfc30be9..1607876b1 100644
--- a/gradle/gradle_scripts/extension.gradle
+++ b/gradle/gradle_scripts/extension.gradle
@@ -56,7 +56,7 @@ dependencies {
     compileOnly project(':app')
     compileOnly 'net.synedra:validatorfx:0.4.2'
     compileOnly files("$rootDir/gradle/gradle_scripts/atlantafx-base-2.0.2.jar")
-    compileOnly 'commons-io:commons-io:2.21.1'
+    compileOnly 'commons-io:commons-io:2.21.0'
     compileOnly "org.kordamp.ikonli:ikonli-javafx:12.4.0"
 
     if (project != project(':base')) {
diff --git a/gradle/gradle_scripts/modules.gradle b/gradle/gradle_scripts/modules.gradle
index 0c88834d8..7e05590d9 100644
--- a/gradle/gradle_scripts/modules.gradle
+++ b/gradle/gradle_scripts/modules.gradle
@@ -67,7 +67,6 @@ extraJavaModuleInfo {
 
 extraJavaModuleInfo {
     module("io.modelcontextprotocol.sdk:mcp-core", "io.modelcontextprotocol.sdk.mcp") {
-        mergeJar("io.modelcontextprotocol.sdk:mcp-json")
         mergeJar("io.modelcontextprotocol.sdk:mcp-json-jackson2")
         overrideModuleName()
         exportAllPackages()