diff --git a/pom.xml b/pom.xml
index f26e854e46..73bb5cce21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <configuration>
-                        <skippedModules>webfx-kit-javafxweb-registry,webfx-kit-javafxweb-registry-gwt-j2cl,webfx-kit-javafxgraphics-fat-j2cl</skippedModules>
+                        <skippedModules>webfx-kit-cssprotocol-java-plugin,webfx-kit-javafxweb-registry,webfx-kit-javafxweb-registry-gwt-j2cl,webfx-kit-javafxgraphics-fat-j2cl</skippedModules>
                     </configuration>
                 </plugin>
             </plugins>
diff --git a/webfx-kit/pom.xml b/webfx-kit/pom.xml
index 4399666c0c..391edba357 100644
--- a/webfx-kit/pom.xml
+++ b/webfx-kit/pom.xml
@@ -21,6 +21,7 @@
         <module>webfx-kit-javafxgraphics-emul</module>
         <module>webfx-kit-javafxmedia-emul</module>
         <module>webfx-kit-javafxweb-emul</module>
+        <module>webfx-kit-cssprotocol-openjfx-plugin</module>
         <module>webfx-kit-javafxcontrols-peers-base</module>
         <module>webfx-kit-javafxcontrols-peers-gwt-j2cl</module>
         <module>webfx-kit-javafxcontrols-registry</module>
diff --git a/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/pom.xml b/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/pom.xml
new file mode 100644
index 0000000000..c2de2f1e94
--- /dev/null
+++ b/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- File managed by WebFX (DO NOT EDIT MANUALLY) -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>dev.webfx</groupId>
+        <artifactId>webfx-kit</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>webfx-kit-cssprotocol-openjfx-plugin</artifactId>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>dev.webfx</groupId>
+            <artifactId>webfx-kit-launcher</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/launcher/spi/impl/openjfx/CssProtocol.java b/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/src/main/java/dev/webfx/kit/css/protocol/CssProtocol.java
similarity index 95%
rename from webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/launcher/spi/impl/openjfx/CssProtocol.java
rename to webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/src/main/java/dev/webfx/kit/css/protocol/CssProtocol.java
index c3575deef0..967e62788d 100644
--- a/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/launcher/spi/impl/openjfx/CssProtocol.java
+++ b/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/src/main/java/dev/webfx/kit/css/protocol/CssProtocol.java
@@ -1,4 +1,4 @@
-package dev.webfx.kit.launcher.spi.impl.openjfx;
+package dev.webfx.kit.css.protocol;
 
 import dev.webfx.kit.launcher.WebFxKitLauncher;
 
diff --git a/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/src/main/java/module-info.java b/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/src/main/java/module-info.java
new file mode 100644
index 0000000000..b043b0847f
--- /dev/null
+++ b/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/src/main/java/module-info.java
@@ -0,0 +1,14 @@
+// File managed by WebFX (DO NOT EDIT MANUALLY)
+
+module webfx.kit.cssprotocol.openjfx.plugin {
+
+    // Direct dependencies modules
+    requires webfx.kit.launcher;
+
+    // Exported packages
+    exports dev.webfx.kit.css.protocol;
+
+    // Provided services
+    provides java.net.spi.URLStreamHandlerProvider with dev.webfx.kit.css.protocol.CssProtocol;
+
+}
\ No newline at end of file
diff --git a/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider b/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider
new file mode 100644
index 0000000000..20db444716
--- /dev/null
+++ b/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider
@@ -0,0 +1 @@
+dev.webfx.kit.css.protocol.CssProtocol
diff --git a/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/webfx.xml b/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/webfx.xml
new file mode 100644
index 0000000000..3280750cd7
--- /dev/null
+++ b/webfx-kit/webfx-kit-cssprotocol-openjfx-plugin/webfx.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+
+    <exported-packages>
+        <source-packages/>
+        <resource-packages/>
+    </exported-packages>
+
+    <dependencies>
+        <used-by-source-modules/>
+    </dependencies>
+
+    <providers>
+        <provider interface="java.net.spi.URLStreamHandlerProvider">dev.webfx.kit.css.protocol.CssProtocol</provider>
+    </providers>
+
+</project>
\ No newline at end of file
diff --git a/webfx-kit/webfx-kit-javafxgraphics-openjfx/pom.xml b/webfx-kit/webfx-kit-javafxgraphics-openjfx/pom.xml
index 0760d4bfbc..ccbeb75c9e 100644
--- a/webfx-kit/webfx-kit-javafxgraphics-openjfx/pom.xml
+++ b/webfx-kit/webfx-kit-javafxgraphics-openjfx/pom.xml
@@ -30,6 +30,13 @@
             <artifactId>javafx-graphics</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>dev.webfx</groupId>
