diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml
index 1bc7dda..4bb3867 100644
--- a/.idea/libraries/bld.xml
+++ b/.idea/libraries/bld.xml
@@ -2,11 +2,12 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.18.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.18-sources.jar!/" />
+      <root url="file://$PROJECT_DIR$/lib/bld" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />
diff --git a/.idea/libraries/compile.xml b/.idea/libraries/compile.xml
index 9bd86aa..143dc93 100644
--- a/.idea/libraries/compile.xml
+++ b/.idea/libraries/compile.xml
@@ -2,12 +2,16 @@
   <library name="compile">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/compile" />
+      <root url="file://$PROJECT_DIR$/lib/provided" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/compile" />
+      <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
     <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/test.xml b/.idea/libraries/test.xml
index 13b6513..c16475a 100644
--- a/.idea/libraries/test.xml
+++ b/.idea/libraries/test.xml
@@ -2,12 +2,17 @@
   <library name="test">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/test" />
+      <root url="file://$PROJECT_DIR$/lib/provided" />
+      <root url="file://$PROJECT_DIR$/src/test/resources" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/test" />
+      <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
     <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 542659b..8678395 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PDMPlugin">
     <option name="skipTestSources" value="false" />
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2367299..72d3d21 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,7 +7,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.rife2/dist/rife2-1.5.18.jar",
+        "${HOME}bld-1.7.0.jar",
         "lib/bld/*.jar",
         "lib/compile/*.jar",
         "lib/runtime/*.jar",
diff --git a/README.md b/README.md
index a7cd70d..87c48ce 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 A simple defensive library to encode/decode URL components.
 
 This library was extracted from the [RIFE2 Web Application Framework](https://rife2.com).  
-A Kotlin version can also be found at [https://github.com/ethauvin/urlencoder](https://github.com/ethauvin/urlencoder).
+A Kotlin Multiplatform version can also be found at [https://github.com/ethauvin/urlencoder](https://github.com/ethauvin/urlencoder).
 
 The rules are determined by combining the unreserved character set from
 [RFC 3986](https://www.rfc-editor.org/rfc/rfc3986#page-13) with the
diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
index 590d8d3..56d549b 100644
Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index 04ac087..88b5a9f 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -1,6 +1,6 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extensions=com.uwyn.rife2:bld-tests-badge:1.0.0
+bld.extensions=com.uwyn.rife2:bld-tests-badge:1.4.6
 bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES
-rife2.downloadLocation=
-rife2.version=1.5.18
+bld.downloadLocation=
+bld.version=1.8.0
diff --git a/src/bld/java/com/uwyn/urlencoder/UrlEncoderBuild.java b/src/bld/java/com/uwyn/urlencoder/UrlEncoderBuild.java
index d117919..a062698 100644
--- a/src/bld/java/com/uwyn/urlencoder/UrlEncoderBuild.java
+++ b/src/bld/java/com/uwyn/urlencoder/UrlEncoderBuild.java
@@ -9,7 +9,6 @@ import rife.bld.publish.PublishLicense;
 import rife.bld.publish.PublishScm;
 
 import java.util.List;
-import java.util.Map;
 import java.util.jar.Attributes;
 
 import static rife.bld.dependencies.Repository.*;
@@ -20,7 +19,7 @@ public class UrlEncoderBuild extends Project {
         pkg = "com.uwyn.urlencoder";
         name = "UrlEncoder";
         mainClass = "com.uwyn.urlencoder.UrlEncoder";
-        version = version(1,3,3);
+        version = version(1,3,5);
 
         javaRelease = 11;
         downloadSources = true;
@@ -28,8 +27,8 @@ public class UrlEncoderBuild extends Project {
 
         repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
         scope(test)
-            .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,9,2)))
-            .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,9,2)));
+            .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,1)))
+            .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,1)));
 
         jarOperation()
             .manifestAttribute(Attributes.Name.MAIN_CLASS, mainClass());
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..a0a140e
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+module com.uwyn.urlencoder {
+    exports com.uwyn.urlencoder;
+}