+            <artifactId>webfx-kit-cssprotocol-openjfx-plugin</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>dev.webfx</groupId>
             <artifactId>webfx-kit-javafxgraphics-peers</artifactId>
diff --git a/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/module-info.java b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/module-info.java
index 7b6c41aaf1..e60e0f9116 100644
--- a/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/module-info.java
+++ b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/module-info.java
@@ -23,6 +23,5 @@
     // Provided services
     provides dev.webfx.kit.launcher.spi.WebFxKitLauncherProvider with dev.webfx.kit.launcher.spi.impl.openjfx.JavaFxWebFxKitLauncherProvider;
     provides dev.webfx.platform.uischeduler.spi.UiSchedulerProvider with dev.webfx.platform.uischeduler.spi.impl.openjfx.FxUiSchedulerProvider;
-    provides java.net.spi.URLStreamHandlerProvider with dev.webfx.kit.launcher.spi.impl.openjfx.CssProtocol;
 
 }
\ No newline at end of file
diff --git a/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider
deleted file mode 100644
index a48a9fec47..0000000000
--- a/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider
+++ /dev/null
@@ -1 +0,0 @@
-dev.webfx.kit.launcher.spi.impl.openjfx.CssProtocol
diff --git a/webfx-kit/webfx-kit-javafxgraphics-openjfx/webfx.xml b/webfx-kit/webfx-kit-javafxgraphics-openjfx/webfx.xml
index b4eeb291dc..a02b78458c 100644
--- a/webfx-kit/webfx-kit-javafxgraphics-openjfx/webfx.xml
+++ b/webfx-kit/webfx-kit-javafxgraphics-openjfx/webfx.xml
@@ -8,11 +8,11 @@
     <providers>
         <provider interface="dev.webfx.kit.launcher.spi.WebFxKitLauncherProvider">dev.webfx.kit.launcher.spi.impl.openjfx.JavaFxWebFxKitLauncherProvider</provider>
         <provider interface="dev.webfx.platform.uischeduler.spi.UiSchedulerProvider">dev.webfx.platform.uischeduler.spi.impl.openjfx.FxUiSchedulerProvider</provider>
-        <provider interface="java.net.spi.URLStreamHandlerProvider">dev.webfx.kit.launcher.spi.impl.openjfx.CssProtocol</provider>
     </providers>
 
     <dependencies>
         <used-by-source-modules/>
+        <plugin-module>webfx-kit-cssprotocol-openjfx-plugin</plugin-module>
     </dependencies>
 
     <graalvm-reflection-json>
diff --git a/webfx.xml b/webfx.xml
index c07d2e4556..d5ab426e63 100644
--- a/webfx.xml
+++ b/webfx.xml
@@ -28,7 +28,7 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <configuration>
-                            <skippedModules>webfx-kit-javafxweb-registry,webfx-kit-javafxweb-registry-gwt-j2cl,webfx-kit-javafxgraphics-fat-j2cl</skippedModules>
+                            <skippedModules>webfx-kit-cssprotocol-java-plugin,webfx-kit-javafxweb-registry,webfx-kit-javafxweb-registry-gwt-j2cl,webfx-kit-javafxgraphics-fat-j2cl</skippedModules>
                         </configuration>
                     </plugin>
                 </plugins>