diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..d056dad6
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,4 @@
+* @Railroad-Team/railroad-maintainers
+
+# File Specific
+/.github/CODEOWNERS @DaRealTurtyWurty
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
new file mode 100644
index 00000000..a842ea82
--- /dev/null
+++ b/.github/SECURITY.md
@@ -0,0 +1,71 @@
+# Security Policy
+
+## Supported Versions
+
+The following table outlines which versions of Railroad currently receive security updates.
+
+| Version | Supported |
+|----------|------------|
+| Main branch (`main`) | ✅ |
+| Latest stable release (`vX.Y.Z`) | ✅ |
+| Older releases | ❌ |
+
+We only provide security fixes for the **most recent stable release** and the `main` development branch.  
+If you're using an older version, please update to the latest release.
+
+---
+
+## Reporting a Vulnerability
+
+If you discover a vulnerability in Railroad or any related project (such as Switchboard, RailroadLogger, or the Plugin API), **please report it responsibly**.  
+Do **not** disclose it publicly until it has been patched.
+
+### 🔒 How to Report
+- **Preferred:** [Create a private vulnerability report](https://github.com/Railroad-Team/Railroad/security/advisories/new)
+- **Alternative:** Email the maintainers at **security@railroadide.dev**
+
+Please include the following details:
+- A clear description of the issue and its potential impact.
+- Steps to reproduce (if applicable).
+- Any relevant logs, crash reports, or proof of concept.
+- A suggested fix or mitigation (optional but appreciated).
+
+You can expect a response **within 48 hours**, and we'll work with you to confirm and fix the issue as quickly as possible.
+
+---
+
+## Disclosure Policy
+
+- Once a fix is ready, we’ll release an updated version of Railroad.
+- You’ll be credited for the discovery if you wish.
+- We generally aim to disclose details publicly **after the patch release**, unless there’s a reason to delay for ecosystem safety.
+
+---
+
+## Security Best Practices for Plugin Developers
+
+If you're developing plugins for Railroad:
+- **Never** execute remote code or download arbitrary files without explicit user consent.
+- **Always** verify signatures or hashes for remote content.
+- **Avoid** storing credentials in plain text — use Railroad’s secure storage API if available.
+- **Do not** request unnecessary permissions.
+- **Respect user privacy** — plugins must not track or collect personal data without consent.
+
+Plugins found violating these policies may be removed from the official plugin registry.
+
+---
+
+## Scope
+
+This policy covers:
+- Railroad IDE (core application)
+- Railroad Plugin API
+- Railroad Logger
+- Switchboard service
+- Official Railroad plugins
+
+If the vulnerability affects a dependency or external service, we’ll coordinate disclosure with the relevant maintainers.
+
+---
+
+*Thank you for helping keep the Railroad ecosystem secure.*
diff --git a/.gitignore b/.gitignore
index 59f9c835..77c687e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,9 @@ bin/
 !**/src/main/**/bin/
 !**/src/test/**/bin/
 
+### Railroad ###
+.railroad/
+
 ### NetBeans ###
 /nbproject/private/
 /nbbuild/
@@ -47,4 +50,4 @@ bin/
 *.class
 
 ### Logs ###
-hs_err_pid*.log
\ No newline at end of file
+hs_err_pid*.log
diff --git a/META-INF/gradle-plugins/dev.railroadide.railroadgradleplugin.properties b/META-INF/gradle-plugins/dev.railroadide.railroadgradleplugin.properties
new file mode 100644
index 00000000..230df5dd
--- /dev/null
+++ b/META-INF/gradle-plugins/dev.railroadide.railroadgradleplugin.properties
@@ -0,0 +1 @@
+implementation-class=dev.railroadide.railroadplugin.RailroadProjectPlugin
diff --git a/build.gradle b/build.gradle
index 4eec43bb..04765454 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,10 +33,18 @@ tasks.withType(JavaCompile).configureEach {
 application {
     mainClass = 'dev.railroadide.railroad.RailroadLauncher'
     applicationDefaultJvmArgs = [
-            '-Djavafx.preloader=dev.railroadide.railroad.RailroadPreloader'
+            '-Djavafx.preloader=dev.railroadide.railroad.RailroadPreloader',
+            '--add-exports=javafx.graphics/com.sun.javafx.iio=ALL-UNNAMED',
+            '--add-exports=javafx.graphics/com.sun.javafx.iio.common=ALL-UNNAMED'
     ]
 }
 
+tasks.named("run") {
+    jvmArgs '-Djavafx.preloader=dev.railroadide.railroad.RailroadPreloader',
+            '--add-exports=javafx.graphics/com.sun.javafx.iio=ALL-UNNAMED',
+            '--add-exports=javafx.graphics/com.sun.javafx.iio.common=ALL-UNNAMED'
+}
+
 javafx {
     version = '21'
     modules = ['javafx.controls', 'javafx.swing', 'javafx.web', 'javafx.fxml', 'javafx.graphics', 'javafx.media']
@@ -45,6 +53,9 @@ javafx {
 dependencies {
     implementation 'org.kordamp.ikonli:ikonli-javafx:12.4.0'
     implementation 'org.kordamp.ikonli:ikonli-fontawesome6-pack:12.4.0'
+    implementation 'org.kordamp.ikonli:ikonli-devicons-pack:12.4.0'
+    implementation 'org.kordamp.jipsy:jipsy-processor:1.2.0'
+    annotationProcessor 'org.kordamp.jipsy:jipsy-annotations:1.2.0'
     implementation 'org.jetbrains:annotations:26.0.2-1'
     implementation 'com.google.code.gson:gson:2.13.2'
     implementation 'com.squareup.okhttp3:okhttp:5.2.1'
@@ -68,7 +79,9 @@ dependencies {
     implementation 'org.apache.commons:commons-text:1.14.0'
     implementation 'net.java.dev.jna:jna:5.18.1'
     implementation 'org.xerial:sqlite-jdbc:3.50.3.0'
-
+    implementation 'com.github.numind-tech:javafxsvg:ce188ef95d'
+    implementation 'io.github.raghul-tech:javafx-markdown-preview-all:1.0.3'
+    implementation 'org.joml:joml:1.10.8'
     implementation 'com.google.guava:guava:33.5.0-jre'
     implementation 'org.apache.maven:maven-core:4.0.0-rc-4'
     implementation 'org.apache.maven:maven-settings:4.0.0-rc-4'
@@ -76,8 +89,7 @@ dependencies {
     implementation 'org.apache.maven:maven-repository-metadata:4.0.0-rc-4'
     implementation 'org.codehaus.plexus:plexus-container-default:2.1.1'
 
-    implementation 'dev.railroadide:java-version-extractor-plugin:1.0.0'
-    implementation 'dev.railroadide:fabric-extractor-plugin:1.0.0'
+    implementation 'dev.railroadide:RailroadGradlePlugin:1.0.0'
 
     implementation 'io.get-coursier:interface:1.0.29-M1'
     implementation 'org.eclipse.jgit:org.eclipse.jgit:7.4.0.202509020913-r'
@@ -130,7 +142,9 @@ runtime {
 
     launcher {
         jvmArgs = [
-                '-Djavafx.preloader=dev.railroadide.railroad.RailroadPreloader'
+                '-Djavafx.preloader=dev.railroadide.railroad.RailroadPreloader',
+                '--add-exports=javafx.graphics/com.sun.javafx.iio=ALL-UNNAMED',
+                '--add-exports=javafx.graphics/com.sun.javafx.iio.common=ALL-UNNAMED'
         ]
     }
 
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 00000000..065aa2f1
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1759143472,
+        "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 00000000..940ae3c8
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,80 @@
+{
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+  };
+
+  outputs = inputs:
+    let
+      javaVersion = 21;
+
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+
+      forEachSystem = f:
+        inputs.nixpkgs.lib.genAttrs systems (
+          system:
+          f {
+            pkgs = import inputs.nixpkgs {
+              inherit system;
+              overlays = [ inputs.self.overlays.default ];
+            };
+          }
+        );
+    in
+    {
+      overlays.default = final: prev:
+        let
+          jdk = prev."jdk${toString javaVersion}";
+          javafx = prev.openjfx;
+        in
+        {
+          inherit jdk javafx;
+          gradle = prev.gradle.override { java = jdk; };
+          lombok = prev.lombok.override { inherit jdk; };
+        };
+
+      devShells = forEachSystem (
+        { pkgs }:
+        {
+          default = pkgs.mkShell {
+            packages = with pkgs; [
+              gradle
+              jdk
+              javafx
+
+              libGL
+              alsa-lib
+
+              gtk3
+              glib
+              gsettings-desktop-schemas
+
+              xorg.libX11
+              xorg.libXtst
+              xorg.libXi
+              xorg.libXxf86vm
+            ];
+
+            shellHook =
+            let
+              loadLombok = "-javaagent:${pkgs.lombok}/share/java/lombok.jar";
+              prev = "\${JAVA_TOOL_OPTIONS:+ $JAVA_TOOL_OPTIONS}";
+            in
+            ''
+              export JAVAFX_MODULE_PATH=${pkgs.javafx}/lib
+              export LD_LIBRARY_PATH="${pkgs.libGL}/lib:${pkgs.gtk3}/lib:${pkgs.glib.out}/lib:${pkgs.xorg.libX11}/lib:${pkgs.xorg.libXtst}/lib:${pkgs.xorg.libXi}/lib:${pkgs.xorg.libXxf86vm}/lib:${pkgs.alsa-lib}/lib:$LD_LIBRARY_PATH"
+              export JAVA_TOOL_OPTIONS="${loadLombok}${prev}"
+              export GSETTINGS_SCHEMA_DIR="${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}/glib-2.0/schemas"
+
+              mkdir ~/.config/Railroad
+              touch ~/.config/Railroad/logger_config.json
+            '';
+          };
+        }
+      );
+    };
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/form/Form.java b/railroad-core/src/main/java/dev/railroadide/core/form/Form.java
index 316ad487..5e733771 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/form/Form.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/form/Form.java
@@ -6,6 +6,7 @@
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
+import lombok.Getter;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -30,6 +31,7 @@ public class Form {
     private final @Nullable Button resetButton;
     private final Pos buttonAlignment;
 
+    @Getter
     private final FormData formData = new FormData();
 
     /**
diff --git a/railroad-core/src/main/java/dev/railroadide/core/form/FormComponent.java b/railroad-core/src/main/java/dev/railroadide/core/form/FormComponent.java
index 3b689857..bccc4dd4 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/form/FormComponent.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/form/FormComponent.java
@@ -170,6 +170,29 @@ public static TextAreaComponent.Builder textArea(@NotNull String dataKey, @NotNu
         return new TextAreaComponent.Builder(dataKey, label);
     }
 
+    /**
+     * Creates a new file chooser component.
+     *
+     * @param dataKey The key of the data.
+     * @param label   The label of the component.
+     * @return The builder for the file chooser component.
+     */
+    public static FileChooserComponent.Builder fileChooser(@NotNull String dataKey, @NotNull String label) {
+        return new FileChooserComponent.Builder(dataKey, label);
+    }
+
+    /**
+     * Creates a new radio button group component backed by an enum.
+     *
+     * @param dataKey   The key of the data.
+     * @param label     The label of the component.
+     * @param enumClass The enum class providing the options.
+     * @return The builder for the radio button group component.
+     */
+    public static <E extends Enum<E>> RadioButtonGroupComponent.Builder<E> radioButtonGroup(@NotNull String dataKey, @NotNull String label, @NotNull Class<E> enumClass) {
+        return new RadioButtonGroupComponent.Builder<>(dataKey, label, enumClass);
+    }
+
     /**
      * Returns a property that represents the default data of the component.
      *
diff --git a/railroad-core/src/main/java/dev/railroadide/core/form/impl/ComboBoxComponent.java b/railroad-core/src/main/java/dev/railroadide/core/form/impl/ComboBoxComponent.java
index f6cfb87b..b81ef286 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/form/impl/ComboBoxComponent.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/form/impl/ComboBoxComponent.java
@@ -61,7 +61,7 @@ public class ComboBoxComponent<T> extends FormComponent<FormComboBox<T>, ComboBo
      */
     public ComboBoxComponent(String dataKey, Data<T> data, FormComponentValidator<ComboBox<T>> validator, FormComponentChangeListener<ComboBox<T>, T> listener, Property<ComboBox<T>> bindComboBoxTo, List<FormTransformer<ComboBox<T>, T, ?>> transformers, EventHandler<? super KeyEvent> keyTypedHandler, @Nullable BooleanBinding visible, Callback<ListView<T>, ListCell<T>> cellFactory, ListCell<T> buttonCell, Supplier<T> defaultValue) {
         super(dataKey, data, currentData -> {
-            var formComboBox = new FormComboBox<>(currentData.label, currentData.required, currentData.editable, currentData.translate, currentData.keyFunction, currentData.valueOfFunction);
+            var formComboBox = new FormComboBox<>(currentData.label, currentData.required, currentData.editable, currentData.translate, (T v) -> currentData.keyFunction.toString(v));
             if (!currentData.translate) {
                 formComboBox.getPrimaryComponent().setConverter(new ComboBoxConverter<>(currentData.keyFunction, currentData.valueOfFunction));
             }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/form/impl/DirectoryChooserComponent.java b/railroad-core/src/main/java/dev/railroadide/core/form/impl/DirectoryChooserComponent.java
index bb5fd9a6..035da2e8 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/form/impl/DirectoryChooserComponent.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/form/impl/DirectoryChooserComponent.java
@@ -14,6 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
@@ -153,6 +154,17 @@ public Builder defaultPath(@Nullable String defaultPath) {
             return this;
         }
 
+        /**
+         * Sets the default path for the directory chooser.
+         *
+         * @param defaultPath the default path for the directory chooser
+         * @return this builder
+         */
+        public Builder defaultPath(@Nullable Path defaultPath) {
+            this.data.defaultPath(defaultPath != null ? defaultPath.toString() : null);
+            return this;
+        }
+
         /**
          * Sets whether the directory chooser is required.
          *
diff --git a/railroad-core/src/main/java/dev/railroadide/core/form/impl/FileChooserComponent.java b/railroad-core/src/main/java/dev/railroadide/core/form/impl/FileChooserComponent.java
new file mode 100644
index 00000000..8f550556
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/form/impl/FileChooserComponent.java
@@ -0,0 +1,235 @@
+package dev.railroadide.core.form.impl;
+
+import dev.railroadide.core.form.*;
+import dev.railroadide.core.form.ui.FormFileChooser;
+import dev.railroadide.core.ui.BrowseButton;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.Property;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.event.EventHandler;
+import javafx.scene.Node;
+import javafx.scene.control.TextField;
+import javafx.scene.input.KeyEvent;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * File picker counterpart to {@link DirectoryChooserComponent}.
+ */
+public class FileChooserComponent extends FormComponent<FormFileChooser, FileChooserComponent.Data, TextField, String> {
+    public FileChooserComponent(String dataKey,
+                                Data data,
+                                FormComponentValidator<TextField> validator,
+                                FormComponentChangeListener<TextField, String> listener,
+                                Property<TextField> bindTextFieldTo,
+                                Property<BrowseButton> bindBrowseButtonTo,
+                                List<FormTransformer<TextField, String, ?>> transformers,
+                                EventHandler<? super KeyEvent> keyTypedHandler,
+                                @Nullable BooleanBinding visible) {
+        super(dataKey, data, d -> new FormFileChooser(d.label, d.required, d.defaultPath, d.includeButton), validator, listener, transformers, visible);
+
+        if (bindTextFieldTo != null) {
+            bindTextFieldTo.bind(componentProperty().map(FormFileChooser::getPrimaryComponent).map(FormFileChooser.TextFieldWithButton::getTextField));
+        }
+
+        if (bindBrowseButtonTo != null) {
+            bindBrowseButtonTo.bind(componentProperty().map(FormFileChooser::getPrimaryComponent).map(FormFileChooser.TextFieldWithButton::getBrowseButton));
+        }
+
+        if (keyTypedHandler != null) {
+            componentProperty().get().getPrimaryComponent().addEventHandler(KeyEvent.KEY_TYPED, keyTypedHandler);
+
+            componentProperty().addListener((observable, oldValue, newValue) -> {
+                if (oldValue != null) {
+                    oldValue.getPrimaryComponent().removeEventHandler(KeyEvent.KEY_TYPED, keyTypedHandler);
+                }
+
+                if (newValue != null) {
+                    newValue.getPrimaryComponent().addEventHandler(KeyEvent.KEY_TYPED, keyTypedHandler);
+                }
+            });
+        }
+    }
+
+    @Override
+    public ObservableValue<TextField> getValidationNode() {
+        return componentProperty()
+            .map(FormFileChooser::getPrimaryComponent)
+            .map(FormFileChooser.TextFieldWithButton::getTextField);
+    }
+
+    @Override
+    protected void applyListener(FormComponentChangeListener<TextField, String> listener) {
+        AtomicReference<ChangeListener<String>> listenerRef = new AtomicReference<>();
+        componentProperty().addListener((observable, oldValue, newValue) -> {
+            if (oldValue != null) {
+                oldValue.getPrimaryComponent().getTextField().textProperty().removeListener(listenerRef.get());
+            }
+
+            if (newValue != null) {
+                ChangeListener<String> changeListener = (observable1, oldValue1, newValue1) ->
+                    listener.changed(newValue.getPrimaryComponent().getTextField(), observable1, oldValue1, newValue1);
+                listenerRef.set(changeListener);
+                newValue.getPrimaryComponent().getTextField().textProperty().addListener(changeListener);
+            }
+        });
+    }
+
+    @Override
+    protected void bindToFormData(FormData formData) {
+        componentProperty()
+            .map(FormFileChooser::getPrimaryComponent)
+            .map(FormFileChooser.TextFieldWithButton::getTextField)
+            .flatMap(TextField::textProperty)
+            .addListener((observable, oldValue, newValue) ->
+                formData.addProperty(dataKey, newValue));
+
+        formData.addProperty(dataKey, componentProperty()
+            .map(FormFileChooser::getPrimaryComponent)
+            .map(FormFileChooser.TextFieldWithButton::getTextField)
+            .map(TextField::getText)
+            .orElse(getData().defaultPath)
+            .getValue());
+    }
+
+    @Override
+    public void reset() {
+        getComponent().getPrimaryComponent().getTextField().setText(getData().defaultPath);
+    }
+
+    public static class Builder implements FormComponentBuilder<FileChooserComponent, TextField, String, Builder> {
+        private final String dataKey;
+        private final Data data;
+        private final List<FormTransformer<TextField, String, ?>> transformers = new ArrayList<>();
+        private FormComponentValidator<TextField> validator;
+        private FormComponentChangeListener<TextField, String> listener;
+        private Property<TextField> bindTextFieldTo;
+        private Property<BrowseButton> bindBrowseButtonTo;
+        private EventHandler<? super KeyEvent> keyTypedHandler;
+        private BooleanBinding visible;
+
+        public Builder(@NotNull String dataKey, @NotNull String label) {
+            this.dataKey = dataKey;
+            this.data = new Data(label);
+        }
+
+        @Override
+        public String dataKey() {
+            return dataKey;
+        }
+
+        public Builder defaultPath(@Nullable String defaultPath) {
+            data.defaultPath(defaultPath);
+            return this;
+        }
+
+        public Builder defaultPath(@Nullable Path defaultPath) {
+            data.defaultPath(defaultPath != null ? defaultPath.toString() : null);
+            return this;
+        }
+
+        public Builder required(boolean required) {
+            data.required(required);
+            return this;
+        }
+
+        public Builder required() {
+            return required(true);
+        }
+
+        public Builder includeButton(boolean includeButton) {
+            data.includeButton(includeButton);
+            return this;
+        }
+
+        public Builder bindTextFieldTo(Property<TextField> bindTextFieldTo) {
+            this.bindTextFieldTo = bindTextFieldTo;
+            return this;
+        }
+
+        public Builder bindBrowseButtonTo(Property<BrowseButton> bindBrowseButtonTo) {
+            this.bindBrowseButtonTo = bindBrowseButtonTo;
+            return this;
+        }
+
+        @Override
+        public Builder validator(FormComponentValidator<TextField> validator) {
+            this.validator = validator;
+            return this;
+        }
+
+        @Override
+        public Builder listener(FormComponentChangeListener<TextField, String> listener) {
+            this.listener = listener;
+            return this;
+        }
+
+        @Override
+        public <X> Builder addTransformer(ObservableValue<TextField> fromComponent, Consumer<X> toComponentFunction, Function<String, X> valueMapper) {
+            transformers.add(new FormTransformer<>(fromComponent, TextField::getText, toComponentFunction, valueMapper));
+            return this;
+        }
+
+        @Override
+        public <U extends Node, X> Builder addTransformer(ObservableValue<TextField> fromComponent, ObservableValue<U> toComponent, Function<String, X> valueMapper) {
+            transformers.add(new FormTransformer<>(fromComponent, TextField::getText, value -> {
+                if (toComponent.getValue() instanceof TextField target) {
+                    target.setText(value.toString());
+                } else {
+                    throw new IllegalArgumentException("Unsupported component type: " + toComponent.getValue().getClass().getName());
+                }
+            }, valueMapper));
+            return this;
+        }
+
+        public Builder keyTypedHandler(EventHandler<? super KeyEvent> keyTypedHandler) {
+            this.keyTypedHandler = keyTypedHandler;
+            return this;
+        }
+
+        @Override
+        public Builder visible(BooleanBinding visible) {
+            this.visible = visible;
+            return this;
+        }
+
+        @Override
+        public FileChooserComponent build() {
+            return new FileChooserComponent(dataKey, data, validator, listener, bindTextFieldTo, bindBrowseButtonTo, transformers, keyTypedHandler, visible);
+        }
+    }
+
+    public static class Data {
+        private final String label;
+        private String defaultPath;
+        private boolean required;
+        private boolean includeButton = true;
+
+        public Data(@NotNull String label) {
+            this.label = label;
+        }
+
+        public Data defaultPath(@Nullable String defaultPath) {
+            this.defaultPath = defaultPath;
+            return this;
+        }
+
+        public Data required(boolean required) {
+            this.required = required;
+            return this;
+        }
+
+        public Data includeButton(boolean includeButton) {
+            this.includeButton = includeButton;
+            return this;
+        }
+    }
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/form/impl/RadioButtonGroupComponent.java b/railroad-core/src/main/java/dev/railroadide/core/form/impl/RadioButtonGroupComponent.java
new file mode 100644
index 00000000..b6867d67
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/form/impl/RadioButtonGroupComponent.java
@@ -0,0 +1,289 @@
+package dev.railroadide.core.form.impl;
+
+import dev.railroadide.core.form.*;
+import dev.railroadide.core.form.ui.FormRadioButtonGroup;
+import dev.railroadide.core.utility.ServiceLocator;
+import dev.railroadide.logger.Logger;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.scene.Node;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * Form component that renders an enum as a radio button group.
+ *
+ * @param <E> enum type
+ */
+public class RadioButtonGroupComponent<E extends Enum<E>> extends FormComponent<FormRadioButtonGroup<E>, RadioButtonGroupComponent.Data<E>, FormRadioButtonGroup<E>, E> {
+    public RadioButtonGroupComponent(String dataKey,
+                                     Data<E> data,
+                                     FormComponentValidator<FormRadioButtonGroup<E>> validator,
+                                     FormComponentChangeListener<FormRadioButtonGroup<E>, E> listener,
+                                     List<FormTransformer<FormRadioButtonGroup<E>, E, ?>> transformers,
+                                     @Nullable BooleanBinding visible) {
+        super(dataKey, data, currentData -> {
+            var component = new FormRadioButtonGroup<>(
+                currentData.label,
+                currentData.required,
+                currentData.options(),
+                currentData.optionLabelProvider,
+                currentData.translateOptions,
+                currentData.spacing
+            );
+
+            E defaultSelection = currentData.selectedSupplier.get();
+            if (defaultSelection != null) {
+                component.setValue(defaultSelection);
+            }
+
+            return component;
+        }, validator, listener, transformers, visible);
+    }
+
+    @Override
+    public ObservableValue<FormRadioButtonGroup<E>> getValidationNode() {
+        return componentProperty();
+    }
+
+    @Override
+    protected void applyListener(FormComponentChangeListener<FormRadioButtonGroup<E>, E> listener) {
+        AtomicReference<ChangeListener<E>> listenerRef = new AtomicReference<>();
+        componentProperty().addListener((observable, oldComponent, newComponent) -> {
+            if (oldComponent != null && listenerRef.get() != null) {
+                oldComponent.valueProperty().removeListener(listenerRef.get());
+            }
+
+            if (newComponent != null) {
+                ChangeListener<E> changeListener = (obs, oldValue, newValue) ->
+                    listener.changed(newComponent, obs, oldValue, newValue);
+                listenerRef.set(changeListener);
+                newComponent.valueProperty().addListener(changeListener);
+            }
+        });
+    }
+
+    @Override
+    protected void bindToFormData(FormData formData) {
+        AtomicReference<ChangeListener<E>> valueListener = new AtomicReference<>();
+
+        Runnable attachListener = () -> {
+            FormRadioButtonGroup<E> component = componentProperty().get();
+            if (component == null) {
+                return;
+            }
+
+            ChangeListener<E> changeListener = (observable, oldValue, newValue) ->
+                formData.add(dataKey, newValue);
+            valueListener.set(changeListener);
+            component.valueProperty().addListener(changeListener);
+            formData.add(dataKey, component.getValue());
+        };
+
+        componentProperty().addListener((observable, oldComponent, newComponent) -> {
+            if (oldComponent != null && valueListener.get() != null) {
+                oldComponent.valueProperty().removeListener(valueListener.get());
+            }
+
+            attachListener.run();
+        });
+
+        attachListener.run();
+    }
+
+    @Override
+    public void reset() {
+        E selection = getData().selectedSupplier.get();
+        getComponent().setValue(selection);
+    }
+
+    /**
+     * Builder for {@link RadioButtonGroupComponent}.
+     */
+    public static class Builder<E extends Enum<E>> implements FormComponentBuilder<RadioButtonGroupComponent<E>, FormRadioButtonGroup<E>, E, Builder<E>> {
+        private final String dataKey;
+        private final Data<E> data;
+        private final List<FormTransformer<FormRadioButtonGroup<E>, E, ?>> transformers = new ArrayList<>();
+        private FormComponentValidator<FormRadioButtonGroup<E>> validator;
+        private FormComponentChangeListener<FormRadioButtonGroup<E>, E> listener;
+        private BooleanBinding visible;
+
+        public Builder(@NotNull String dataKey, @NotNull String label, @NotNull Class<E> enumClass) {
+            this.dataKey = dataKey;
+            this.data = new Data<>(label, enumClass);
+            deriveLocalizationDefaults(enumClass);
+        }
+
+        private void deriveLocalizationDefaults(Class<E> enumClass) {
+            try {
+                Method method = enumClass.getMethod("getLocalizationKey");
+                if (method.getReturnType() == String.class) {
+                    data.optionLabelProvider(enumValue -> {
+                        try {
+                            return (String) method.invoke(enumValue);
+                        } catch (IllegalAccessException | InvocationTargetException exception) {
+                            ServiceLocator.getService(Logger.class).warn("Failed to invoke getLocalizationKey for {}", enumValue, exception);
+                            return enumValue.name();
+                        }
+                    });
+                    data.translateOptions(true);
+                    return;
+                }
+            } catch (NoSuchMethodException ignored) {
+                // Default fallback handled below.
+            }
+
+            data.optionLabelProvider(Enum::name);
+        }
+
+        @Override
+        public String dataKey() {
+            return dataKey;
+        }
+
+        public Builder<E> options(List<E> options) {
+            data.options(options);
+            return this;
+        }
+
+        public Builder<E> options(E[] options) {
+            return options(Arrays.asList(options));
+        }
+
+        public Builder<E> required(boolean required) {
+            data.required(required);
+            return this;
+        }
+
+        public Builder<E> required() {
+            return required(true);
+        }
+
+        public Builder<E> selected(E selected) {
+            return selected(() -> selected);
+        }
+
+        public Builder<E> selected(Supplier<E> supplier) {
+            data.selectedSupplier(Objects.requireNonNull(supplier));
+            return this;
+        }
+
+        public Builder<E> spacing(double spacing) {
+            data.spacing(spacing);
+            return this;
+        }
+
+        public Builder<E> optionLabelProvider(Function<E, String> provider) {
+            data.optionLabelProvider(provider);
+            return this;
+        }
+
+        public Builder<E> translateOptions(boolean translate) {
+            data.translateOptions(translate);
+            return this;
+        }
+
+        @Override
+        public Builder<E> validator(FormComponentValidator<FormRadioButtonGroup<E>> validator) {
+            this.validator = validator;
+            return this;
+        }
+
+        @Override
+        public Builder<E> listener(FormComponentChangeListener<FormRadioButtonGroup<E>, E> listener) {
+            this.listener = listener;
+            return this;
+        }
+
+        @Override
+        public <X> Builder<E> addTransformer(ObservableValue<FormRadioButtonGroup<E>> fromComponent, Consumer<X> toComponentFunction, Function<E, X> valueMapper) {
+            transformers.add(new FormTransformer<>(fromComponent, FormRadioButtonGroup::getValue, toComponentFunction, valueMapper));
+            return this;
+        }
+
+        @Override
+        public <U extends Node, X> Builder<E> addTransformer(ObservableValue<FormRadioButtonGroup<E>> fromComponent, ObservableValue<U> toComponent, Function<E, X> valueMapper) {
+            transformers.add(new FormTransformer<>(fromComponent, FormRadioButtonGroup::getValue, value -> {
+                Node target = toComponent.getValue();
+                if (target instanceof HasSetValue hasSetValue) {
+                    hasSetValue.setValue(value);
+                }
+            }, valueMapper));
+            return this;
+        }
+
+        @Override
+        public Builder<E> visible(BooleanBinding visible) {
+            this.visible = visible;
+            return this;
+        }
+
+        @Override
+        public RadioButtonGroupComponent<E> build() {
+            return new RadioButtonGroupComponent<>(dataKey, data, validator, listener, transformers, visible);
+        }
+    }
+
+    /**
+     * Mutable data backing the component factory.
+     */
+    public static class Data<E extends Enum<E>> {
+        private final String label;
+        private final Class<E> enumClass;
+        private boolean required;
+        private boolean translateOptions;
+        private double spacing = 12;
+        private Supplier<E> selectedSupplier = () -> null;
+        private Function<E, String> optionLabelProvider = Enum::name;
+        private List<E> options;
+
+        public Data(String label, Class<E> enumClass) {
+            this.label = label;
+            this.enumClass = enumClass;
+            this.options = enumClass.isEnum() ? List.of(enumClass.getEnumConstants()) : List.of();
+        }
+
+        public void required(boolean required) {
+            this.required = required;
+        }
+
+        public void translateOptions(boolean translateOptions) {
+            this.translateOptions = translateOptions;
+        }
+
+        public void spacing(double spacing) {
+            this.spacing = spacing;
+        }
+
+        public void selectedSupplier(Supplier<E> selectedSupplier) {
+            this.selectedSupplier = Objects.requireNonNull(selectedSupplier);
+        }
+
+        public void optionLabelProvider(Function<E, String> optionLabelProvider) {
+            this.optionLabelProvider = Objects.requireNonNull(optionLabelProvider);
+        }
+
+        public void options(List<E> options) {
+            this.options = List.copyOf(Objects.requireNonNull(options));
+        }
+
+        public List<E> options() {
+            if (options != null)
+                return options;
+
+            return List.of(enumClass.getEnumConstants());
+        }
+    }
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/form/impl/TextAreaComponent.java b/railroad-core/src/main/java/dev/railroadide/core/form/impl/TextAreaComponent.java
index 52a9b773..0027efdd 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/form/impl/TextAreaComponent.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/form/impl/TextAreaComponent.java
@@ -18,6 +18,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 /**
  * A form component that represents a text area.
@@ -41,7 +42,10 @@ public class TextAreaComponent extends FormComponent<FormTextArea, TextAreaCompo
      * @param visible         the visibility of the text area
      */
     public TextAreaComponent(String dataKey, Data data, FormComponentValidator<TextArea> validator, FormComponentChangeListener<TextArea, String> listener, Property<TextArea> bindTextAreaTo, List<FormTransformer<TextArea, String, ?>> transformers, EventHandler<? super KeyEvent> keyTypedHandler, @Nullable BooleanBinding visible) {
-        super(dataKey, data, currentData -> new FormTextArea(currentData.label, currentData.required, currentData.text, currentData.promptText, currentData.editable, currentData.resize, currentData.wrapText, currentData.translate), validator, listener, transformers, visible);
+        super(dataKey, data, currentData -> {
+            String initialText = currentData.text == null ? "" : currentData.text.get();
+            return new FormTextArea(currentData.label, currentData.required, initialText, currentData.promptText, currentData.editable, currentData.resize, currentData.wrapText, currentData.translate);
+        }, validator, listener, transformers, visible);
 
         if (bindTextAreaTo != null) {
             bindTextAreaTo.bind(componentProperty().map(FormTextArea::getPrimaryComponent));
@@ -95,13 +99,13 @@ protected void bindToFormData(FormData formData) {
         formData.addProperty(dataKey, componentProperty()
             .map(FormTextArea::getPrimaryComponent)
             .map(TextArea::getText)
-            .orElse(getData().text)
+            .orElse(getData().text.get())
             .getValue());
     }
 
     @Override
     public void reset() {
-        getComponent().getPrimaryComponent().setText(getData().text);
+        getComponent().getPrimaryComponent().setText(getData().text.get());
     }
 
     /**
@@ -160,7 +164,17 @@ public Builder required() {
          * @return this builder
          */
         public Builder text(String text) {
-            data.text = text;
+            return text(() -> text);
+        }
+
+        /**
+         * Sets the text supplier of the text area.
+         *
+         * @param textSupplier supplier returning the text
+         * @return this builder
+         */
+        public Builder text(Supplier<String> textSupplier) {
+            data.text(textSupplier);
             return this;
         }
 
@@ -260,7 +274,7 @@ public Builder bindTextAreaTo(Property<TextArea> bindTextAreaTo) {
          * @param fromComponent       the observable value of the component to transform
          * @param toComponentFunction the function to set the value of the component
          * @param valueMapper         the function to map the value to the desired type
-         * @param <W>                 the type of the component
+         * @param <X>                 the type of the component
          * @return this builder
          */
         @Override
@@ -276,7 +290,7 @@ public <X> Builder addTransformer(ObservableValue<TextArea> fromComponent, Consu
          * @param toComponent   the component to set the value to
          * @param valueMapper   the function to map the value to the desired type
          * @param <U>           the type of the component
-         * @param <W>           the type of the value
+         * @param <X>           the type of the value
          * @return this builder
          */
         @Override
@@ -331,7 +345,7 @@ public TextAreaComponent build() {
     public static class Data {
         public final String label;
         public boolean required;
-        public String text = "";
+        private Supplier<String> text = () -> "";
         public String promptText;
         public boolean editable = true;
         public boolean resize;
@@ -365,7 +379,18 @@ public Data required(boolean required) {
          * @return this data
          */
         public Data text(String text) {
-            this.text = text;
+            this.text = () -> text;
+            return this;
+        }
+
+        /**
+         * Sets the text supplier of the text area.
+         *
+         * @param supplier supplier returning the text
+         * @return this data
+         */
+        public Data text(Supplier<String> supplier) {
+            this.text = supplier != null ? supplier : () -> "";
             return this;
         }
 
diff --git a/railroad-core/src/main/java/dev/railroadide/core/form/impl/TextFieldComponent.java b/railroad-core/src/main/java/dev/railroadide/core/form/impl/TextFieldComponent.java
index 84e46847..ea1893b9 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/form/impl/TextFieldComponent.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/form/impl/TextFieldComponent.java
@@ -2,6 +2,7 @@
 
 import dev.railroadide.core.form.*;
 import dev.railroadide.core.form.ui.FormTextField;
+import dev.railroadide.core.ui.AutoCompleteOptions;
 import javafx.application.Platform;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.Property;
@@ -9,13 +10,18 @@
 import javafx.beans.value.ObservableValue;
 import javafx.event.EventHandler;
 import javafx.scene.Node;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
 import javafx.scene.control.TextField;
 import javafx.scene.input.KeyEvent;
+import javafx.util.Callback;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -44,7 +50,7 @@ public class TextFieldComponent extends FormComponent<FormTextField, TextFieldCo
      */
     public TextFieldComponent(String dataKey, Data data, FormComponentValidator<TextField> validator, FormComponentChangeListener<TextField, String> listener, Property<TextField> bindTextFieldTo, List<FormTransformer<TextField, String, ?>> transformers, EventHandler<? super KeyEvent> keyTypedHandler, @Nullable BooleanBinding visible) {
         super(dataKey, data, currentData -> {
-            var formTextField = new FormTextField(currentData.label, currentData.required, currentData.promptText, currentData.editable, currentData.translate);
+            var formTextField = new FormTextField(currentData.label, currentData.required, currentData.promptText, currentData.editable, currentData.translate, currentData.getAutoCompleteOptions());
             if (currentData.text != null) {
                 new Thread(() -> {
                     String text = data.text.get();
@@ -300,6 +306,83 @@ public Builder keyTypedHandler(EventHandler<? super KeyEvent> keyTypedHandler) {
             return this;
         }
 
+        /**
+         * Enables auto-complete behaviour using the provided suggestion provider.
+         *
+         * @param provider function that returns suggestions given the current query
+         * @return this builder
+         */
+        public Builder autoComplete(Function<String, ? extends Collection<String>> provider) {
+            ensureAutoCompleteOptions().setSuggestionsProvider(Objects.requireNonNull(provider, "provider"));
+            return this;
+        }
+
+        /**
+         * Enables auto-complete behaviour using a static collection of suggestions.
+         *
+         * @param suggestions the suggestions to display
+         * @return this builder
+         */
+        public Builder autoCompleteSuggestions(Collection<String> suggestions) {
+            Objects.requireNonNull(suggestions, "suggestions");
+            return autoCompleteSuggestionsSupplier(() -> suggestions);
+        }
+
+        /**
+         * Enables auto-complete behaviour using a supplier of suggestions.
+         *
+         * @param suggestionsSupplier supplier that returns the current suggestions
+         * @return this builder
+         */
+        public Builder autoCompleteSuggestionsSupplier(Supplier<? extends Collection<String>> suggestionsSupplier) {
+            ensureAutoCompleteOptions().setSuggestionsSupplier(Objects.requireNonNull(suggestionsSupplier, "suggestionsSupplier"));
+            return this;
+        }
+
+        /**
+         * Sets the maximum number of suggestions to display.
+         */
+        public Builder autoCompleteMaxSuggestions(int maxSuggestions) {
+            ensureAutoCompleteOptions().setMaxSuggestions(maxSuggestions);
+            return this;
+        }
+
+        /**
+         * Sets the minimum number of characters before querying suggestions.
+         */
+        public Builder autoCompleteMinQueryLength(int minQueryLength) {
+            ensureAutoCompleteOptions().setMinQueryLength(minQueryLength);
+            return this;
+        }
+
+        /**
+         * Sets whether the auto-complete lookup should be case sensitive.
+         */
+        public Builder autoCompleteCaseSensitive(boolean caseSensitive) {
+            ensureAutoCompleteOptions().setCaseSensitive(caseSensitive);
+            return this;
+        }
+
+        /**
+         * Sets whether suggestions should be shown even when the query is empty.
+         */
+        public Builder autoCompleteShowSuggestionsOnEmpty(boolean showOnEmpty) {
+            ensureAutoCompleteOptions().setShowSuggestionsOnEmpty(showOnEmpty);
+            return this;
+        }
+
+        /**
+         * Sets the cell factory used to render suggestions in the popup.
+         */
+        public Builder autoCompleteSuggestionCellFactory(@Nullable Callback<ListView<String>, ListCell<String>> cellFactory) {
+            ensureAutoCompleteOptions().setSuggestionCellFactory(cellFactory);
+            return this;
+        }
+
+        private AutoCompleteOptions ensureAutoCompleteOptions() {
+            return data.ensureAutoCompleteOptions();
+        }
+
         /**
          * Sets the visibility of the text field.
          *
@@ -333,6 +416,7 @@ public static class Data {
         private boolean editable = true;
         private boolean required = false;
         private boolean translate = true;
+        private AutoCompleteOptions autoCompleteOptions;
 
         /**
          * Constructs a new data for the text field.
@@ -402,5 +486,19 @@ public Data translate(boolean translate) {
             this.translate = translate;
             return this;
         }
+
+        AutoCompleteOptions ensureAutoCompleteOptions() {
+            if (autoCompleteOptions == null) {
+                autoCompleteOptions = new AutoCompleteOptions();
+            }
+            return autoCompleteOptions;
+        }
+
+        public AutoCompleteOptions getAutoCompleteOptions() {
+            if (autoCompleteOptions == null || !autoCompleteOptions.isConfigured()) {
+                return null;
+            }
+            return autoCompleteOptions;
+        }
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormComboBox.java b/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormComboBox.java
index f5ce532b..ebed8c5b 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormComboBox.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormComboBox.java
@@ -10,6 +10,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
+import java.util.function.Function;
 
 /**
  * A form combo box component that extends InformativeLabeledHBox to provide
@@ -29,8 +30,8 @@ public class FormComboBox<T> extends InformativeLabeledHBox<ComboBox<T>> impleme
      * @param keyFunction     the function to convert items to strings for display
      * @param valueOfFunction the function to convert strings back to items
      */
-    public FormComboBox(String labelKey, boolean required, boolean editable, boolean translate, @Nullable ToStringFunction<T> keyFunction, @Nullable FromStringFunction<T> valueOfFunction) {
-        super(labelKey, required, Map.of("editable", editable, "translate", translate, "keyFunction", keyFunction, "valueOfFunction", valueOfFunction));
+    public FormComboBox(String labelKey, boolean required, boolean editable, boolean translate, @Nullable Function<T, String> keyFunction) {
+        super(labelKey, required, Map.of("editable", editable, "translate", translate, "keyFunction", keyFunction));
     }
 
     /**
@@ -44,10 +45,9 @@ public FormComboBox(String labelKey, boolean required, boolean editable, boolean
     public ComboBox<T> createPrimaryComponent(Map<String, Object> params) {
         boolean editable = (boolean) params.get("editable");
         boolean translate = (boolean) params.get("translate");
-        ToStringFunction<T> keyFunction = (ToStringFunction<T>) params.get("keyFunction");
-        FromStringFunction<T> valueOfFunction = (FromStringFunction<T>) params.get("valueOfFunction");
+        Function<T, String> keyFunction = (Function<T, String>) params.get("keyFunction");
 
-        ComboBox<T> comboBox = translate ? new LocalizedComboBox<>(keyFunction, valueOfFunction) : new ComboBox<>();
+        ComboBox<T> comboBox = translate ? new LocalizedComboBox<>(keyFunction) : new ComboBox<>();
         comboBox.setEditable(editable);
         comboBox.getStyleClass().add("rr-combo-box");
         return comboBox;
diff --git a/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormFileChooser.java b/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormFileChooser.java
new file mode 100644
index 00000000..ae010276
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormFileChooser.java
@@ -0,0 +1,94 @@
+package dev.railroadide.core.form.ui;
+
+import dev.railroadide.core.form.HasSetValue;
+import dev.railroadide.core.ui.BrowseButton;
+import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.ui.RRTextField;
+import javafx.application.Platform;
+import javafx.scene.Scene;
+import javafx.scene.paint.Color;
+import lombok.Getter;
+import org.jetbrains.annotations.Nullable;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * A labeled text field with an optional browse button for selecting files.
+ */
+@Getter
+public class FormFileChooser extends InformativeLabeledHBox<FormFileChooser.TextFieldWithButton> implements HasSetValue {
+    public FormFileChooser(String labelKey, boolean required, @Nullable String defaultPath, boolean includeButton) {
+        super(labelKey, required, createParams(defaultPath, includeButton));
+    }
+
+    private static Map<String, Object> createParams(@Nullable String defaultPath, boolean includeButton) {
+        Map<String, Object> params = new HashMap<>();
+        if (defaultPath != null) {
+            params.put("defaultPath", defaultPath);
+        }
+
+        params.put("includeButton", includeButton);
+        return params;
+    }
+
+    @Override
+    public TextFieldWithButton createPrimaryComponent(Map<String, Object> params) {
+        var defaultPath = (String) params.get("defaultPath");
+        var includeButton = (boolean) params.get("includeButton");
+
+        RRTextField textField = new RRTextField();
+        textField.getStyleClass().add("rr-text-field");
+        if (defaultPath != null) {
+            textField.setText(defaultPath);
+        }
+
+        BrowseButton browseButton = null;
+        if (includeButton) {
+            var browseButtonIcon = new FontIcon(FontAwesomeSolid.FILE);
+            browseButtonIcon.setIconSize(16);
+            browseButtonIcon.setIconColor(Color.CADETBLUE);
+
+            browseButton = new BrowseButton();
+            browseButton.parentWindowProperty().bind(sceneProperty().map(Scene::getWindow));
+            browseButton.textFieldProperty().set(textField);
+            browseButton.browseTypeProperty().set(BrowseButton.BrowseType.FILE);
+            browseButton.getStyleClass().add("rr-button");
+            browseButton.setGraphic(browseButtonIcon);
+        }
+
+        var hbox = new TextFieldWithButton(textField, browseButton);
+        getChildren().add(hbox);
+
+        return hbox;
+    }
+
+    @Override
+    public void setValue(Object value) {
+        Platform.runLater(() -> getPrimaryComponent().textField.setText(Objects.toString(value, "")));
+    }
+
+    /**
+     * Simple container for text field + optional browse button.
+     */
+    @Getter
+    public static class TextFieldWithButton extends RRHBox {
+        private final RRTextField textField;
+        private final @Nullable BrowseButton browseButton;
+
+        public TextFieldWithButton(RRTextField textField, @Nullable BrowseButton browseButton) {
+            super(5);
+
+            this.textField = textField;
+            this.browseButton = browseButton;
+
+            getChildren().add(textField);
+            if (browseButton != null) {
+                getChildren().add(browseButton);
+            }
+        }
+    }
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormRadioButtonGroup.java b/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormRadioButtonGroup.java
new file mode 100644
index 00000000..0e7bb2bd
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormRadioButtonGroup.java
@@ -0,0 +1,134 @@
+package dev.railroadide.core.form.ui;
+
+import dev.railroadide.core.form.HasSetValue;
+import dev.railroadide.core.localization.LocalizationService;
+import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.utility.ServiceLocator;
+import javafx.application.Platform;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.Toggle;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.HBox;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * A form component wrapper that renders a horizontal group of radio buttons with a label.
+ *
+ * @param <E> the enum backing the radio buttons
+ */
+public class FormRadioButtonGroup<E extends Enum<E>> extends InformativeLabeledHBox<HBox> implements HasSetValue {
+    private ToggleGroup toggleGroup;
+    private final ObjectProperty<E> value = new SimpleObjectProperty<>();
+    private Map<E, RadioButton> radioButtons;
+
+    public FormRadioButtonGroup(String labelKey, boolean required, List<E> values, Function<E, String> optionLabelProvider, boolean translateOptions, double spacing) {
+        super(labelKey, required, Map.of(
+            "values", values,
+            "labelProvider", optionLabelProvider,
+            "translateOptions", translateOptions,
+            "spacing", spacing
+        ));
+
+        value.addListener((observable, oldValue, newValue) -> {
+            if (newValue == null && toggleGroup != null && toggleGroup.getSelectedToggle() != null) {
+                toggleGroup.selectToggle(null);
+            }
+        });
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public HBox createPrimaryComponent(Map<String, Object> params) {
+        List<E> values = (List<E>) params.get("values");
+        Function<E, String> labelProvider = (Function<E, String>) params.get("labelProvider");
+        boolean translate = Boolean.TRUE.equals(params.getOrDefault("translateOptions", Boolean.TRUE));
+        double spacing = params.get("spacing") instanceof Number number ? number.doubleValue() : 12d;
+
+        var container = new RRHBox(spacing);
+        container.getStyleClass().add("form-radio-button-group");
+
+        this.toggleGroup = new ToggleGroup();
+        if (radioButtons == null) {
+            radioButtons = new LinkedHashMap<>();
+        } else {
+            radioButtons.clear();
+        }
+
+        for (E enumValue : values) {
+            var radioButton = new RadioButton();
+            radioButton.setToggleGroup(toggleGroup);
+            radioButton.setUserData(enumValue);
+            radioButton.setMnemonicParsing(false);
+            radioButton.getStyleClass().add("rr-radio-button");
+
+            String label = labelProvider.apply(enumValue);
+            radioButton.setText(translate ?
+                ServiceLocator.getService(LocalizationService.class).get(label) :
+                label);
+
+            container.getChildren().add(radioButton);
+            radioButtons.put(enumValue, radioButton);
+        }
+
+        toggleGroup.selectedToggleProperty().addListener((observable, oldToggle, newToggle) -> {
+            if (newToggle == null) {
+                value.set(null);
+            } else {
+                value.set((E) newToggle.getUserData());
+            }
+        });
+
+        return container;
+    }
+
+    public ObjectProperty<E> valueProperty() {
+        return value;
+    }
+
+    public E getValue() {
+        return value.get();
+    }
+
+    public void setValue(E newValue) {
+        if (newValue == null) {
+            Platform.runLater(() -> {
+                if (toggleGroup != null) {
+                    toggleGroup.selectToggle(null);
+                }
+                value.set(null);
+            });
+            return;
+        }
+
+        RadioButton radioButton = radioButtons.get(newValue);
+        if (radioButton == null)
+            return;
+
+        Platform.runLater(() -> radioButton.setSelected(true));
+    }
+
+    @Override
+    public void setValue(Object newValue) {
+        if (newValue == null) {
+            setValue(null);
+            return;
+        }
+
+        @SuppressWarnings("unchecked")
+        E enumValue = (E) newValue;
+        setValue(enumValue);
+    }
+
+    /**
+     * Exposes the selected toggle for validation or accessibility.
+     */
+    public Toggle selectedToggle() {
+        return toggleGroup == null ? null : toggleGroup.getSelectedToggle();
+    }
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormTextField.java b/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormTextField.java
index 1f78ad62..a80d6573 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormTextField.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/form/ui/FormTextField.java
@@ -1,7 +1,11 @@
 package dev.railroadide.core.form.ui;
 
 import dev.railroadide.core.form.HasSetValue;
+import dev.railroadide.core.ui.AutoCompleteOptions;
+import dev.railroadide.core.ui.RRAutoCompleteTextField;
 import dev.railroadide.core.ui.RRTextField;
+import dev.railroadide.core.utility.ServiceLocator;
+import dev.railroadide.logger.Logger;
 import javafx.application.Platform;
 import javafx.scene.control.TextField;
 
@@ -24,7 +28,11 @@ public class FormTextField extends InformativeLabeledHBox<TextField> implements
      * @param translate  whether to use localization for the prompt text
      */
     public FormTextField(String labelKey, boolean required, String promptText, boolean editable, boolean translate) {
-        super(labelKey, required, createParams(promptText, editable, translate));
+        this(labelKey, required, promptText, editable, translate, null);
+    }
+
+    public FormTextField(String labelKey, boolean required, String promptText, boolean editable, boolean translate, AutoCompleteOptions autoCompleteOptions) {
+        super(labelKey, required, createParams(promptText, editable, translate, autoCompleteOptions));
     }
 
     /**
@@ -35,12 +43,14 @@ public FormTextField(String labelKey, boolean required, String promptText, boole
      * @param translate  whether to use localization
      * @return a map containing the component parameters
      */
-    private static Map<String, Object> createParams(String promptText, boolean editable, boolean translate) {
+    private static Map<String, Object> createParams(String promptText, boolean editable, boolean translate, AutoCompleteOptions autoCompleteOptions) {
         Map<String, Object> params = new HashMap<>();
-        if (promptText != null)
+        if (promptText != null) {
             params.put("promptText", promptText);
+        }
         params.put("editable", editable);
         params.put("translate", translate);
+        params.put("autoCompleteOptions", autoCompleteOptions);
         return params;
     }
 
@@ -55,12 +65,31 @@ public TextField createPrimaryComponent(Map<String, Object> params) {
         String promptText = (String) params.get("promptText");
         boolean editable = (boolean) params.get("editable");
         boolean translate = (boolean) params.get("translate");
+        AutoCompleteOptions autoCompleteOptions = (AutoCompleteOptions) params.get("autoCompleteOptions");
+
+        RRTextField textField;
+        boolean useAutoComplete = autoCompleteOptions != null && autoCompleteOptions.isConfigured();
+        if (useAutoComplete) {
+            ServiceLocator.getService(Logger.class).debug("FormTextField using autocomplete for label {}", promptText != null ? promptText : "null");
+        }
+
+        if (useAutoComplete) {
+            var autoCompleteTextField = translate ? new RRAutoCompleteTextField(promptText) : new RRAutoCompleteTextField();
+            if (!translate) {
+                autoCompleteTextField.setPromptText(promptText);
+            }
+
+            autoCompleteTextField.applyOptions(autoCompleteOptions);
+            textField = autoCompleteTextField;
+        } else {
+            textField = translate ? new RRTextField(promptText) : new RRTextField();
+            if (!translate) {
+                textField.setPromptText(promptText);
+            }
+        }
 
-        RRTextField textField = translate ? new RRTextField(promptText) : new RRTextField();
         textField.setEditable(editable);
         textField.getStyleClass().add("rr-text-field");
-        if (!translate)
-            textField.setPromptText(promptText);
 
         return textField;
     }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/AutoCompleteOptions.java b/railroad-core/src/main/java/dev/railroadide/core/ui/AutoCompleteOptions.java
new file mode 100644
index 00000000..b1018c3e
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/AutoCompleteOptions.java
@@ -0,0 +1,74 @@
+package dev.railroadide.core.ui;
+
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.util.Callback;
+import lombok.Getter;
+import lombok.Setter;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * Configuration holder for auto-complete capable text fields.
+ * Provides the data sources and runtime behaviour flags for suggestion lookups.
+ */
+public class AutoCompleteOptions {
+    private Supplier<? extends Collection<String>> suggestionsSupplier;
+    private Function<String, ? extends Collection<String>> suggestionsProvider;
+    private Callback<ListView<String>, ListCell<String>> suggestionCellFactory;
+    @Setter
+    @Getter
+    private boolean caseSensitive;
+    @Setter
+    @Getter
+    private boolean showSuggestionsOnEmpty;
+    @Getter
+    private int maxSuggestions = 50;
+    @Getter
+    private int minQueryLength = 1;
+
+    public boolean isConfigured() {
+        return suggestionsProvider != null || suggestionsSupplier != null;
+    }
+
+    public @Nullable Supplier<? extends Collection<String>> getSuggestionsSupplier() {
+        return suggestionsSupplier;
+    }
+
+    public void setSuggestionsSupplier(@Nullable Supplier<? extends Collection<String>> suggestionsSupplier) {
+        this.suggestionsSupplier = suggestionsSupplier;
+    }
+
+    public @Nullable Function<String, ? extends Collection<String>> getSuggestionsProvider() {
+        return suggestionsProvider;
+    }
+
+    public void setSuggestionsProvider(@Nullable Function<String, ? extends Collection<String>> suggestionsProvider) {
+        this.suggestionsProvider = suggestionsProvider;
+    }
+
+    public @Nullable Callback<ListView<String>, ListCell<String>> getSuggestionCellFactory() {
+        return suggestionCellFactory;
+    }
+
+    public void setSuggestionCellFactory(@Nullable Callback<ListView<String>, ListCell<String>> suggestionCellFactory) {
+        this.suggestionCellFactory = suggestionCellFactory;
+    }
+
+    public void setMaxSuggestions(int maxSuggestions) {
+        if (maxSuggestions <= 0)
+            throw new IllegalArgumentException("maxSuggestions must be greater than 0");
+
+        this.maxSuggestions = maxSuggestions;
+    }
+
+    public void setMinQueryLength(int minQueryLength) {
+        if (minQueryLength < 0)
+            throw new IllegalArgumentException("minQueryLength must be >= 0");
+
+        this.minQueryLength = minQueryLength;
+    }
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/RRAutoCompleteTextField.java b/railroad-core/src/main/java/dev/railroadide/core/ui/RRAutoCompleteTextField.java
new file mode 100644
index 00000000..db781ef1
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/RRAutoCompleteTextField.java
@@ -0,0 +1,221 @@
+package dev.railroadide.core.ui;
+
+import javafx.application.Platform;
+import javafx.geometry.Side;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.CustomMenuItem;
+import javafx.scene.control.ListView;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * {@link RRTextField} variant that can display auto-complete suggestions beneath the field.
+ */
+public class RRAutoCompleteTextField extends RRTextField {
+    private static final double MAX_POPUP_HEIGHT = 200;
+    private static final double MIN_SUGGESTION_HEIGHT = 28;
+    private final ContextMenu suggestionsPopup = new ContextMenu();
+    private final ListView<String> suggestionsListView = new RRListView<>();
+    private final CustomMenuItem suggestionsContainer = new CustomMenuItem(suggestionsListView, false);
+    private AutoCompleteOptions autoCompleteOptions = new AutoCompleteOptions();
+
+    public RRAutoCompleteTextField() {
+        this(null);
+    }
+
+    public RRAutoCompleteTextField(String localizationKey, Object... args) {
+        super(localizationKey, args);
+    }
+
+    @Override
+    protected void initialize() {
+        super.initialize();
+        
+        suggestionsPopup.setAutoHide(true);
+        suggestionsContainer.setHideOnClick(false);
+        setPrefWidth(240);
+        suggestionsPopup.getItems().add(suggestionsContainer);
+
+        suggestionsListView.setFocusTraversable(false);
+        suggestionsListView.setOnMouseClicked(event -> applySelectedSuggestion());
+        suggestionsListView.setOnKeyPressed(event -> {
+            if (event.getCode() == KeyCode.ENTER) {
+                applySelectedSuggestion();
+                event.consume();
+            }
+        });
+
+        applyListViewOptions();
+
+        textProperty().addListener((obs, oldValue, newValue) -> handleTextChanged(newValue));
+        focusedProperty().addListener((obs, oldValue, newValue) -> {
+            if (!newValue) {
+                suggestionsPopup.hide();
+            } else if (autoCompleteOptions.isShowSuggestionsOnEmpty()) {
+                handleTextChanged(getText());
+            }
+        });
+
+        addEventFilter(KeyEvent.KEY_PRESSED, this::handleKeyPress);
+    }
+
+    private void handleKeyPress(KeyEvent event) {
+        if (event.getCode() == KeyCode.ESCAPE && suggestionsPopup.isShowing()) {
+            suggestionsPopup.hide();
+            event.consume();
+        } else if (event.getCode() == KeyCode.DOWN && !suggestionsPopup.isShowing()) {
+            handleTextChanged(getText());
+        }
+    }
+
+    private void handleTextChanged(@Nullable String newValue) {
+        if (!autoCompleteOptions.isConfigured())
+            return;
+
+        String query = newValue == null ? "" : newValue;
+        if (!shouldQuery(query)) {
+            suggestionsPopup.hide();
+            return;
+        }
+
+        List<String> suggestions = fetchSuggestions(query);
+        if (suggestions.isEmpty()) {
+            suggestionsPopup.hide();
+            return;
+        }
+
+        populatePopup(suggestions);
+    }
+
+    private boolean shouldQuery(String query) {
+        if ((query.isBlank() && !autoCompleteOptions.isShowSuggestionsOnEmpty()))
+            return false;
+
+        return query.isBlank() || query.length() >= autoCompleteOptions.getMinQueryLength();
+    }
+
+    private List<String> fetchSuggestions(String query) {
+        Collection<String> source = autoCompleteOptions.getSuggestionsProvider() != null ?
+            autoCompleteOptions.getSuggestionsProvider().apply(query) :
+            resolveStaticSuggestions();
+
+        if (source == null || source.isEmpty())
+            return List.of();
+
+        if (autoCompleteOptions.getSuggestionsProvider() != null) {
+            List<String> provided = source.stream()
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+            return applySortingAndLimit(query, provided);
+        }
+
+        final String normalizedQuery = autoCompleteOptions.isCaseSensitive() ? query : query.toLowerCase(Locale.ROOT);
+        final boolean emptyQuery = normalizedQuery.isBlank();
+
+        List<String> filtered = source.stream()
+            .filter(Objects::nonNull)
+            .filter(candidate -> emptyQuery || matches(candidate, normalizedQuery))
+            .collect(Collectors.toList());
+
+        return applySortingAndLimit(query, filtered);
+    }
+
+    private Collection<String> resolveStaticSuggestions() {
+        return autoCompleteOptions.getSuggestionsSupplier() != null ?
+            autoCompleteOptions.getSuggestionsSupplier().get() :
+            List.of();
+    }
+
+    private boolean matches(String candidate, String normalizedQuery) {
+        String value = autoCompleteOptions.isCaseSensitive() ? candidate : candidate.toLowerCase(Locale.ROOT);
+        return value.contains(normalizedQuery);
+    }
+
+    private List<String> applySortingAndLimit(String query, Collection<String> suggestions) {
+        String normalizedQuery = autoCompleteOptions.isCaseSensitive() ? query : query.toLowerCase(Locale.ROOT);
+
+        return suggestions.stream()
+            .sorted(createSuggestionComparator(normalizedQuery))
+            .limit(autoCompleteOptions.getMaxSuggestions())
+            .collect(Collectors.toList());
+    }
+
+    private Comparator<String> createSuggestionComparator(String normalizedQuery) {
+        return Comparator
+            .<String>comparingInt(candidate -> matchScore(candidate, normalizedQuery))
+            .thenComparing(Comparator.naturalOrder());
+    }
+
+    private int matchScore(String candidate, String normalizedQuery) {
+        if (normalizedQuery.isBlank())
+            return 0;
+
+        String value = autoCompleteOptions.isCaseSensitive() ? candidate : candidate.toLowerCase(Locale.ROOT);
+        if (value.startsWith(normalizedQuery))
+            return 0;
+
+        int index = value.indexOf(normalizedQuery);
+        if (index >= 0)
+            return 1 + index;
+
+        return Integer.MAX_VALUE;
+    }
+
+    private void populatePopup(List<String> suggestions) {
+        suggestionsListView.getItems().setAll(suggestions);
+        suggestionsListView.getSelectionModel().selectFirst();
+        adjustPopupSize();
+
+        if (!suggestionsPopup.isShowing()) {
+            Platform.runLater(() -> suggestionsPopup.show(this, Side.BOTTOM, 0, 0));
+        }
+    }
+
+    private void adjustPopupSize() {
+        Platform.runLater(() -> {
+            double rowHeight = suggestionsListView.getFixedCellSize() > 0 ?
+                suggestionsListView.getFixedCellSize() :
+                MIN_SUGGESTION_HEIGHT;
+
+            int itemCount = Math.max(1, suggestionsListView.getItems().size());
+            double prefHeight = (itemCount * rowHeight) + suggestionsListView.snappedTopInset() + suggestionsListView.snappedBottomInset();
+
+            double clampedHeight = Math.min(MAX_POPUP_HEIGHT, prefHeight);
+            suggestionsListView.setMinHeight(Math.min(rowHeight, clampedHeight));
+            suggestionsListView.setPrefHeight(clampedHeight);
+            suggestionsListView.setMaxHeight(MAX_POPUP_HEIGHT);
+
+            double prefWidth = Math.max(getWidth(), getPrefWidth());
+            suggestionsListView.setPrefWidth(prefWidth);
+        });
+    }
+
+    private void applySelectedSuggestion() {
+        String suggestion = suggestionsListView.getSelectionModel().getSelectedItem();
+        if (suggestion == null)
+            return;
+
+        setText(suggestion);
+        positionCaret(suggestion.length());
+        suggestionsPopup.hide();
+    }
+
+    /**
+     * Applies the provided auto-complete options to this text field.
+     */
+    public void applyOptions(AutoCompleteOptions options) {
+        if (options == null)
+            throw new IllegalArgumentException("AutoCompleteOptions cannot be null");
+
+        this.autoCompleteOptions = options;
+        applyListViewOptions();
+    }
+
+    private void applyListViewOptions() {
+        suggestionsListView.setCellFactory(autoCompleteOptions.getSuggestionCellFactory());
+    }
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/RRButton.java b/railroad-core/src/main/java/dev/railroadide/core/ui/RRButton.java
index 25e6f0ef..924649a5 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/RRButton.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/RRButton.java
@@ -1,14 +1,19 @@
 package dev.railroadide.core.ui;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.utility.ServiceLocator;
+import dev.railroadide.core.ui.localized.LocalizedTextProperty;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import javafx.animation.ScaleTransition;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.util.Duration;
-import lombok.Getter;
 import org.kordamp.ikonli.Ikon;
 import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
 import org.kordamp.ikonli.javafx.FontIcon;
@@ -18,50 +23,49 @@
  * Supports different sizes, styles, and icon integration.
  */
 public class RRButton extends Button {
-    private ButtonVariant variant = ButtonVariant.PRIMARY;
-    private ButtonSize size = ButtonSize.MEDIUM;
+    public static final String[] DEFAULT_STYLE_CLASSES = {"rr-button", "button"};
+
     private FontIcon icon;
-    @Getter
-    private boolean isLoading = false;
-    private String localizationKey;
-    private Object[] localizationArgs;
 
-    private String originalText;
     private Node originalGraphic;
     private FontIcon loadingSpinner;
 
+    private final BooleanProperty isLoading = new SimpleBooleanProperty(this, "isLoading", false);
+
+    public boolean getIsLoading() {
+        return isLoading.get();
+    }
+
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
+
+    private final BooleanProperty isSquare = new SimpleBooleanProperty(this, "isSquare", false);
+    private final BooleanProperty isOutlined = new SimpleBooleanProperty(this, "isOutlined", false);
+    private final BooleanProperty isFlat = new SimpleBooleanProperty(this, "isFlat", false);
+    private final ObjectProperty<ButtonVariant> variant = new SimpleObjectProperty<>(this, "variant", ButtonVariant.PRIMARY);
+    private final ObjectProperty<ButtonSize> size = new SimpleObjectProperty<>(this, "size", ButtonSize.MEDIUM);
+
     public RRButton() {
         this("");
     }
 
     public RRButton(String localizationKey, Ikon icon, Object... args) {
-        super((localizationKey != null && !localizationKey.isBlank()) ? ServiceLocator.getService(LocalizationService.class).get(localizationKey) : "");
+        super();
+
+        initialize(localizationKey, args);
         setIcon(icon);
-        initialize();
-        if(localizationKey != null && !localizationKey.isBlank()) {
-            this.localizationKey = localizationKey;
-            this.localizationArgs = args;
-            addLocalizationListener();
-        }
     }
 
     public RRButton(String localizationKey, Node graphic, Object... args) {
-        super((localizationKey != null && !localizationKey.isBlank()) ? ServiceLocator.getService(LocalizationService.class).get(localizationKey) : "");
+        super();
+
+        initialize(localizationKey, args);
         setGraphic(graphic);
-        initialize();
-        if(localizationKey != null && !localizationKey.isBlank()) {
-            this.localizationKey = localizationKey;
-            this.localizationArgs = args;
-            addLocalizationListener();
-        }
     }
 
     public RRButton(String localizationKey, Object... args) {
-        super(ServiceLocator.getService(LocalizationService.class).get(localizationKey, args));
-        initialize();
-        this.localizationKey = localizationKey;
-        this.localizationArgs = args;
-        addLocalizationListener();
+        super();
+
+        initialize(localizationKey, args);
     }
 
     /**
@@ -118,17 +122,21 @@ public static RRButton warning(String text) {
         return button;
     }
 
-    private void initialize() {
-        getStyleClass().addAll("rr-button", "button");
+    protected void initialize(String localizationKey, Object... args) {
+        getStyleClass().setAll(RRButton.DEFAULT_STYLE_CLASSES);
+
         setAlignment(Pos.CENTER);
         setPadding(new Insets(8, 16, 8, 16));
 
+        textProperty().bindBidirectional(localizedText);
+        localizedText.setTranslation(localizationKey, args);
+
         loadingSpinner = new FontIcon(FontAwesomeSolid.SYNC_ALT);
         loadingSpinner.setIconSize(16);
         loadingSpinner.getStyleClass().add("loading-spinner");
 
         setOnMousePressed($ -> {
-            if (!isLoading) {
+            if (!getIsLoading()) {
                 var scale = new ScaleTransition(Duration.millis(100), this);
                 scale.setToX(0.95);
                 scale.setToY(0.95);
@@ -137,7 +145,7 @@ private void initialize() {
         });
 
         setOnMouseReleased($ -> {
-            if (!isLoading) {
+            if (!getIsLoading()) {
                 var scale = new ScaleTransition(Duration.millis(100), this);
                 scale.setToX(1.0);
                 scale.setToY(1.0);
@@ -145,20 +153,24 @@ private void initialize() {
             }
         });
 
+        isLoading.addListener($ -> {
+            if (getIsLoading()) {
+                onLoading();
+            } else {
+                onNotLoading();
+            }
+        });
+
+        variant.addListener($ -> updateStyle());
+        size.addListener($ -> updateStyle());
+        isSquare.addListener($ -> updateStyle());
+        isOutlined.addListener($ -> updateStyle());
+        isFlat.addListener($ -> updateStyle());
+
         updateStyle();
         updateContent();
     }
 
-    private void addLocalizationListener() {
-        if (localizationKey != null) {
-            ServiceLocator.getService(LocalizationService.class).currentLanguageProperty().addListener((observable, oldValue, newValue) -> {
-                if (!isLoading) {
-                    setText(ServiceLocator.getService(LocalizationService.class).get(localizationKey, localizationArgs));
-                }
-            });
-        }
-    }
-
     /**
      * Set the button text using a localization key with optional formatting arguments.
      * The text will automatically update when the application language changes.
@@ -167,29 +179,21 @@ private void addLocalizationListener() {
      * @param args            optional formatting arguments for the localized text
      */
     public void setLocalizedText(String localizationKey, Object... args) {
-        this.localizationKey = localizationKey;
-        this.localizationArgs = args;
-        if (!isLoading) {
-            setText(ServiceLocator.getService(LocalizationService.class).get(localizationKey, args));
-        }
-
-        addLocalizationListener();
+        localizedText.setTranslation(localizationKey, args);
     }
 
     /**
      * Set the button variant
      */
     public void setVariant(ButtonVariant variant) {
-        this.variant = variant;
-        updateStyle();
+        this.variant.set(variant);
     }
 
     /**
      * Set the button size
      */
     public void setButtonSize(ButtonSize size) {
-        this.size = size;
-        updateStyle();
+        this.size.set(size);
     }
 
     /**
@@ -203,11 +207,12 @@ public void setIcon(Ikon iconCode) {
         if (iconCode != null) {
             icon = new FontIcon(iconCode);
             icon.setIconSize(16);
+            icon.getStyleClass().add("button-icon");
         } else {
             icon = null;
         }
 
-        if (!isLoading) {
+        if (!getIsLoading()) {
             updateContent();
         }
     }
@@ -242,42 +247,45 @@ public void setIcon(Ikon iconCode) {
      * @param loading true to show loading state, false to restore normal state
      */
     public void setLoading(boolean loading) {
-        if (this.isLoading == loading)
-            return;
+        isLoading.set(loading);
+    }
 
-        this.isLoading = loading;
+    /**
+     * Called when the button has started loading
+     */
+    protected void onLoading() {
+        textProperty().unbindBidirectional(localizedText);
+        originalGraphic = getGraphic();
 
-        if (loading) {
-            originalText = getText();
-            originalGraphic = getGraphic();
+        setDisable(true);
+        getStyleClass().add("loading");
 
-            setDisable(true);
-            getStyleClass().add("loading");
+        var loadingContent = new RRHBox(8);
+        loadingContent.setAlignment(Pos.CENTER);
+        loadingContent.getChildren().addAll(loadingSpinner);
 
-            var loadingContent = new RRHBox(8);
-            loadingContent.setAlignment(Pos.CENTER);
-            loadingContent.getChildren().addAll(loadingSpinner);
+        if (localizedText.get() != null && !localizedText.get().isEmpty()) {
+            setText("Loading...");
+        } else {
+            setText("");
+        }
 
-            if (originalText != null && !originalText.isEmpty()) {
-                setText("Loading...");
-            } else {
-                setText("");
-            }
+        setGraphic(loadingContent);
+    }
 
-            setGraphic(loadingContent);
-        } else {
-            setDisable(false);
-            getStyleClass().remove("loading");
+    /**
+     * Called when the button has stopped loading
+     */
+    protected void onNotLoading() {
+        setDisable(false);
+        getStyleClass().remove("loading");
 
-            if (originalText != null) {
-                setText(originalText);
-            }
+        textProperty().bindBidirectional(localizedText);
 
-            if (originalGraphic != null) {
-                setGraphic(originalGraphic);
-            } else {
-                updateContent();
-            }
+        if (originalGraphic != null) {
+            setGraphic(originalGraphic);
+        } else {
+            updateContent();
         }
     }
 
@@ -292,30 +300,29 @@ public void setRounded(boolean rounded) {
         }
     }
 
+    /**
+     * Force the button into a square shape.
+     */
+    public void setSquare(boolean square) {
+        isSquare.set(square);
+    }
+
     /**
      * Set the button as outlined
      */
     public void setOutlined(boolean outlined) {
-        if (outlined) {
-            getStyleClass().add("outlined");
-        } else {
-            getStyleClass().remove("outlined");
-        }
+        isOutlined.set(outlined);
     }
 
     /**
      * Set the button as flat
      */
     public void setFlat(boolean flat) {
-        if (flat) {
-            getStyleClass().add("flat");
-        } else {
-            getStyleClass().remove("flat");
-        }
+        isFlat.set(flat);
     }
 
     private void updateContent() {
-        if (isLoading)
+        if (getIsLoading())
             return; // Don't update content while loading
 
         if (icon != null) {
@@ -334,30 +341,34 @@ private void updateContent() {
     }
 
     private void updateStyle() {
-        getStyleClass().removeAll("primary", "secondary", "ghost", "danger", "success", "warning");
-        getStyleClass().removeAll("small", "medium", "large");
-
-        switch (variant) {
-            case PRIMARY -> getStyleClass().add("primary");
-            case SECONDARY -> getStyleClass().add("secondary");
-            case GHOST -> getStyleClass().add("ghost");
-            case DANGER -> getStyleClass().add("danger");
-            case SUCCESS -> getStyleClass().add("success");
-            case WARNING -> getStyleClass().add("warning");
-        }
+        ObservableList<String> styleClass = getStyleClass();
 
-        switch (size) {
-            case SMALL -> getStyleClass().add("small");
-            case MEDIUM -> getStyleClass().add("medium");
-            case LARGE -> getStyleClass().add("large");
-        }
-    }
+        styleClass.removeAll("square", "outlined", "flat");
+        styleClass.removeAll("primary", "secondary", "ghost", "danger", "success", "warning");
+        styleClass.removeAll("small", "medium", "large");
 
-    public enum ButtonVariant {
-        PRIMARY, SECONDARY, GHOST, DANGER, SUCCESS, WARNING
-    }
+        if (isSquare.get())
+            styleClass.add("square");
+
+        if (isOutlined.get())
+            styleClass.add("outlined");
+
+        if (isFlat.get())
+            styleClass.add("flat");
 
-    public enum ButtonSize {
-        SMALL, MEDIUM, LARGE
+        switch (variant.get()) {
+            case PRIMARY -> styleClass.add("primary");
+            case SECONDARY -> styleClass.add("secondary");
+            case GHOST -> styleClass.add("ghost");
+            case DANGER -> styleClass.add("danger");
+            case SUCCESS -> styleClass.add("success");
+            case WARNING -> styleClass.add("warning");
+        }
+
+        switch (size.get()) {
+            case SMALL -> styleClass.add("small");
+            case MEDIUM -> styleClass.add("medium");
+            case LARGE -> styleClass.add("large");
+        }
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/RRCheckBox.java b/railroad-core/src/main/java/dev/railroadide/core/ui/RRCheckBox.java
new file mode 100644
index 00000000..9812b538
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/RRCheckBox.java
@@ -0,0 +1,218 @@
+package dev.railroadide.core.ui;
+
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+import dev.railroadide.core.ui.localized.LocalizedTextProperty;
+import javafx.animation.ScaleTransition;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.CheckBox;
+import javafx.util.Duration;
+
+public class RRCheckBox extends CheckBox {
+
+    private FontIcon icon;
+
+    private Node originalGraphic;
+    private FontIcon loadingSpinner;
+
+    private final BooleanProperty isLoading = new SimpleBooleanProperty(this, "isLoading", false);
+    public boolean getIsLoading() {
+        return isLoading.get();
+    }
+
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
+
+    public RRCheckBox() {
+        this("");
+    }
+
+    public RRCheckBox(String localizationKey, Ikon icon, Object... args) {
+        super();
+        
+        initialize(localizationKey, args);
+        setIcon(icon);
+    }
+
+    public RRCheckBox(String localizationKey, Node graphic, Object... args) {
+        super();
+        
+        initialize(localizationKey, args);
+        setGraphic(graphic);
+    }
+
+    public RRCheckBox(String localizationKey, Object... args) {
+        super();
+        
+        initialize(localizationKey, args);
+    }
+
+    private void initialize(String localizationKey, Object... args) {
+        getStyleClass().setAll("rr-check-box", "check-box");
+        setAlignment(Pos.CENTER);
+        setPadding(new Insets(8, 16, 8, 16));
+
+        textProperty().bindBidirectional(localizedText);
+        localizedText.setTranslation(localizationKey, args);
+
+        loadingSpinner = new FontIcon(FontAwesomeSolid.SYNC_ALT);
+        loadingSpinner.setIconSize(16);
+        loadingSpinner.getStyleClass().add("loading-spinner");
+
+        setOnMousePressed($ -> {
+            if (!getIsLoading()) {
+                var scale = new ScaleTransition(Duration.millis(100), this);
+                scale.setToX(0.95);
+                scale.setToY(0.95);
+                scale.play();
+            }
+        });
+
+        setOnMouseReleased($ -> {
+            if (!getIsLoading()) {
+                var scale = new ScaleTransition(Duration.millis(100), this);
+                scale.setToX(1.0);
+                scale.setToY(1.0);
+                scale.play();
+            }
+        });
+
+        isLoading.addListener($ -> {
+            if (getIsLoading()) {
+                onLoading();
+            } else {
+                onNotLoading();
+            }
+        });
+
+        updateContent();
+    }
+
+    /**
+     * Set the checkbox text using a localization key with optional formatting arguments.
+     * The text will automatically update when the application language changes.
+     *
+     * @param localizationKey the localization key for the text
+     * @param args            optional formatting arguments for the localized text
+     */
+    public void setLocalizedText(String localizationKey, Object... args) {
+        localizedText.setTranslation(localizationKey, args);
+    }
+
+    /**
+     * Set an icon for the checkbox
+     */
+    public void setIcon(Ikon iconCode) {
+        if (icon != null && getGraphic() == icon) {
+            setGraphic(null);
+        }
+
+        if (iconCode != null) {
+            icon = new FontIcon(iconCode);
+            icon.setIconSize(16);
+        } else {
+            icon = null;
+        }
+
+        if (!getIsLoading()) {
+            updateContent();
+        }
+    }
+
+    /**
+     * Set loading state for the checkbox.
+     * <p>
+     * When loading is true:
+     * - The checkbox becomes disabled and shows a spinning icon
+     * - The text changes to "Loading..." if there was original text
+     * - The checkbox gets a "loading" CSS class for styling
+     * - Click animations are disabled during loading
+     * <p>
+     * When loading is false:
+     * - The checkbox is re-enabled and shows the original content
+     * - Original text and icon are restored
+     * - The "loading" CSS class is removed
+     * <p>
+     * Example usage:
+     * <pre>
+     * RRCheckBox checkbox = new RRCheckBox();
+     * checkbox.setOnAction(e -> {
+     *     checkbox.setLoading(true);
+     *     // Perform async operation
+     *     CompletableFuture.runAsync(() -> {
+     *         // Do work...
+     *         Platform.runLater(() -> checkbox.setLoading(false));
+     *     });
+     * });
+     * </pre>
+     *
+     * @param loading true to show loading state, false to restore normal state
+     */
+    public void setLoading(boolean loading) {
+        isLoading.set(loading);
+    }
+
+    /**
+     * Called when the button has started loading
+     */
+    protected void onLoading() {
+        textProperty().unbindBidirectional(localizedText);
+        originalGraphic = getGraphic();
+
+        setDisable(true);
+        getStyleClass().add("loading");
+
+        var loadingContent = new RRHBox(8);
+        loadingContent.setAlignment(Pos.CENTER);
+        loadingContent.getChildren().addAll(loadingSpinner);
+
+        if (localizedText.get() != null && !localizedText.get().isEmpty()) {
+            setText("Loading...");
+        } else {
+            setText("");
+        }
+
+        setGraphic(loadingContent);
+    }
+
+    /**
+     * Called when the button has stopped loading
+     */
+    protected void onNotLoading() {
+        setDisable(false);
+        getStyleClass().remove("loading");
+
+        textProperty().bindBidirectional(localizedText);
+
+        if (originalGraphic != null) {
+            setGraphic(originalGraphic);
+        } else {
+            updateContent();
+        }
+    }
+
+    private void updateContent() {
+        if (getIsLoading())
+            return; // Don't update content while loading
+
+        if (icon != null) {
+            var content = new RRHBox(8);
+            content.setAlignment(Pos.CENTER);
+            content.getChildren().add(icon);
+
+            if (getText() != null && !getText().isEmpty()) {
+                setGraphic(content);
+            } else {
+                setGraphic(icon);
+            }
+        } else {
+            setGraphic(null);
+        }
+    }
+    
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/RRFormContainer.java b/railroad-core/src/main/java/dev/railroadide/core/ui/RRFormContainer.java
index c4f825a0..dc8eec98 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/RRFormContainer.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/RRFormContainer.java
@@ -30,23 +30,27 @@ public RRFormContainer(@Nullable String title, Insets padding) {
         titleLabel = new LocalizedLabel("");
         titleLabel.getStyleClass().add("form-title");
 
-        if (title != null && !title.trim().isEmpty()) {
-            if (title.contains(".")) {
-                titleLabel.setKey(title);
-            } else {
-                titleLabel.setText(title);
-            }
+        if (title != null && title.contains(".")) {
+            setLocalizedTitle(title);
+        } else {
+            setTitle(title);
         }
-        titleLabel.setVisible(title != null && !title.trim().isEmpty());
 
         formContent = new VBox(20);
         formContent.getStyleClass().add("form-content");
 
+        initialize(padding);
+    }
+
+    protected void initialize(Insets padding) {
+
         setPadding(padding);
         setSpacing(20);
 
-        getChildren().addAll(titleLabel, formContent);
         VBox.setVgrow(formContent, javafx.scene.layout.Priority.ALWAYS);
+        updateLayout();
+
+        titleLabel.visibleProperty().addListener(_observable -> updateLayout());
     }
 
     /**
@@ -65,6 +69,15 @@ public void setLocalizedTitle(String localizationKey, Object... args) {
         titleLabel.setVisible(localizationKey != null && !localizationKey.trim().isEmpty());
     }
 
+    private void updateLayout() {
+        getChildren().clear();
+
+        if (titleLabel.isVisible()) {
+            getChildren().add(titleLabel);
+        }
+        getChildren().add(formContent);
+    }
+
     /**
      * Get the form title
      */
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/RRHBox.java b/railroad-core/src/main/java/dev/railroadide/core/ui/RRHBox.java
index 1961e086..fc68e98e 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/RRHBox.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/RRHBox.java
@@ -1,5 +1,6 @@
 package dev.railroadide.core.ui;
 
+import javafx.scene.Node;
 import javafx.scene.layout.HBox;
 
 public class RRHBox extends HBox {
@@ -12,4 +13,14 @@ public RRHBox(double spacing) {
         super(spacing);
         getStyleClass().addAll("Railroad", "Pane", "HBox", "background-2");
     }
+
+    public RRHBox(double spacing, Node... children) {
+        super(spacing, children);
+        getStyleClass().addAll("Railroad", "Pane", "HBox", "background-2");
+    }
+
+    public RRHBox(Node... children) {
+        super(children);
+        getStyleClass().addAll("Railroad", "Pane", "HBox", "background-2");
+    }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/RRListView.java b/railroad-core/src/main/java/dev/railroadide/core/ui/RRListView.java
index e88fce2c..72249a89 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/RRListView.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/RRListView.java
@@ -57,7 +57,9 @@ public static <T> RRListView<T> create() {
     }
 
     private void initialize() {
-        getStyleClass().addAll("rr-list-view", "list-view");
+        if (!getStyleClass().contains("rr-list-view")) {
+            getStyleClass().add("rr-list-view");
+        }
         setPadding(new Insets(8));
 
         // Enable smooth scrolling
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/RRMenuBar.java b/railroad-core/src/main/java/dev/railroadide/core/ui/RRMenuBar.java
index 73c003d2..5fc703d1 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/RRMenuBar.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/RRMenuBar.java
@@ -30,9 +30,9 @@ public RRMenuBar(boolean addDefaults, Menu... children) {
             help.getItems().add(new LocalizedMenuItem("railroad.menu.help.documentation", "https://railroadide.dev/"));
             help.getItems().add(new SeparatorMenuItem());
             help.getItems().add(new LocalizedMenuItem("railroad.menu.help.issues", "https://github.com/Railroad-Team/Railroad/issues"));
-            help.getItems().add(new LocalizedMenuItem("railroad.menu.help.discord", "https://railroadide.dev/discord"));
+            help.getItems().add(new LocalizedMenuItem("railroad.menu.help.discord", "https://discord.turtywurty.dev/"));
 
-            this.getMenus().addLast(help);
+            getMenus().addLast(help);
         }
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/RRPasswordField.java b/railroad-core/src/main/java/dev/railroadide/core/ui/RRPasswordField.java
new file mode 100644
index 00000000..86e1f515
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/RRPasswordField.java
@@ -0,0 +1,210 @@
+package dev.railroadide.core.ui;
+
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+import dev.railroadide.core.ui.domain.TextFieldControl;
+import dev.railroadide.core.ui.localized.LocalizedTextProperty;
+import dev.railroadide.core.ui.styling.TextFieldSize;
+import dev.railroadide.core.ui.styling.ValidationState;
+import javafx.animation.FadeTransition;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.PasswordField;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.util.Duration;
+import lombok.Getter;
+
+public class RRPasswordField extends PasswordField implements TextFieldControl {
+
+    public static final String[] DEFAULT_STYLE_CLASSES = { "rr-text-field", "rr-password-field", "text-field", "password-field" };
+
+    private TextFieldSize size = TextFieldSize.MEDIUM;
+    private ValidationState validationState = ValidationState.NONE;
+    private FontIcon prefixIcon;
+    private FontIcon suffixIcon;
+
+    @Getter
+    private HBox container;
+
+    private final LocalizedTextProperty localizedPromptText = new LocalizedTextProperty(this, "localizedPromptText", null);
+
+    /**
+     * Constructs a new password field with empty text and default styling.
+     */
+    public RRPasswordField() {
+        this("");
+    }
+
+    /**
+     * Constructs a new password field with localized placeholder text and a prefix icon.
+     *
+     * @param localizationKey the localization key for the placeholder text
+     * @param prefixIcon      the icon to display before the text field
+     */
+    public RRPasswordField(String localizationKey, Ikon prefixIcon) {
+        this(localizationKey);
+        setPrefixIcon(prefixIcon);
+    }
+
+    /**
+     * Constructs a new password field with localized placeholder text.
+     *
+     * @param localizationKey the localization key for the placeholder text
+     * @param args            optional formatting arguments for the localized text
+     */
+    public RRPasswordField(String localizationKey, Object... args) {
+        super();
+        initialize();
+
+        setLocalizedPlaceholder(localizationKey, args);
+    }
+
+    protected void initialize() {
+        getStyleClass().setAll(RRPasswordField.DEFAULT_STYLE_CLASSES);
+        setPadding(new Insets(8, 12, 8, 12));
+
+        promptTextProperty().bindBidirectional(localizedPromptText);
+
+        container = new HBox();
+        container.setAlignment(Pos.CENTER_LEFT);
+        container.setSpacing(8);
+
+        focusedProperty().addListener((obs, oldVal, newVal) -> {
+            var fade = new FadeTransition(Duration.millis(200), this);
+            fade.setFromValue(newVal ? 0.8 : 1.0);
+            fade.setToValue(newVal ? 1.0 : 0.8);
+            fade.play();
+        });
+
+        updateStyle();
+    }
+
+    @Override
+    public void setTextFieldSize(TextFieldSize size) {
+        this.size = size;
+        updateStyle();
+    }
+
+    @Override
+    public void setValidationState(ValidationState state) {
+        this.validationState = state;
+        updateStyle();
+    }
+
+    @Override
+    public void setPrefixIcon(Ikon iconCode) {
+        if (iconCode != null) {
+            prefixIcon = new FontIcon(iconCode);
+            prefixIcon.setIconSize(16);
+            prefixIcon.getStyleClass().add("prefix-icon");
+        } else {
+            prefixIcon = null;
+        }
+
+        updateIcons();
+    }
+
+    @Override
+    public void setSuffixIcon(Ikon iconCode) {
+        if (iconCode != null) {
+            suffixIcon = new FontIcon(iconCode);
+            suffixIcon.setIconSize(16);
+            suffixIcon.getStyleClass().add("suffix-icon");
+        } else {
+            suffixIcon = null;
+        }
+
+        updateIcons();
+    }
+
+    @Override
+    public void setRounded(boolean rounded) {
+        if (rounded) {
+            getStyleClass().add("rounded");
+        } else {
+            getStyleClass().remove("rounded");
+        }
+    }
+
+    @Override
+    public void setOutlined(boolean outlined) {
+        if (outlined) {
+            getStyleClass().add("outlined");
+        } else {
+            getStyleClass().remove("outlined");
+        }
+    }
+
+    @Override
+    public void setDisabledState(boolean disabled) {
+        setDisable(disabled);
+
+        if (disabled) {
+            getStyleClass().add("disabled");
+        } else {
+            getStyleClass().remove("disabled");
+        }
+    }
+
+    @Override
+    public void setPlaceholder(String placeholder) {
+        setPromptText(placeholder);
+    }
+
+    @Override
+    public void setLocalizedPlaceholder(String localizationKey, Object... args) {
+        localizedPromptText.setTranslation(localizationKey, args);
+    }
+
+    @Override
+    public void clearWithAnimation() {
+        FadeTransition fade = new FadeTransition(Duration.millis(200), this);
+        fade.setFromValue(1.0);
+        fade.setToValue(0.5);
+        fade.setOnFinished(e -> {
+            setText("");
+            FadeTransition fadeBack = new FadeTransition(Duration.millis(200), this);
+            fadeBack.setFromValue(0.5);
+            fadeBack.setToValue(1.0);
+            fadeBack.play();
+        });
+
+        fade.play();
+    }
+
+    private void updateIcons() {
+        container.getChildren().clear();
+
+        if (prefixIcon != null) {
+            container.getChildren().add(prefixIcon);
+        }
+
+        container.getChildren().add(this);
+        HBox.setHgrow(this, Priority.ALWAYS);
+
+        if (suffixIcon != null) {
+            container.getChildren().add(suffixIcon);
+        }
+    }
+
+    private void updateStyle() {
+        getStyleClass().removeAll("small", "medium", "large");
+        getStyleClass().removeAll("success", "error", "warning");
+
+        switch (size) {
+            case SMALL -> getStyleClass().add("small");
+            case MEDIUM -> getStyleClass().add("medium");
+            case LARGE -> getStyleClass().add("large");
+        }
+
+        switch (validationState) {
+            case SUCCESS -> getStyleClass().add("success");
+            case ERROR -> getStyleClass().add("error");
+            case WARNING -> getStyleClass().add("warning");
+            default -> {}
+        }
+    }
+
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/RRRadioButton.java b/railroad-core/src/main/java/dev/railroadide/core/ui/RRRadioButton.java
new file mode 100644
index 00000000..7a5011ec
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/RRRadioButton.java
@@ -0,0 +1,195 @@
+package dev.railroadide.core.ui;
+
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+import dev.railroadide.core.ui.localized.LocalizedTextProperty;
+import javafx.animation.ScaleTransition;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.RadioButton;
+import javafx.util.Duration;
+
+public class RRRadioButton extends RadioButton {
+
+    public static final String[] DEFAULT_STYLE_CLASSES = { "rr-radio-button", "radio-button" };
+
+    private FontIcon icon;
+
+    private Node originalGraphic;
+    private FontIcon loadingSpinner;
+
+    private final BooleanProperty isLoading = new SimpleBooleanProperty(this, "isLoading", false);
+    public boolean getIsLoading() {
+        return isLoading.get();
+    }
+
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
+
+    public RRRadioButton() {
+        this("");
+    }
+
+	public RRRadioButton(String localizationKey, Ikon icon, Object... args) {
+        super();
+
+        initialize(localizationKey, args);
+        setIcon(icon);
+    }
+
+	public RRRadioButton(String localizationKey, Node graphic, Object... args) {
+		super();
+        
+        initialize(localizationKey, args);
+        setGraphic(graphic);
+    }
+
+    public RRRadioButton(String localizationKey, Object... args) {
+		super();
+        
+        initialize(localizationKey, args);
+    }
+
+    protected void initialize(String localizationKey, Object... args) {
+        getStyleClass().setAll(RRRadioButton.DEFAULT_STYLE_CLASSES);
+
+        setPadding(new Insets(8, 16, 8, 16));
+
+        textProperty().bindBidirectional(localizedText);
+        localizedText.setTranslation(localizationKey, args);
+
+        loadingSpinner = new FontIcon(FontAwesomeSolid.SYNC_ALT);
+        loadingSpinner.setIconSize(16);
+        loadingSpinner.getStyleClass().add("loading-spinner");
+
+        setOnMousePressed($ -> {
+            if (!getIsLoading()) {
+                var scale = new ScaleTransition(Duration.millis(100), this);
+                scale.setToX(0.95);
+                scale.setToY(0.95);
+                scale.play();
+            }
+        });
+
+        setOnMouseReleased($ -> {
+            if (!getIsLoading()) {
+                var scale = new ScaleTransition(Duration.millis(100), this);
+                scale.setToX(1.0);
+                scale.setToY(1.0);
+                scale.play();
+            }
+        });
+
+        isLoading.addListener($ -> {
+            if (getIsLoading()) {
+                onLoading();
+            } else {
+                onNotLoading();
+            }
+        });
+
+        updateContent();
+    }
+    
+    /**
+     * Set the button text using a localization key with optional formatting arguments.
+     * The text will automatically update when the application language changes.
+     *
+     * @param localizationKey the localization key for the text
+     * @param args            optional formatting arguments for the localized text
+     */
+    public void setLocalizedText(String localizationKey, Object... args) {
+        localizedText.setTranslation(localizationKey, args);
+    }
+
+    /**
+     * Set an icon for the button
+     */
+    public void setIcon(Ikon iconCode) {
+        if (icon != null && getGraphic() == icon) {
+            setGraphic(null);
+        }
+
+        if (iconCode != null) {
+            icon = new FontIcon(iconCode);
+            icon.setIconSize(16);
+            icon.getStyleClass().add("button-icon");
+        } else {
+            icon = null;
+        }
+
+        if (!getIsLoading()) {
+            updateContent();
+        }
+    }
+
+    /**
+     * Set loading state for the button
+     */
+    public void setLoading(boolean loading) {
+        isLoading.set(loading);
+    }
+
+    /**
+     * Called when the button has started loading
+     */
+    protected void onLoading() {
+        textProperty().unbindBidirectional(localizedText);
+        originalGraphic = getGraphic();
+
+        setDisable(true);
+        getStyleClass().add("loading");
+
+        var loadingContent = new RRHBox(8);
+        loadingContent.setAlignment(Pos.CENTER);
+        loadingContent.getChildren().addAll(loadingSpinner);
+
+        if (localizedText.get() != null && !localizedText.get().isEmpty()) {
+            setText("Loading...");
+        } else {
+            setText("");
+        }
+
+        setGraphic(loadingContent);
+    }
+
+    /**
+     * Called when the button has stopped loading
+     */
+    protected void onNotLoading() {
+        setDisable(false);
+        getStyleClass().remove("loading");
+
+        textProperty().bindBidirectional(localizedText);
+
+        if (originalGraphic != null) {
+            setGraphic(originalGraphic);
+        } else {
+            updateContent();
+        }
+    }
+
+    private void updateContent() {
+        if (getIsLoading())
+            return; // Don't update content while loading
+
+        if (icon != null) {
+            var content = new RRHBox(8);
+            content.setAlignment(Pos.CENTER);
+            content.getChildren().add(icon);
+
+            if (getText() != null && !getText().isEmpty()) {
+                setGraphic(content);
+            } else {
+                setGraphic(icon);
+            }
+        } else {
+            setGraphic(null);
+        }
+    }
+
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/RRStackPane.java b/railroad-core/src/main/java/dev/railroadide/core/ui/RRStackPane.java
index 419ecb03..5116b637 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/RRStackPane.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/RRStackPane.java
@@ -1,5 +1,6 @@
 package dev.railroadide.core.ui;
 
+import javafx.scene.Node;
 import javafx.scene.layout.StackPane;
 
 public class RRStackPane extends StackPane {
@@ -7,4 +8,9 @@ public RRStackPane() {
         super();
         getStyleClass().addAll("Railroad", "Pane", "StackPane", "background-2");
     }
+
+    public RRStackPane(Node... children) {
+        super(children);
+        getStyleClass().addAll("Railroad", "Pane", "StackPane", "background-2");
+    }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/RRTableView.java b/railroad-core/src/main/java/dev/railroadide/core/ui/RRTableView.java
new file mode 100644
index 00000000..75e2c09a
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/RRTableView.java
@@ -0,0 +1,45 @@
+package dev.railroadide.core.ui;
+
+import javafx.collections.ObservableList;
+import javafx.scene.control.TableView;
+
+public class RRTableView<T> extends TableView<T> {
+
+    public static final String[] DEFAULT_STYLE_CLASSES = { "rr-table-view", "table-view" };
+
+    public RRTableView() {
+        super();
+        initialize();
+    }
+
+    public RRTableView(ObservableList<T> items) {
+        super(items);
+        initialize();
+    }
+
+    protected void initialize() {
+        getStyleClass().setAll(DEFAULT_STYLE_CLASSES);
+    }
+
+    /**
+     * Set the table view as bordered
+     */
+    public void setBordered(boolean bordered) {
+        if (bordered) {
+            getStyleClass().add("bordered");
+        } else {
+            getStyleClass().remove("bordered");
+        }
+    }
+
+    /**
+     * Set the table view as striped
+     */
+    public void setStriped(boolean striped) {
+        if (striped) {
+            getStyleClass().add("striped");
+        } else {
+            getStyleClass().remove("striped");
+        }
+    }
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/RRTextField.java b/railroad-core/src/main/java/dev/railroadide/core/ui/RRTextField.java
index 389691f5..b4f2086b 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/RRTextField.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/RRTextField.java
@@ -1,7 +1,9 @@
 package dev.railroadide.core.ui;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.utility.ServiceLocator;
+import dev.railroadide.core.ui.domain.TextFieldControl;
+import dev.railroadide.core.ui.localized.LocalizedTextProperty;
+import dev.railroadide.core.ui.styling.TextFieldSize;
+import dev.railroadide.core.ui.styling.ValidationState;
 import javafx.animation.FadeTransition;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -17,7 +19,10 @@
  * A modern text field component with enhanced styling, icons, and validation states.
  * Supports different sizes, validation states, and icon integration.
  */
-public class RRTextField extends TextField {
+public class RRTextField extends TextField implements TextFieldControl {
+
+    public static final String[] DEFAULT_STYLE_CLASSES = { "rr-text-field", "text-field" };
+
     private TextFieldSize size = TextFieldSize.MEDIUM;
     private ValidationState validationState = ValidationState.NONE;
     private FontIcon prefixIcon;
@@ -25,6 +30,8 @@ public class RRTextField extends TextField {
     @Getter
     private HBox container;
 
+    private final LocalizedTextProperty localizedPromptText = new LocalizedTextProperty(this, "localizedPromptText", null);
+
     /**
      * Constructs a new text field with empty text and default styling.
      */
@@ -51,14 +58,17 @@ public RRTextField(String localizationKey, Ikon prefixIcon) {
      */
     public RRTextField(String localizationKey, Object... args) {
         super();
-        setLocalizedPlaceholder(localizationKey, args);
         initialize();
+
+        setLocalizedPlaceholder(localizationKey, args);
     }
 
-    private void initialize() {
-        getStyleClass().addAll("rr-text-field", "text-field");
+    protected void initialize() {
+        getStyleClass().setAll(RRTextField.DEFAULT_STYLE_CLASSES);
         setPadding(new Insets(8, 12, 8, 12));
 
+        promptTextProperty().bindBidirectional(localizedPromptText);
+
         container = new HBox();
         container.setAlignment(Pos.CENTER_LEFT);
         container.setSpacing(8);
@@ -76,6 +86,7 @@ private void initialize() {
     /**
      * Set the text field size
      */
+    @Override
     public void setTextFieldSize(TextFieldSize size) {
         this.size = size;
         updateStyle();
@@ -84,6 +95,7 @@ public void setTextFieldSize(TextFieldSize size) {
     /**
      * Set the validation state
      */
+    @Override
     public void setValidationState(ValidationState state) {
         this.validationState = state;
         updateStyle();
@@ -92,6 +104,7 @@ public void setValidationState(ValidationState state) {
     /**
      * Set a prefix icon
      */
+    @Override
     public void setPrefixIcon(Ikon iconCode) {
         if (iconCode != null) {
             prefixIcon = new FontIcon(iconCode);
@@ -106,6 +119,7 @@ public void setPrefixIcon(Ikon iconCode) {
     /**
      * Set a suffix icon
      */
+    @Override
     public void setSuffixIcon(Ikon iconCode) {
         if (iconCode != null) {
             suffixIcon = new FontIcon(iconCode);
@@ -121,6 +135,7 @@ public void setSuffixIcon(Ikon iconCode) {
     /**
      * Set the text field as rounded
      */
+    @Override
     public void setRounded(boolean rounded) {
         if (rounded) {
             getStyleClass().add("rounded");
@@ -132,6 +147,7 @@ public void setRounded(boolean rounded) {
     /**
      * Set the text field as outlined
      */
+    @Override
     public void setOutlined(boolean outlined) {
         if (outlined) {
             getStyleClass().add("outlined");
@@ -143,6 +159,7 @@ public void setOutlined(boolean outlined) {
     /**
      * Set the text field as disabled state
      */
+    @Override
     public void setDisabledState(boolean disabled) {
         setDisable(disabled);
         if (disabled) {
@@ -181,12 +198,11 @@ private void updateStyle() {
             case SUCCESS -> getStyleClass().add("success");
             case ERROR -> getStyleClass().add("error");
             case WARNING -> getStyleClass().add("warning");
+            default -> {}
         }
     }
 
-    /**
-     * Set placeholder text with modern styling
-     */
+    @Override
     public void setPlaceholder(String placeholder) {
         setPromptText(placeholder);
     }
@@ -194,6 +210,7 @@ public void setPlaceholder(String placeholder) {
     /**
      * Clear the text field with animation
      */
+    @Override
     public void clearWithAnimation() {
         FadeTransition fade = new FadeTransition(Duration.millis(200), this);
         fade.setFromValue(1.0);
@@ -209,19 +226,8 @@ public void clearWithAnimation() {
         fade.play();
     }
 
+    @Override
     public void setLocalizedPlaceholder(String localizationKey, Object... args) {
-        setPromptText(ServiceLocator.getService(LocalizationService.class).get(localizationKey, args));
-        if (localizationKey != null) {
-            ServiceLocator.getService(LocalizationService.class).currentLanguageProperty().addListener((observable, oldValue, newValue) ->
-                setPromptText(ServiceLocator.getService(LocalizationService.class).get(localizationKey, args)));
-        }
-    }
-
-    public enum TextFieldSize {
-        SMALL, MEDIUM, LARGE
-    }
-
-    public enum ValidationState {
-        NONE, SUCCESS, ERROR, WARNING
+        localizedPromptText.setTranslation(localizationKey, args);
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/RRToggleButton.java b/railroad-core/src/main/java/dev/railroadide/core/ui/RRToggleButton.java
new file mode 100644
index 00000000..85ca5044
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/RRToggleButton.java
@@ -0,0 +1,371 @@
+package dev.railroadide.core.ui;
+
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+import dev.railroadide.core.ui.localized.LocalizedTextProperty;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
+import javafx.animation.ScaleTransition;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.ObservableList;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.ToggleButton;
+import javafx.util.Duration;
+
+public class RRToggleButton extends ToggleButton {
+
+	public static final String[] DEFAULT_STYLE_CLASSES = { "rr-button", "rr-toggle-button", "toggle-button" };
+
+    private FontIcon icon;
+
+    private Node originalGraphic;
+    private FontIcon loadingSpinner;
+
+    private final BooleanProperty isLoading = new SimpleBooleanProperty(this, "isLoading", false);
+    public boolean getIsLoading() {
+        return isLoading.get();
+    }
+
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
+    private final BooleanProperty isSquare = new SimpleBooleanProperty(this, "isSquare", false);
+    private final BooleanProperty isOutlined = new SimpleBooleanProperty(this, "isOutlined", false);
+    private final BooleanProperty isFlat = new SimpleBooleanProperty(this, "isFlat", false);
+    private final ObjectProperty<ButtonVariant> variant = new SimpleObjectProperty<>(this, "variant", ButtonVariant.PRIMARY);
+    private final ObjectProperty<ButtonSize> size = new SimpleObjectProperty<>(this, "size", ButtonSize.MEDIUM);
+
+	public RRToggleButton() {
+        this("");
+    }
+
+	public RRToggleButton(String localizationKey, Ikon icon, Object... args) {
+        super();
+        
+        initialize(localizationKey, args);
+        setIcon(icon);
+    }
+
+	public RRToggleButton(String localizationKey, Node graphic, Object... args) {
+		super();
+        
+        initialize(localizationKey, args);
+        setGraphic(graphic);
+    }
+
+    public RRToggleButton(String localizationKey, Object... args) {
+		super();
+        
+        initialize(localizationKey, args);
+    }
+
+    /**
+     * Create a primary toggle button
+     */
+    public static RRToggleButton primary(String text) {
+        var button = new RRToggleButton(text);
+        button.setVariant(ButtonVariant.PRIMARY);
+        return button;
+    }
+
+    /**
+     * Create a secondary toggle button
+     */
+    public static RRToggleButton secondary(String text) {
+        var button = new RRToggleButton(text);
+        button.setVariant(ButtonVariant.SECONDARY);
+        return button;
+    }
+
+    /**
+     * Create a ghost toggle button
+     */
+    public static RRToggleButton ghost(String text) {
+        var button = new RRToggleButton(text);
+        button.setVariant(ButtonVariant.GHOST);
+        return button;
+    }
+
+    /**
+     * Create a danger toggle button
+     */
+    public static RRToggleButton danger(String text) {
+        var button = new RRToggleButton(text);
+        button.setVariant(ButtonVariant.DANGER);
+        return button;
+    }
+
+    /**
+     * Create a success toggle button
+     */
+    public static RRToggleButton success(String text) {
+        var button = new RRToggleButton(text);
+        button.setVariant(ButtonVariant.SUCCESS);
+        return button;
+    }
+
+    /**
+     * Create a warning toggle button
+     */
+    public static RRToggleButton warning(String text) {
+        var button = new RRToggleButton(text);
+        button.setVariant(ButtonVariant.WARNING);
+        return button;
+    }
+
+	protected void initialize(String localizationKey, Object... args) {
+		getStyleClass().setAll(RRToggleButton.DEFAULT_STYLE_CLASSES);
+
+        setAlignment(Pos.CENTER);
+        setPadding(new Insets(8, 16, 8, 16));
+
+        textProperty().bindBidirectional(localizedText);
+        localizedText.setTranslation(localizationKey, args);
+
+        loadingSpinner = new FontIcon(FontAwesomeSolid.SYNC_ALT);
+        loadingSpinner.setIconSize(16);
+        loadingSpinner.getStyleClass().add("loading-spinner");
+
+        setOnMousePressed($ -> {
+            if (!getIsLoading()) {
+                var scale = new ScaleTransition(Duration.millis(100), this);
+                scale.setToX(0.95);
+                scale.setToY(0.95);
+                scale.play();
+            }
+        });
+
+        setOnMouseReleased($ -> {
+            if (!getIsLoading()) {
+                var scale = new ScaleTransition(Duration.millis(100), this);
+                scale.setToX(1.0);
+                scale.setToY(1.0);
+                scale.play();
+            }
+        });
+
+        isLoading.addListener($ -> {
+            if (getIsLoading()) {
+                onLoading();
+            } else {
+                onNotLoading();
+            }
+        });
+
+        variant.addListener($ -> updateStyle());
+        size.addListener($ -> updateStyle());
+        isSquare.addListener($ -> updateStyle());
+        isOutlined.addListener($ -> updateStyle());
+        isFlat.addListener($ -> updateStyle());
+
+        updateStyle();
+        updateContent();
+	}
+
+    /**
+     * Set the button text using a localization key with optional formatting arguments.
+     * The text will automatically update when the application language changes.
+     *
+     * @param localizationKey the localization key for the text
+     * @param args            optional formatting arguments for the localized text
+     */
+    public void setLocalizedText(String localizationKey, Object... args) {
+        localizedText.setTranslation(localizationKey, args);
+    }
+
+    /**
+     * Set the button variant
+     */
+    public void setVariant(ButtonVariant variant) {
+        this.variant.set(variant);
+    }
+
+    /**
+     * Set the button size
+     */
+    public void setButtonSize(ButtonSize size) {
+        this.size.set(size);
+    }
+
+    /**
+     * Set an icon for the button
+     */
+    public void setIcon(Ikon iconCode) {
+        if (icon != null && getGraphic() == icon) {
+            setGraphic(null);
+        }
+
+        if (iconCode != null) {
+            icon = new FontIcon(iconCode);
+            icon.setIconSize(16);
+            icon.getStyleClass().add("button-icon");
+        } else {
+            icon = null;
+        }
+
+        if (!getIsLoading()) {
+            updateContent();
+        }
+    }
+
+    /**
+     * Set loading state for the button.
+     * <p>
+     * When loading is true:
+     * - The button becomes disabled and shows a spinning icon
+     * - The text changes to "Loading..." if there was original text
+     * - The button gets a "loading" CSS class for styling
+     * - Click animations are disabled during loading
+     * <p>
+     * When loading is false:
+     * - The button is re-enabled and shows the original content
+     * - Original text and icon are restored
+     * - The "loading" CSS class is removed
+     * <p>
+     * Example usage:
+     * <pre>
+     * RRToggleButton button = RRToggleButton.primary("Save");
+     * button.setOnAction(e -> {
+     *     button.setLoading(true);
+     *     // Perform async operation
+     *     CompletableFuture.runAsync(() -> {
+     *         // Do work...
+     *         Platform.runLater(() -> button.setLoading(false));
+     *     });
+     * });
+     * </pre>
+     *
+     * @param loading true to show loading state, false to restore normal state
+     */
+    public void setLoading(boolean loading) {
+        isLoading.set(loading);
+    }
+
+    /**
+     * Set the button as rounded
+     */
+    public void setRounded(boolean rounded) {
+        if (rounded) {
+            getStyleClass().add("rounded");
+        } else {
+            getStyleClass().remove("rounded");
+        }
+    }
+
+    /**
+     * Force the button into a square shape.
+     */
+    public void setSquare(boolean square) {
+        isSquare.set(square);
+    }
+
+    /**
+     * Set the button as outlined
+     */
+    public void setOutlined(boolean outlined) {
+        isOutlined.set(outlined);
+    }
+
+    /**
+     * Set the button as flat
+     */
+    public void setFlat(boolean flat) {
+        isFlat.set(flat);
+    }
+
+    /**
+     * Called when the button has started loading
+     */
+    protected void onLoading() {
+        textProperty().unbindBidirectional(localizedText);
+        originalGraphic = getGraphic();
+
+        setDisable(true);
+        getStyleClass().add("loading");
+
+        var loadingContent = new RRHBox(8);
+        loadingContent.setAlignment(Pos.CENTER);
+        loadingContent.getChildren().addAll(loadingSpinner);
+
+        if (localizedText.get() != null && !localizedText.get().isEmpty()) {
+            setText("Loading...");
+        } else {
+            setText("");
+        }
+
+        setGraphic(loadingContent);
+    }
+
+    /**
+     * Called when the button has stopped loading
+     */
+    protected void onNotLoading() {
+        setDisable(false);
+        getStyleClass().remove("loading");
+
+        textProperty().bindBidirectional(localizedText);
+
+        if (originalGraphic != null) {
+            setGraphic(originalGraphic);
+        } else {
+            updateContent();
+        }
+    }
+
+    private void updateContent() {
+        if (getIsLoading())
+            return; // Don't update content while loading
+
+        if (icon != null) {
+            var content = new RRHBox(8);
+            content.setAlignment(Pos.CENTER);
+            content.getChildren().add(icon);
+
+            if (getText() != null && !getText().isEmpty()) {
+                setGraphic(content);
+            } else {
+                setGraphic(icon);
+            }
+        } else {
+            setGraphic(null);
+        }
+    }
+
+    private void updateStyle() {
+        ObservableList<String> styleClass = getStyleClass();
+
+        styleClass.removeAll("square", "outlined", "flat");
+        styleClass.removeAll("primary", "secondary", "ghost", "danger", "success", "warning");
+        styleClass.removeAll("small", "medium", "large");
+
+        if (isSquare.get())
+            styleClass.add("square");
+
+        if (isOutlined.get())
+            styleClass.add("outlined");
+
+        if (isFlat.get())
+            styleClass.add("flat");
+
+        switch (variant.get()) {
+            case PRIMARY -> styleClass.add("primary");
+            case SECONDARY -> styleClass.add("secondary");
+            case GHOST -> styleClass.add("ghost");
+            case DANGER -> styleClass.add("danger");
+            case SUCCESS -> styleClass.add("success");
+            case WARNING -> styleClass.add("warning");
+        }
+
+        switch (size.get()) {
+            case SMALL -> styleClass.add("small");
+            case MEDIUM -> styleClass.add("medium");
+            case LARGE -> styleClass.add("large");
+        }
+    }
+
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/domain/TextFieldControl.java b/railroad-core/src/main/java/dev/railroadide/core/ui/domain/TextFieldControl.java
new file mode 100644
index 00000000..f6e90893
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/domain/TextFieldControl.java
@@ -0,0 +1,69 @@
+package dev.railroadide.core.ui.domain;
+
+import org.kordamp.ikonli.Ikon;
+
+import dev.railroadide.core.ui.styling.TextFieldSize;
+import dev.railroadide.core.ui.styling.ValidationState;
+
+public interface TextFieldControl {
+
+    /**
+     * Set the size of the text field
+     * @param size
+     */
+    void setTextFieldSize(TextFieldSize size);
+
+    /**
+     * Set the validation state of the field
+     * @param state
+     */
+    void setValidationState(ValidationState state);
+
+    /**
+     * Set a prefix icon
+     * @param iconCode
+     */
+    void setPrefixIcon(Ikon iconCode);
+
+    /**
+     * Set a suffix icon
+     * @param iconCode
+     */
+    void setSuffixIcon(Ikon iconCode);
+
+    /**
+     * Set the text field as rounded
+     * @param rounded
+     */
+    void setRounded(boolean rounded);
+
+    /**
+     * Set the text field as outlined
+     * @param outlined
+     */
+    void setOutlined(boolean outlined);
+
+    /**
+     * Set the text field as disabled state
+     * @param disabled
+     */
+    void setDisabledState(boolean disabled);
+
+    /**
+     * Set placeholder text, displayed when the text field is empty
+     * @param placeholder
+     */
+    void setPlaceholder(String placeholder);
+
+    /**
+     * Set the placeholder text using a localization key
+     * @param localizationKey
+     * @param args optional arguments to format the translation
+     */
+    void setLocalizedPlaceholder(String localizationKey, Object... args);
+
+    /**
+     * Clear the text field with an animation
+     */
+    void clearWithAnimation();
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedButton.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedButton.java
index a48bf96f..2b8d8e4d 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedButton.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedButton.java
@@ -1,14 +1,13 @@
 package dev.railroadide.core.ui.localized;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.utility.ServiceLocator;
 import javafx.scene.control.Button;
 
 /**
  * An extension of the JavaFX Button that allows for the button's text to be a localized string.
  */
 public class LocalizedButton extends Button {
-    private String currentKey;
+
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
 
     /**
      * Constructs a LocalizedButton with the specified key.
@@ -18,8 +17,8 @@ public class LocalizedButton extends Button {
      */
     public LocalizedButton(String key) {
         super();
+        textProperty().bindBidirectional(localizedText);
         setKey(key);
-        setText(ServiceLocator.getService(LocalizationService.class).get(key));
     }
 
     /**
@@ -29,7 +28,7 @@ public LocalizedButton(String key) {
      * @return The current key
      */
     public String getKey() {
-        return currentKey;
+        return localizedText.getTranslationKey();
     }
 
     /**
@@ -39,9 +38,6 @@ public String getKey() {
      * @param key The new key
      */
     public void setKey(String key) {
-        currentKey = key;
-        ServiceLocator.getService(LocalizationService.class).currentLanguageProperty().addListener((observable, oldValue, newValue) ->
-            setText(ServiceLocator.getService(LocalizationService.class).get(key)));
-        setText(ServiceLocator.getService(LocalizationService.class).get(currentKey));
+        localizedText.setTranslationKey(key);
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedCheckMenuItem.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedCheckMenuItem.java
index 0fa2130c..5d74b5ab 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedCheckMenuItem.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedCheckMenuItem.java
@@ -1,14 +1,13 @@
 package dev.railroadide.core.ui.localized;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.utility.ServiceLocator;
 import javafx.scene.control.CheckMenuItem;
 
 /**
  * An extension of the JavaFX CheckMenuItem that allows for the CheckMenuItem's text to be localized.
  */
 public class LocalizedCheckMenuItem extends CheckMenuItem {
-    private String currentKey;
+    
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
 
     /**
      * Creates a new LocalizedCheckMenuItem with the specified key.
@@ -18,9 +17,10 @@ public class LocalizedCheckMenuItem extends CheckMenuItem {
      */
     public LocalizedCheckMenuItem(String key, boolean selected) {
         super();
+
+        textProperty().bindBidirectional(localizedText);
         setKey(key);
         setSelected(selected);
-        setText(ServiceLocator.getService(LocalizationService.class).get(key));
     }
 
     /**
@@ -29,7 +29,7 @@ public LocalizedCheckMenuItem(String key, boolean selected) {
      * @return the current localization key
      */
     public String getKey() {
-        return currentKey;
+        return localizedText.getTranslationKey();
     }
 
     /**
@@ -38,9 +38,6 @@ public String getKey() {
      * @param key the new localization key to set
      */
     public void setKey(final String key) {
-        currentKey = key;
-        ServiceLocator.getService(LocalizationService.class).currentLanguageProperty().addListener((observable, oldValue, newValue) ->
-            setText(ServiceLocator.getService(LocalizationService.class).get(key)));
-        setText(ServiceLocator.getService(LocalizationService.class).get(currentKey));
+        localizedText.setTranslationKey(key);
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedComboBox.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedComboBox.java
index 9a46be42..580bca7d 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedComboBox.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedComboBox.java
@@ -1,13 +1,8 @@
 package dev.railroadide.core.ui.localized;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.utility.FromStringFunction;
-import dev.railroadide.core.utility.ServiceLocator;
-import dev.railroadide.core.utility.ToStringFunction;
+import javafx.collections.ObservableList;
 import javafx.scene.control.ComboBox;
-import javafx.util.StringConverter;
-
-import java.util.Locale;
+import java.util.function.Function;
 
 /**
  * An extension of the JavaFX ComboBox that allows for the ComboBox's items to have localised labels.
@@ -15,30 +10,54 @@
  * @param <T> The type of the ComboBox items.
  */
 public class LocalizedComboBox<T> extends ComboBox<T> {
+
+    public static final String[] DEFAULT_STYLE_CLASSES = { "combo-box-base", "rr-combo-box", "combo-box" };
+
+    /**
+     * Create a new ComboBox that can localize it's items with a given key function
+     */
+    public LocalizedComboBox() {
+        super();
+        initialize();
+    }
+
     /**
-     * Creates a new LocalizedComboBox with the given key and valueOf functions.
-     *
-     * @param keyFunction     The function that converts the object to a key.
-     * @param valueOfFunction The function that converts the key to the object.
+     * Create a new ComboBox that can localize it's items with a given key function
+     * 
+     * @param keyFunction A function that for any value T returns a localization key
      */
-    public LocalizedComboBox(ToStringFunction<T> keyFunction, FromStringFunction<T> valueOfFunction) {
-        setConverter(new StringConverter<>() {
-            @Override
-            public String toString(T object) {
-                if (object == null)
-                    return "NullObject";
-
-                String key = keyFunction.toString(object);
-                if (key == null)
-                    return "NullKey";
-
-                return ServiceLocator.getService(LocalizationService.class).get(key);
-            }
-
-            @Override
-            public T fromString(String string) {
-                return valueOfFunction.fromString(string.toUpperCase(Locale.ROOT));
-            }
-        });
+    public LocalizedComboBox(Function<T, String> keyFunction) {
+        super();
+        initialize();
+        setKeyFunction(keyFunction);
     }
+
+    /**
+     * Creates a new LocalizedComboBox from a list of localizationKeys
+     * 
+     * @param localizationKeys A list of localization keys
+     * @return
+     */
+    public static LocalizedComboBox<String> fromLocalizationKeys(ObservableList<String> localizationKeys) {
+        LocalizedComboBox<String> combo = new LocalizedComboBox<>();
+        combo.setKeyFunction(Function.identity());
+        combo.setItems(localizationKeys);
+
+        return combo;
+    }
+
+    protected void initialize() {
+        getStyleClass().setAll(LocalizedComboBox.DEFAULT_STYLE_CLASSES);
+    }
+
+    /**
+     * Assign a new key function to the LocalizedComboBox
+     * 
+     * @param keyFunction A function that for any value T returns a localization key
+     */
+    public void setKeyFunction(Function<T, String> keyFunction) {
+        setCellFactory(list -> new LocalizedListCell<T>(keyFunction));
+        setButtonCell(new LocalizedListCell<T>(keyFunction));
+    }
+
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedLabel.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedLabel.java
index e3a538e4..a3ed4794 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedLabel.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedLabel.java
@@ -1,9 +1,5 @@
 package dev.railroadide.core.ui.localized;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.utility.ServiceLocator;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.scene.control.Label;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
@@ -13,9 +9,8 @@
  */
 @Getter
 public class LocalizedLabel extends Label {
-    private final ObservableList<Object> args = FXCollections.observableArrayList();
-    private String key;
-
+    
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
     /**
      * Creates a new LocalizedLabel and sets the key and args
      *
@@ -24,9 +19,15 @@ public class LocalizedLabel extends Label {
      */
     public LocalizedLabel(@NotNull String key, @NotNull Object... args) {
         super();
+
+        textProperty().bindBidirectional(localizedText);
         setKey(key, args);
     }
 
+    public String getKey() {
+        return localizedText.getTranslationKey();
+    }
+
     /**
      * Updates the key and args, and then updates the text of the label.
      * Adds a listener to the current language property to update the text when the language changes.
@@ -35,16 +36,6 @@ public LocalizedLabel(@NotNull String key, @NotNull Object... args) {
      * @param args The args to be applied to the localized key
      */
     public void setKey(@NotNull String key, @NotNull Object... args) {
-        this.args.setAll(args);
-        this.key = key;
-
-        if (key != null && !key.trim().isEmpty()) {
-            LocalizationService service = ServiceLocator.getService(LocalizationService.class);
-            service.currentLanguageProperty().addListener((observable, oldValue, newValue) ->
-                setText(service.get(key, args)));
-            setText(service.get(this.key, args));
-        } else {
-            setText("");
-        }
+        localizedText.setTranslation(key, args);
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedListCell.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedListCell.java
index e74349e3..5d4567d4 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedListCell.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedListCell.java
@@ -1,7 +1,5 @@
 package dev.railroadide.core.ui.localized;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.utility.ServiceLocator;
 import javafx.scene.control.ListCell;
 
 import java.util.function.Function;
@@ -12,6 +10,9 @@
  * @param <T> The type of the ListCell items.
  */
 public class LocalizedListCell<T> extends ListCell<T> {
+
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
+
     /**
      * Creates a LocalizedListCell with the given key function.
      * A listener is added to the List Cell to update the text when the item changes.
@@ -20,19 +21,14 @@ public class LocalizedListCell<T> extends ListCell<T> {
      * @param keyFunction The function that converts the object to a key to be localized.
      */
     public LocalizedListCell(Function<T, String> keyFunction) {
+
+        textProperty().bindBidirectional(localizedText);
+
         itemProperty().addListener((observable, oldValue, newValue) -> {
             if (newValue == null) {
-                setText(null);
-            } else {
-                setText(ServiceLocator.getService(LocalizationService.class).get(keyFunction.apply(newValue)));
-            }
-        });
-
-        ServiceLocator.getService(LocalizationService.class).currentLanguageProperty().addListener((observable, oldValue, newValue) -> {
-            if (getItem() == null) {
-                setText(null);
+                localizedText.setTranslationKey(null);
             } else {
-                setText(ServiceLocator.getService(LocalizationService.class).get(keyFunction.apply(getItem())));
+                localizedText.setTranslationKey(keyFunction.apply(newValue));
             }
         });
     }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedMenu.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedMenu.java
index 04f914c2..f1d4bab8 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedMenu.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedMenu.java
@@ -1,14 +1,13 @@
 package dev.railroadide.core.ui.localized;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.utility.ServiceLocator;
 import javafx.scene.control.Menu;
 
 /**
  * An extension of the JavaFX Menu that allows for the Menu's text to be localised.
  */
 public class LocalizedMenu extends Menu {
-    private String currentKey;
+    
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
 
     /**
      * Creates a new LocalizedMenu with the specified key.
@@ -17,8 +16,8 @@ public class LocalizedMenu extends Menu {
      */
     public LocalizedMenu(final String key) {
         super();
+        textProperty().bindBidirectional(localizedText);
         setKey(key);
-        setText(ServiceLocator.getService(LocalizationService.class).get(key));
     }
 
     /**
@@ -27,7 +26,7 @@ public LocalizedMenu(final String key) {
      * @return The current localization key
      */
     public String getKey() {
-        return currentKey;
+        return localizedText.getTranslationKey();
     }
 
     /**
@@ -36,9 +35,6 @@ public String getKey() {
      * @param key The new localization key to set
      */
     public void setKey(final String key) {
-        currentKey = key;
-        ServiceLocator.getService(LocalizationService.class).currentLanguageProperty().addListener((observable, oldValue, newValue) ->
-            setText(ServiceLocator.getService(LocalizationService.class).get(key)));
-        setText(ServiceLocator.getService(LocalizationService.class).get(currentKey));
+        localizedText.setTranslationKey(key);
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedMenuItem.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedMenuItem.java
index 63c1b869..7fc7d383 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedMenuItem.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedMenuItem.java
@@ -1,9 +1,8 @@
 package dev.railroadide.core.ui.localized;
 
-import dev.railroadide.core.localization.LocalizationService;
 import dev.railroadide.core.settings.keybinds.KeybindData;
 import dev.railroadide.core.utility.DesktopUtils;
-import dev.railroadide.core.utility.ServiceLocator;
+import javafx.scene.Node;
 import javafx.scene.control.MenuItem;
 
 /**
@@ -11,7 +10,8 @@
  * It also supports setting a url to open when the item is clicked, additionally allows for a keybind to be set to trigger the items action.
  */
 public class LocalizedMenuItem extends MenuItem {
-    private String currentKey;
+
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
 
     /**
      * Creates a new LocalizedMenuItem with the specified key.
@@ -20,8 +20,19 @@ public class LocalizedMenuItem extends MenuItem {
      */
     public LocalizedMenuItem(final String key) {
         super();
+        textProperty().bindBidirectional(localizedText);
         setKey(key);
-        setText(ServiceLocator.getService(LocalizationService.class).get(key));
+    }
+
+    /**
+     * Creates a new LocalizedMenuItem with the specified key and graphic.
+     *
+     * @param key     The localization key
+     * @param graphic The graphic node to display alongside the text
+     */
+    public LocalizedMenuItem(final String key, Node graphic) {
+        this(key);
+        setGraphic(graphic);
     }
 
     /**
@@ -32,7 +43,7 @@ public LocalizedMenuItem(final String key) {
      */
     public LocalizedMenuItem(final String key, String url) {
         this(key);
-        this.setOnAction($ -> DesktopUtils.openUrl(url));
+        setOnAction($ -> DesktopUtils.openUrl(url));
     }
 
     /**
@@ -41,7 +52,7 @@ public LocalizedMenuItem(final String key, String url) {
      * @return The current localization key
      */
     public String getKey() {
-        return currentKey;
+        return localizedText.getTranslationKey();
     }
 
     /**
@@ -50,10 +61,7 @@ public String getKey() {
      * @param key The new localization key to set
      */
     public void setKey(final String key) {
-        currentKey = key;
-        ServiceLocator.getService(LocalizationService.class).currentLanguageProperty().addListener((observable, oldValue, newValue) ->
-            setText(ServiceLocator.getService(LocalizationService.class).get(key)));
-        setText(ServiceLocator.getService(LocalizationService.class).get(currentKey));
+        localizedText.setTranslationKey(key);
     }
 
     /**
@@ -62,6 +70,6 @@ public void setKey(final String key) {
      * @param keybindData the keybind data to associate with this menu item
      */
     public void setKeybindData(KeybindData keybindData) {
-        this.setAccelerator(keybindData.getKeyCodeCombination());
+        setAccelerator(keybindData.getKeyCodeCombination());
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTab.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTab.java
new file mode 100644
index 00000000..191f224a
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTab.java
@@ -0,0 +1,51 @@
+package dev.railroadide.core.ui.localized;
+
+import dev.railroadide.core.localization.LocalizationService;
+import dev.railroadide.core.utility.ServiceLocator;
+import javafx.scene.Node;
+import javafx.scene.control.Tab;
+
+/**
+ * An extension of the JavaFX Tab that allows for the Tab's text to be localised.
+ */
+public class LocalizedTab extends Tab {
+    private String currentKey;
+
+    public LocalizedTab(String titleKey) {
+        super();
+        setKey(titleKey);
+        setText(ServiceLocator.getService(LocalizationService.class).get(titleKey));
+    }
+
+    public LocalizedTab() {
+        super();
+    }
+
+    public LocalizedTab(String titleKey, Node content) {
+        this(titleKey);
+        setContent(content);
+    }
+
+    /**
+     * Gets the current key used for localization.
+     *
+     * @return The current localization key.
+     */
+    public String getKey() {
+        return currentKey;
+    }
+
+    /**
+     * Sets the key and then updates the text of the label.
+     * Adds a listener to the current language property to update the text when the language changes.
+     *
+     * @param key The localization key
+     */
+    public void setKey(final String key) {
+        currentKey = key;
+        LocalizationService l18n = ServiceLocator.getService(LocalizationService.class);
+        l18n.currentLanguageProperty().addListener((observable, oldValue, newValue) ->
+            setText(l18n.get(key)));
+        setText(l18n.get(currentKey));
+    }
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTableColumn.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTableColumn.java
new file mode 100644
index 00000000..65a7ad2e
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTableColumn.java
@@ -0,0 +1,42 @@
+package dev.railroadide.core.ui.localized;
+
+import javafx.scene.control.TableColumn;
+
+/**
+ * An extension of the JavaFX TableColumn that allows for the TableColumn's label to be localised.
+ */
+public class LocalizedTableColumn<S, T> extends TableColumn<S, T> {
+    
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
+
+    /**
+     * Sets the key and then the set the text to the localized key.
+     *
+     * @param translationKey The key to be localized
+     * @param args Optional arguments to format the localized string
+     */
+    public LocalizedTableColumn(final String translationKey, Object... args) {
+        super();
+        textProperty().bindBidirectional(localizedText);
+        setKey(translationKey);
+    }
+
+    /**
+     * Gets the current key used for localization.
+     *
+     * @return The current localization key.
+     */
+    public String getKey() {
+        return localizedText.getTranslationKey();
+    }
+
+    /**
+     * Sets the key and then updates the text of the label.
+     * Adds a listener to the current language property to update the text when the language changes.
+     *
+     * @param translationKey The localization key
+     */
+    public void setKey(final String translationKey) {
+        localizedText.setTranslationKey(translationKey);
+    }
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedText.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedText.java
index c975a425..83affbda 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedText.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedText.java
@@ -1,14 +1,13 @@
 package dev.railroadide.core.ui.localized;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.utility.ServiceLocator;
 import javafx.scene.text.Text;
 
 /**
  * An extension of the JavaFX Text that allows for the Text's text to be localised.
  */
 public class LocalizedText extends Text {
-    private String currentKey;
+    
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
 
     /**
      * Sets the key and then the set the text to the localized key.
@@ -17,8 +16,8 @@ public class LocalizedText extends Text {
      */
     public LocalizedText(final String key) {
         super();
+        textProperty().bindBidirectional(localizedText);
         setKey(key);
-        setText(ServiceLocator.getService(LocalizationService.class).get(key));
     }
 
     /**
@@ -27,7 +26,7 @@ public LocalizedText(final String key) {
      * @return The current localization key.
      */
     public String getKey() {
-        return currentKey;
+        return localizedText.getTranslationKey();
     }
 
     /**
@@ -37,9 +36,6 @@ public String getKey() {
      * @param key The localization key
      */
     public void setKey(final String key) {
-        currentKey = key;
-        ServiceLocator.getService(LocalizationService.class).currentLanguageProperty().addListener((observable, oldValue, newValue) ->
-            setText(ServiceLocator.getService(LocalizationService.class).get(key)));
-        setText(ServiceLocator.getService(LocalizationService.class).get(currentKey));
+        localizedText.setTranslationKey(key);
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTextArea.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTextArea.java
index 03a7afa6..7bb31002 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTextArea.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTextArea.java
@@ -1,14 +1,13 @@
 package dev.railroadide.core.ui.localized;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.utility.ServiceLocator;
 import javafx.scene.control.TextArea;
 
 /**
  * An extension of the JavaFX TextArea that allows for the TextArea's prompt text to be localised.
  */
 public class LocalizedTextArea extends TextArea {
-    private String currentKey;
+    
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
 
     /**
      * Sets the key and sets the prompt text to the localized key.
@@ -17,10 +16,8 @@ public class LocalizedTextArea extends TextArea {
      */
     public LocalizedTextArea(final String key) {
         super();
-        if (key != null) {
-            setKey(key);
-            setPromptText(ServiceLocator.getService(LocalizationService.class).get(key));
-        }
+        promptTextProperty().bindBidirectional(localizedText);
+        setKey(key);
     }
 
     /**
@@ -29,7 +26,7 @@ public LocalizedTextArea(final String key) {
      * @return The current key.
      */
     public String getKey() {
-        return currentKey;
+        return localizedText.getTranslationKey();
     }
 
     /**
@@ -39,9 +36,6 @@ public String getKey() {
      * @param key The key to be localized
      */
     public void setKey(final String key) {
-        currentKey = key;
-        ServiceLocator.getService(LocalizationService.class).currentLanguageProperty().addListener((observable, oldValue, newValue) ->
-            setPromptText(ServiceLocator.getService(LocalizationService.class).get(key)));
-        setPromptText(ServiceLocator.getService(LocalizationService.class).get(currentKey));
+        localizedText.setTranslationKey(key);
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTextField.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTextField.java
index 44908be5..a5c2b8dd 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTextField.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTextField.java
@@ -1,14 +1,13 @@
 package dev.railroadide.core.ui.localized;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.utility.ServiceLocator;
 import javafx.scene.control.TextField;
 
 /**
  * An extension of the JavaFX TextField that allows for the TextField's prompt text to be localised.
  */
 public class LocalizedTextField extends TextField {
-    private String currentKey;
+    
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
 
     /**
      * Sets the key and sets the prompt text to the localized key.
@@ -17,10 +16,8 @@ public class LocalizedTextField extends TextField {
      */
     public LocalizedTextField(final String key) {
         super();
-        if (key != null) {
-            setKey(key);
-            setPromptText(ServiceLocator.getService(LocalizationService.class).get(key));
-        }
+        promptTextProperty().bindBidirectional(localizedText);
+        setKey(key);
     }
 
     /**
@@ -29,7 +26,7 @@ public LocalizedTextField(final String key) {
      * @return The current key.
      */
     public String getKey() {
-        return currentKey;
+        return localizedText.getTranslationKey();
     }
 
     /**
@@ -39,10 +36,6 @@ public String getKey() {
      * @param key The key to be localized
      */
     public void setKey(final String key) {
-        currentKey = key;
-        LocalizationService service = ServiceLocator.getService(LocalizationService.class);
-        service.currentLanguageProperty().addListener((observable, oldValue, newValue) ->
-            setPromptText(service.get(key)));
-        setPromptText(service.get(currentKey));
+        localizedText.setTranslationKey(key);
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTextProperty.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTextProperty.java
new file mode 100644
index 00000000..3beef6df
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTextProperty.java
@@ -0,0 +1,154 @@
+package dev.railroadide.core.ui.localized;
+
+import dev.railroadide.core.localization.LocalizationService;
+import dev.railroadide.core.utility.ServiceLocator;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.beans.property.StringPropertyBase;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+
+/**
+ * A text property capable of localizing its content.
+ * 
+ * Bind a pre-exiting text property to it to use its behavior.
+ * Use a bidirectional binding if you plan on also using un-localized text.
+ * 
+ */
+public class LocalizedTextProperty extends StringPropertyBase {
+
+    private static final Object DEFAULT_BEAN = null;
+    private static final String DEFAULT_NAME = "";
+
+    private final Object bean;
+    private final String name;
+
+    private final StringProperty translationKey;
+    private final ListProperty<Object> translationArgs;
+    private String translated;
+
+    /**
+     * The constructor of {@code LocalizedTextProperty}
+     *
+     * @param bean         the bean of this {@code StringProperty}
+     * @param name         the name of this {@code StringProperty}
+     * @param initialValue the initial value of the wrapped value
+     * @param args         optional args to format the localized string
+     */
+    public LocalizedTextProperty(Object bean, String name, String initialValue, Object... args) {
+        super("");
+        this.bean = bean;
+        this.name = (name == null) ? DEFAULT_NAME : name;
+
+        this.translationKey = new SimpleStringProperty(this, "localizationKey", initialValue);
+        this.translationArgs = new SimpleListProperty<Object>(this, "localizationArgs",
+                FXCollections.observableArrayList(args));
+
+        translated = null;
+
+        initialize();
+        updateTranslation(true);
+    }
+
+    protected void initialize() {
+        ServiceLocator.getService(LocalizationService.class)
+                .currentLanguageProperty()
+                .addListener($ -> updateTranslation(false));
+
+        translationKey.addListener($ -> updateTranslation(true));
+        translationArgs.addListener((ListChangeListener<Object>) $ -> updateTranslation(true));
+    }
+
+    /**
+     * Indicates whether the property is activated.
+     * The property is disactivated when it's value has been directly set.
+     */
+    private boolean activated = false;
+
+    /**
+     * Used to block update when updating more than one property at a time.
+     */
+    private boolean blockedUpdates = false;
+
+    private void updateTranslation(boolean activate) {
+        
+        if (blockedUpdates)
+            return;
+
+        if (activate)
+            activated = true;
+        
+        if (!activated)
+            return;
+
+        if (translationKey.get() != null) {
+            var service = ServiceLocator.getService(LocalizationService.class);
+            this.translated = service.get(translationKey.get(), translationArgs.get().toArray());
+
+            set(this.translated);
+        } else {
+            this.translated = null;
+            set(null);
+        }
+    }
+
+    @Override
+    protected void invalidated() {
+        if (get() != translated) {
+            activated = false;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Object getBean() {
+        return bean;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @return A property containing this property's translationKey
+     */
+    public StringProperty translationKeyProperty() { return this.translationKey; }
+    public String getTranslationKey() { return translationKey.get(); }
+    public void setTranslationKey(String translationKey) {
+        if (translationKey == null || translationKey.trim().isEmpty())
+            this.translationKey.set(null);
+        else
+            this.translationKey.set(translationKey);
+    }
+
+    /**
+     * @return A property containing this property's translation arguments
+     */
+    public ListProperty<Object> translationArgsProperty() { return this.translationArgs; }
+    public ObservableList<Object> getTranslationArgs() { return translationArgs.get(); }
+    public void setTranslationArgs(Object... args) {
+        if (args.length == 0 || (args.length == 1 && args[0] == null))
+            this.translationArgs.clear();
+        else
+            this.translationArgs.setAll(args);
+    }
+
+    public void setTranslation(String translationKey, Object... args) {
+        blockedUpdates = true;
+        setTranslationKey(translationKey);
+        setTranslationArgs(args);
+        blockedUpdates = false;
+
+        updateTranslation(true);
+    }
+
+}
\ No newline at end of file
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTitledPane.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTitledPane.java
index ce3149d2..1fa67e08 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTitledPane.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTitledPane.java
@@ -1,23 +1,20 @@
 package dev.railroadide.core.ui.localized;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.utility.ServiceLocator;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.control.TitledPane;
 import org.jetbrains.annotations.NotNull;
 
 public class LocalizedTitledPane extends TitledPane {
-    private final ObservableList<Object> args = FXCollections.observableArrayList();
-    private String key;
+
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
 
     public LocalizedTitledPane() {
     }
 
     public LocalizedTitledPane(Node content, String titleKey, @NotNull Object... args) {
         super(titleKey, content);
-        setKey(key, args);
+        textProperty().bindBidirectional(localizedText);
+        setKey(titleKey, args);
     }
 
     /**
@@ -28,18 +25,6 @@ public LocalizedTitledPane(Node content, String titleKey, @NotNull Object... arg
      * @param args The args to be applied to the localized key
      */
     public void setKey(@NotNull String key, @NotNull Object... args) {
-        this.args.setAll(args);
-        this.key = key;
-
-        // Only set up localization if the key is not empty
-        if (key != null && !key.trim().isEmpty()) {
-            LocalizationService service = ServiceLocator.getService(LocalizationService.class);
-            service.currentLanguageProperty().addListener((observable, oldValue, newValue) ->
-                setText(service.get(key, args)));
-            setText(service.get(this.key, args));
-        } else {
-            // Clear the text if the key is empty
-            setText("");
-        }
+        localizedText.setTranslation(key, args);
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTooltip.java b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTooltip.java
index 12496d2d..012277e7 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTooltip.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/localized/LocalizedTooltip.java
@@ -1,9 +1,5 @@
 package dev.railroadide.core.ui.localized;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.utility.ServiceLocator;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.scene.control.Tooltip;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
@@ -13,8 +9,8 @@
  */
 @Getter
 public class LocalizedTooltip extends Tooltip {
-    private final ObservableList<Object> args = FXCollections.observableArrayList();
-    private String key;
+    
+    private final LocalizedTextProperty localizedText = new LocalizedTextProperty(this, "localizedText", null);
 
     /**
      * Creates a new LocalizedTooltip and sets the key and args.
@@ -24,6 +20,7 @@ public class LocalizedTooltip extends Tooltip {
      */
     public LocalizedTooltip(@NotNull String key, @NotNull Object... args) {
         super();
+        textProperty().bindBidirectional(localizedText);
         setKey(key, args);
     }
 
@@ -35,18 +32,6 @@ public LocalizedTooltip(@NotNull String key, @NotNull Object... args) {
      * @param args The args to be applied to the localized key
      */
     public void setKey(@NotNull String key, @NotNull Object... args) {
-        this.args.setAll(args);
-        this.key = key;
-
-        // Only set up localization if the key is not empty
-        if (key != null && !key.trim().isEmpty()) {
-            LocalizationService service = ServiceLocator.getService(LocalizationService.class);
-            service.currentLanguageProperty().addListener((observable, oldValue, newValue) ->
-                setText(service.get(key, args)));
-            setText(service.get(this.key, args));
-        } else {
-            // Clear the text if the key is empty
-            setText("");
-        }
+        localizedText.setTranslation(key, args);
     }
 }
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/styling/ButtonSize.java b/railroad-core/src/main/java/dev/railroadide/core/ui/styling/ButtonSize.java
new file mode 100644
index 00000000..b773ad76
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/styling/ButtonSize.java
@@ -0,0 +1,5 @@
+package dev.railroadide.core.ui.styling;
+
+public enum ButtonSize {
+    SMALL, MEDIUM, LARGE
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/styling/ButtonVariant.java b/railroad-core/src/main/java/dev/railroadide/core/ui/styling/ButtonVariant.java
new file mode 100644
index 00000000..7c3a6936
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/styling/ButtonVariant.java
@@ -0,0 +1,5 @@
+package dev.railroadide.core.ui.styling;
+
+public enum ButtonVariant {
+    PRIMARY, SECONDARY, GHOST, DANGER, SUCCESS, WARNING
+}
\ No newline at end of file
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/styling/TextFieldSize.java b/railroad-core/src/main/java/dev/railroadide/core/ui/styling/TextFieldSize.java
new file mode 100644
index 00000000..71f13f4a
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/styling/TextFieldSize.java
@@ -0,0 +1,7 @@
+package dev.railroadide.core.ui.styling;
+
+public enum TextFieldSize {
+    SMALL,
+    MEDIUM,
+    LARGE
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/ui/styling/ValidationState.java b/railroad-core/src/main/java/dev/railroadide/core/ui/styling/ValidationState.java
new file mode 100644
index 00000000..982f1932
--- /dev/null
+++ b/railroad-core/src/main/java/dev/railroadide/core/ui/styling/ValidationState.java
@@ -0,0 +1,8 @@
+package dev.railroadide.core.ui.styling;
+
+public enum ValidationState {
+    NONE,
+    SUCCESS,
+    ERROR,
+    WARNING
+}
diff --git a/railroad-core/src/main/java/dev/railroadide/core/utility/OperatingSystem.java b/railroad-core/src/main/java/dev/railroadide/core/utility/OperatingSystem.java
index fee161b6..0a11cb5a 100644
--- a/railroad-core/src/main/java/dev/railroadide/core/utility/OperatingSystem.java
+++ b/railroad-core/src/main/java/dev/railroadide/core/utility/OperatingSystem.java
@@ -39,4 +39,16 @@ public enum OperatingSystem {
 
         return UNKNOWN;
     }
+
+    public static boolean isMac() {
+        return CURRENT == MAC;
+    }
+
+    public static boolean isWindows() {
+        return CURRENT == WINDOWS;
+    }
+
+    public static boolean isLinux() {
+        return CURRENT == LINUX;
+    }
 }
diff --git a/src/main/java/dev/railroadide/railroad/DefaultGradleEnvironment.java b/src/main/java/dev/railroadide/railroad/DefaultGradleEnvironment.java
new file mode 100644
index 00000000..c68a6a42
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/DefaultGradleEnvironment.java
@@ -0,0 +1,93 @@
+package dev.railroadide.railroad;
+
+import dev.railroadide.railroad.gradle.GradleEnvironment;
+import dev.railroadide.railroad.gradle.GradleSettings;
+import dev.railroadide.railroad.gradle.service.task.GradleTaskExecutionRequest;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.defaults.data.GradleRunConfigurationData;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.project.Project;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+public record DefaultGradleEnvironment(Project project, Path gradleInstallationPath,
+                                       GradleSettings settings) implements GradleEnvironment {
+    @Override
+    public boolean useWrapper() {
+        return settings.isUseWrapper();
+    }
+
+    @Override
+    public Optional<Path> installationPath() {
+        return Optional.ofNullable(gradleInstallationPath);
+    }
+
+    @Override
+    public Optional<Path> userHomePath() {
+        return Optional.ofNullable(settings.getGradleUserHome());
+    }
+
+    @Override
+    public Optional<JDK> jvm() {
+        return Optional.ofNullable(settings.getGradleJvm());
+    }
+
+    @Override
+    public String jvmArgumentsFor(GradleTaskExecutionRequest request, JDK jvm) {
+        List<RunConfiguration<?>> configurations = settings.getConfigurations();
+        if (configurations == null || configurations.isEmpty())
+            return "";
+
+        for (RunConfiguration<?> configuration : configurations) {
+            if(!(configuration.data() instanceof GradleRunConfigurationData data))
+                continue;
+
+            if (!matchesConfiguration(request, jvm, data))
+                continue;
+
+            String[] vmOptions = data.getVmOptions();
+            if (vmOptions != null && vmOptions.length > 0)
+                return String.join(" ", vmOptions);
+        }
+
+        return "";
+    }
+
+    @Override
+    public boolean isDaemonEnabled() {
+        return settings.isDaemonEnabled();
+    }
+
+    @Override
+    public Optional<Long> daemonIdleTimeout() {
+        return Optional.ofNullable(settings.getDaemonIdleTimeout());
+    }
+
+    private boolean matchesConfiguration(GradleTaskExecutionRequest request,
+                                         JDK jvm,
+                                         GradleRunConfigurationData data) {
+        if (request == null || data == null)
+            return false;
+
+        String configuredTask = data.getTask();
+        if (configuredTask == null || !configuredTask.equals(request.taskPath()))
+            return false;
+
+        Path configuredProjectPath = data.getGradleProjectPath();
+        if (!pathsMatch(configuredProjectPath, project.getPath()))
+            return false;
+
+        JDK configurationJdk = data.getJavaHome();
+        return jvm == null || configurationJdk == null || configurationJdk.equals(jvm);
+    }
+
+    private static boolean pathsMatch(Path first, Path second) {
+        if (first == null || second == null)
+            return Objects.equals(first, second);
+
+        return first.toAbsolutePath().normalize().equals(second.toAbsolutePath().normalize());
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/Railroad.java b/src/main/java/dev/railroadide/railroad/Railroad.java
index 536b5416..b25dbbac 100644
--- a/src/main/java/dev/railroadide/railroad/Railroad.java
+++ b/src/main/java/dev/railroadide/railroad/Railroad.java
@@ -2,12 +2,17 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import de.codecentric.centerdevice.javafxsvg.SvgImageLoaderFactory;
+import de.codecentric.centerdevice.javafxsvg.dimension.PrimitiveDimensionProvider;
 import dev.railroadide.core.utility.ServiceLocator;
 import dev.railroadide.logger.Logger;
 import dev.railroadide.logger.LoggerManager;
 import dev.railroadide.logger.LoggerService;
 import dev.railroadide.railroad.config.ConfigHandler;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationTypes;
+import dev.railroadide.railroad.java.JDKManager;
 import dev.railroadide.railroad.localization.L18n;
+import dev.railroadide.railroad.localization.Languages;
 import dev.railroadide.railroad.plugin.PluginManager;
 import dev.railroadide.railroad.plugin.defaults.DefaultEventBus;
 import dev.railroadide.railroad.project.LicenseRegistry;
@@ -21,8 +26,9 @@
 import dev.railroadide.railroad.settings.keybinds.Keybinds;
 import dev.railroadide.railroad.switchboard.SwitchboardRepositories;
 import dev.railroadide.railroad.theme.ThemeManager;
-import dev.railroadide.railroad.utility.LocalDateTimeTypeAdapter;
+import dev.railroadide.railroad.utility.json.LocalDateTimeTypeAdapter;
 import dev.railroadide.railroad.utility.ShutdownHooks;
+import dev.railroadide.railroad.utility.json.PathTypeAdapter;
 import dev.railroadide.railroad.vcs.RepositoryManager;
 import dev.railroadide.railroad.welcome.WelcomePane;
 import dev.railroadide.railroad.window.WindowBuilder;
@@ -37,6 +43,7 @@
 import javafx.stage.Stage;
 import okhttp3.OkHttpClient;
 
+import java.nio.file.Path;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -62,6 +69,7 @@ public class Railroad extends Application {
         .disableHtmlEscaping()
         .registerTypeAdapter(Facet.class, new FacetTypeAdapter())
         .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeTypeAdapter())
+        .registerTypeHierarchyAdapter(Path.class, new PathTypeAdapter())
         .create();
     public static final ProjectManager PROJECT_MANAGER = new ProjectManager();
     public static final RepositoryManager REPOSITORY_MANAGER = new RepositoryManager();
@@ -94,13 +102,16 @@ public void init() {
 
         List<InitializationStep> steps = List.of(
             new InitializationStep("Initializing logger", LoggerManager::init),
+            new InitializationStep("Initializing run configuration types", RunConfigurationTypes::initialize),
             new InitializationStep("Loading configuration", ConfigHandler::initConfig),
             new InitializationStep("Scanning plugins", () -> PluginManager.loadPlugins(ConfigHandler.getConfigDirectory().resolve("plugins"))),
             new InitializationStep("Registering keybinds", Keybinds::initialize),
+            new InitializationStep("Scanning language files", Languages::initialize),
             new InitializationStep("Loading settings", Settings::initialize),
             new InitializationStep("Preparing settings handler", SettingsHandler::init),
             new InitializationStep("Preparing themes", ThemeManager::init),
             new InitializationStep("Binding service locator", () -> ServiceLocator.setServiceProvider(Services::getService)),
+            new InitializationStep("Finding Java versions", JDKManager::refreshJDKs),
             new InitializationStep("Loading language", () -> L18n.loadLanguage(SettingsHandler.getValue(Settings.LANGUAGE))),
             new InitializationStep("Initializing repositories", SwitchboardRepositories::initialize),
             new InitializationStep("Loading mapping channels", MappingChannelRegistry::initialize),
@@ -150,6 +161,7 @@ public void start(Stage primaryStage) {
         }
 
         try {
+            SvgImageLoaderFactory.install(new PrimitiveDimensionProvider());
             WINDOW_MANAGER.showPrimary(
                 primaryStage,
                 new Scene(new WelcomePane()),
diff --git a/src/main/java/dev/railroadide/railroad/Services.java b/src/main/java/dev/railroadide/railroad/Services.java
index 3c10799b..c75dde38 100644
--- a/src/main/java/dev/railroadide/railroad/Services.java
+++ b/src/main/java/dev/railroadide/railroad/Services.java
@@ -10,8 +10,8 @@
 import dev.railroadide.railroad.ide.DefaultDocumentEditorStateService;
 import dev.railroadide.railroad.ide.DefaultIDEStateService;
 import dev.railroadide.railroad.localization.L18n;
-import dev.railroadide.railroad.project.creation.DefaultProjectCreationPipelineService;
-import dev.railroadide.railroad.project.creation.service.*;
+import dev.railroadide.railroad.project.onboarding.creation.DefaultProjectCreationPipelineService;
+import dev.railroadide.railroad.project.onboarding.creation.service.*;
 import dev.railroadide.railroad.utility.DiscardingOutputStream;
 import dev.railroadide.railroadpluginapi.services.ApplicationInfoService;
 import dev.railroadide.railroadpluginapi.services.DocumentEditorStateService;
diff --git a/src/main/java/dev/railroadide/railroad/config/ConfigHandler.java b/src/main/java/dev/railroadide/railroad/config/ConfigHandler.java
index bf1a326b..0b9798b4 100644
--- a/src/main/java/dev/railroadide/railroad/config/ConfigHandler.java
+++ b/src/main/java/dev/railroadide/railroad/config/ConfigHandler.java
@@ -13,9 +13,8 @@ public final class ConfigHandler {
     private final Config config = new Config();
 
     public static Path getConfigDirectory() {
-        OperatingSystem os = OperatingSystem.CURRENT;
         String userHome = System.getProperty("user.home");
-        return switch (os) {
+        return switch (OperatingSystem.CURRENT) {
             case WINDOWS -> {
                 String roaming = System.getenv("APPDATA");
                 if (roaming != null && !roaming.isBlank()) {
diff --git a/src/main/java/dev/railroadide/railroad/gradle/GradleEnvironment.java b/src/main/java/dev/railroadide/railroad/gradle/GradleEnvironment.java
new file mode 100644
index 00000000..aff4aa43
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/GradleEnvironment.java
@@ -0,0 +1,72 @@
+package dev.railroadide.railroad.gradle;
+
+import dev.railroadide.railroad.gradle.service.task.GradleTaskExecutionRequest;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.project.Project;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+/**
+ * Represents the environment configuration for Gradle execution within a project.
+ */
+public interface GradleEnvironment {
+
+    /**
+     * Retrieves the associated project for this Gradle environment.
+     *
+     * @return the project instance.
+     */
+    Project project();
+
+    /**
+     * Determines whether the Gradle wrapper should be used.
+     *
+     * @return true if the Gradle wrapper is used, false otherwise.
+     */
+    boolean useWrapper();
+
+    /**
+     * Retrieves the installation path of the Gradle distribution, if specified.
+     *
+     * @return an Optional containing the installation path, or an empty Optional if not set.
+     */
+    Optional<Path> installationPath();
+
+    /**
+     * Retrieves the user home directory path for Gradle, if specified.
+     *
+     * @return an Optional containing the user home path, or an empty Optional if not set.
+     */
+    Optional<Path> userHomePath();
+
+    /**
+     * Retrieves the Java Development Kit (JDK) configuration for this Gradle environment, if specified.
+     *
+     * @return an Optional containing the JDK instance, or an empty Optional if not set.
+     */
+    Optional<JDK> jvm();
+
+    /**
+     * Constructs the JVM arguments for a specific Gradle task execution request.
+     *
+     * @param request the Gradle task execution request.
+     * @param jvm     the JDK instance to be used.
+     * @return a string containing the JVM arguments.
+     */
+    String jvmArgumentsFor(GradleTaskExecutionRequest request, JDK jvm);
+
+    /**
+     * Checks whether the Gradle daemon is enabled.
+     *
+     * @return true if the Gradle daemon is enabled, false otherwise.
+     */
+    boolean isDaemonEnabled();
+
+    /**
+     * Retrieves the idle timeout duration for the Gradle daemon, if specified.
+     *
+     * @return an Optional containing the idle timeout in minutes, or an empty Optional if not set.
+     */
+    Optional<Long> daemonIdleTimeout();
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/GradleOutputStream.java b/src/main/java/dev/railroadide/railroad/gradle/GradleOutputStream.java
new file mode 100644
index 00000000..7b9e67b9
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/GradleOutputStream.java
@@ -0,0 +1,48 @@
+package dev.railroadide.railroad.gradle;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.ByteArrayOutputStream;
+import java.util.function.Consumer;
+
+/**
+ * An output stream that captures Gradle output and forwards it to a consumer.
+ */
+public class GradleOutputStream extends ByteArrayOutputStream {
+    private final Consumer<String> outputConsumer;
+
+    /**
+     * Creates a new Gradle output stream.
+     *
+     * @param outputConsumer the consumer to forward output to
+     */
+    public GradleOutputStream(Consumer<String> outputConsumer) {
+        this.outputConsumer = outputConsumer;
+    }
+
+    @Override
+    public void writeBytes(byte @NotNull [] bytes) {
+        super.writeBytes(bytes);
+        flushOutput();
+    }
+
+    @Override
+    public synchronized void write(int b) {
+        super.write(b);
+        flushOutput();
+    }
+
+    @Override
+    public synchronized void write(byte @NotNull [] b, int off, int len) {
+        super.write(b, off, len);
+        flushOutput();
+    }
+
+    private void flushOutput() {
+        String output = toString();
+        if (!output.isEmpty()) {
+            outputConsumer.accept(output);
+            reset();
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/GradleSettings.java b/src/main/java/dev/railroadide/railroad/gradle/GradleSettings.java
new file mode 100644
index 00000000..5fbc84cd
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/GradleSettings.java
@@ -0,0 +1,51 @@
+package dev.railroadide.railroad.gradle;
+
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.java.JDK;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.nio.file.Path;
+import java.util.List;
+
+/**
+ * Captures the CLI and project settings that should be applied when invoking Gradle.
+ */
+@Getter
+@Setter
+@ToString
+@EqualsAndHashCode
+public class GradleSettings {
+    private boolean useWrapper;
+    private String wrapperVersion;
+    private Path customGradleHome;
+    private Path gradleUserHome;
+    private JDK gradleJvm;
+    private boolean offlineMode;
+    private boolean enableBuildCache;
+    private boolean parallelExecution;
+    private int maxWorkerCount;
+    private List<RunConfiguration<?>> configurations;
+    private boolean daemonEnabled;
+    private Long daemonIdleTimeout;
+
+    public GradleSettings(boolean useWrapper, String wrapperVersion, Path customGradleHome, Path gradleUserHome,
+                          JDK gradleJvm, boolean offlineMode, boolean enableBuildCache, boolean parallelExecution,
+                          int maxWorkerCount, List<RunConfiguration<?>> configurations,
+                          boolean daemonEnabled, Long daemonIdleTimeout) {
+        this.useWrapper = useWrapper;
+        this.wrapperVersion = wrapperVersion;
+        this.customGradleHome = customGradleHome;
+        this.gradleUserHome = gradleUserHome;
+        this.gradleJvm = gradleJvm;
+        this.offlineMode = offlineMode;
+        this.enableBuildCache = enableBuildCache;
+        this.parallelExecution = parallelExecution;
+        this.maxWorkerCount = maxWorkerCount;
+        this.configurations = configurations;
+        this.daemonEnabled = daemonEnabled;
+        this.daemonIdleTimeout = daemonIdleTimeout;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/model/GradleBuildModel.java b/src/main/java/dev/railroadide/railroad/gradle/model/GradleBuildModel.java
new file mode 100644
index 00000000..5e8f5daa
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/model/GradleBuildModel.java
@@ -0,0 +1,18 @@
+package dev.railroadide.railroad.gradle.model;
+
+import dev.railroadide.railroadplugin.dto.FabricDataModel;
+import dev.railroadide.railroadplugin.dto.RailroadProject;
+
+import java.nio.file.Path;
+
+/**
+ * Represents a Gradle build and its constituent projects.
+ *
+ * @param gradleVersion the version of Gradle used to build the project
+ * @param rootDir       the root directory of the imported build
+ * @param fabricData    the Fabric modding platform data model, if applicable
+ * @param project       the root project of the Gradle build
+ */
+public record GradleBuildModel(String gradleVersion, Path rootDir, FabricDataModel fabricData,
+                               RailroadProject project) {
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/model/GradleModelListener.java b/src/main/java/dev/railroadide/railroad/gradle/model/GradleModelListener.java
new file mode 100644
index 00000000..c0ebd89d
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/model/GradleModelListener.java
@@ -0,0 +1,25 @@
+package dev.railroadide.railroad.gradle.model;
+
+/**
+ * Listener interface for receiving notifications about Gradle model reload events.
+ */
+public interface GradleModelListener {
+    /**
+     * Called when a model reload is initiated.
+     */
+    void modelReloadStarted();
+
+    /**
+     * Called when a model reload completes successfully.
+     *
+     * @param model the reloaded Gradle build model
+     */
+    void modelReloadSucceeded(GradleBuildModel model);
+
+    /**
+     * Called when a model reload fails.
+     *
+     * @param error the error that caused the reload to fail
+     */
+    void modelReloadFailed(Throwable error);
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/model/GradleProjectModel.java b/src/main/java/dev/railroadide/railroad/gradle/model/GradleProjectModel.java
new file mode 100644
index 00000000..d3e7cd2f
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/model/GradleProjectModel.java
@@ -0,0 +1,21 @@
+package dev.railroadide.railroad.gradle.model;
+
+import dev.railroadide.railroadplugin.dto.RailroadConfiguration;
+import dev.railroadide.railroadplugin.dto.RailroadGradleTask;
+
+import java.nio.file.Path;
+import java.util.List;
+
+/**
+ * Captures information about a single Gradle project within a composite build.
+ *
+ * @param path               the colon-separated path identifying the project in the build
+ * @param name               the user-visible name of the project
+ * @param projectDir         the directory where the project resides
+ * @param tasks              the tasks exposed by this project
+ * @param configurationTrees the configuration trees for dependencies in this project
+ */
+public record GradleProjectModel(String path, String name, Path projectDir,
+                                 List<? extends RailroadGradleTask> tasks,
+                                 List<? extends RailroadConfiguration> configurationTrees) {
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/project/GradleInvocationPreferences.java b/src/main/java/dev/railroadide/railroad/gradle/project/GradleInvocationPreferences.java
new file mode 100644
index 00000000..7e383872
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/project/GradleInvocationPreferences.java
@@ -0,0 +1,52 @@
+package dev.railroadide.railroad.gradle.project;
+
+import java.nio.file.Path;
+
+/**
+ * Preferences for invoking Gradle builds.
+ *
+ * @param offlineMode              whether to run Gradle in offline mode
+ * @param enableBuildCache         whether to enable the Gradle build cache
+ * @param parallelExecution        whether to enable parallel execution of tasks
+ * @param isDaemonEnabled          whether to enable the Gradle daemon
+ * @param daemonIdleTimeoutMinutes the idle timeout for the Gradle daemon in minutes
+ * @param maxWorkerCount           the maximum number of worker threads for Gradle
+ * @param customGradleHome         a custom Gradle home directory, or null to use the default
+ * @param gradleUserHome           a custom Gradle user home directory, or null to use the default
+ */
+public record GradleInvocationPreferences(boolean offlineMode,
+                                          boolean enableBuildCache,
+                                          boolean parallelExecution,
+                                          boolean isDaemonEnabled,
+                                          Long daemonIdleTimeoutMinutes,
+                                          Integer maxWorkerCount,
+                                          Path customGradleHome,
+                                          Path gradleUserHome) {
+    /**
+     * Returns the default Gradle invocation preferences.
+     * <p>
+     * Defaults:
+     * - offlineMode: false
+     * - enableBuildCache: false
+     * - parallelExecution: false
+     * - isDaemonEnabled: true
+     * - daemonIdleTimeoutMinutes: null
+     * - maxWorkerCount: null
+     * - customGradleHome: null
+     * - gradleUserHome: null
+     *
+     * @return the default preferences
+     */
+    static GradleInvocationPreferences defaults() {
+        return new GradleInvocationPreferences(false, false, false, true, null, null, null, null);
+    }
+
+    /**
+     * Returns the daemon idle timeout in minutes.
+     *
+     * @return the daemon idle timeout in minutes, or null if not set
+     */
+    Long daemonIdleTimeout() {
+        return daemonIdleTimeoutMinutes;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/project/GradleManager.java b/src/main/java/dev/railroadide/railroad/gradle/project/GradleManager.java
new file mode 100644
index 00000000..d0725ad7
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/project/GradleManager.java
@@ -0,0 +1,408 @@
+package dev.railroadide.railroad.gradle.project;
+
+import dev.railroadide.railroad.AppResources;
+import dev.railroadide.railroad.DefaultGradleEnvironment;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.gradle.GradleEnvironment;
+import dev.railroadide.railroad.gradle.GradleSettings;
+import dev.railroadide.railroad.gradle.service.GradleConsoleMode;
+import dev.railroadide.railroad.gradle.service.GradleExecutionService;
+import dev.railroadide.railroad.gradle.service.GradleModelService;
+import dev.railroadide.railroad.gradle.service.impl.ToolingGradleExecutionService;
+import dev.railroadide.railroad.gradle.service.impl.ToolingGradleModelService;
+import dev.railroadide.railroad.gradle.service.task.GradleTaskExecutionHandle;
+import dev.railroadide.railroad.gradle.service.task.GradleTaskExecutionRequest;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationTypes;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.JDKManager;
+import dev.railroadide.railroad.project.Project;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Encapsulates all Gradle-related state for a {@link Project}, including cached environments and models.
+ */
+public final class GradleManager {
+    private static final String DOWNLOAD_SOURCES_TASK = "railroadDownloadAllSources";
+    private static final String DOWNLOAD_SOURCES_INIT_RESOURCE = "scripts/init-download-sources.gradle";
+
+    private final Project project;
+    private final Object lock = new Object();
+
+    private ExecutorService modelExecutor;
+    private ExecutorService executionExecutor;
+    private GradleModelService modelService;
+    private GradleExecutionService executionService;
+    private GradleEnvironment environment;
+    private GradleSettings gradleSettings;
+
+    /**
+     * Creates a new Gradle manager for the given project.
+     *
+     * @param project the project
+     */
+    public GradleManager(Project project) {
+        this.project = Objects.requireNonNull(project);
+    }
+
+    /**
+     * Gets the shared Gradle model service for this project.
+     *
+     * @return the model service
+     * @throws IllegalStateException if the project is not a Gradle project
+     */
+    public GradleModelService getGradleModelService() {
+        ensureIsGradleProject();
+
+        synchronized (lock) {
+            if (modelService == null) {
+                if (modelExecutor == null || modelExecutor.isShutdown()) {
+                    modelExecutor = Executors.newSingleThreadExecutor(runnable -> {
+                        var thread = new Thread(runnable, "railroad-gradle-model-" + project.getPathString());
+                        thread.setDaemon(true);
+                        return thread;
+                    });
+                }
+
+                modelService = new ToolingGradleModelService(
+                    project,
+                    getGradleEnvironment(),
+                    modelExecutor
+                );
+            }
+
+            return modelService;
+        }
+    }
+
+    /**
+     * Gets the Gradle environment for this project.
+     *
+     * @return the Gradle environment
+     * @throws IllegalStateException if the project is not a Gradle project
+     */
+    public GradleEnvironment getGradleEnvironment() {
+        ensureIsGradleProject();
+
+        synchronized (lock) {
+            if (environment == null) {
+                GradleSettings settings = getGradleSettings();
+                Path gradleHome = discoverGradleInstallationPath();
+
+                environment = new DefaultGradleEnvironment(
+                    project,
+                    gradleHome,
+                    settings
+                );
+            }
+
+            return environment;
+        }
+    }
+
+    public GradleSettings getGradleSettings() {
+        ensureIsGradleProject();
+
+        synchronized (lock) {
+            if (gradleSettings == null) {
+                gradleSettings = buildGradleSettings();
+            }
+
+            return gradleSettings;
+        }
+    }
+
+    /**
+     * Runs a simple task using the shared execution service; completes the provided future when done.
+     *
+     * @param taskName the name of the task to run
+     * @param jdk      the JDK to use for execution
+     * @param future   the future to complete when done
+     */
+    public void runBuildTaskAsync(String taskName, JDK jdk, CompletableFuture<Runnable> future) {
+        Objects.requireNonNull(taskName, "taskName");
+        Objects.requireNonNull(jdk, "jdk");
+
+        try {
+            ensureIsGradleProject();
+        } catch (IllegalStateException exception) {
+            future.completeExceptionally(exception);
+            return;
+        }
+
+        GradleInvocationPreferences prefs = loadGradleInvocationPreferences();
+        GradleExecutionService execService = getExecutionService(jdk);
+
+        var request = new GradleTaskExecutionRequest(
+            taskName,
+            List.of(),
+            Map.of(),
+            Map.of(),
+            prefs.offlineMode(),
+            false,
+            false,
+            GradleConsoleMode.RICH
+        );
+
+        GradleTaskExecutionHandle handle = execService.runTask(request);
+        handle.completionFuture().whenComplete((result, throwable) -> {
+            if (throwable != null) {
+                future.completeExceptionally(throwable);
+            } else {
+                future.complete(() -> {
+                });
+            }
+        });
+    }
+
+    /**
+     * Downloads sources for all Gradle projects using the bundled download-sources plugin.
+     *
+     * @return a future that completes when the download task finishes
+     */
+    public CompletableFuture<Void> downloadAllSources() {
+        var completion = new CompletableFuture<Void>();
+
+        try {
+            ensureIsGradleProject();
+        } catch (IllegalStateException exception) {
+            completion.completeExceptionally(exception);
+            return completion;
+        }
+
+        Path initScriptPath;
+        try {
+            initScriptPath = extractInitScript(DOWNLOAD_SOURCES_INIT_RESOURCE, "railroad-download-sources");
+        } catch (IOException exception) {
+            completion.completeExceptionally(exception);
+            return completion;
+        }
+
+        GradleSettings settings = getGradleSettings();
+        JDK jdk = settings.getGradleJvm() != null ? settings.getGradleJvm() : JDKManager.getDefaultJDK();
+        GradleExecutionService execService = getExecutionService(jdk);
+
+        boolean offline = settings.isOfflineMode();
+        var request = new GradleTaskExecutionRequest(
+            DOWNLOAD_SOURCES_TASK,
+            List.of("--init-script", initScriptPath.toAbsolutePath().toString()),
+            Map.of(),
+            Map.of(),
+            offline,
+            !offline,
+            false,
+            GradleConsoleMode.RICH
+        );
+
+        GradleTaskExecutionHandle handle;
+        try {
+            handle = execService.runTask(request);
+        } catch (Exception exception) {
+            deleteIfExists(initScriptPath);
+            completion.completeExceptionally(exception);
+            return completion;
+        }
+
+        handle.completionFuture().whenComplete((result, throwable) -> {
+            deleteIfExists(initScriptPath);
+            if (throwable != null) {
+                completion.completeExceptionally(throwable);
+            } else {
+                completion.complete(null);
+            }
+        });
+
+        return completion;
+    }
+
+    private void ensureIsGradleProject() {
+        Path path = project.getPath();
+        if (!isGradleProject())
+            throw new IllegalStateException("Project at " + path + " is not a Gradle project.");
+    }
+
+    public boolean isGradleProject() {
+        Path path = project.getPath();
+        Path groovyBuildFile = path.resolve("build.gradle");
+        Path kotlinBuildFile = path.resolve("build.gradle.kts");
+        boolean hasGroovyBuild = Files.isRegularFile(groovyBuildFile) && Files.isReadable(groovyBuildFile);
+        boolean hasKotlinBuild = Files.isRegularFile(kotlinBuildFile) && Files.isReadable(kotlinBuildFile);
+        return hasGradleWrapper() || hasGroovyBuild || hasKotlinBuild;
+    }
+
+    private GradleSettings buildGradleSettings() {
+        GradleInvocationPreferences prefs = loadGradleInvocationPreferences();
+
+        boolean useWrapper = hasGradleWrapper();
+        String wrapperVersion = getGradleVersion();
+        Path gradleUserHome = getEnvPath("GRADLE_USER_HOME").orElse(prefs.gradleUserHome());
+        JDK gradleJvm = JDKManager.getDefaultJDK();
+
+        List<RunConfiguration<?>> gradleRunConfigs =
+            project.getRunConfigManager().getConfigurations().stream()
+                .filter(config -> config != null && config.type() == RunConfigurationTypes.GRADLE)
+                .toList();
+
+        Path customGradleHome = useWrapper ? null : getEnvPath("GRADLE_HOME").orElse(prefs.customGradleHome());
+
+        int maxWorkers = prefs.maxWorkerCount() != null ?
+            prefs.maxWorkerCount() :
+            Runtime.getRuntime().availableProcessors();
+
+        return new GradleSettings(
+            useWrapper,
+            wrapperVersion,
+            customGradleHome,
+            gradleUserHome,
+            gradleJvm,
+            prefs.offlineMode(),
+            prefs.enableBuildCache(),
+            prefs.parallelExecution(),
+            maxWorkers,
+            gradleRunConfigs,
+            prefs.isDaemonEnabled(),
+            prefs.daemonIdleTimeout()
+        );
+    }
+
+    private Path discoverGradleInstallationPath() {
+        if (!hasGradleWrapper())
+            return getEnvPath("GRADLE_HOME").orElse(null);
+
+        // Prefer wrapper when available; external installation only needed when wrapper is absent.
+        return null;
+    }
+
+    private boolean hasGradleWrapper() {
+        Path wrapperProps = project.getPath().resolve("gradle").resolve("wrapper").resolve("gradle-wrapper.properties");
+        return Files.isRegularFile(wrapperProps);
+    }
+
+    private String getGradleVersion() {
+        Path wrapperProps = project.getPath().resolve("gradle").resolve("wrapper").resolve("gradle-wrapper.properties");
+        if (!Files.isRegularFile(wrapperProps))
+            return null;
+
+        try {
+            for (String rawLine : Files.readAllLines(wrapperProps)) {
+                String line = rawLine.trim();
+                if (line.startsWith("distributionUrl=")) {
+                    String url = line.substring("distributionUrl=".length()).trim();
+
+                    if ((url.startsWith("\"") && url.endsWith("\"")) || (url.startsWith("'") && url.endsWith("'"))) {
+                        url = url.substring(1, url.length() - 1);
+                    }
+
+                    int lastSlash = url.lastIndexOf('/');
+                    String filename = lastSlash != -1 ? url.substring(lastSlash + 1) : url;
+
+                    Matcher m = Pattern.compile("gradle-([0-9][0-9A-Za-z.-]*)", Pattern.CASE_INSENSITIVE)
+                        .matcher(filename);
+                    if (m.find())
+                        return m.group(1);
+
+                    // Couldn't extract version from filename
+                    return null;
+                }
+            }
+
+            return null;
+        } catch (IOException exception) {
+            Railroad.LOGGER.error("Error reading gradle-wrapper.properties", exception);
+            return null;
+        }
+    }
+
+    private Optional<Path> getEnvPath(String envKey) {
+        String value = System.getenv(envKey);
+        if (value == null || value.isBlank())
+            return Optional.empty();
+
+        try {
+            Path path = Path.of(value).toAbsolutePath().normalize();
+            return Files.exists(path) ? Optional.of(path) : Optional.empty();
+        } catch (Exception exception) {
+            return Optional.empty();
+        }
+    }
+
+    private GradleInvocationPreferences loadGradleInvocationPreferences() {
+        return project.getDataStore().readJson("gradle/settings.json", GradleInvocationPreferences.class)
+            .orElseGet(GradleInvocationPreferences::defaults);
+    }
+
+    private Path extractInitScript(String resourcePath, String prefix) throws IOException {
+        try (var stream = AppResources.getResourceAsStream(resourcePath)) {
+            if (stream == null)
+                throw new IOException("Missing init script resource: " + resourcePath);
+
+            Path tempFile = Files.createTempFile(prefix, ".gradle");
+            Files.copy(stream, tempFile, StandardCopyOption.REPLACE_EXISTING);
+            tempFile.toFile().deleteOnExit();
+            return tempFile;
+        }
+    }
+
+    private void deleteIfExists(Path path) {
+        if (path == null)
+            return;
+
+        try {
+            Files.deleteIfExists(path);
+        } catch (IOException ignored) {
+        }
+    }
+
+    public void saveSettings() {
+        synchronized (lock) {
+            project.getDataStore().writeJson(
+                "gradle/settings.json",
+                new GradleInvocationPreferences(
+                    gradleSettings.isOfflineMode(),
+                    gradleSettings.isEnableBuildCache(),
+                    gradleSettings.isParallelExecution(),
+                    gradleSettings.isDaemonEnabled(),
+                    gradleSettings.getDaemonIdleTimeout(),
+                    gradleSettings.getMaxWorkerCount(),
+                    gradleSettings.getCustomGradleHome(),
+                    gradleSettings.getGradleUserHome()
+                )
+            );
+
+            this.environment = null; // Invalidate cached environment
+        }
+    }
+
+    // TODO: Support changing JDK at runtime (this would require recreating the execution service)
+    private GradleExecutionService getExecutionService(JDK jdkOverride) {
+        synchronized (lock) {
+            if (executionService == null) {
+                if (executionExecutor == null || executionExecutor.isShutdown()) {
+                    executionExecutor = Executors.newCachedThreadPool(r -> {
+                        var thread = new Thread(r, "railroad-gradle-exec-" + project.getPathString());
+                        thread.setDaemon(true);
+                        return thread;
+                    });
+                }
+
+                var execEnv = new JdkOverridingEnvironment(getGradleEnvironment(), jdkOverride);
+                executionService = new ToolingGradleExecutionService(project, execEnv, executionExecutor);
+            }
+
+            return executionService;
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/project/JdkOverridingEnvironment.java b/src/main/java/dev/railroadide/railroad/gradle/project/JdkOverridingEnvironment.java
new file mode 100644
index 00000000..53680e89
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/project/JdkOverridingEnvironment.java
@@ -0,0 +1,57 @@
+package dev.railroadide.railroad.gradle.project;
+
+import dev.railroadide.railroad.gradle.GradleEnvironment;
+import dev.railroadide.railroad.gradle.service.task.GradleTaskExecutionRequest;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.project.Project;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+/**
+ * A Gradle environment that overrides the JVM with a specified JDK.
+ *
+ * @param delegate    the original Gradle environment to delegate to
+ * @param overrideJvm the JDK to use instead of the one from the delegate
+ */
+record JdkOverridingEnvironment(GradleEnvironment delegate, JDK overrideJvm) implements GradleEnvironment {
+    @Override
+    public Project project() {
+        return delegate.project();
+    }
+
+    @Override
+    public boolean useWrapper() {
+        return delegate.useWrapper();
+    }
+
+    @Override
+    public Optional<Path> installationPath() {
+        return delegate.installationPath();
+    }
+
+    @Override
+    public Optional<Path> userHomePath() {
+        return delegate.userHomePath();
+    }
+
+    @Override
+    public Optional<JDK> jvm() {
+        return Optional.ofNullable(overrideJvm);
+    }
+
+    @Override
+    public String jvmArgumentsFor(GradleTaskExecutionRequest request, JDK jvm) {
+        return delegate.jvmArgumentsFor(request, jvm);
+    }
+
+    @Override
+    public boolean isDaemonEnabled() {
+        return delegate.isDaemonEnabled();
+    }
+
+    @Override
+    public Optional<Long> daemonIdleTimeout() {
+        return delegate.daemonIdleTimeout();
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/GradleConsoleMode.java b/src/main/java/dev/railroadide/railroad/gradle/service/GradleConsoleMode.java
new file mode 100644
index 00000000..a6243373
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/GradleConsoleMode.java
@@ -0,0 +1,10 @@
+package dev.railroadide.railroad.gradle.service;
+
+/**
+ * Configures how Gradle should render console output.
+ */
+public enum GradleConsoleMode {
+    RICH,
+    PLAIN,
+    QUIET;
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/GradleExecutionService.java b/src/main/java/dev/railroadide/railroad/gradle/service/GradleExecutionService.java
new file mode 100644
index 00000000..c43bcd97
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/GradleExecutionService.java
@@ -0,0 +1,37 @@
+package dev.railroadide.railroad.gradle.service;
+
+import dev.railroadide.railroad.gradle.service.task.GradleTaskExecutionHandle;
+import dev.railroadide.railroad.gradle.service.task.GradleTaskExecutionRequest;
+
+import java.util.List;
+
+/**
+ * Responsible for scheduling Gradle task executions and exposing their state.
+ */
+public interface GradleExecutionService {
+
+    /**
+     * Begins execution of the provided request.
+     *
+     * @param request the Gradle task request to execute
+     * @return a handle that can be used to observe and control the running task
+     */
+    GradleTaskExecutionHandle runTask(GradleTaskExecutionRequest request);
+
+    /**
+     * @return the handles for tasks currently running through this service
+     */
+    List<GradleTaskExecutionHandle> getRunningTasks();
+
+    /**
+     * Stops every task that was started through this service.
+     *
+     * @return handles to the tasks that were requested to stop
+     */
+    List<GradleTaskExecutionHandle> stopAllRunningTasks();
+
+    /**
+     * @return the last few task execution requests submitted to this service
+     */
+    List<GradleTaskExecutionRequest> getRecentRequests();
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/GradleModelService.java b/src/main/java/dev/railroadide/railroad/gradle/service/GradleModelService.java
new file mode 100644
index 00000000..7ac5ad90
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/GradleModelService.java
@@ -0,0 +1,40 @@
+package dev.railroadide.railroad.gradle.service;
+
+import dev.railroadide.railroad.gradle.model.GradleBuildModel;
+import dev.railroadide.railroad.gradle.model.GradleModelListener;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Manages the background import of Gradle models and exposes task metadata.
+ */
+public interface GradleModelService {
+
+    /**
+     * Refreshes the Gradle model, optionally forcing a rebuild even if cached data exists.
+     *
+     * @param force whether to bypass caches when refreshing the model
+     * @return a future that completes with the refreshed model
+     */
+    CompletableFuture<GradleBuildModel> refreshModel(boolean force);
+
+    /**
+     * @return the last successful Gradle build model that was loaded
+     */
+    Optional<GradleBuildModel> getCachedModel();
+
+    /**
+     * Adds a listener to be notified of model changes.
+     *
+     * @param listener the listener to add
+     */
+    void addListener(GradleModelListener listener);
+
+    /**
+     * Removes a previously added listener.
+     *
+     * @param listener the listener to remove
+     */
+    void removeListener(GradleModelListener listener);
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/impl/ToolingGradleExecutionService.java b/src/main/java/dev/railroadide/railroad/gradle/service/impl/ToolingGradleExecutionService.java
new file mode 100644
index 00000000..01a1618a
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/impl/ToolingGradleExecutionService.java
@@ -0,0 +1,202 @@
+package dev.railroadide.railroad.gradle.service.impl;
+
+import dev.railroadide.railroad.gradle.GradleEnvironment;
+import dev.railroadide.railroad.gradle.GradleOutputStream;
+import dev.railroadide.railroad.gradle.service.GradleExecutionService;
+import dev.railroadide.railroad.gradle.service.task.GradleTaskExecutionHandle;
+import dev.railroadide.railroad.gradle.service.task.GradleTaskExecutionRequest;
+import dev.railroadide.railroad.gradle.service.task.GradleTaskExecutionResult;
+import dev.railroadide.railroad.gradle.service.task.GradleTaskState;
+import dev.railroadide.railroad.project.Project;
+import org.gradle.tooling.*;
+import org.gradle.tooling.events.ProgressListener;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ * Implementation of {@link GradleExecutionService} using the Gradle Tooling API.
+ */
+public class ToolingGradleExecutionService implements GradleExecutionService {
+    private final Project project;
+    private final GradleEnvironment environment;
+    private final Executor executor;
+
+    private final Map<UUID, GradleTaskExecutionHandle> runningTasks = new ConcurrentHashMap<>();
+    private final Deque<GradleTaskExecutionRequest> recentRequests = new ArrayDeque<>();
+
+    /**
+     * Creates a new ToolingGradleExecutionService.
+     *
+     * @param project     the project for which Gradle tasks will be executed
+     * @param environment the Gradle environment configuration
+     * @param executor    the executor for running tasks asynchronously
+     */
+    public ToolingGradleExecutionService(Project project, GradleEnvironment environment, Executor executor) {
+        this.project = Objects.requireNonNull(project);
+        this.environment = Objects.requireNonNull(environment);
+        this.executor = Objects.requireNonNull(executor);
+    }
+
+    private static int findFreePort() {
+        try (var socket = new ServerSocket(0)) {
+            return socket.getLocalPort();
+        } catch (IOException exception) {
+            throw new RuntimeException("Failed to find a free port for debugging", exception);
+        }
+    }
+
+    private static String bufferToString(Queue<String> buffer) {
+        var stringBuilder = new StringBuilder();
+        for (String line : buffer) {
+            stringBuilder.append(line).append(System.lineSeparator());
+        }
+
+        return stringBuilder.toString();
+    }
+
+    @Override
+    public GradleTaskExecutionHandle runTask(GradleTaskExecutionRequest request) {
+        var handle = new ToolingGradleTaskExecutionHandle(request);
+        runningTasks.put(handle.id(), handle);
+
+        CompletableFuture<GradleTaskExecutionResult> future = CompletableFuture.supplyAsync(() -> {
+            handle.updateState(GradleTaskState.STARTING, "railroad.gradle.execution.starting");
+            try {
+                GradleTaskExecutionResult result = execute(request, handle);
+                handle.updateState(GradleTaskState.COMPLETED, "railroad.gradle.execution.completed");
+                return result;
+            } catch (BuildCancelledException | CancellationException exception) {
+                handle.updateState(GradleTaskState.CANCELLED, "railroad.gradle.execution.cancelled");
+                throw exception;
+            } catch (Exception exception) {
+                handle.updateState(GradleTaskState.FAILED, "railroad.gradle.execution.failed");
+                throw new CompletionException(exception);
+            } finally {
+                runningTasks.remove(handle.id());
+
+                recentRequests.addFirst(request);
+                if (recentRequests.size() > 10) {
+                    recentRequests.removeLast();
+                }
+            }
+        }, executor);
+
+        handle.setResultFuture(future);
+        return handle;
+    }
+
+    @Override
+    public List<GradleTaskExecutionHandle> getRunningTasks() {
+        return List.copyOf(runningTasks.values());
+    }
+
+    @Override
+    public List<GradleTaskExecutionHandle> stopAllRunningTasks() {
+        return runningTasks.values().stream()
+            .peek(GradleTaskExecutionHandle::cancel)
+            .toList();
+    }
+
+    @Override
+    public List<GradleTaskExecutionRequest> getRecentRequests() {
+        return List.copyOf(recentRequests);
+    }
+
+    private GradleTaskExecutionResult execute(GradleTaskExecutionRequest request, ToolingGradleTaskExecutionHandle handle) {
+        GradleConnector connector = GradleConnector.newConnector()
+            .forProjectDirectory(project.getPath().toFile());
+        ToolingGradleModelService.configureConnector(connector, environment);
+
+        CancellationTokenSource tokenSource = GradleConnector.newCancellationTokenSource();
+        handle.attachCancellationToken(tokenSource);
+
+        try (ProjectConnection connection = connector.connect()) {
+            BuildLauncher build = connection.newBuild()
+                .forTasks(request.taskPath());
+
+            List<String> args = buildArguments(request);
+            if (!args.isEmpty()) {
+                build.withArguments(args);
+            }
+
+            environment.jvm().ifPresent(jvm -> {
+                build.setJavaHome(jvm.path().toFile());
+                String jvmArgsStr = environment.jvmArgumentsFor(request, jvm);
+                if (jvmArgsStr != null && !jvmArgsStr.isBlank()) {
+                    List<String> jvmArgs = Arrays.stream(jvmArgsStr.split("\\s+"))
+                        .filter(arg -> !arg.isBlank())
+                        .toList();
+                    build.addJvmArguments(jvmArgs);
+                }
+            });
+
+            if (!request.environment().isEmpty()) {
+                build.setEnvironmentVariables(request.environment());
+            }
+
+            build.withCancellationToken(tokenSource.token());
+
+            build.setStandardOutput(new GradleOutputStream(handle::emitOutput));
+            build.setStandardError(new GradleOutputStream(handle::emitError));
+            build.addProgressListener((ProgressListener) event -> {
+                String msg = event.getDescriptor() != null
+                    ? event.getDescriptor().getName()
+                    : event.getDisplayName();
+                handle.updateState(GradleTaskState.RUNNING, msg);
+            });
+
+            applyDebugConfiguration(request, build, handle);
+
+            build.run();
+
+            return new GradleTaskExecutionResult(handle.currentState(), 0, bufferToString(handle.getOutputBuffer()), bufferToString(handle.getErrorBuffer()));
+        }
+    }
+
+    private List<String> buildArguments(GradleTaskExecutionRequest request) {
+        List<String> args = new ArrayList<>(request.additionalArgs());
+
+        if (request.offline()) {
+            args.add("--offline");
+        }
+
+        if (request.refreshDependencies()) {
+            args.add("--refresh-dependencies");
+        }
+
+        switch (request.consoleMode()) {
+            case RICH -> args.add("--console=rich");
+            case PLAIN -> args.add("--console=plain");
+            case QUIET -> args.add("--quiet");
+        }
+
+        // system properties as -Dkey=value
+        request.systemProperties().forEach((key, value) -> args.add("-D" + key + "=" + value));
+
+        return args;
+    }
+
+    private void applyDebugConfiguration(GradleTaskExecutionRequest request,
+                                         BuildLauncher build,
+                                         ToolingGradleTaskExecutionHandle handle) {
+        if (!request.debug())
+            return;
+
+        int debugPort = findFreePort();
+
+        List<String> debugJvmArgs = List.of(
+            "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:" + debugPort
+        );
+        build.addJvmArguments(debugJvmArgs);
+
+        handle.setDebugPort(debugPort);
+        handle.updateState(
+            GradleTaskState.STARTING,
+            "railroad.gradle.execution.debug_started",
+            debugPort
+        );
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/impl/ToolingGradleModelService.java b/src/main/java/dev/railroadide/railroad/gradle/service/impl/ToolingGradleModelService.java
new file mode 100644
index 00000000..103e0fc7
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/impl/ToolingGradleModelService.java
@@ -0,0 +1,202 @@
+package dev.railroadide.railroad.gradle.service.impl;
+
+import dev.railroadide.railroad.AppResources;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.gradle.GradleEnvironment;
+import dev.railroadide.railroad.gradle.model.GradleBuildModel;
+import dev.railroadide.railroad.gradle.model.GradleModelListener;
+import dev.railroadide.railroad.gradle.service.GradleModelService;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroad.utility.function.ThrowingSupplier;
+import dev.railroadide.railroadplugin.dto.FabricDataModel;
+import dev.railroadide.railroadplugin.dto.RailroadProject;
+import org.gradle.tooling.GradleConnector;
+import org.gradle.tooling.ProjectConnection;
+import org.gradle.tooling.UnknownModelException;
+import org.gradle.tooling.model.build.BuildEnvironment;
+import org.gradle.tooling.model.gradle.GradleBuild;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.time.Duration;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+/**
+ * Implementation of {@link GradleModelService} that uses the Gradle Tooling API to load
+ * the Gradle build model.
+ */
+public class ToolingGradleModelService implements GradleModelService {
+    private final Project project;
+    private final GradleEnvironment environment;
+    private final Executor executor;
+
+    private final Object lock = new Object();
+    private final AtomicReference<GradleBuildModel> cachedModel = new AtomicReference<>();
+    private final Duration modelTimeout = Duration.ofMinutes(3);
+    private final List<GradleModelListener> listeners = new CopyOnWriteArrayList<>();
+    private volatile CompletableFuture<GradleBuildModel> ongoingRefresh = null;
+
+    /**
+     * Creates a new ToolingGradleModelService.
+     *
+     * @param project     the project for which to load the Gradle model
+     * @param environment the Gradle environment configuration
+     * @param executor    the executor to use for asynchronous operations
+     */
+    public ToolingGradleModelService(Project project, GradleEnvironment environment, Executor executor) {
+        this.project = Objects.requireNonNull(project);
+        this.environment = Objects.requireNonNull(environment);
+        this.executor = Objects.requireNonNull(executor);
+    }
+
+    public static GradleBuildModel loadModel(Project project, GradleEnvironment environment) {
+        GradleConnector connector = GradleConnector.newConnector()
+            .forProjectDirectory(project.getPath().toFile());
+        configureConnector(connector, environment);
+
+        Path initScriptPath = null;
+        try (ProjectConnection connection = connector.connect()) {
+            initScriptPath = writeInitScript();
+            String[] initScriptArgs = {"--init-script", initScriptPath.toAbsolutePath().toString()};
+            connection.newBuild().withArguments(initScriptArgs).run();
+
+            BuildEnvironment buildEnvironment = connection.model(BuildEnvironment.class)
+                .withArguments(initScriptArgs)
+                .get();
+            GradleBuild gradleBuild = connection.model(GradleBuild.class)
+                .withArguments(initScriptArgs)
+                .get();
+            RailroadProject railroadProject = requestOptionalModel(connection, RailroadProject.class, initScriptArgs);
+            FabricDataModel fabricDataModel = requestOptionalModel(connection, FabricDataModel.class, initScriptArgs);
+
+            String gradleVersion = buildEnvironment.getGradle().getGradleVersion();
+            Path rootDir = gradleBuild.getRootProject().getProjectDirectory().toPath();
+
+            return new GradleBuildModel(gradleVersion, rootDir, fabricDataModel, railroadProject);
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to load Gradle model", exception);
+        } finally {
+            if (initScriptPath != null) {
+                try {
+                    Files.deleteIfExists(initScriptPath);
+                } catch (Exception ignored) {
+                }
+            }
+        }
+    }
+
+    private static Path writeInitScript() {
+        try {
+            Path path = Files.createTempFile("gradle-init-script", ".gradle");
+            path.toFile().deleteOnExit();
+            Files.copy(AppResources.getResourceAsStream("scripts/init-gradle-plugin.gradle"), path, StandardCopyOption.REPLACE_EXISTING);
+            return path;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to write Gradle init script", exception);
+        }
+    }
+
+    private static <T> T requestOptionalModel(ProjectConnection connection, Class<T> modelClass, String[] initScriptArgs) {
+        try {
+            return connection.model(modelClass)
+                .withArguments(initScriptArgs)
+                .get();
+        } catch (UnknownModelException exception) {
+            Railroad.LOGGER.warn("Gradle model {} is not available; continuing without it", modelClass.getSimpleName());
+            return null;
+        }
+    }
+
+    /**
+     * Configures the given GradleConnector based on the provided GradleEnvironment.
+     *
+     * @param connector   the GradleConnector to configure
+     * @param environment the GradleEnvironment containing configuration settings
+     */
+    public static void configureConnector(GradleConnector connector, GradleEnvironment environment) {
+        if (environment == null || connector == null)
+            return;
+
+        if (environment.useWrapper()) {
+            connector.useBuildDistribution();
+        } else {
+            environment.installationPath().ifPresent(path -> connector.useInstallation(path.toFile()));
+            environment.userHomePath().ifPresent(path -> connector.useGradleUserHomeDir(path.toFile()));
+        }
+
+        // TODO: Enable setting Java home via environment.jvm() when custom JVM support is implemented.
+        // environment.jvm().ifPresent(jvm -> connector.setJavaHome(jvm.javaHome().toFile()));
+    }
+
+    private static <T> Supplier<T> safely(ThrowingSupplier<T> supplier) {
+        return () -> {
+            try {
+                return supplier.get();
+            } catch (RuntimeException exception) {
+                throw exception;
+            } catch (Exception exception) {
+                throw new CompletionException(exception);
+            }
+        };
+    }
+
+    @Override
+    public void addListener(GradleModelListener listener) {
+        listeners.add(listener);
+    }
+
+    @Override
+    public void removeListener(GradleModelListener listener) {
+        listeners.remove(listener);
+    }
+
+    @Override
+    public CompletableFuture<GradleBuildModel> refreshModel(boolean force) {
+        synchronized (lock) {
+            if (!force) {
+                GradleBuildModel existingModel = cachedModel.get();
+                if (existingModel != null)
+                    return CompletableFuture.completedFuture(existingModel);
+            }
+
+            if (ongoingRefresh != null && !ongoingRefresh.isDone())
+                return ongoingRefresh;
+
+            listeners.forEach(GradleModelListener::modelReloadStarted);
+
+            ongoingRefresh = CompletableFuture.supplyAsync(
+                    safely(() -> ToolingGradleModelService.loadModel(this.project, this.environment)),
+                    executor)
+                .orTimeout(modelTimeout.toMillis(), TimeUnit.MILLISECONDS)
+                .whenComplete((model, throwable) -> {
+                    synchronized (lock) {
+                        if (throwable == null && model != null) {
+                            cachedModel.set(model);
+                            listeners.forEach(listener -> listener.modelReloadSucceeded(model));
+                        } else {
+                            listeners.forEach(listener ->
+                                listener.modelReloadFailed(throwable != null ?
+                                    throwable :
+                                    new IllegalStateException("Failed to load model"))
+                            );
+                        }
+
+                        ongoingRefresh = null;
+                    }
+                });
+
+            return ongoingRefresh;
+        }
+    }
+
+    @Override
+    public Optional<GradleBuildModel> getCachedModel() {
+        return Optional.ofNullable(cachedModel.get());
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/impl/ToolingGradleTaskExecutionHandle.java b/src/main/java/dev/railroadide/railroad/gradle/service/impl/ToolingGradleTaskExecutionHandle.java
new file mode 100644
index 00000000..489e3d23
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/impl/ToolingGradleTaskExecutionHandle.java
@@ -0,0 +1,203 @@
+package dev.railroadide.railroad.gradle.service.impl;
+
+import dev.railroadide.railroad.gradle.service.task.GradleTaskExecutionHandle;
+import dev.railroadide.railroad.gradle.service.task.GradleTaskExecutionRequest;
+import dev.railroadide.railroad.gradle.service.task.GradleTaskExecutionResult;
+import dev.railroadide.railroad.gradle.service.task.GradleTaskState;
+import dev.railroadide.railroad.gradle.service.task.event.GradleTaskErrorEvent;
+import dev.railroadide.railroad.gradle.service.task.event.GradleTaskOutputEvent;
+import dev.railroadide.railroad.gradle.service.task.event.GradleTaskProgressEvent;
+import dev.railroadide.railroad.gradle.service.task.event.GradleTaskStatusEvent;
+import org.gradle.tooling.CancellationTokenSource;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Consumer;
+
+/**
+ * Implementation of {@link GradleTaskExecutionHandle} for managing the execution of a Gradle task.
+ */
+public class ToolingGradleTaskExecutionHandle implements GradleTaskExecutionHandle {
+    private final UUID id = UUID.randomUUID();
+    private final GradleTaskExecutionRequest request;
+
+    private final List<Consumer<GradleTaskProgressEvent>> progressListeners = new CopyOnWriteArrayList<>();
+    private final List<Consumer<GradleTaskOutputEvent>> outputListeners = new CopyOnWriteArrayList<>();
+    private final List<Consumer<GradleTaskErrorEvent>> errorListeners = new CopyOnWriteArrayList<>();
+    private final List<Consumer<GradleTaskStatusEvent>> statusListeners = new CopyOnWriteArrayList<>();
+    private final Queue<String> outputBuffer = new ConcurrentLinkedQueue<>();
+    private final Queue<String> errorBuffer = new ConcurrentLinkedQueue<>();
+    private volatile GradleTaskState state = GradleTaskState.QUEUED;
+    private volatile CompletableFuture<GradleTaskExecutionResult> resultCompletion = new CompletableFuture<>();
+    private volatile CancellationTokenSource cancellationTokenSource;
+    private volatile int debugPort = -1;
+
+    /**
+     * Creates a new ToolingGradleTaskExecutionHandle for the given request.
+     *
+     * @param request the Gradle task execution request
+     */
+    ToolingGradleTaskExecutionHandle(GradleTaskExecutionRequest request) {
+        this.request = request;
+    }
+
+    @Override
+    public UUID id() {
+        return id;
+    }
+
+    @Override
+    public GradleTaskExecutionRequest request() {
+        return request;
+    }
+
+    @Override
+    public GradleTaskState currentState() {
+        return state;
+    }
+
+    @Override
+    public Optional<Integer> debugPort() {
+        return debugPort >= 0 ? Optional.of(debugPort) : Optional.empty();
+    }
+
+    /**
+     * Attaches a CancellationTokenSource to this execution handle.
+     *
+     * @param tokenSource the CancellationTokenSource to attach
+     */
+    void attachCancellationToken(CancellationTokenSource tokenSource) {
+        this.cancellationTokenSource = tokenSource;
+    }
+
+    /**
+     * Sets the debug port for this execution handle.
+     *
+     * @param port the debug port number
+     */
+    void setDebugPort(int port) {
+        this.debugPort = port;
+    }
+
+    @Override
+    public void cancel() {
+        CancellationTokenSource src = this.cancellationTokenSource;
+        if (src != null) {
+            src.cancel();
+        }
+    }
+
+    @Override
+    public void onProgressChanged(Consumer<GradleTaskProgressEvent> listener) {
+        progressListeners.add(listener);
+    }
+
+    @Override
+    public void onOutputReceived(Consumer<GradleTaskOutputEvent> listener) {
+        outputListeners.add(listener);
+    }
+
+    @Override
+    public void onErrorReceived(Consumer<GradleTaskErrorEvent> listener) {
+        errorListeners.add(listener);
+    }
+
+    @Override
+    public void onStatusChanged(Consumer<GradleTaskStatusEvent> listener) {
+        statusListeners.add(listener);
+    }
+
+    @Override
+    public CompletableFuture<GradleTaskExecutionResult> completionFuture() {
+        return resultCompletion;
+    }
+
+    /**
+     * Updates the current state of the task and notifies listeners.
+     *
+     * @param newState    the new state of the task
+     * @param messageKey  the message key for status updates
+     * @param messageArgs optional arguments for the message
+     */
+    void updateState(GradleTaskState newState, String messageKey, Object... messageArgs) {
+        this.state = newState;
+
+        var progressEvent = new GradleTaskProgressEvent(
+            id,
+            newState,
+            messageKey,
+            messageArgs,
+            -1.0, // unknown progress for now
+            Instant.now()
+        );
+        for (Consumer<GradleTaskProgressEvent> listener : progressListeners) {
+            listener.accept(progressEvent);
+        }
+
+        var statusEvent = new GradleTaskStatusEvent(id, newState, messageKey, messageArgs);
+        for (var listener : statusListeners) {
+            listener.accept(statusEvent);
+        }
+    }
+
+    /**
+     * Emits an output line and notifies listeners.
+     *
+     * @param output the output line
+     */
+    void emitOutput(String output) {
+        outputBuffer.add(output);
+
+        var outputEvent = new GradleTaskOutputEvent(id, state, output);
+        for (var listener : outputListeners) {
+            listener.accept(outputEvent);
+        }
+    }
+
+    /**
+     * Emits an error line and notifies listeners.
+     *
+     * @param error the error line
+     */
+    void emitError(String error) {
+        errorBuffer.add(error);
+
+        var errorEvent = new GradleTaskErrorEvent(id, state, error);
+        for (var listener : errorListeners) {
+            listener.accept(errorEvent);
+        }
+    }
+
+    /**
+     * Sets the result future for this execution handle.
+     *
+     * @param future the CompletableFuture representing the task result
+     */
+    void setResultFuture(CompletableFuture<GradleTaskExecutionResult> future) {
+        this.resultCompletion = future;
+    }
+
+    /**
+     * Gets the output buffer.
+     *
+     * @return the output buffer
+     */
+    Queue<String> getOutputBuffer() {
+        return outputBuffer;
+    }
+
+    /**
+     * Gets the error buffer.
+     *
+     * @return the error buffer
+     */
+    Queue<String> getErrorBuffer() {
+        return errorBuffer;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/task/GradleTaskExecutionHandle.java b/src/main/java/dev/railroadide/railroad/gradle/service/task/GradleTaskExecutionHandle.java
new file mode 100644
index 00000000..8c8e2173
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/task/GradleTaskExecutionHandle.java
@@ -0,0 +1,75 @@
+package dev.railroadide.railroad.gradle.service.task;
+
+import dev.railroadide.railroad.gradle.service.task.event.GradleTaskErrorEvent;
+import dev.railroadide.railroad.gradle.service.task.event.GradleTaskOutputEvent;
+import dev.railroadide.railroad.gradle.service.task.event.GradleTaskProgressEvent;
+import dev.railroadide.railroad.gradle.service.task.event.GradleTaskStatusEvent;
+
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+
+/**
+ * Tracks a running Gradle task and exposes APIs for observation and control.
+ */
+public interface GradleTaskExecutionHandle {
+
+    /**
+     * @return the unique identifier assigned to this execution.
+     */
+    UUID id();
+
+    /**
+     * @return the request that produced this execution handle.
+     */
+    GradleTaskExecutionRequest request();
+
+    /**
+     * @return the current state of the Gradle task execution
+     */
+    GradleTaskState currentState();
+
+    /**
+     * @return the debug port if the task is running in debug mode, otherwise empty
+     */
+    Optional<Integer> debugPort();
+
+    /**
+     * Cancels the execution asynchronously.
+     */
+    void cancel();
+
+    /**
+     * Registers a listener for progress updates emitted by Gradle.
+     *
+     * @param listener the consumer that handles progress events
+     */
+    void onProgressChanged(Consumer<GradleTaskProgressEvent> listener);
+
+    /**
+     * Registers a listener for standard output produced by Gradle.
+     *
+     * @param listener the consumer that handles output chunks
+     */
+    void onOutputReceived(Consumer<GradleTaskOutputEvent> listener);
+
+    /**
+     * Registers a listener for errors emitted by Gradle.
+     *
+     * @param listener the consumer that handles error events
+     */
+    void onErrorReceived(Consumer<GradleTaskErrorEvent> listener);
+
+    /**
+     * Registers a listener for status changes (queued, running, completed, etc.).
+     *
+     * @param listener the consumer that handles status events
+     */
+    void onStatusChanged(Consumer<GradleTaskStatusEvent> listener);
+
+    /**
+     * @return a future that completes when the task finishes, either successfully or with a failure
+     */
+    CompletableFuture<GradleTaskExecutionResult> completionFuture();
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/task/GradleTaskExecutionRequest.java b/src/main/java/dev/railroadide/railroad/gradle/service/task/GradleTaskExecutionRequest.java
new file mode 100644
index 00000000..f687d042
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/task/GradleTaskExecutionRequest.java
@@ -0,0 +1,24 @@
+package dev.railroadide.railroad.gradle.service.task;
+
+import dev.railroadide.railroad.gradle.service.GradleConsoleMode;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Describes how Gradle should execute a specific task.
+ *
+ * @param taskPath            the fully-qualified task path to run
+ * @param additionalArgs      extra CLI arguments provided by the user
+ * @param systemProperties    Gradle system properties that should be passed to the JVM
+ * @param environment         environment variables to include with the Gradle process
+ * @param offline             whether Gradle should operate in offline mode
+ * @param refreshDependencies whether Gradle should refresh dependencies before running
+ * @param debug               whether to enable Gradle debug logging
+ * @param consoleMode         how Gradle should render console output
+ */
+public record GradleTaskExecutionRequest(String taskPath, List<String> additionalArgs,
+                                         Map<String, String> systemProperties, Map<String, String> environment,
+                                         boolean offline, boolean refreshDependencies, boolean debug,
+                                         GradleConsoleMode consoleMode) {
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/task/GradleTaskExecutionResult.java b/src/main/java/dev/railroadide/railroad/gradle/service/task/GradleTaskExecutionResult.java
new file mode 100644
index 00000000..887e1287
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/task/GradleTaskExecutionResult.java
@@ -0,0 +1,16 @@
+package dev.railroadide.railroad.gradle.service.task;
+
+/**
+ * Summarizes the outcome of a finished Gradle execution.
+ *
+ * @param state       the final state of the task
+ * @param exitCode    the OS exit code returned by Gradle
+ * @param output      the captured standard output stream
+ * @param errorOutput the captured error stream
+ */
+public record GradleTaskExecutionResult(
+    GradleTaskState state,
+    int exitCode,
+    String output,
+    String errorOutput) {
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/task/GradleTaskState.java b/src/main/java/dev/railroadide/railroad/gradle/service/task/GradleTaskState.java
new file mode 100644
index 00000000..2f7adf85
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/task/GradleTaskState.java
@@ -0,0 +1,13 @@
+package dev.railroadide.railroad.gradle.service.task;
+
+/**
+ * Represents the lifecycle stages of a Gradle task execution.
+ */
+public enum GradleTaskState {
+    QUEUED,
+    STARTING,
+    RUNNING,
+    COMPLETED,
+    FAILED,
+    CANCELLED;
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/task/event/GradleTaskErrorEvent.java b/src/main/java/dev/railroadide/railroad/gradle/service/task/event/GradleTaskErrorEvent.java
new file mode 100644
index 00000000..a9199867
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/task/event/GradleTaskErrorEvent.java
@@ -0,0 +1,20 @@
+package dev.railroadide.railroad.gradle.service.task.event;
+
+import dev.railroadide.railroad.gradle.service.task.GradleTaskState;
+
+import java.util.UUID;
+
+// TODO: extend with more error details (e.g., exception type, stack trace, etc.)
+
+/**
+ * Carries information about an error produced by a running Gradle task.
+ *
+ * @param taskId       the execution handle identifier
+ * @param state        the task’s terminal state when the error occurred
+ * @param errorMessage the message provided by Gradle
+ */
+public record GradleTaskErrorEvent(
+    UUID taskId,
+    GradleTaskState state,
+    String errorMessage) {
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/task/event/GradleTaskOutputEvent.java b/src/main/java/dev/railroadide/railroad/gradle/service/task/event/GradleTaskOutputEvent.java
new file mode 100644
index 00000000..18a26508
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/task/event/GradleTaskOutputEvent.java
@@ -0,0 +1,18 @@
+package dev.railroadide.railroad.gradle.service.task.event;
+
+import dev.railroadide.railroad.gradle.service.task.GradleTaskState;
+
+import java.util.UUID;
+
+/**
+ * Represents a chunk of Gradle output emitted while a task is running.
+ *
+ * @param taskId the identifier of the running task
+ * @param state  the current state when the output was produced
+ * @param output the actual text emitted
+ */
+public record GradleTaskOutputEvent(
+    UUID taskId,
+    GradleTaskState state,
+    String output) {
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/task/event/GradleTaskProgressEvent.java b/src/main/java/dev/railroadide/railroad/gradle/service/task/event/GradleTaskProgressEvent.java
new file mode 100644
index 00000000..fd17cc1d
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/task/event/GradleTaskProgressEvent.java
@@ -0,0 +1,20 @@
+package dev.railroadide.railroad.gradle.service.task.event;
+
+import dev.railroadide.railroad.gradle.service.task.GradleTaskState;
+
+import java.time.Instant;
+import java.util.UUID;
+
+/**
+ * Signals incremental progress from a running Gradle task.
+ *
+ * @param taskId      the execution identifier
+ * @param state       the current task state
+ * @param messageKey  an optional message describing the progress, identified by a localization key
+ * @param messageArgs optional arguments for the progress message
+ * @param progress    a fraction between {@code 0.0} and {@code 1.0}
+ * @param timestamp   when the progress event was emitted
+ */
+public record GradleTaskProgressEvent(UUID taskId, GradleTaskState state, String messageKey, Object[] messageArgs,
+                                      double progress, Instant timestamp) {
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/service/task/event/GradleTaskStatusEvent.java b/src/main/java/dev/railroadide/railroad/gradle/service/task/event/GradleTaskStatusEvent.java
new file mode 100644
index 00000000..f20bfe1d
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/service/task/event/GradleTaskStatusEvent.java
@@ -0,0 +1,20 @@
+package dev.railroadide.railroad.gradle.service.task.event;
+
+import dev.railroadide.railroad.gradle.service.task.GradleTaskState;
+
+import java.util.UUID;
+
+/**
+ * Indicates a status change for a running Gradle task.
+ *
+ * @param taskId      the execution identifier
+ * @param state       the current lifecycle stage
+ * @param messageKey  optional contextual text localization key
+ * @param messageArgs optional arguments for the localization text
+ */
+public record GradleTaskStatusEvent(
+    UUID taskId,
+    GradleTaskState state,
+    String messageKey,
+    Object[] messageArgs) {
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/GradleProjectContextMenu.java b/src/main/java/dev/railroadide/railroad/gradle/ui/GradleProjectContextMenu.java
new file mode 100644
index 00000000..aa7aad21
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/GradleProjectContextMenu.java
@@ -0,0 +1,65 @@
+package dev.railroadide.railroad.gradle.ui;
+
+import dev.railroadide.core.ui.RRBorderPane;
+import dev.railroadide.core.ui.localized.LocalizedMenuItem;
+import dev.railroadide.railroad.ide.projectexplorer.PathItem;
+import dev.railroadide.railroad.ide.projectexplorer.ProjectExplorerPane;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroad.utility.FileUtils;
+import dev.railroadide.railroad.utility.icon.RailroadBrandsIcon;
+import dev.railroadide.railroadplugin.dto.RailroadModule;
+import javafx.scene.control.ContextMenu;
+import javafx.stage.Window;
+import org.gradle.tooling.model.GradleProject;
+import org.gradle.tooling.model.gradle.GradleScript;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+import java.io.File;
+import java.nio.file.Path;
+
+public class GradleProjectContextMenu extends ContextMenu {
+    public GradleProjectContextMenu(Project project, RailroadModule module) {
+        super();
+
+        var openGradleConfig = new LocalizedMenuItem("railroad.gradle.tools.ctx_menu.open_gradle_config", new FontIcon(RailroadBrandsIcon.GRADLE));
+        openGradleConfig.setOnAction(event -> {
+            Path buildFile = findBuildScript(module);
+            if (buildFile == null)
+                return;
+
+            // TODO: Eventually we will have a system like Project#getFileManager to handle opening files
+            Window owner = getOwnerWindow();
+            if (owner != null && owner.getScene() != null && owner.getScene().getRoot() instanceof RRBorderPane borderPane) {
+                ProjectExplorerPane.openFile(project, new PathItem(buildFile), borderPane);
+            } else {
+                // Fallback to system handler if we cannot locate the IDE root pane
+                FileUtils.openInDefaultApplication(buildFile);
+            }
+        });
+
+        var syncItem = new LocalizedMenuItem("railroad.gradle.tools.ctx_menu.sync", new FontIcon(FontAwesomeSolid.SYNC));
+        syncItem.setOnAction(event -> project.getGradleManager().getGradleModelService().refreshModel(true));
+
+        getItems().addAll(openGradleConfig, syncItem);
+    }
+
+    private Path findBuildScript(RailroadModule module) {
+        if (module == null || module.getProjectDir() == null)
+            return null;
+
+        GradleProject gradleProject = module.getGradleProject();
+        if (gradleProject == null)
+            return null;
+
+        GradleScript buildScript = gradleProject.getBuildScript();
+        if (buildScript == null)
+            return null;
+
+        File sourceFile = buildScript.getSourceFile();
+        if (sourceFile == null)
+            return null;
+
+        return sourceFile.toPath();
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/GradleToolsPane.java b/src/main/java/dev/railroadide/railroad/gradle/ui/GradleToolsPane.java
new file mode 100644
index 00000000..844a63a2
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/GradleToolsPane.java
@@ -0,0 +1,189 @@
+package dev.railroadide.railroad.gradle.ui;
+
+import dev.railroadide.core.ui.RRButton;
+import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.ui.RRToggleButton;
+import dev.railroadide.core.ui.RRVBox;
+import dev.railroadide.core.ui.localized.LocalizedTab;
+import dev.railroadide.core.ui.localized.LocalizedTooltip;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.gradle.GradleSettings;
+import dev.railroadide.railroad.gradle.model.GradleBuildModel;
+import dev.railroadide.railroad.gradle.model.GradleModelListener;
+import dev.railroadide.railroad.gradle.project.GradleManager;
+import dev.railroadide.railroad.gradle.ui.deps.GradleDependenciesPane;
+import dev.railroadide.railroad.gradle.ui.task.GradleTasksPane;
+import dev.railroadide.railroad.project.Project;
+import javafx.application.Platform;
+import javafx.scene.Node;
+import javafx.scene.control.ButtonBase;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import lombok.Getter;
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.StackedFontIcon;
+
+@Getter
+public class GradleToolsPane extends RRVBox {
+    private final TabPane tabPane;
+    private final Tab tasksTab;
+    private final Tab dependenciesTab;
+
+    public GradleToolsPane(Project project) {
+        super();
+        getStyleClass().add("gradle-tools-pane");
+
+        GradleManager gradleManager = project.getGradleManager();
+        var modelService = gradleManager.getGradleModelService();
+
+        var syncButton = createButtonBarButton(
+            FontAwesomeSolid.SYNC,
+            "railroad.gradle.tools.button.sync.tooltip",
+            "sync-button",
+            false
+        );
+        syncButton.setOnAction(event ->
+            gradleManager.getGradleModelService().refreshModel(true));
+
+        var downloadSourcesButton = createButtonBarButton(
+            FontAwesomeSolid.DOWNLOAD,
+            "railroad.gradle.tools.button.downloadsources.tooltip",
+            "download-sources-button",
+            false
+        );
+        downloadSourcesButton.setOnAction(event -> {
+            Railroad.LOGGER.info("Downloading Gradle sources...");
+            downloadSourcesButton.setDisable(true);
+            gradleManager.downloadAllSources().whenComplete((ignored, throwable) -> {
+                if (throwable != null) {
+                    Railroad.LOGGER.error("Failed to download Gradle sources", throwable);
+                } else {
+                    Railroad.LOGGER.info("Gradle sources downloaded successfully");
+                }
+
+                Platform.runLater(() -> downloadSourcesButton.setDisable(false));
+            });
+        });
+
+        var offlineIcon = new StackedFontIcon();
+        offlineIcon.setIconCodes(FontAwesomeSolid.WIFI, FontAwesomeSolid.SLASH);
+        var toggleOfflineButton = createButtonBarButton(
+            offlineIcon,
+            "railroad.gradle.tools.button.toggleoffline.tooltip",
+            "toggle-offline-button",
+            true
+        );
+        toggleOfflineButton.setOnAction(event -> {
+            GradleSettings gradleSettings = gradleManager.getGradleSettings();
+            boolean newOfflineMode = !gradleSettings.isOfflineMode();
+            gradleSettings.setOfflineMode(newOfflineMode);
+            gradleManager.saveSettings();
+            ((RRToggleButton) toggleOfflineButton).setSelected(newOfflineMode);
+        });
+
+        var listener = new GradleModelListener() {
+            private void setButtonsDisabled(boolean disabled) {
+                Platform.runLater(() -> {
+                    syncButton.setDisable(disabled);
+                    downloadSourcesButton.setDisable(disabled);
+                    toggleOfflineButton.setDisable(disabled);
+                });
+            }
+
+            @Override
+            public void modelReloadStarted() {
+                setButtonsDisabled(true);
+            }
+
+            @Override
+            public void modelReloadSucceeded(GradleBuildModel model) {
+                setButtonsDisabled(false);
+            }
+
+            @Override
+            public void modelReloadFailed(Throwable error) {
+                setButtonsDisabled(false);
+            }
+        };
+        modelService.addListener(listener);
+
+        var buttonBar = new RRHBox(2, syncButton, downloadSourcesButton, toggleOfflineButton);
+        buttonBar.getStyleClass().add("gradle-tools-buttonbar");
+
+        getChildren().add(buttonBar);
+
+        this.tasksTab = new LocalizedTab("railroad.gradle.tools.tasks", new GradleTasksPane(project));
+        this.dependenciesTab = new LocalizedTab("railroad.gradle.tools.dependencies", new GradleDependenciesPane(project));
+
+        this.tabPane = new TabPane(tasksTab, dependenciesTab);
+        tabPane.getStyleClass().add("gradle-tools-tabpane");
+        tabPane.setTabClosingPolicy(TabPane.TabClosingPolicy.UNAVAILABLE);
+        getChildren().add(tabPane);
+        VBox.setVgrow(tabPane, Priority.ALWAYS);
+    }
+
+    private static ButtonBase createButtonBarButton(Ikon ikon, String tooltipKey, String styleClass, boolean toggle) {
+        return toggle
+            ? createToggleButtonBarButton(ikon, tooltipKey, styleClass)
+            : createButtonBarButton(ikon, tooltipKey, styleClass);
+    }
+
+    private static ButtonBase createButtonBarButton(Node ikon, String tooltipKey, String styleClass, boolean toggle) {
+        return toggle
+            ? createToggleButtonBarButton(ikon, tooltipKey, styleClass)
+            : createButtonBarButton(ikon, tooltipKey, styleClass);
+    }
+
+    private static RRToggleButton createToggleButtonBarButton(Node graphic, String tooltipKey, String styleClass) {
+        var button = new RRToggleButton("", graphic);
+        button.setSquare(true);
+        button.setButtonSize(ButtonSize.SMALL);
+        button.setVariant(ButtonVariant.GHOST);
+        button.setTooltip(new LocalizedTooltip(tooltipKey));
+        button.getStyleClass().addAll("gradle-tools-buttonbar-button", styleClass);
+        return button;
+    }
+
+    private static RRToggleButton createToggleButtonBarButton(Ikon graphic, String tooltipKey, String styleClass) {
+        var button = new RRToggleButton("", graphic);
+        button.setSquare(true);
+        button.setButtonSize(ButtonSize.SMALL);
+        button.setVariant(ButtonVariant.GHOST);
+        button.setTooltip(new LocalizedTooltip(tooltipKey));
+        button.getStyleClass().addAll("gradle-tools-buttonbar-button", styleClass);
+        return button;
+    }
+
+    private static RRButton createButtonBarButton(Node graphic, String tooltipKey, String styleClass) {
+        var button = new RRButton("", graphic);
+        button.setSquare(true);
+        button.setButtonSize(ButtonSize.SMALL);
+        button.setVariant(ButtonVariant.GHOST);
+        button.setTooltip(new LocalizedTooltip(tooltipKey));
+        button.getStyleClass().addAll("gradle-tools-buttonbar-button", styleClass);
+        return button;
+    }
+
+    private static RRButton createButtonBarButton(Ikon graphic, String tooltipKey, String styleClass) {
+        var button = new RRButton("", graphic);
+        button.setSquare(true);
+        button.setButtonSize(ButtonSize.SMALL);
+        button.setVariant(ButtonVariant.GHOST);
+        button.setTooltip(new LocalizedTooltip(tooltipKey));
+        button.getStyleClass().addAll("gradle-tools-buttonbar-button", styleClass);
+        return button;
+    }
+
+    public boolean isTasksTabSelected() {
+        return this.tabPane.getSelectionModel().getSelectedItem() == tasksTab;
+    }
+
+    public boolean isDependenciesTabSelected() {
+        return this.tabPane.getSelectionModel().getSelectedItem() == dependenciesTab;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/GradleTreeBuilder.java b/src/main/java/dev/railroadide/railroad/gradle/ui/GradleTreeBuilder.java
new file mode 100644
index 00000000..7ee4d45d
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/GradleTreeBuilder.java
@@ -0,0 +1,29 @@
+package dev.railroadide.railroad.gradle.ui;
+
+import dev.railroadide.railroad.gradle.ui.tree.GradleTreeElement;
+import dev.railroadide.railroad.project.Project;
+import javafx.collections.ObservableList;
+import javafx.scene.control.TreeItem;
+
+public interface GradleTreeBuilder<T> {
+    TreeItem<GradleTreeElement> buildTree(Project project, ObservableList<T> elements);
+
+    default String getParentProjectPath(String projectPath) {
+        if (projectPath == null || ":".equals(projectPath))
+            return null;
+
+        String trimmed = projectPath.startsWith(":") ? projectPath.substring(1) : projectPath;
+        if (trimmed.isEmpty())
+            return null;
+
+        int lastSeparator = trimmed.lastIndexOf(':');
+        if (lastSeparator < 0)
+            return ":";
+
+        String parentSegments = trimmed.substring(0, lastSeparator);
+        if (parentSegments.isEmpty())
+            return ":";
+
+        return ":" + parentSegments;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/GradleTreeViewPane.java b/src/main/java/dev/railroadide/railroad/gradle/ui/GradleTreeViewPane.java
new file mode 100644
index 00000000..f124e59c
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/GradleTreeViewPane.java
@@ -0,0 +1,97 @@
+package dev.railroadide.railroad.gradle.ui;
+
+import dev.railroadide.core.ui.RRVBox;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.gradle.model.GradleBuildModel;
+import dev.railroadide.railroad.gradle.model.GradleModelListener;
+import dev.railroadide.railroad.gradle.service.GradleModelService;
+import dev.railroadide.railroad.gradle.ui.tree.GradleTreeCell;
+import dev.railroadide.railroad.gradle.ui.tree.GradleTreeElement;
+import dev.railroadide.railroad.project.Project;
+import io.github.palexdev.materialfx.controls.MFXProgressSpinner;
+import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.TreeView;
+import javafx.scene.layout.StackPane;
+
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public abstract class GradleTreeViewPane<T> extends RRVBox {
+    private final ObservableList<T> elements = FXCollections.observableArrayList();
+
+    private final TreeView<GradleTreeElement> treeView = new TreeView<>();
+    private final MFXProgressSpinner loadingSpinner = new MFXProgressSpinner();
+    private final StackPane loadingContainer = new StackPane(loadingSpinner);
+    private final AtomicBoolean isLoading = new AtomicBoolean(true);
+
+    public GradleTreeViewPane(Project project) {
+        super();
+        getStyleClass().add("gradle-tool-content-pane");
+
+        loadingSpinner.getStyleClass().add("gradle-tool-loading-spinner");
+        loadingContainer.setAlignment(Pos.CENTER);
+        loadingContainer.prefHeightProperty().bind(heightProperty());
+        loadingContainer.prefWidthProperty().bind(widthProperty());
+
+        treeView.getStyleClass().add("gradle-tasks-tree-view");
+        treeView.setShowRoot(false);
+        treeView.setCellFactory(param -> new GradleTreeCell());
+        treeView.prefHeightProperty().bind(heightProperty());
+        elements.addListener((ListChangeListener<? super T>) change -> Platform.runLater(() -> {
+            GradleTreeBuilder<T> treeBuilder = createTreeBuilder();
+            treeView.setRoot(treeBuilder.buildTree(project, elements));
+        }));
+
+        updateLoadingState();
+
+        GradleModelService modelService = project.getGradleManager().getGradleModelService();
+        modelService.refreshModel(true);
+        modelService.addListener(new GradleModelListener() {
+            @Override
+            public void modelReloadStarted() {
+                isLoading.set(true);
+                updateLoadingState();
+            }
+
+            @Override
+            public void modelReloadSucceeded(GradleBuildModel model) {
+                isLoading.set(false);
+                elements.setAll(getElementsFromModel(modelService, model));
+                updateLoadingState();
+            }
+
+            @Override
+            public void modelReloadFailed(Throwable error) {
+                Railroad.LOGGER.error("Failed to reload Gradle model", error);
+                isLoading.set(false);
+                updateLoadingState();
+            }
+        });
+    }
+
+    protected abstract GradleTreeBuilder<T> createTreeBuilder();
+
+    protected abstract Collection<T> getElementsFromModel(GradleModelService modelService, GradleBuildModel model);
+
+    protected void updateLoadingState() {
+        Platform.runLater(() -> {
+            ObservableList<Node> children = getChildren();
+            if (isLoading.get()) {
+                if (!children.contains(loadingContainer)) {
+                    children.clear();
+                    children.add(loadingContainer);
+                }
+            } else {
+                if (!children.contains(treeView)) {
+                    children.clear();
+                    children.add(treeView);
+                }
+            }
+        });
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/deps/GradleDependenciesPane.java b/src/main/java/dev/railroadide/railroad/gradle/ui/deps/GradleDependenciesPane.java
new file mode 100644
index 00000000..375302de
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/deps/GradleDependenciesPane.java
@@ -0,0 +1,35 @@
+package dev.railroadide.railroad.gradle.ui.deps;
+
+import dev.railroadide.railroad.gradle.model.GradleBuildModel;
+import dev.railroadide.railroad.gradle.service.GradleModelService;
+import dev.railroadide.railroad.gradle.ui.GradleTreeBuilder;
+import dev.railroadide.railroad.gradle.ui.GradleTreeViewPane;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroadplugin.dto.RailroadConfiguration;
+import dev.railroadide.railroadplugin.dto.RailroadProject;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Stream;
+
+public class GradleDependenciesPane extends GradleTreeViewPane<RailroadConfiguration> {
+    public GradleDependenciesPane(Project project) {
+        super(project);
+    }
+
+    @Override
+    protected GradleTreeBuilder<RailroadConfiguration> createTreeBuilder() {
+        return new GradleDependencyTreeBuilder();
+    }
+
+    @Override
+    protected Collection<RailroadConfiguration> getElementsFromModel(GradleModelService modelService, GradleBuildModel model) {
+        return List.copyOf(modelService.getCachedModel()
+            .map(GradleBuildModel::project)
+            .map(RailroadProject::getModules)
+            .map(Collection::stream)
+            .orElseGet(Stream::empty)
+            .flatMap(module -> module.getConfigurations().stream())
+            .toList());
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/deps/GradleDependencyTreeBuilder.java b/src/main/java/dev/railroadide/railroad/gradle/ui/deps/GradleDependencyTreeBuilder.java
new file mode 100644
index 00000000..6e43abfc
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/deps/GradleDependencyTreeBuilder.java
@@ -0,0 +1,112 @@
+package dev.railroadide.railroad.gradle.ui.deps;
+
+import dev.railroadide.railroad.gradle.ui.GradleTreeBuilder;
+import dev.railroadide.railroad.gradle.ui.tree.GradleConfigurationElement;
+import dev.railroadide.railroad.gradle.ui.tree.GradleDependencyElement;
+import dev.railroadide.railroad.gradle.ui.tree.GradleProjectElement;
+import dev.railroadide.railroad.gradle.ui.tree.GradleTreeElement;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroadplugin.dto.RailroadConfiguration;
+import dev.railroadide.railroadplugin.dto.RailroadDependency;
+import dev.railroadide.railroadplugin.dto.RailroadModule;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.control.TreeItem;
+import org.gradle.tooling.model.DomainObjectSet;
+
+import java.util.*;
+
+public class GradleDependencyTreeBuilder implements GradleTreeBuilder<RailroadConfiguration> {
+    @Override
+    public TreeItem<GradleTreeElement> buildTree(Project project, ObservableList<RailroadConfiguration> elements) {
+        TreeItem<GradleTreeElement> root = new TreeItem<>();
+
+        List<RailroadConfiguration> rootConfigs = elements.stream()
+            .filter(Objects::nonNull)
+            .filter(cfg -> cfg.getParent() == null)
+            .filter(cfg -> cfg.getDependencies() != null && !cfg.getDependencies().isEmpty())
+            .toList();
+
+        Map<RailroadModule, List<RailroadConfiguration>> configsByModule = new HashMap<>();
+        for (RailroadConfiguration cfg : elements) {
+            if (cfg == null)
+                continue;
+
+            RailroadModule module = cfg.getParent();
+            if (cfg.getDependencies() == null || cfg.getDependencies().isEmpty())
+                continue;
+
+            configsByModule.computeIfAbsent(module, k -> new ArrayList<>()).add(cfg);
+        }
+
+        for (Map.Entry<RailroadModule, List<RailroadConfiguration>> entry : configsByModule.entrySet()) {
+            RailroadModule module = entry.getKey();
+            List<RailroadConfiguration> configs = entry.getValue();
+
+            TreeItem<GradleTreeElement> moduleNode = module != null
+                ? new TreeItem<>(new GradleProjectElement(project, module))
+                : root;
+
+            if (module != null) {
+                root.getChildren().add(moduleNode);
+            }
+
+            for (RailroadConfiguration configurationTree : configs) {
+                DomainObjectSet<? extends RailroadDependency> dependencies = configurationTree.getDependencies();
+                if (dependencies == null || dependencies.isEmpty())
+                    continue;
+
+                TreeItem<GradleTreeElement> configurationNode = new TreeItem<>(
+                    new GradleConfigurationElement(configurationTree.getName()));
+                moduleNode.getChildren().add(configurationNode);
+
+                addDependencies(configurationNode, dependencies);
+            }
+        }
+
+        for (RailroadConfiguration configurationTree : rootConfigs) {
+            DomainObjectSet<? extends RailroadDependency> dependencies = configurationTree.getDependencies();
+            if (dependencies == null || dependencies.isEmpty())
+                continue;
+
+            TreeItem<GradleTreeElement> configurationNode = new TreeItem<>(
+                new GradleConfigurationElement(configurationTree.getName()));
+            root.getChildren().add(configurationNode);
+
+            addDependencies(configurationNode, dependencies);
+        }
+
+        sortTree(root);
+        return root;
+    }
+
+    private void addDependencies(TreeItem<GradleTreeElement> parent, Collection<? extends RailroadDependency> dependencies) {
+        if (dependencies == null)
+            return;
+
+        for (RailroadDependency dependency : dependencies) {
+            if (dependency == null)
+                continue;
+
+            TreeItem<GradleTreeElement> dependencyNode = new TreeItem<>(new GradleDependencyElement(dependency));
+            parent.getChildren().add(dependencyNode);
+
+            addDependencies(dependencyNode, dependency.getChildren());
+        }
+    }
+
+    private void sortTree(TreeItem<GradleTreeElement> node) {
+        Comparator<TreeItem<GradleTreeElement>> comparator = Comparator.comparing(
+            item -> {
+                GradleTreeElement element = item.getValue();
+                return element == null ? "" : element.getName();
+            },
+            String.CASE_INSENSITIVE_ORDER
+        );
+
+        FXCollections.sort(node.getChildren(), comparator);
+        for (TreeItem<GradleTreeElement> child : node.getChildren()) {
+            sortTree(child);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/task/GradleTaskContextMenu.java b/src/main/java/dev/railroadide/railroad/gradle/ui/task/GradleTaskContextMenu.java
new file mode 100644
index 00000000..7497b69d
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/task/GradleTaskContextMenu.java
@@ -0,0 +1,106 @@
+package dev.railroadide.railroad.gradle.ui.task;
+
+import dev.railroadide.core.ui.localized.LocalizedMenuItem;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationManager;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationTypes;
+import dev.railroadide.railroad.ide.runconfig.defaults.data.GradleRunConfigurationData;
+import dev.railroadide.railroad.java.JDKManager;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroadplugin.dto.RailroadGradleTask;
+import dev.railroadide.railroadplugin.dto.RailroadModule;
+import javafx.scene.control.ContextMenu;
+import org.jetbrains.annotations.NotNull;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+import java.util.Optional;
+
+public class GradleTaskContextMenu extends ContextMenu {
+    public GradleTaskContextMenu(Project project, RailroadGradleTask task) {
+        super();
+
+        var runIcon = new FontIcon(FontAwesomeSolid.PLAY);
+        runIcon.getStyleClass().add("run-button");
+
+        var runItem = new LocalizedMenuItem("railroad.runconfig.run.tooltip", runIcon);
+        runItem.setOnAction(event -> {
+            var runConfiguration = getOrCreateRunConfig(project, task);
+            runConfiguration.run(project);
+        });
+
+        var debugIcon = new FontIcon(FontAwesomeSolid.BUG);
+        debugIcon.getStyleClass().add("debug-button");
+
+        var debugItem = new LocalizedMenuItem("railroad.runconfig.debug.tooltip", debugIcon);
+        debugItem.setOnAction(event -> {
+            var runConfiguration = getOrCreateRunConfig(project, task);
+
+            runConfiguration.debug(project);
+        });
+
+        getItems().addAll(runItem, debugItem);
+    }
+
+    /**
+     * Get an existing run configuration for the given Gradle task, or create a new one if it doesn't exist.
+     *
+     * @param project the current project
+     * @param task    the Gradle task
+     * @return the run configuration
+     */
+    public static @NotNull RunConfiguration<GradleRunConfigurationData> getOrCreateRunConfig(Project project, RailroadGradleTask task) {
+        RunConfigurationManager runConfigManager = project.getRunConfigManager();
+        @SuppressWarnings("unchecked")
+        Optional<RunConfiguration<GradleRunConfigurationData>> existingRunConfig = runConfigManager.getConfigurations().stream()
+            .filter(configuration -> hasExistingRunConfig(task, configuration))
+            .map(configuration -> (RunConfiguration<GradleRunConfigurationData>) configuration)
+            .findFirst();
+
+        return existingRunConfig.orElseGet(() -> createRunConfig(task, runConfigManager));
+    }
+
+    /**
+     * Create a new run configuration for the given Gradle task.
+     *
+     * @param task             the Gradle task
+     * @param runConfigManager the run configuration manager
+     * @return the newly created run configuration
+     */
+    public static @NotNull RunConfiguration<GradleRunConfigurationData> createRunConfig(RailroadGradleTask task, RunConfigurationManager runConfigManager) {
+        var configurationData = new GradleRunConfigurationData();
+        RailroadModule module = task.module();
+        if (module == null || module.getGradleProject() == null)
+            throw new IllegalStateException("Cannot create run configuration: module or Gradle project is null");
+
+        configurationData.setGradleProjectPath(module.getGradleProject().getProjectDirectory().toPath());
+        configurationData.setTask(task.getName());
+        configurationData.setJavaHome(JDKManager.getDefaultJDK());
+        configurationData.setName(module.getName() + " [" + task.getName() + "]");
+
+        var runConfiguration = new RunConfiguration<>(RunConfigurationTypes.GRADLE, configurationData);
+        runConfigManager.addConfiguration(runConfiguration);
+        runConfigManager.setSelectedConfiguration(runConfiguration);
+        return runConfiguration;
+    }
+
+    /**
+     * Check if the given run configuration corresponds to the given Gradle task.
+     *
+     * @param task          the Gradle task
+     * @param configuration the run configuration
+     * @return true if the run configuration corresponds to the Gradle task, false otherwise
+     */
+    public static boolean hasExistingRunConfig(RailroadGradleTask task, RunConfiguration<?> configuration) {
+        if (configuration.type() != RunConfigurationTypes.GRADLE)
+            return false;
+
+        var data = (GradleRunConfigurationData) configuration.data();
+        RailroadModule module = task.module();
+        if (module == null || module.getGradleProject() == null)
+            return false;
+
+        return data.getGradleProjectPath().equals(module.getGradleProject().getProjectDirectory().toPath())
+            && data.getTask().equals(task.getName());
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/task/GradleTaskTreeBuilder.java b/src/main/java/dev/railroadide/railroad/gradle/ui/task/GradleTaskTreeBuilder.java
new file mode 100644
index 00000000..bcd185fd
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/task/GradleTaskTreeBuilder.java
@@ -0,0 +1,131 @@
+package dev.railroadide.railroad.gradle.ui.task;
+
+import dev.railroadide.railroad.gradle.ui.GradleTreeBuilder;
+import dev.railroadide.railroad.gradle.ui.tree.GradleProjectElement;
+import dev.railroadide.railroad.gradle.ui.tree.GradleTaskElement;
+import dev.railroadide.railroad.gradle.ui.tree.GradleTaskGroupElement;
+import dev.railroadide.railroad.gradle.ui.tree.GradleTreeElement;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroad.utility.StringUtils;
+import dev.railroadide.railroadplugin.dto.RailroadGradleTask;
+import dev.railroadide.railroadplugin.dto.RailroadModule;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.control.TreeItem;
+
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class GradleTaskTreeBuilder implements GradleTreeBuilder<RailroadGradleTask> {
+    @Override
+    public TreeItem<GradleTreeElement> buildTree(Project project, ObservableList<RailroadGradleTask> elements) {
+        TreeItem<GradleTreeElement> root = new TreeItem<>();
+
+        Map<RailroadModule, List<RailroadGradleTask>> tasksByProject = elements.stream()
+            .collect(Collectors.groupingBy(RailroadGradleTask::module));
+
+        Map<String, RailroadModule> projectsByPath = tasksByProject.keySet().stream()
+            .collect(Collectors.toMap(RailroadModule::getPath, Function.identity()));
+
+        Map<String, TreeItem<GradleTreeElement>> projectNodes = new ConcurrentHashMap<>();
+
+        for (RailroadModule module : tasksByProject.keySet()) {
+            ensureProjectNode(project, module, projectsByPath, projectNodes, root);
+        }
+
+        for (Map.Entry<RailroadModule, List<RailroadGradleTask>> entry : tasksByProject.entrySet()) {
+            TreeItem<GradleTreeElement> projectNode = projectNodes.get(entry.getKey().getPath());
+            if (projectNode == null)
+                continue;
+
+            addTasksToProjectNode(project, projectNode, entry.getValue());
+        }
+
+        sortTree(root);
+        return root;
+    }
+
+    private TreeItem<GradleTreeElement> ensureProjectNode(
+        Project project,
+        RailroadModule module,
+        Map<String, RailroadModule> projectsByPath,
+        Map<String, TreeItem<GradleTreeElement>> projectNodes,
+        TreeItem<GradleTreeElement> root
+    ) {
+        return projectNodes.computeIfAbsent(module.getPath(), path -> {
+            TreeItem<GradleTreeElement> parentNode = root;
+            String parentPath = getParentProjectPath(path);
+            if (parentPath != null) {
+                RailroadModule parentProject = projectsByPath.get(parentPath);
+                if (parentProject != null) {
+                    parentNode = ensureProjectNode(project, parentProject, projectsByPath, projectNodes, root);
+                }
+            }
+
+            TreeItem<GradleTreeElement> node =
+                new TreeItem<>(new GradleProjectElement(project, module));
+            parentNode.getChildren().add(node);
+            return node;
+        });
+    }
+
+    private void addTasksToProjectNode(Project project, TreeItem<GradleTreeElement> projectNode,
+                                       List<RailroadGradleTask> projectTasks) {
+        Map<String, List<RailroadGradleTask>> tasksByGroup = projectTasks.stream()
+            .collect(Collectors.groupingBy(task -> {
+                String group = task.getGroup();
+                return group == null ? "<no-group>" : StringUtils.capitalizeFirstLetterOfEachWord(group);
+            }, HashMap::new, Collectors.toList()));
+
+        for (Map.Entry<String, List<RailroadGradleTask>> groupEntry : tasksByGroup.entrySet()) {
+            String groupName = groupEntry.getKey();
+            List<RailroadGradleTask> groupTasks = groupEntry.getValue();
+
+            TreeItem<GradleTreeElement> groupNode = new TreeItem<>(
+                new GradleTaskGroupElement(groupName));
+            projectNode.getChildren().add(groupNode);
+
+            for (RailroadGradleTask task : groupTasks) {
+                TreeItem<GradleTreeElement> taskNode =
+                    new TreeItem<>(new GradleTaskElement(project, task));
+                groupNode.getChildren().add(taskNode);
+            }
+        }
+    }
+
+    private void sortTree(TreeItem<GradleTreeElement> node) {
+        Comparator<TreeItem<GradleTreeElement>> comparator =
+            Comparator.<TreeItem<GradleTreeElement>, Integer>comparing(
+                item -> typeRank(item.getValue())
+            ).thenComparing(
+                item -> {
+                    GradleTreeElement element = item.getValue();
+                    return element == null ? "" : element.getName();
+                },
+                String.CASE_INSENSITIVE_ORDER
+            );
+
+        FXCollections.sort(node.getChildren(), comparator);
+        for (TreeItem<GradleTreeElement> child : node.getChildren()) {
+            sortTree(child);
+        }
+    }
+
+    private int typeRank(GradleTreeElement element) {
+        if (element instanceof GradleTaskElement)
+            return 0;
+
+        if (element instanceof GradleTaskGroupElement)
+            return 1;
+
+        if (element instanceof GradleProjectElement)
+            return 2;
+
+        return Integer.MAX_VALUE;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/task/GradleTasksPane.java b/src/main/java/dev/railroadide/railroad/gradle/ui/task/GradleTasksPane.java
new file mode 100644
index 00000000..3d835756
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/task/GradleTasksPane.java
@@ -0,0 +1,41 @@
+package dev.railroadide.railroad.gradle.ui.task;
+
+import dev.railroadide.railroad.gradle.model.GradleBuildModel;
+import dev.railroadide.railroad.gradle.service.GradleModelService;
+import dev.railroadide.railroad.gradle.ui.GradleTreeBuilder;
+import dev.railroadide.railroad.gradle.ui.GradleTreeViewPane;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroadplugin.dto.RailroadGradleTask;
+import dev.railroadide.railroadplugin.dto.RailroadModule;
+import dev.railroadide.railroadplugin.dto.RailroadProject;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+public class GradleTasksPane extends GradleTreeViewPane<RailroadGradleTask> {
+    public GradleTasksPane(Project project) {
+        super(project);
+    }
+
+    @Override
+    protected GradleTreeBuilder<RailroadGradleTask> createTreeBuilder() {
+        return new GradleTaskTreeBuilder();
+    }
+
+    @Override
+    protected Collection<RailroadGradleTask> getElementsFromModel(GradleModelService modelService, GradleBuildModel model) {
+        Optional<GradleBuildModel> cachedModel = modelService.getCachedModel();
+        if (cachedModel.isEmpty())
+            return List.of();
+
+        RailroadProject railroadProject = cachedModel.get().project();
+        List<RailroadGradleTask> tasks = new ArrayList<>();
+        for (RailroadModule module : railroadProject.getModules()) {
+            tasks.addAll(module.getTasks());
+        }
+
+        return tasks;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleConfigurationElement.java b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleConfigurationElement.java
new file mode 100644
index 00000000..2f0c1416
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleConfigurationElement.java
@@ -0,0 +1,20 @@
+package dev.railroadide.railroad.gradle.ui.tree;
+
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+
+public class GradleConfigurationElement extends GradleTreeElement {
+    public GradleConfigurationElement(String name) {
+        super(name);
+    }
+
+    @Override
+    public Ikon getIcon() {
+        return FontAwesomeSolid.FOLDER;
+    }
+
+    @Override
+    public String getStyleClass() {
+        return "gradle-configuration-element";
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleDependencyElement.java b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleDependencyElement.java
new file mode 100644
index 00000000..f8e1a9e8
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleDependencyElement.java
@@ -0,0 +1,28 @@
+package dev.railroadide.railroad.gradle.ui.tree;
+
+import dev.railroadide.railroadplugin.dto.RailroadDependency;
+import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+
+@Getter
+public class GradleDependencyElement extends GradleTreeElement {
+    private final RailroadDependency dependencyNode;
+
+    public GradleDependencyElement(@NotNull RailroadDependency dependencyNode) {
+        super(dependencyNode.getGroup() + ":" + dependencyNode.getName() + ":" + dependencyNode.getVersion());
+        this.dependencyNode = dependencyNode;
+    }
+
+    @Override
+    public Ikon getIcon() {
+        return FontAwesomeSolid.BOOK;
+    }
+
+    @Override
+    public String getStyleClass() {
+        return "gradle-dependency-element";
+    }
+
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleProjectElement.java b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleProjectElement.java
new file mode 100644
index 00000000..07cb3a41
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleProjectElement.java
@@ -0,0 +1,39 @@
+package dev.railroadide.railroad.gradle.ui.tree;
+
+import dev.railroadide.railroad.gradle.ui.GradleProjectContextMenu;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroad.utility.icon.RailroadBrandsIcon;
+import dev.railroadide.railroadplugin.dto.RailroadModule;
+import javafx.scene.control.ContextMenu;
+import org.kordamp.ikonli.Ikon;
+
+import java.util.Objects;
+
+public class GradleProjectElement extends GradleTreeElement {
+    private final Project project;
+    private final RailroadModule module;
+
+    public GradleProjectElement(Project project, RailroadModule module) {
+        super(Objects.requireNonNull(module, "module must not be null").getName() == null
+            ? "Unnamed Project"
+            : Objects.requireNonNull(module, "module must not be null").getName());
+
+        this.project = project;
+        this.module = Objects.requireNonNull(module, "module must not be null");
+    }
+
+    @Override
+    public Ikon getIcon() {
+        return RailroadBrandsIcon.GRADLE;
+    }
+
+    @Override
+    public String getStyleClass() {
+        return "gradle-project-element";
+    }
+
+    @Override
+    public ContextMenu getContextMenu() {
+        return new GradleProjectContextMenu(this.project, this.module);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleTaskElement.java b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleTaskElement.java
new file mode 100644
index 00000000..a0096740
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleTaskElement.java
@@ -0,0 +1,51 @@
+package dev.railroadide.railroad.gradle.ui.tree;
+
+import dev.railroadide.railroad.gradle.ui.task.GradleTaskContextMenu;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroadplugin.dto.RailroadGradleTask;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Tooltip;
+import lombok.Getter;
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.devicons.Devicons;
+
+@Getter
+public class GradleTaskElement extends GradleTreeElement {
+    private final Project project;
+    private final RailroadGradleTask task;
+
+    public GradleTaskElement(Project project, RailroadGradleTask task) {
+        super(task != null ? task.getName() : "Unknown Task");
+        if (project == null)
+            throw new IllegalArgumentException("Project cannot be null");
+        if (task == null)
+            throw new IllegalArgumentException("Task cannot be null");
+
+        this.project = project;
+        this.task = task;
+    }
+
+    @Override
+    public Ikon getIcon() {
+        return Devicons.TERMINAL;
+    }
+
+    @Override
+    public String getStyleClass() {
+        return "gradle-task-element";
+    }
+
+    @Override
+    public Tooltip getTooltip() {
+        String description = this.task.getDescription();
+        if (description == null || description.isEmpty())
+            return null;
+
+        return new Tooltip(description);
+    }
+
+    @Override
+    public ContextMenu getContextMenu() {
+        return new GradleTaskContextMenu(this.project, this.task);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleTaskGroupElement.java b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleTaskGroupElement.java
new file mode 100644
index 00000000..4cfc5075
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleTaskGroupElement.java
@@ -0,0 +1,20 @@
+package dev.railroadide.railroad.gradle.ui.tree;
+
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+
+public class GradleTaskGroupElement extends GradleTreeElement {
+    public GradleTaskGroupElement(String name) {
+        super("<no-group>".equals(name) ? "Other" : name);
+    }
+
+    @Override
+    public Ikon getIcon() {
+        return FontAwesomeSolid.FOLDER;
+    }
+
+    @Override
+    public String getStyleClass() {
+        return "gradle-tasks-group-element";
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleTreeCell.java b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleTreeCell.java
new file mode 100644
index 00000000..471ae39f
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleTreeCell.java
@@ -0,0 +1,46 @@
+package dev.railroadide.railroad.gradle.ui.tree;
+
+import dev.railroadide.railroad.gradle.ui.task.GradleTaskContextMenu;
+import javafx.scene.control.TreeCell;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+public class GradleTreeCell extends TreeCell<GradleTreeElement> {
+    private final FontIcon icon = new FontIcon();
+
+    public GradleTreeCell() {
+        super();
+        icon.setIconSize(16);
+    }
+
+    @Override
+    protected void updateItem(GradleTreeElement item, boolean empty) {
+        super.updateItem(item, empty);
+        if (empty || item == null) {
+            setText(null);
+            setGraphic(null);
+        } else {
+            setText(item.getName());
+            icon.getStyleClass().removeIf(styleClass ->
+                styleClass.equals("gradle-project-element") ||
+                    styleClass.equals("gradle-tasks-group-element") ||
+                    styleClass.equals("gradle-task-element")
+            );
+            icon.getStyleClass().add(item.getStyleClass());
+            icon.setIconCode(item.getIcon());
+            setGraphic(icon);
+            setTooltip(item.getTooltip());
+            setContextMenu(item.getContextMenu());
+            setOnMouseClicked(event -> {
+                if (event.getClickCount() == 2 && !isEmpty()) {
+                    if (item instanceof GradleTaskElement taskElement) {
+                        var runConfiguration = GradleTaskContextMenu.getOrCreateRunConfig(
+                            taskElement.getProject(),
+                            taskElement.getTask()
+                        );
+                        runConfiguration.run(taskElement.getProject());
+                    }
+                }
+            });
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleTreeElement.java b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleTreeElement.java
new file mode 100644
index 00000000..ae4771a7
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/gradle/ui/tree/GradleTreeElement.java
@@ -0,0 +1,32 @@
+package dev.railroadide.railroad.gradle.ui.tree;
+
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Tooltip;
+import lombok.Getter;
+import org.kordamp.ikonli.Ikon;
+
+@Getter
+public abstract class GradleTreeElement {
+    private final String name;
+
+    public GradleTreeElement(String name) {
+        this.name = name;
+    }
+
+    public abstract Ikon getIcon();
+
+    public abstract String getStyleClass();
+
+    public Tooltip getTooltip() {
+        return null;
+    }
+
+    public ContextMenu getContextMenu() {
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/IDESetup.java b/src/main/java/dev/railroadide/railroad/ide/IDESetup.java
index b7e05b5d..a5f73546 100644
--- a/src/main/java/dev/railroadide/railroad/ide/IDESetup.java
+++ b/src/main/java/dev/railroadide/railroad/ide/IDESetup.java
@@ -1,53 +1,52 @@
 package dev.railroadide.railroad.ide;
 
 import com.kodedu.terminalfx.Terminal;
-import com.kodedu.terminalfx.TerminalBuilder;
-import com.kodedu.terminalfx.config.TerminalConfig;
 import com.panemu.tiwulfx.control.dock.DetachableTabPane;
 import dev.railroadide.core.settings.keybinds.KeybindContexts;
-import dev.railroadide.core.settings.keybinds.KeybindData;
-import dev.railroadide.core.ui.*;
-import dev.railroadide.core.ui.localized.LocalizedCheckMenuItem;
-import dev.railroadide.core.ui.localized.LocalizedLabel;
-import dev.railroadide.core.ui.localized.LocalizedMenu;
-import dev.railroadide.core.ui.localized.LocalizedMenuItem;
+import dev.railroadide.core.ui.RRBorderPane;
+import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.ui.RRVBox;
 import dev.railroadide.railroad.Railroad;
 import dev.railroadide.railroad.Services;
+import dev.railroadide.railroad.gradle.ui.GradleToolsPane;
 import dev.railroadide.railroad.ide.projectexplorer.ProjectExplorerPane;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.ui.RunConfigurationEditorPane;
 import dev.railroadide.railroad.ide.ui.ConsolePane;
 import dev.railroadide.railroad.ide.ui.IDEWelcomePane;
 import dev.railroadide.railroad.ide.ui.ImageViewerPane;
 import dev.railroadide.railroad.ide.ui.StatusBarPane;
+import dev.railroadide.railroad.ide.ui.setup.IDEMenuBarFactory;
+import dev.railroadide.railroad.ide.ui.setup.PaneIconBarFactory;
+import dev.railroadide.railroad.ide.ui.setup.RunControlsPane;
+import dev.railroadide.railroad.ide.ui.setup.TerminalFactory;
+import dev.railroadide.railroad.project.FacetDetectedEvent;
 import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroad.project.facet.Facet;
+import dev.railroadide.railroad.project.facet.FacetManager;
 import dev.railroadide.railroad.settings.keybinds.KeybindHandler;
-import dev.railroadide.railroad.settings.ui.SettingsPane;
+import dev.railroadide.railroad.utility.icon.RailroadBrandsIcon;
+import dev.railroadide.railroad.window.WindowBuilder;
 import dev.railroadide.railroadpluginapi.events.ProjectEvent;
 import javafx.application.Platform;
-import javafx.collections.ListChangeListener;
-import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
-import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.control.*;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyCodeCombination;
-import javafx.scene.input.KeyCombination;
-import javafx.scene.paint.Color;
-import javafx.scene.text.TextAlignment;
+import javafx.scene.control.SplitPane;
+import javafx.scene.control.Tab;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
 import javafx.stage.Stage;
 import org.fxmisc.richtext.CodeArea;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
-import org.kordamp.ikonli.javafx.FontIcon;
 
-import java.nio.file.Path;
-import java.util.LinkedHashMap;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 public class IDESetup {
@@ -61,20 +60,21 @@ public class IDESetup {
      */
     public static Scene createIDEScene(Project project) {
         var root = new RRBorderPane();
-        //root.setTop(createMenuBar()); // TODO: This doesn't work in production
+        var topBar = new RRHBox(IDEMenuBarFactory.create(), new Region(), RunControlsPane.create(project));
+        HBox.setHgrow(topBar.getChildren().get(1), Priority.ALWAYS);
+        root.setTop(topBar);
 
         var leftPane = new DetachableTabPane();
         leftPane.addTab("Project", new ProjectExplorerPane(project, root));
 
         var rightPane = new DetachableTabPane();
-        rightPane.addTab("Properties", createNotImplementedPane());
 
         var editorPane = new DetachableTabPane();
         editorPane.addTab("Welcome", new IDEWelcomePane());
 
         var consolePane = new DetachableTabPane();
         consolePane.addTab("Console", new ConsolePane());
-        consolePane.addTab("Terminal", createTerminal(project.getPath()));
+        consolePane.addTab("Terminal", TerminalFactory.create(project.getPath()));
 
         var centerBottomSplit = new SplitPane(editorPane, consolePane);
         centerBottomSplit.setOrientation(Orientation.VERTICAL);
@@ -85,7 +85,18 @@ public static Scene createIDEScene(Project project) {
         mainSplit.setDividerPositions(0.15, 0.85);
         root.setCenter(mainSplit);
 
-        root.setLeft(buildPaneIconBar(
+        if (project.hasFacet(FacetManager.GRADLE)) {
+            openGradleTab(project, project.getFacet(FacetManager.GRADLE).orElseThrow(), rightPane, root, mainSplit);
+        }
+
+        Railroad.EVENT_BUS.subscribe(FacetDetectedEvent.class, event -> {
+            if (event.project() != project)
+                return;
+
+            openGradleTab(project, event.facet(), rightPane, root, mainSplit);
+        });
+
+        root.setLeft(PaneIconBarFactory.create(
             leftPane,
             mainSplit,
             Orientation.VERTICAL,
@@ -93,16 +104,8 @@ public static Scene createIDEScene(Project project) {
             Map.of("Project", FontAwesomeSolid.FOLDER.getDescription())
         ));
 
-        root.setRight(buildPaneIconBar(
-            rightPane,
-            mainSplit,
-            Orientation.VERTICAL,
-            2,
-            Map.of("Properties", FontAwesomeSolid.INFO_CIRCLE.getDescription())
-        ));
-
         var bottomBar = new RRVBox();
-        var bottomIcons = buildPaneIconBar(
+        var bottomIcons = PaneIconBarFactory.create(
             consolePane,
             centerBottomSplit,
             Orientation.HORIZONTAL,
@@ -122,6 +125,35 @@ public static Scene createIDEScene(Project project) {
         return new Scene(root);
     }
 
+    private static void openGradleTab(Project project, Facet<?> facet, DetachableTabPane rightPane, RRBorderPane root, SplitPane mainSplit) {
+        Platform.runLater(() -> {
+            if (facet.getType() == FacetManager.GRADLE) {
+                if (rightPane.getTabs().stream().noneMatch(tab -> tab.getContent() instanceof GradleToolsPane)) {
+                    rightPane.addTab("Gradle", new GradleToolsPane(project));
+
+                    root.setRight(PaneIconBarFactory.create(
+                        rightPane,
+                        mainSplit,
+                        Orientation.VERTICAL,
+                        2,
+                        Map.of("Gradle", RailroadBrandsIcon.GRADLE.getDescription())
+                    ));
+                }
+            }
+        });
+    }
+
+    public static void showEditRunConfigurationsWindow(@NotNull Project project, @Nullable RunConfiguration<?> runConfiguration) {
+        var editorPane = new RunConfigurationEditorPane(project);
+        WindowBuilder.create()
+            .owner(Railroad.WINDOW_MANAGER.getPrimaryStage())
+            .title("railroad.window.ide.toolbar.edit_run_configurations", true)
+            .applyPreferredSize()
+            .scene(new Scene(editorPane))
+            .onInit(stage -> editorPane.selectConfiguration(runConfiguration))
+            .build();
+    }
+
     /**
      * Switch to the IDE window
      * <p>
@@ -160,242 +192,6 @@ public static void switchToIDE(Project project) {
         });
     }
 
-    private static MenuBar createMenuBar() {
-        var newFileItem = new LocalizedMenuItem("railroad.menu.file.new_file");
-        newFileItem.setGraphic(new FontIcon(FontAwesomeSolid.FILE));
-        newFileItem.setKeybindData(new KeybindData(KeyCode.N, new KeyCombination.Modifier[]{KeyCombination.SHORTCUT_DOWN}));
-
-        var openFileItem = new LocalizedMenuItem("railroad.menu.file.open_file");
-        openFileItem.setGraphic(new FontIcon(FontAwesomeSolid.FOLDER_OPEN));
-        openFileItem.setAccelerator(new KeyCodeCombination(KeyCode.O, KeyCombination.SHORTCUT_DOWN));
-
-        var saveItem = new LocalizedMenuItem("railroad.menu.file.save");
-        saveItem.setGraphic(new FontIcon(FontAwesomeSolid.SAVE));
-        saveItem.setAccelerator(new KeyCodeCombination(KeyCode.S, KeyCombination.SHORTCUT_DOWN));
-
-        var saveAsItem = new LocalizedMenuItem("railroad.menu.file.save_as");
-        saveAsItem.setGraphic(new FontIcon(FontAwesomeSolid.SAVE));
-        saveAsItem.setAccelerator(new KeyCodeCombination(KeyCode.S, KeyCombination.SHORTCUT_DOWN, KeyCombination.SHIFT_DOWN));
-
-        var separator1 = new SeparatorMenuItem();
-
-        var exitItem = new LocalizedMenuItem("railroad.menu.file.exit");
-        exitItem.setGraphic(new FontIcon(FontAwesomeSolid.SIGN_OUT_ALT));
-        exitItem.setAccelerator(new KeyCodeCombination(KeyCode.Q, KeyCombination.SHORTCUT_DOWN));
-        exitItem.setOnAction(e -> Platform.exit());
-
-        var undoItem = new LocalizedMenuItem("railroad.menu.edit.undo");
-        undoItem.setGraphic(new FontIcon(FontAwesomeSolid.UNDO));
-        undoItem.setAccelerator(new KeyCodeCombination(KeyCode.Z, KeyCombination.SHORTCUT_DOWN));
-
-        var redoItem = new LocalizedMenuItem("railroad.menu.edit.redo");
-        redoItem.setGraphic(new FontIcon(FontAwesomeSolid.REDO));
-        redoItem.setAccelerator(new KeyCodeCombination(KeyCode.Y, KeyCombination.SHORTCUT_DOWN));
-
-        var separator2 = new SeparatorMenuItem();
-
-        var cutItem = new LocalizedMenuItem("railroad.menu.edit.cut");
-        cutItem.setGraphic(new FontIcon(FontAwesomeSolid.CUT));
-        cutItem.setAccelerator(new KeyCodeCombination(KeyCode.X, KeyCombination.SHORTCUT_DOWN));
-
-        var copyItem = new LocalizedMenuItem("railroad.menu.edit.copy");
-        copyItem.setGraphic(new FontIcon(FontAwesomeSolid.COPY));
-        copyItem.setAccelerator(new KeyCodeCombination(KeyCode.C, KeyCombination.SHORTCUT_DOWN));
-
-        var pasteItem = new LocalizedMenuItem("railroad.menu.edit.paste");
-        pasteItem.setGraphic(new FontIcon(FontAwesomeSolid.PASTE));
-        pasteItem.setAccelerator(new KeyCodeCombination(KeyCode.V, KeyCombination.SHORTCUT_DOWN));
-
-        var separator3 = new SeparatorMenuItem();
-
-        var findItem = new LocalizedMenuItem("railroad.menu.edit.find");
-        findItem.setGraphic(new FontIcon(FontAwesomeSolid.SEARCH));
-        findItem.setAccelerator(new KeyCodeCombination(KeyCode.F, KeyCombination.SHORTCUT_DOWN));
-
-        var replaceItem = new LocalizedMenuItem("railroad.menu.edit.replace");
-        replaceItem.setGraphic(new FontIcon(FontAwesomeSolid.SEARCH_PLUS));
-        replaceItem.setAccelerator(new KeyCodeCombination(KeyCode.H, KeyCombination.CONTROL_DOWN));
-
-        var projectExplorerItem = new LocalizedCheckMenuItem("railroad.menu.view.project_explorer", true);
-        projectExplorerItem.setGraphic(new FontIcon(FontAwesomeSolid.FOLDER));
-        projectExplorerItem.setAccelerator(new KeyCodeCombination(KeyCode.DIGIT1, KeyCombination.SHORTCUT_DOWN));
-
-        var propertiesItem = new LocalizedCheckMenuItem("railroad.menu.view.properties", true);
-        propertiesItem.setGraphic(new FontIcon(FontAwesomeSolid.INFO_CIRCLE));
-        propertiesItem.setAccelerator(new KeyCodeCombination(KeyCode.DIGIT2, KeyCombination.SHORTCUT_DOWN));
-
-        var consoleItem = new LocalizedCheckMenuItem("railroad.menu.view.console", true);
-        consoleItem.setGraphic(new FontIcon(FontAwesomeSolid.TERMINAL));
-        consoleItem.setAccelerator(new KeyCodeCombination(KeyCode.DIGIT3, KeyCombination.SHORTCUT_DOWN));
-
-        var separator4 = new SeparatorMenuItem();
-
-        var fullScreenItem = new LocalizedMenuItem("railroad.menu.view.full_screen");
-        fullScreenItem.setGraphic(new FontIcon(FontAwesomeSolid.EXPAND));
-        fullScreenItem.setAccelerator(new KeyCodeCombination(KeyCode.F11));
-
-        var runItem = new LocalizedMenuItem("railroad.menu.run.run");
-        runItem.setGraphic(new FontIcon(FontAwesomeSolid.PLAY));
-        runItem.setAccelerator(new KeyCodeCombination(KeyCode.F5));
-
-        var debugItem = new LocalizedMenuItem("railroad.menu.run.debug");
-        debugItem.setGraphic(new FontIcon(FontAwesomeSolid.BUG));
-        debugItem.setAccelerator(new KeyCodeCombination(KeyCode.F6));
-
-        var stopItem = new LocalizedMenuItem("railroad.menu.run.stop");
-        stopItem.setGraphic(new FontIcon(FontAwesomeSolid.STOP));
-        stopItem.setAccelerator(new KeyCodeCombination(KeyCode.F7));
-
-        var settingsItem = new LocalizedMenuItem("railroad.menu.tools.settings");
-        settingsItem.setGraphic(new FontIcon(FontAwesomeSolid.COG));
-        settingsItem.setAccelerator(new KeyCodeCombination(KeyCode.COMMA, KeyCombination.SHORTCUT_DOWN));
-        settingsItem.setOnAction($ -> SettingsPane.openSettingsWindow());
-
-        var pluginsItem = new LocalizedMenuItem("railroad.menu.tools.plugins");
-        pluginsItem.setGraphic(new FontIcon(FontAwesomeSolid.PUZZLE_PIECE));
-        pluginsItem.setOnAction($ -> SettingsPane.openPluginsWindow());
-
-        var terminalItem = new LocalizedMenuItem("railroad.menu.tools.terminal");
-        terminalItem.setGraphic(new FontIcon(FontAwesomeSolid.TERMINAL));
-        terminalItem.setAccelerator(new KeyCodeCombination(KeyCode.T, KeyCombination.SHORTCUT_DOWN, KeyCombination.SHIFT_DOWN));
-
-        var fileMenu = new LocalizedMenu("railroad.menu.file");
-        fileMenu.getItems().add(newFileItem);
-        fileMenu.getItems().add(openFileItem);
-        fileMenu.getItems().add(saveItem);
-        fileMenu.getItems().add(saveAsItem);
-        fileMenu.getItems().add(separator1);
-        fileMenu.getItems().add(exitItem);
-        fileMenu.getStyleClass().add("rr-menu");
-
-        var editMenu = new LocalizedMenu("railroad.menu.edit");
-        editMenu.getItems().add(undoItem);
-        editMenu.getItems().add(redoItem);
-        editMenu.getItems().add(separator2);
-        editMenu.getItems().add(cutItem);
-        editMenu.getItems().add(copyItem);
-        editMenu.getItems().add(pasteItem);
-        editMenu.getItems().add(separator3);
-        editMenu.getItems().add(findItem);
-        editMenu.getItems().add(replaceItem);
-        editMenu.getStyleClass().add("rr-menu");
-
-        var viewMenu = new LocalizedMenu("railroad.menu.view");
-        viewMenu.getItems().add(projectExplorerItem);
-        viewMenu.getItems().add(propertiesItem);
-        viewMenu.getItems().add(consoleItem);
-        viewMenu.getItems().add(separator4);
-        viewMenu.getItems().add(fullScreenItem);
-        viewMenu.getStyleClass().add("rr-menu");
-
-        var runMenu = new LocalizedMenu("railroad.menu.run");
-        runMenu.getItems().add(runItem);
-        runMenu.getItems().add(debugItem);
-        runMenu.getItems().add(stopItem);
-        runMenu.getStyleClass().add("rr-menu");
-
-        var toolsMenu = new LocalizedMenu("railroad.menu.tools");
-        toolsMenu.getItems().add(settingsItem);
-        toolsMenu.getItems().add(pluginsItem);
-        toolsMenu.getItems().add(terminalItem);
-        toolsMenu.getStyleClass().add("rr-menu");
-
-        var menuBar = new RRMenuBar(true, fileMenu, editMenu, viewMenu, runMenu, toolsMenu);
-        menuBar.setUseSystemMenuBar(true);
-        menuBar.getStyleClass().add("rr-menu-bar");
-        return menuBar;
-    }
-
-    /**
-     * Builds a tiny icon-bar with one toggle button that shows/hides
-     * the given pane in the given SplitPane at the given position index.
-     */
-    private static Node buildPaneIconBar(
-        DetachableTabPane pane,
-        SplitPane split,
-        Orientation orientation,
-        int originalIndex,
-        Map<String, String> iconsByName
-    ) {
-        var bar = orientation == Orientation.HORIZONTAL ? new RRHBox(4) : new RRVBox(4);
-        bar.getStyleClass().add("icon-bar-" + orientation.name().toLowerCase(Locale.ROOT));
-
-        // Map each Tab to its ToggleButton
-        Map<Tab, ToggleButton> btnMap = new LinkedHashMap<>();
-
-        // A helper to (re)create the button for a given tab
-        Consumer<Tab> addButtonFor = tab -> {
-            String name = tab.getText();
-            String icon = iconsByName.getOrDefault(name, FontAwesomeSolid.EYE.getDescription());
-            var btn = new ToggleButton("", new FontIcon(icon));
-            btn.getStyleClass().add("icon-button");
-
-            btn.setOnAction(e -> {
-                boolean isVisible = split.getItems().contains(pane);
-                Tab selected = pane.getSelectionModel().getSelectedItem();
-
-                if (isVisible && selected == tab) {
-                    // collapse...
-                    split.getItems().remove(pane);
-                    btnMap.values().forEach(b -> b.setSelected(false));
-                } else {
-                    if (!isVisible) {
-                        split.getItems().add(Math.min(originalIndex, split.getItems().size()), pane);
-                    }
-                    pane.getSelectionModel().select(tab);
-                    btnMap.values().forEach(b -> b.setSelected(b == btn));
-                }
-            });
-
-            btnMap.put(tab, btn);
-            bar.getChildren().add(btn);
-        };
-
-        // Remove button when a tab goes away
-        Consumer<Tab> removeButtonFor = tab -> {
-            var btn = btnMap.remove(tab);
-            if (btn != null) bar.getChildren().remove(btn);
-        };
-
-        // Listen to tabs being added/removed
-        pane.getTabs().addListener((ListChangeListener<Tab>) change -> {
-            while (change.next()) {
-                if (change.wasAdded()) {
-                    change.getAddedSubList().forEach(addButtonFor);
-                }
-                if (change.wasRemoved()) {
-                    change.getRemoved().forEach(removeButtonFor);
-                }
-            }
-        });
-
-        // initialize for existing tabs
-        pane.getTabs().forEach(addButtonFor);
-
-        // keep toggle state in sync on selection
-        pane.getSelectionModel().selectedItemProperty().addListener((obs, oldT, newT) -> {
-            btnMap.forEach((tab, btn) -> btn.setSelected(tab == newT));
-        });
-
-        // set the initially-selected button
-        Tab init = pane.getSelectionModel().getSelectedItem();
-        if (init != null) {
-            btnMap.get(init).setSelected(true);
-        }
-
-        return bar;
-    }
-
-
-    public static Terminal createTerminal(Path path) {
-        var terminalConfig = new TerminalConfig();
-        terminalConfig.setBackgroundColor(Color.rgb(16, 16, 16));
-        terminalConfig.setForegroundColor(Color.rgb(240, 240, 240));
-        terminalConfig.setCursorColor(Color.rgb(255, 0, 0, 0.5));
-        var terminalBuilder = new TerminalBuilder(terminalConfig);
-        terminalBuilder.setTerminalPath(path);
-        return terminalBuilder.newTerminal().getTerminal();
-    }
 
     /**
      * Find the best tab pane for files (CodeArea) in the given parent.
@@ -487,29 +283,4 @@ else if (bestCandidate.get() == null || tabPane.getTabs().size() < bestCandidate
         return Optional.empty();
     }
 
-    private static Node createNotImplementedPane() {
-        var card = new RRCard(16);
-        card.setPadding(new Insets(32, 32, 32, 32));
-        card.setMaxWidth(Double.MAX_VALUE);
-        card.setAlignment(Pos.CENTER);
-
-        var icon = new FontIcon(FontAwesomeSolid.TOOLS);
-        icon.setIconSize(48);
-        icon.getStyleClass().add("not-implemented-icon");
-
-        var title = new LocalizedLabel("not_implemented.title");
-        title.getStyleClass().add("not-implemented-title");
-        title.setAlignment(Pos.CENTER);
-        title.setTextAlignment(TextAlignment.CENTER);
-        title.setWrapText(true);
-
-        var subtitle = new LocalizedLabel("not_implemented.subtitle");
-        subtitle.getStyleClass().add("not-implemented-subtitle");
-        subtitle.setWrapText(true);
-        subtitle.setAlignment(Pos.CENTER);
-        subtitle.setTextAlignment(TextAlignment.CENTER);
-
-        card.addContent(icon, title, subtitle);
-        return card;
-    }
 }
diff --git a/src/main/java/dev/railroadide/railroad/ide/completion/CompletionItem.java b/src/main/java/dev/railroadide/railroad/ide/completion/CompletionItem.java
new file mode 100644
index 00000000..3b585515
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/completion/CompletionItem.java
@@ -0,0 +1,16 @@
+package dev.railroadide.railroad.ide.completion;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Immutable model representing a single completion entry.
+ *
+ * @param insertText  text inserted into the editor when selected
+ * @param displayText text shown to the user in the completion list
+ */
+public record CompletionItem(String insertText, String displayText) {
+    @Override
+    public @NotNull String toString() {
+        return displayText;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/completion/CompletionProvider.java b/src/main/java/dev/railroadide/railroad/ide/completion/CompletionProvider.java
new file mode 100644
index 00000000..0c6f4d81
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/completion/CompletionProvider.java
@@ -0,0 +1,18 @@
+package dev.railroadide.railroad.ide.completion;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Abstraction for providing code completion suggestions.
+ */
+public interface CompletionProvider {
+    /**
+     * Computes completion suggestions for the specified trigger location.
+     *
+     * @param document  full document snapshot
+     * @param triggerAt index of the trigger character (e.g. '.')
+     * @return a {@link CompletionResult} or {@code null} if completions are not available
+     */
+    @Nullable
+    CompletionResult compute(String document, int triggerAt);
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/completion/CompletionResult.java b/src/main/java/dev/railroadide/railroad/ide/completion/CompletionResult.java
new file mode 100644
index 00000000..fda7c239
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/completion/CompletionResult.java
@@ -0,0 +1,13 @@
+package dev.railroadide.railroad.ide.completion;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Result payload describing completions for a particular trigger index.
+ */
+public record CompletionResult(int dotIndex, List<CompletionItem> items) {
+    public static CompletionResult empty() {
+        return new CompletionResult(-1, Collections.emptyList());
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/completion/JdtCompletionProvider.java b/src/main/java/dev/railroadide/railroad/ide/completion/JdtCompletionProvider.java
new file mode 100644
index 00000000..6417671a
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/completion/JdtCompletionProvider.java
@@ -0,0 +1,311 @@
+package dev.railroadide.railroad.ide.completion;
+
+import org.eclipse.jdt.core.dom.*;
+import org.jetbrains.annotations.Nullable;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/**
+ * Default completion provider using Eclipse JDT to resolve types and members.
+ */
+public record JdtCompletionProvider(Path filePath, String[] systemModulePaths) implements CompletionProvider {
+    @Override
+    public @Nullable CompletionResult compute(String document, int triggerAt) {
+        if (document == null || document.isEmpty() || triggerAt < 0 || triggerAt >= document.length())
+            return null;
+
+        if (document.charAt(triggerAt) != '.')
+            return null;
+
+        Pair range = findIdentifierRangeBeforeDot(document, triggerAt);
+        if (range == null)
+            return null;
+
+        ASTParser parser = ASTParser.newParser(AST.JLS21);
+        parser.setSource(document.toCharArray());
+        parser.setKind(ASTParser.K_COMPILATION_UNIT);
+        parser.setResolveBindings(true);
+        parser.setBindingsRecovery(true);
+        parser.setStatementsRecovery(true);
+        parser.setUnitName(filePath.getFileName().toString());
+        parser.setEnvironment(systemModulePaths, null, null, false);
+
+        CompilationUnit unit = (CompilationUnit) parser.createAST(null);
+        NodeFinder finder = new NodeFinder(unit, range.start(), Math.max(1, range.length()));
+        ASTNode node = finder.getCoveredNode();
+        if (node == null) {
+            node = finder.getCoveringNode();
+        }
+
+        CompletionTarget target = null;
+        ASTNode cursor = node;
+        while (cursor != null && target == null) {
+            if (cursor instanceof ExpressionStatement statement) {
+                cursor = statement.getExpression();
+            }
+
+            target = resolveCompletionTarget(cursor);
+            cursor = cursor != null ? cursor.getParent() : null;
+        }
+
+        if (target == null || target.type() == null)
+            return null;
+
+        List<CompletionItem> suggestions = collectCompletionSuggestions(unit, target);
+        if (suggestions.isEmpty())
+            return null;
+
+        return new CompletionResult(triggerAt, suggestions);
+    }
+
+    private CompletionTarget resolveCompletionTarget(ASTNode node) {
+        if (node == null)
+            return null;
+
+        if (node instanceof Name name) {
+            IBinding binding = name.resolveBinding();
+            if (binding instanceof ITypeBinding typeBinding)
+                return new CompletionTarget(normalizeType(typeBinding), true);
+
+            if (binding instanceof IVariableBinding variableBinding) {
+                ITypeBinding type = normalizeType(variableBinding.getType());
+                if (type != null)
+                    return new CompletionTarget(type, false);
+            }
+
+            if (binding instanceof IMethodBinding methodBinding) {
+                ITypeBinding type = normalizeType(methodBinding.getReturnType());
+                if (type != null)
+                    return new CompletionTarget(type, false);
+            }
+        }
+
+        if (node instanceof Expression expression) {
+            ITypeBinding type = normalizeType(expression.resolveTypeBinding());
+            if (type != null)
+                return new CompletionTarget(type, false);
+        }
+
+        return null;
+    }
+
+    private ITypeBinding normalizeType(ITypeBinding binding) {
+        if (binding == null)
+            return null;
+
+        if (binding.isAnonymous()) {
+            binding = binding.getSuperclass();
+        }
+
+        if (binding == null)
+            return null;
+
+        if (binding.isArray() || binding.isPrimitive() || binding.isNullType())
+            return binding;
+
+        if (binding.isTypeVariable()) {
+            ITypeBinding erasure = binding.getErasure();
+            return erasure != null ? erasure : binding;
+        }
+
+        ITypeBinding declaration = binding.getTypeDeclaration();
+        return declaration != null ? declaration : binding;
+    }
+
+    private List<CompletionItem> collectCompletionSuggestions(CompilationUnit unit, CompletionTarget target) {
+        LinkedHashSet<CompletionItem> results = new LinkedHashSet<>();
+        String currentPackage = extractPackageName(unit);
+        Set<String> visited = ConcurrentHashMap.newKeySet();
+        addMembers(target.type(), target.staticContext(), currentPackage, results, visited);
+        return new ArrayList<>(results);
+    }
+
+    private String extractPackageName(CompilationUnit unit) {
+        if (unit == null)
+            return "";
+
+        PackageDeclaration declaration = unit.getPackage();
+        if (declaration == null || declaration.getName() == null)
+            return "";
+
+        return declaration.getName().getFullyQualifiedName();
+    }
+
+    private void addMembers(ITypeBinding type, boolean staticContext, String currentPackage,
+                            LinkedHashSet<CompletionItem> results, Set<String> visited) {
+        if (type == null)
+            return;
+
+        ITypeBinding working = type;
+        if (!working.isArray() && !working.isPrimitive()) {
+            working = working.getErasure();
+        }
+
+        String key = working.getKey();
+        if (key == null) {
+            key = working.getQualifiedName();
+        }
+
+        if (key == null || !visited.add(key))
+            return;
+
+        if (working.isArray()) {
+            results.add(new CompletionItem("length", "length : int"));
+            addMembers(working.getSuperclass(), staticContext, currentPackage, results, visited);
+            return;
+        }
+
+        if (working.isPrimitive())
+            return;
+
+        for (IVariableBinding field : working.getDeclaredFields()) {
+            if (field.isSynthetic())
+                continue;
+
+            int modifiers = field.getModifiers();
+            boolean isStatic = Modifier.isStatic(modifiers);
+            if (staticContext) {
+                if (!isStatic)
+                    continue;
+            } else if (isStatic)
+                continue;
+
+            if (!isAccessible(modifiers, field.getDeclaringClass(), currentPackage))
+                continue;
+
+            results.add(createFieldItem(field));
+        }
+
+        for (IMethodBinding method : working.getDeclaredMethods()) {
+            if (method.isConstructor() || method.isSynthetic())
+                continue;
+
+            int modifiers = method.getModifiers();
+            boolean isStatic = Modifier.isStatic(modifiers);
+            if (staticContext) {
+                if (!isStatic)
+                    continue;
+            } else if (isStatic)
+                continue;
+
+            if (!isAccessible(modifiers, method.getDeclaringClass(), currentPackage))
+                continue;
+
+            results.add(createMethodItem(method));
+        }
+
+        if (staticContext) {
+            for (ITypeBinding nested : working.getDeclaredTypes()) {
+                if (nested == null || nested.getName() == null || nested.getName().isBlank())
+                    continue;
+
+                int modifiers = nested.getModifiers();
+                if (!Modifier.isStatic(modifiers))
+                    continue;
+
+                if (!isAccessible(modifiers, nested, currentPackage))
+                    continue;
+
+                results.add(createTypeItem(nested));
+            }
+        }
+
+        addMembers(working.getSuperclass(), staticContext, currentPackage, results, visited);
+        for (ITypeBinding iface : working.getInterfaces()) {
+            addMembers(iface, staticContext, currentPackage, results, visited);
+        }
+    }
+
+    private boolean isAccessible(int modifiers, ITypeBinding declaringType, String currentPackage) {
+        if (Modifier.isPublic(modifiers) || Modifier.isProtected(modifiers))
+            return true;
+
+        if (Modifier.isPrivate(modifiers))
+            return false;
+
+        String declaringPackage = declaringType != null ? packageName(declaringType) : "";
+        return declaringPackage.equals(currentPackage);
+    }
+
+    private CompletionItem createFieldItem(IVariableBinding field) {
+        String name = field.getName();
+        String type = renderType(field.getType());
+        String prefix = Modifier.isStatic(field.getModifiers()) ? "static " : "";
+        return new CompletionItem(name, prefix + name + " : " + type);
+    }
+
+    private CompletionItem createMethodItem(IMethodBinding method) {
+        String name = method.getName();
+        String prefix = Modifier.isStatic(method.getModifiers()) ? "static " : "";
+        String parameters = Arrays.stream(method.getParameterTypes())
+            .map(JdtCompletionProvider::renderType)
+            .collect(Collectors.joining(", "));
+        String returnType = renderType(method.getReturnType());
+        return new CompletionItem(name, prefix + name + "(" + parameters + ") : " + returnType);
+    }
+
+    private CompletionItem createTypeItem(ITypeBinding type) {
+        String name = type.getName();
+        String prefix = Modifier.isStatic(type.getModifiers()) ? "static " : "";
+        return new CompletionItem(name, prefix + name + " (type)");
+    }
+
+    public static String renderType(ITypeBinding type) {
+        if (type == null)
+            return "?";
+
+        if (type.isArray())
+            return renderType(type.getComponentType()) + "[]";
+
+        if (type.isPrimitive() || type.isNullType())
+            return type.getName();
+
+        if (type.isTypeVariable()) {
+            ITypeBinding erasure = type.getErasure();
+            if (erasure != null)
+                return renderType(erasure);
+        }
+
+        ITypeBinding declaration = type.getTypeDeclaration();
+        String qualified = declaration != null ? declaration.getQualifiedName() : type.getQualifiedName();
+        if (qualified != null && !qualified.isBlank())
+            return qualified;
+
+        String name = type.getName();
+        return name != null && !name.isBlank() ? name : "?";
+    }
+
+    private String packageName(ITypeBinding type) {
+        if (type == null)
+            return "";
+
+        IPackageBinding pkg = type.getPackage();
+        if (pkg == null)
+            return "";
+
+        String name = pkg.getName();
+        return name != null ? name : "";
+    }
+
+    private Pair findIdentifierRangeBeforeDot(String text, int dotPosition) {
+        int start = dotPosition - 1;
+        while (start >= 0 && Character.isJavaIdentifierPart(text.charAt(start))) {
+            start--;
+        }
+
+        start++;
+        if (start > dotPosition)
+            return null;
+
+        return new Pair(start, dotPosition - start);
+    }
+
+    private record CompletionTarget(ITypeBinding type, boolean staticContext) {
+    }
+
+    private record Pair(int start, int length) {
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/diagnostics/DiagnosticsProvider.java b/src/main/java/dev/railroadide/railroad/ide/diagnostics/DiagnosticsProvider.java
new file mode 100644
index 00000000..dda5b639
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/diagnostics/DiagnosticsProvider.java
@@ -0,0 +1,19 @@
+package dev.railroadide.railroad.ide.diagnostics;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Provides language diagnostics for a document snapshot.
+ */
+public interface DiagnosticsProvider {
+    /**
+     * Computes diagnostics for the supplied document.
+     *
+     * @param document full document text
+     * @return immutable list of diagnostics (empty when none)
+     */
+    @NotNull
+    List<EditorDiagnostic> compute(String document);
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/diagnostics/EditorDiagnostic.java b/src/main/java/dev/railroadide/railroad/ide/diagnostics/EditorDiagnostic.java
new file mode 100644
index 00000000..c4259a20
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/diagnostics/EditorDiagnostic.java
@@ -0,0 +1,64 @@
+package dev.railroadide.railroad.ide.diagnostics;
+
+import javax.tools.Diagnostic;
+import javax.tools.JavaFileObject;
+import java.util.Locale;
+
+/**
+ * Immutable diagnostic representation understood by the editor UI.
+ */
+public record EditorDiagnostic(
+    Diagnostic.Kind kind,
+    int start,
+    int end,
+    long line,
+    long column,
+    String message,
+    String code,
+    JavaFileObject source
+) implements Diagnostic<JavaFileObject> {
+    @Override
+    public Diagnostic.Kind getKind() {
+        return kind;
+    }
+
+    @Override
+    public JavaFileObject getSource() {
+        return source;
+    }
+
+    @Override
+    public long getPosition() {
+        return start;
+    }
+
+    @Override
+    public long getStartPosition() {
+        return start;
+    }
+
+    @Override
+    public long getEndPosition() {
+        return end;
+    }
+
+    @Override
+    public long getLineNumber() {
+        return line;
+    }
+
+    @Override
+    public long getColumnNumber() {
+        return column;
+    }
+
+    @Override
+    public String getCode() {
+        return code;
+    }
+
+    @Override
+    public String getMessage(Locale locale) {
+        return message;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/diagnostics/JdtDiagnosticsProvider.java b/src/main/java/dev/railroadide/railroad/ide/diagnostics/JdtDiagnosticsProvider.java
new file mode 100644
index 00000000..a26f5626
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/diagnostics/JdtDiagnosticsProvider.java
@@ -0,0 +1,89 @@
+package dev.railroadide.railroad.ide.diagnostics;
+
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.compiler.IProblem;
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.core.dom.ASTParser;
+import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.jetbrains.annotations.NotNull;
+
+import javax.tools.Diagnostic;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Diagnostics provider backed by Eclipse JDT's parser.
+ */
+public record JdtDiagnosticsProvider(Path filePath) implements DiagnosticsProvider {
+    @Override
+    public @NotNull List<EditorDiagnostic> compute(String document) {
+        if (document == null || document.isEmpty())
+            return List.of();
+
+        char[] source = document.toCharArray();
+
+        ASTParser parser = ASTParser.newParser(AST.JLS21);
+        parser.setKind(ASTParser.K_COMPILATION_UNIT);
+        parser.setResolveBindings(false);
+        parser.setBindingsRecovery(false);
+        parser.setStatementsRecovery(true);
+        parser.setSource(source);
+        parser.setUnitName(filePath.getFileName().toString());
+
+        Map<String, String> options = JavaCore.getOptions();
+        JavaCore.setComplianceOptions(JavaCore.VERSION_21, options);
+        parser.setCompilerOptions(options);
+
+        CompilationUnit unit = (CompilationUnit) parser.createAST(null);
+        JavaFileObject sourceFile = new SimpleJavaFileObject(filePath.toUri(), JavaFileObject.Kind.SOURCE) {
+            @Override
+            public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+                return document;
+            }
+        };
+
+        return toDiagnostics(unit.getProblems(), source, sourceFile);
+    }
+
+    private static List<EditorDiagnostic> toDiagnostics(IProblem[] problems, char[] source, JavaFileObject sourceFile) {
+        if (problems == null || problems.length == 0)
+            return List.of();
+
+        List<EditorDiagnostic> diagnostics = new ArrayList<>(problems.length);
+        for (IProblem problem : problems) {
+            Diagnostic.Kind kind = problem.isError()
+                ? Diagnostic.Kind.ERROR
+                : (problem.isWarning() ? Diagnostic.Kind.WARNING : Diagnostic.Kind.OTHER);
+            if (kind == Diagnostic.Kind.OTHER)
+                continue;
+
+            int start = Math.max(0, problem.getSourceStart());
+            int end = Math.min(source.length, problem.getSourceEnd() + 1);
+            long line = problem.getSourceLineNumber();
+            long column = computeColumn(source, start);
+            String message = problem.getMessage();
+            String code = problem.getID() == 0 ? null : Integer.toString(problem.getID());
+
+            diagnostics.add(new EditorDiagnostic(kind, start, end, line, column, message, code, sourceFile));
+        }
+
+        return diagnostics;
+    }
+
+    private static long computeColumn(char[] source, int position) {
+        int column = 1;
+        for (int i = position - 1; i >= 0; i--) {
+            char c = source[i];
+            if (c == '\n' || c == '\r')
+                break;
+
+            column++;
+        }
+
+        return column;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/projectexplorer/ProjectExplorerPane.java b/src/main/java/dev/railroadide/railroad/ide/projectexplorer/ProjectExplorerPane.java
index ad24ed83..65ab5fc7 100644
--- a/src/main/java/dev/railroadide/railroad/ide/projectexplorer/ProjectExplorerPane.java
+++ b/src/main/java/dev/railroadide/railroad/ide/projectexplorer/ProjectExplorerPane.java
@@ -8,6 +8,8 @@
 import dev.railroadide.core.ui.RRVBox;
 import dev.railroadide.core.ui.localized.LocalizedTextField;
 import dev.railroadide.core.ui.localized.LocalizedTooltip;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import dev.railroadide.railroad.Railroad;
 import dev.railroadide.railroad.Services;
 import dev.railroadide.railroad.ide.IDESetup;
@@ -18,6 +20,7 @@
 import dev.railroadide.railroad.ide.projectexplorer.task.SearchTask;
 import dev.railroadide.railroad.ide.projectexplorer.task.WatchTask;
 import dev.railroadide.railroad.ide.ui.*;
+import dev.railroadide.railroad.ide.ui.setup.TerminalFactory;
 import dev.railroadide.railroad.plugin.defaults.DefaultDocument;
 import dev.railroadide.railroad.project.Project;
 import dev.railroadide.railroad.settings.keybinds.KeybindHandler;
@@ -251,7 +254,7 @@ public static void openInTerminal(PathItem item, RRBorderPane mainPane) {
 
         Optional<DetachableTabPane> pane = IDESetup.findBestPaneForTerminal(mainPane);
         pane.ifPresent(detachableTabPane -> {
-            Terminal terminal = IDESetup.createTerminal(Files.isDirectory(path) ? path : path.getParent());
+            Terminal terminal = TerminalFactory.create(Files.isDirectory(path) ? path : path.getParent());
             if (!Files.isDirectory(path)) {
                 terminal.onTerminalFxReady(() -> terminal.command(path.getFileName().toString()));
             }
@@ -284,6 +287,41 @@ public static void openFile(Project project, PathItem item, RRBorderPane mainPan
                     .findFirst()
                     .orElse(null);
 
+                if (fileName.endsWith(".md")) {
+                    Tab tab;
+                    var preview = new MarkdownPreviewPane(path);
+                    if (welcomeTab != null) {
+                        welcomeTab.setContent(preview);
+                        welcomeTab.setText(fileName);
+                        tab = welcomeTab;
+                    } else {
+                        tab = detachableTabPane.addTab(fileName, preview);
+                    }
+
+                    detachableTabPane.getSelectionModel().select(tab);
+
+                    var document = new DefaultDocument(fileName, path);
+                    Railroad.EVENT_BUS.publish(new FileEvent(document, FileEvent.EventType.OPENED));
+                    Railroad.EVENT_BUS.publish(new FileEvent(document, FileEvent.EventType.ACTIVATED));
+
+                    tab.setOnClosed(event -> {
+                        Railroad.EVENT_BUS.publish(new FileEvent(document, FileEvent.EventType.CLOSED));
+                        if (tab.isSelected()) {
+                            Railroad.EVENT_BUS.publish(new FileEvent(document, FileEvent.EventType.DEACTIVATED));
+                        }
+                    });
+
+                    tab.setOnSelectionChanged(event -> {
+                        if (tab.isSelected()) {
+                            Railroad.EVENT_BUS.publish(new FileEvent(document, FileEvent.EventType.ACTIVATED));
+                        } else {
+                            Railroad.EVENT_BUS.publish(new FileEvent(document, FileEvent.EventType.DEACTIVATED));
+                            Services.DOCUMENT_EDITOR_STATE.setActiveEditorPane(null);
+                        }
+                    });
+                    return;
+                }
+
                 TextEditorPane editorContent;
                 if (fileName.endsWith(".java")) {
                     editorContent = new JavaCodeEditorPane(project, path);
@@ -403,22 +441,22 @@ private Node createModernHeader(Project project) {
         actionButtons.setAlignment(Pos.CENTER_RIGHT);
 
         var refreshButton = new RRButton("", FontAwesomeSolid.SYNC_ALT);
-        refreshButton.setVariant(RRButton.ButtonVariant.GHOST);
-        refreshButton.setButtonSize(RRButton.ButtonSize.SMALL);
+        refreshButton.setVariant(ButtonVariant.GHOST);
+        refreshButton.setButtonSize(ButtonSize.SMALL);
         refreshButton.getStyleClass().add("project-explorer-button");
         refreshButton.setTooltip(new LocalizedTooltip("railroad.generic.refresh"));
         refreshButton.setOnAction(e -> refreshProjectExplorer());
 
         var collapseAllButton = new RRButton("", FontAwesomeSolid.COMPRESS_ALT);
-        collapseAllButton.setVariant(RRButton.ButtonVariant.GHOST);
-        collapseAllButton.setButtonSize(RRButton.ButtonSize.SMALL);
+        collapseAllButton.setVariant(ButtonVariant.GHOST);
+        collapseAllButton.setButtonSize(ButtonSize.SMALL);
         collapseAllButton.getStyleClass().add("project-explorer-button");
         collapseAllButton.setTooltip(new LocalizedTooltip("railroad.generic.collapse_all"));
         collapseAllButton.setOnAction(e -> ProjectExplorerPane.collapseAll(this.treeView.getRoot()));
 
         var expandAllButton = new RRButton("", FontAwesomeSolid.EXPAND_ALT);
-        expandAllButton.setVariant(RRButton.ButtonVariant.GHOST);
-        expandAllButton.setButtonSize(RRButton.ButtonSize.SMALL);
+        expandAllButton.setVariant(ButtonVariant.GHOST);
+        expandAllButton.setButtonSize(ButtonSize.SMALL);
         expandAllButton.getStyleClass().add("project-explorer-button");
         expandAllButton.setTooltip(new LocalizedTooltip("railroad.generic.expand_all"));
         expandAllButton.setOnAction(e -> ProjectExplorerPane.expandAll(this.treeView.getRoot()));
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfiguration.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfiguration.java
new file mode 100644
index 00000000..b5cf4316
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfiguration.java
@@ -0,0 +1,196 @@
+package dev.railroadide.railroad.ide.runconfig;
+
+import com.google.gson.JsonObject;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.project.Project;
+import javafx.scene.control.ContextMenu;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Represents a single run configuration entry that can be exposed through the IDE toolbar.
+ * A configuration stores presentation metadata and callbacks for run, debug, and stop actions.
+ */
+@EqualsAndHashCode
+@ToString
+public final class RunConfiguration<D extends RunConfigurationData> {
+    private final UUID uuid;
+    private final RunConfigurationType<D> type;
+    private final D data;
+    private String folderPath;
+
+    /**
+     * Creates a new run configuration.
+     *
+     * @param uuid the unique identifier of the configuration
+     * @param type the type of the configuration
+     * @param data the data of the configuration
+     */
+    public RunConfiguration(UUID uuid, RunConfigurationType<D> type, D data) {
+        this.uuid = uuid;
+        this.type = type;
+        this.data = data;
+    }
+
+    /**
+     * Creates a new run configuration with a random UUID.
+     *
+     * @param type the type of the configuration
+     * @param data the data of the configuration
+     */
+    public RunConfiguration(RunConfigurationType<D> type, D data) {
+        this(UUID.randomUUID(), type, data);
+    }
+
+    /**
+     * Gets the unique identifier of the configuration.
+     *
+     * @return the UUID
+     */
+    public UUID uuid() {
+        return uuid;
+    }
+
+    /**
+     * Gets the type of the configuration.
+     *
+     * @return the type
+     */
+    public RunConfigurationType<D> type() {
+        return type;
+    }
+
+    /**
+     * Gets the data of the configuration.
+     *
+     * @return the data
+     */
+    public D data() {
+        return data;
+    }
+
+    /**
+     * Gets the folder path of the configuration.
+     *
+     * @return the folder path
+     */
+    public String folderPath() {
+        return folderPath;
+    }
+
+    /**
+     * Sets the folder path of the configuration.
+     *
+     * @param folderPath the folder path to set
+     * @throws NullPointerException if folderPath is null
+     */
+    public void setFolderPath(@NotNull String folderPath) {
+        Objects.requireNonNull(folderPath, "folderPath");
+        this.folderPath = folderPath;
+    }
+
+    /**
+     * Runs the configuration in the given project.
+     *
+     * @param project the project to run the configuration in
+     * @return a completable future that completes when the run action is finished
+     */
+    public CompletableFuture<Void> run(Project project) {
+        Objects.requireNonNull(project, "project");
+        return type.run(project, this);
+    }
+
+    /**
+     * Runs the configuration in the given project.
+     *
+     * @param project the project to run the configuration in
+     * @return a completable future that completes when the run action is finished
+     */
+    public CompletableFuture<Void> debug(Project project) {
+        Objects.requireNonNull(project, "project");
+        return type.debug(project, this);
+    }
+
+    /**
+     * Stops the configuration in the given project.
+     *
+     * @param project the project to stop the configuration in
+     * @return a completable future that completes when the stop action is finished
+     */
+    public CompletableFuture<Void> stop(Project project) {
+        Objects.requireNonNull(project, "project");
+        return type.stop(project, this);
+    }
+
+    /**
+     * Checks if running is supported for this configuration in the given project.
+     *
+     * @param project the project to check
+     * @return true if running is supported, false otherwise
+     */
+    public boolean isDebuggingSupported(Project project) {
+        Objects.requireNonNull(project, "project");
+        return type.isDebuggingSupported(project, this);
+    }
+
+    /**
+     * Creates a context menu for this configuration in the given project.
+     *
+     * @param project the project to create the context menu for
+     * @return the context menu
+     */
+    public ContextMenu createContextMenu(Project project) {
+        Objects.requireNonNull(project, "project");
+        return type.createContextMenu(project, this);
+    }
+
+    /**
+     * Serializes the given run configuration to a JSON object.
+     *
+     * @param config the run configuration to serialize
+     * @return the JSON object representing the run configuration
+     */
+    public static JsonObject toJson(RunConfiguration<?> config) {
+        var json = new JsonObject();
+        json.addProperty("uuid", config.uuid().toString());
+        json.addProperty("type", RunConfigurationType.REGISTRY.entries().entrySet().stream()
+            .filter(entry -> Objects.equals(entry.getValue(), config.type()))
+            .map(Map.Entry::getKey)
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException(config.type().getClass().getSimpleName() + " not registered in registry")));
+        json.add("data", Railroad.GSON.toJsonTree(config.data()));
+        return json;
+    }
+
+    /**
+     * Deserializes a run configuration from a JSON object.
+     *
+     * @param json the JSON object to deserialize
+     * @return the deserialized run configuration
+     */
+    @SuppressWarnings("unchecked")
+    public static <D extends RunConfigurationData> RunConfiguration<D> fromJson(JsonObject json) {
+        UUID uuid = UUID.fromString(requireNonBlank(json.get("uuid").getAsString(), "uuid"));
+        String typeId = requireNonBlank(json.get("type").getAsString(), "type");
+        RunConfigurationType<D> type = (RunConfigurationType<D>) RunConfigurationType.REGISTRY.get(typeId);
+        if (type == null)
+            throw new IllegalStateException("RunConfigurationType with id '" + typeId + "' not found in registry");
+
+        D data = Railroad.GSON.fromJson(json.get("data"), type.getDataClass());
+        return new RunConfiguration<>(uuid, type, data);
+    }
+
+    private static String requireNonBlank(String value, String name) {
+        Objects.requireNonNull(value, name);
+        if (value.isBlank())
+            throw new IllegalArgumentException(name + " cannot be blank");
+
+        return value;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfigurationData.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfigurationData.java
new file mode 100644
index 00000000..4bfc13b9
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfigurationData.java
@@ -0,0 +1,56 @@
+package dev.railroadide.railroad.ide.runconfig;
+
+import dev.railroadide.core.form.*;
+import dev.railroadide.railroad.project.Project;
+import lombok.Data;
+
+@Data
+public abstract class RunConfigurationData {
+    private String name;
+    private boolean allowMultipleInstances = false;
+    private boolean showConsoleOnRun = true;
+
+    public abstract RunConfigurationType<?> getType();
+
+    public abstract Form createConfigurationForm(Project project, RunConfiguration<?> configuration);
+
+    public abstract void applyConfigurationFormData(FormData formData);
+
+    protected void applyBaseFormData(FormData formData) {
+        this.name = formData.getString("name");
+        this.allowMultipleInstances = formData.getBoolean("allowMultipleInstances");
+        this.showConsoleOnRun = formData.getBoolean("showConsoleOnRun");
+    }
+
+    protected Form.Builder createBaseFormBuilder(Project project, RunConfiguration<?> configuration) {
+        return Form.create()
+            .disableSubmitButton()
+            .disableResetButton()
+            .appendSection(FormSection.create("railroad.runconfig.general.title")
+                .appendComponent(FormComponent.textField("name", "railroad.runconfig.general.name.label")
+                    .required()
+                    .text(() -> name)
+                    .promptText("railroad.runconfig.general.name.prompt")
+                    .validator(textField -> {
+                        String text = textField.getText();
+                        if (text == null || text.isBlank())
+                            return ValidationResult.error("railroad.runconfig.general.name.validation.required");
+
+                        if (project.getRunConfigManager().isDuplicateName(text, getType(), configuration.uuid()))
+                            return ValidationResult.error("railroad.runconfig.general.name.validation.duplicate");
+
+                        return ValidationResult.ok();
+                    })
+                    .build()
+                )
+                .appendComponent(FormComponent.checkBox("allowMultipleInstances", "railroad.runconfig.general.allowMultipleInstances.label")
+                    .selected(allowMultipleInstances)
+                    .build()
+                )
+                .appendComponent(FormComponent.checkBox("showConsoleOnRun", "railroad.runconfig.general.showConsoleOnRun.label")
+                    .selected(showConsoleOnRun)
+                    .build()
+                )
+            );
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfigurationManager.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfigurationManager.java
new file mode 100644
index 00000000..9c333c61
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfigurationManager.java
@@ -0,0 +1,163 @@
+package dev.railroadide.railroad.ide.runconfig;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroad.project.data.ProjectDataStore;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class RunConfigurationManager {
+    private static final String RUN_CONFIGURATIONS_FILE = "run_configs.json";
+
+    @Getter
+    private final ObservableList<RunConfiguration<?>> configurations = FXCollections.observableArrayList();
+    @Getter
+    private final ObjectProperty<RunConfiguration<?>> selectedConfiguration = new SimpleObjectProperty<>();
+
+    private final Project project;
+
+    public RunConfigurationManager(Project project) {
+        this.project = project;
+        readConfigurations();
+
+        this.configurations.addListener(
+            (ListChangeListener<? super RunConfiguration<?>>) change -> writeRunConfigurations());
+    }
+
+    /**
+     * Set the selected run configuration.
+     *
+     * @param configuration The run configuration to select, or null to clear the selection.
+     */
+    public void setSelectedConfiguration(@Nullable RunConfiguration<?> configuration) {
+        this.selectedConfiguration.set(configuration);
+    }
+
+    /**
+     * Remove a run configuration from this project.
+     *
+     * @param configuration The run configuration to remove.
+     */
+    public boolean removeConfiguration(RunConfiguration<?> configuration) {
+        return this.configurations.remove(configuration);
+    }
+
+    /**
+     * Add a run configuration to this project.
+     *
+     * @param configuration The run configuration to add.
+     * @throws IllegalArgumentException if a run configuration with the same name already exists.
+     */
+    public void addConfiguration(RunConfiguration<?> configuration) {
+        if (this.configurations.contains(configuration))
+            throw new IllegalArgumentException("Run configuration already exists: " + configuration.data().getName());
+
+        this.configurations.addFirst(configuration);
+    }
+
+    /**
+     * Update an existing run configuration.
+     *
+     * @param configuration The run configuration to update.
+     */
+    public @Nullable RunConfiguration<?> updateConfiguration(@NotNull RunConfiguration<?> configuration) {
+        int index = getIndexByUUID(configuration.uuid());
+        return index != -1 ? this.configurations.set(index, configuration) : null;
+
+    }
+
+    /**
+     * Get the index of a run configuration by its UUID.
+     *
+     * @param uuid The UUID of the run configuration.
+     * @return The index of the run configuration, or -1 if not found.
+     */
+    public int getIndexByUUID(UUID uuid) {
+        for (int index = 0; index < this.configurations.size(); index++) {
+            if (this.configurations.get(index).uuid().equals(uuid))
+                return index;
+        }
+
+        return -1;
+    }
+
+    /**
+     * Sends updated configurations to this manager, replacing the current list.
+     *
+     * @param configurations The new list of run configurations.
+     */
+    public void sendUpdatedConfigurations(ObservableList<RunConfiguration<?>> configurations) {
+        this.configurations.setAll(configurations);
+    }
+
+    /**
+     * Get a run configuration by its UUID.
+     *
+     * @param uuid The UUID of the run configuration.
+     * @return The run configuration, or null if not found.
+     */
+    public @Nullable RunConfiguration<?> getConfigurationByUUID(@Nullable UUID uuid) {
+        return this.configurations.stream()
+            .filter(config -> config.uuid().equals(uuid))
+            .findFirst()
+            .orElse(null);
+    }
+
+    /**
+     * Checks if a run configuration name is duplicate within the same type.
+     *
+     * @param name         The name to check.
+     * @param type         The run configuration type.
+     * @param excludeUUIDs UUIDs to exclude from the check.
+     * @return True if the name can be accepted, false otherwise.
+     */
+    public boolean isDuplicateName(String name, RunConfigurationType<?> type, UUID... excludeUUIDs) {
+        return this.configurations.stream().anyMatch(
+            cfg -> cfg.data().getName().equalsIgnoreCase(name) && cfg.type() == type &&
+                (excludeUUIDs == null || excludeUUIDs.length == 0 || !List.of(excludeUUIDs).contains(cfg.uuid())));
+    }
+
+    /**
+     * Writes the current run configurations to the project's data store.
+     */
+    private void writeRunConfigurations() {
+        var jsonArray = new JsonArray();
+        for (RunConfiguration<?> config : this.configurations) {
+            jsonArray.add(RunConfiguration.toJson(config));
+        }
+
+        this.project.getDataStore().writeJson(RUN_CONFIGURATIONS_FILE, jsonArray);
+    }
+
+    /**
+     * Reads the run configurations from the project's data store and populates the configurations list.
+     */
+    private void readConfigurations() {
+        ProjectDataStore dataStore = this.project.getDataStore();
+        dataStore.readJson(RUN_CONFIGURATIONS_FILE, JsonArray.class).ifPresent(jsonArray -> {
+            List<RunConfiguration<?>> runConfigurations = new ArrayList<>(jsonArray.size());
+            for (JsonElement element : jsonArray) {
+                try {
+                    RunConfiguration<?> config = RunConfiguration.fromJson(element.getAsJsonObject());
+                    runConfigurations.add(config);
+                } catch (Exception exception) {
+                    Railroad.LOGGER.error("Failed to load run configuration for project: {}", this.project.getPathString(), exception);
+                }
+            }
+
+            this.configurations.setAll(runConfigurations);
+        });
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfigurationType.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfigurationType.java
new file mode 100644
index 00000000..6043d4d0
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfigurationType.java
@@ -0,0 +1,102 @@
+package dev.railroadide.railroad.ide.runconfig;
+
+import dev.railroadide.core.registry.Registry;
+import dev.railroadide.core.registry.RegistryManager;
+import dev.railroadide.core.ui.localized.LocalizedMenuItem;
+import dev.railroadide.railroad.ide.IDESetup;
+import dev.railroadide.railroad.project.Project;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.paint.Paint;
+import org.kordamp.ikonli.Ikon;
+
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Defines how a specific category of run configuration executes run/debug/stop actions.
+ * Subclasses override the lifecycle methods and consume options stored on RunConfiguration.
+ */
+public abstract class RunConfigurationType<D extends RunConfigurationData> {
+    public static final Registry<RunConfigurationType<?>> REGISTRY =
+        RegistryManager.createRegistry("railroad:run_configuration_type", RunConfigurationType.class);
+
+    private final String localizationKey;
+    private final Ikon icon;
+    private final Paint iconColor;
+
+    protected RunConfigurationType(String localizationKey, Ikon icon, Paint iconColor) {
+        this.localizationKey = requireNonBlank(localizationKey, "localizationKey");
+        this.icon = Objects.requireNonNull(icon, "icon cannot be null");
+        this.iconColor = Objects.requireNonNull(iconColor, "iconColor cannot be null");
+    }
+
+    public final String getLocalizationKey() {
+        return localizationKey;
+    }
+
+    public final Ikon getIcon() {
+        return icon;
+    }
+
+    public final Paint getIconColor() {
+        return iconColor;
+    }
+
+    /**
+     * Run this configuration using the provided project and configuration options.
+     */
+    public abstract CompletableFuture<Void> run(Project project, RunConfiguration<D> configuration);
+
+    /**
+     * Debug this configuration.
+     */
+    public abstract CompletableFuture<Void> debug(Project project, RunConfiguration<D> configuration);
+
+    /**
+     * Stop execution for this configuration.
+     */
+    public abstract CompletableFuture<Void> stop(Project project, RunConfiguration<D> configuration);
+
+    public boolean isDebuggingSupported(Project project, RunConfiguration<D> configuration) {
+        return false;
+    }
+
+    private static String requireNonBlank(String value, String parameterName) {
+        Objects.requireNonNull(value, parameterName);
+        if (value.isBlank())
+            throw new IllegalArgumentException(parameterName + " cannot be blank");
+
+        return value;
+    }
+
+    public ContextMenu createContextMenu(Project project, RunConfiguration<D> runConfiguration) {
+        var menu = new ContextMenu();
+
+        var editItem = new LocalizedMenuItem("railroad.run_configuration.edit");
+        editItem.setOnAction(event -> IDESetup.showEditRunConfigurationsWindow(project, runConfiguration));
+
+        var pinItem = new LocalizedMenuItem("railroad.run_configuration.pin");
+        pinItem.setOnAction(event -> {
+
+        });
+
+        var deleteItem = new LocalizedMenuItem("railroad.run_configuration.delete");
+        deleteItem.setOnAction(event -> project.getRunConfigManager().removeConfiguration(runConfiguration));
+
+        menu.getItems().addAll(editItem, pinItem, deleteItem);
+        return menu;
+    }
+
+    public RunConfiguration<D> createConfigurationInstance(D data) {
+        return new RunConfiguration<>(this, data);
+    }
+
+    public abstract D createDataInstance(Project project);
+
+    public abstract Class<D> getDataClass();
+
+    public RunConfiguration<D> createDefaultConfiguration(Project project) {
+        D data = createDataInstance(project);
+        return createConfigurationInstance(data);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfigurationTypes.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfigurationTypes.java
new file mode 100644
index 00000000..40d5fdf6
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/RunConfigurationTypes.java
@@ -0,0 +1,29 @@
+package dev.railroadide.railroad.ide.runconfig;
+
+import dev.railroadide.railroad.ide.runconfig.defaults.*;
+
+import java.util.Objects;
+
+public class RunConfigurationTypes {
+    public static final JavaApplicationRunConfigurationType JAVA_APPLICATION =
+        register("railroad:java_application", new JavaApplicationRunConfigurationType());
+    public static final GradleRunConfigurationType GRADLE =
+        register("railroad:gradle", new GradleRunConfigurationType());
+    public static final CompoundRunConfigurationType COMPOUND =
+        register("railroad:compound", new CompoundRunConfigurationType());
+    public static final JarApplicationRunConfigurationType JAR_APPLICATION =
+        register("railroad:jar_application", new JarApplicationRunConfigurationType());
+    public static final ShellScriptRunConfigurationType SHELL_SCRIPT =
+        register("railroad:shell_script", new ShellScriptRunConfigurationType());
+
+    @SuppressWarnings("unchecked")
+    public static <D extends RunConfigurationData, T extends RunConfigurationType<D>> T register(String id, T type) {
+        Objects.requireNonNull(id, "id");
+        Objects.requireNonNull(type, "type");
+        return (T) RunConfigurationType.REGISTRY.register(id, type);
+    }
+
+    public static void initialize() {
+        // Intentionally left blank.
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/RunExecutor.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/RunExecutor.java
new file mode 100644
index 00000000..cd6347d7
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/RunExecutor.java
@@ -0,0 +1,11 @@
+package dev.railroadide.railroad.ide.runconfig;
+
+import dev.railroadide.railroad.project.Project;
+
+@FunctionalInterface
+public interface RunExecutor {
+    RunExecutor NO_OP = (project, configuration) -> {
+    };
+
+    void execute(Project project, RunConfiguration configuration);
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/CompoundRunConfigurationType.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/CompoundRunConfigurationType.java
new file mode 100644
index 00000000..211eceb8
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/CompoundRunConfigurationType.java
@@ -0,0 +1,142 @@
+package dev.railroadide.railroad.ide.runconfig.defaults;
+
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationType;
+import dev.railroadide.railroad.ide.runconfig.defaults.data.CompoundRunConfigurationData;
+import dev.railroadide.railroad.project.Project;
+import javafx.scene.paint.Color;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public class CompoundRunConfigurationType extends RunConfigurationType<CompoundRunConfigurationData> {
+    public CompoundRunConfigurationType() {
+        super("railroad.runconfig.compound", FontAwesomeSolid.LAYER_GROUP, Color.web("#9b59b6"));
+    }
+
+    @Override
+    public CompletableFuture<Void> run(Project project, RunConfiguration<CompoundRunConfigurationData> configuration) {
+        return executeChildren(project, configuration, false);
+    }
+
+    @Override
+    public CompletableFuture<Void> debug(Project project, RunConfiguration<CompoundRunConfigurationData> configuration) {
+        return executeChildren(project, configuration, true);
+    }
+
+    @Override
+    public CompletableFuture<Void> stop(Project project, RunConfiguration<CompoundRunConfigurationData> configuration) {
+        List<RunConfiguration<?>> children = getResolvedChildren(project, configuration);
+        if (children.isEmpty())
+            return CompletableFuture.completedFuture(null);
+
+        List<CompletableFuture<Void>> stopFutures = new ArrayList<>(children.size());
+        for (RunConfiguration<?> child : children) {
+            try {
+                stopFutures.add(child.stop(project));
+            } catch (Throwable throwable) {
+                stopFutures.add(CompletableFuture.failedFuture(throwable));
+            }
+        }
+
+        return CompletableFuture.allOf(stopFutures.toArray(new CompletableFuture[0]));
+    }
+
+    @Override
+    public boolean isDebuggingSupported(Project project, RunConfiguration<CompoundRunConfigurationData> configuration) {
+        return getResolvedChildren(project, configuration).stream()
+            .allMatch(rc -> rc.isDebuggingSupported(project));
+    }
+
+    @Override
+    public CompoundRunConfigurationData createDataInstance(Project project) {
+        var data = new CompoundRunConfigurationData();
+        data.setName("New Compound Configuration");
+        return data;
+    }
+
+    @Override
+    public Class<CompoundRunConfigurationData> getDataClass() {
+        return CompoundRunConfigurationData.class;
+    }
+
+    private List<RunConfiguration<?>> getResolvedChildren(Project project,
+                                                          RunConfiguration<CompoundRunConfigurationData> configuration) {
+        List<RunConfiguration<?>> resolved =
+            configuration.data().resolveConfigurations(project.getRunConfigManager().getConfigurations());
+        List<RunConfiguration<?>> valid = new ArrayList<>(resolved.size());
+        for (RunConfiguration<?> child : resolved) {
+            if (child == null) {
+                Railroad.LOGGER.warn("Null run configuration found in compound run configuration: {}", configuration.data().getName());
+                continue;
+            }
+
+            valid.add(child);
+        }
+
+        return valid;
+    }
+
+    private CompletableFuture<Void> executeChildren(Project project,
+                                                    RunConfiguration<CompoundRunConfigurationData> configuration,
+                                                    boolean debug) {
+        var children = getResolvedChildren(project, configuration);
+        if (children.isEmpty())
+            return CompletableFuture.completedFuture(null);
+
+        if (debug) {
+            children = children.stream()
+                .filter(child -> {
+                    boolean supported = child.isDebuggingSupported(project);
+                    if (!supported) {
+                        Railroad.LOGGER.warn("Skipping '{}' in compound configuration '{}' because it does not support debugging.",
+                            child.data().getName(), configuration.data().getName());
+                    }
+
+                    return supported;
+                })
+                .toList();
+            if (children.isEmpty())
+                return CompletableFuture.completedFuture(null);
+        }
+
+        return configuration.data().getRunMode() == CompoundRunConfigurationData.RunMode.PARALLEL ?
+            runParallel(children, project, debug) :
+            runSequential(children, project, debug);
+    }
+
+    private CompletableFuture<Void> runParallel(List<RunConfiguration<?>> children,
+                                                Project project,
+                                                boolean debug) {
+        List<CompletableFuture<Void>> futures = new ArrayList<>(children.size());
+        for (RunConfiguration<?> child : children) {
+            futures.add(invokeChild(child, project, debug));
+        }
+
+        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
+    }
+
+    private CompletableFuture<Void> runSequential(List<RunConfiguration<?>> children,
+                                                  Project project,
+                                                  boolean debug) {
+        CompletableFuture<Void> chain = CompletableFuture.completedFuture(null);
+        for (RunConfiguration<?> child : children) {
+            chain = chain.thenCompose(ignored -> invokeChild(child, project, debug));
+        }
+
+        return chain;
+    }
+
+    private CompletableFuture<Void> invokeChild(RunConfiguration<?> child,
+                                                Project project,
+                                                boolean debug) {
+        try {
+            return debug ? child.debug(project) : child.run(project);
+        } catch (Throwable throwable) {
+            return CompletableFuture.failedFuture(throwable);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/GradleRunConfigurationType.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/GradleRunConfigurationType.java
new file mode 100644
index 00000000..ac15abab
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/GradleRunConfigurationType.java
@@ -0,0 +1,184 @@
+package dev.railroadide.railroad.ide.runconfig.defaults;
+
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationType;
+import dev.railroadide.railroad.ide.runconfig.defaults.data.GradleRunConfigurationData;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.JDKManager;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroad.utility.icon.RailroadBrandsIcon;
+import javafx.scene.paint.Color;
+import org.gradle.tooling.*;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class GradleRunConfigurationType extends RunConfigurationType<GradleRunConfigurationData> {
+    private final Map<RunConfiguration<GradleRunConfigurationData>, GradleExecutionHandle> executions =
+        new ConcurrentHashMap<>();
+    private final ExecutorService handleCloser = Executors.newSingleThreadExecutor(runnable -> {
+        var thread = new Thread(runnable, "gradle-handle-closer");
+        thread.setDaemon(true);
+        return thread;
+    });
+
+    public GradleRunConfigurationType() {
+        super("railroad.runconfig.gradle", RailroadBrandsIcon.GRADLE, Color.web("#6dc24f"));
+    }
+
+    @Override
+    public CompletableFuture<Void> run(Project project, RunConfiguration<GradleRunConfigurationData> configuration) {
+        var result = new CompletableFuture<Void>();
+        CompletableFuture.runAsync(() -> {
+            try {
+                executeGradleBuild(configuration, result);
+            } catch (Throwable throwable) {
+                result.completeExceptionally(throwable);
+            }
+        });
+        return result;
+    }
+
+    @Override
+    public CompletableFuture<Void> debug(Project project, RunConfiguration<GradleRunConfigurationData> configuration) {
+        return CompletableFuture.failedFuture(new UnsupportedOperationException(
+            "Debugging Gradle run configurations is not supported yet."));
+    }
+
+    @Override
+    public CompletableFuture<Void> stop(Project project, RunConfiguration<GradleRunConfigurationData> configuration) {
+        closeHandle(executions.remove(configuration));
+        return CompletableFuture.completedFuture(null);
+    }
+
+    @Override
+    public boolean isDebuggingSupported(Project project, RunConfiguration<GradleRunConfigurationData> configuration) {
+        return false; // TODO: Implement debugging support (?)
+    }
+
+    @Override
+    public GradleRunConfigurationData createDataInstance(Project project) {
+        var data = new GradleRunConfigurationData();
+        data.setName("New Gradle Configuration");
+        data.setGradleProjectPath(project.getPath());
+        data.setJavaHome(/*project.getJDKManager().getDefaultJDK()*/ JDKManager.getDefaultJDK()); // TODO
+        return data;
+    }
+
+    @Override
+    public Class<GradleRunConfigurationData> getDataClass() {
+        return GradleRunConfigurationData.class;
+    }
+
+    public record GradleExecutionHandle(ProjectConnection connection, CancellationTokenSource cancellationTokenSource)
+        implements AutoCloseable {
+        @Override
+        public void close() {
+            cancellationTokenSource.cancel();
+            connection.close();
+        }
+    }
+
+    private static String requireTask(GradleRunConfigurationData data) {
+        String task = data.getTask();
+        if (task == null || task.isBlank())
+            throw new IllegalStateException("Gradle task must be specified.");
+
+        return task;
+    }
+
+    private static Path requireGradleProjectPath(GradleRunConfigurationData data) {
+        Path path = data.getGradleProjectPath();
+        if (path == null)
+            throw new IllegalStateException("Gradle project path must be specified.");
+
+        if (Files.notExists(path) || !Files.isDirectory(path))
+            throw new IllegalStateException("Gradle project path does not exist or is not a directory: " + path);
+
+        return path;
+    }
+
+    private static JDK requireJavaHome(GradleRunConfigurationData data) {
+        JDK javaHome = data.getJavaHome();
+        if (javaHome == null)
+            throw new IllegalStateException("Java home must be specified for Gradle run configurations.");
+
+        return javaHome;
+    }
+
+    private void closeHandle(GradleExecutionHandle handle) {
+        if (handle == null)
+            return;
+
+        handleCloser.execute(() -> {
+            try {
+                handle.close();
+            } catch (Exception exception) {
+                Railroad.LOGGER.error("Failed to close Gradle connection", exception);
+            }
+        });
+    }
+
+    private void executeGradleBuild(RunConfiguration<GradleRunConfigurationData> configuration,
+                                    CompletableFuture<Void> future) {
+        GradleRunConfigurationData data = configuration.data();
+        String task = requireTask(data);
+        Path gradleProjectPath = requireGradleProjectPath(data);
+        Map<String, String> environmentVariables = new HashMap<>(System.getenv());
+        if (data.getEnvironmentVariables() != null)
+            environmentVariables.putAll(data.getEnvironmentVariables());
+        String[] vmOptions = data.getVmOptions() == null ? new String[0] : data.getVmOptions();
+        JDK javaHome = requireJavaHome(data);
+
+        var connector = GradleConnector.newConnector()
+            .forProjectDirectory(gradleProjectPath.toFile())
+            .useBuildDistribution();
+
+        try {
+            ProjectConnection connection = connector.connect();
+            CancellationTokenSource tokenSource = GradleConnector.newCancellationTokenSource();
+            var handle = new GradleExecutionHandle(connection, tokenSource);
+            executions.put(configuration, handle);
+
+            connection.newBuild()
+                .forTasks(task)
+                .setJvmArguments(vmOptions)
+                .setEnvironmentVariables(environmentVariables)
+                .setJavaHome(javaHome.path().toFile())
+                .setColorOutput(true)
+                .withCancellationToken(tokenSource.token())
+                .setStandardOutput(System.out) // TODO: Redirect to IDE console
+                .setStandardError(System.err) // TODO: Redirect to IDE console
+                .setStandardInput(System.in) // TODO: Redirect to IDE console
+                .run(new ResultHandler<>() {
+                    @Override
+                    public void onComplete(Void result) {
+                        closeHandle(executions.remove(configuration));
+                        future.complete(null);
+                    }
+
+                    @Override
+                    public void onFailure(GradleConnectionException failure) {
+                        Railroad.LOGGER.error("Gradle build failed", failure);
+                        closeHandle(executions.remove(configuration));
+                        future.completeExceptionally(failure);
+                    }
+                });
+        } catch (BuildException exception) {
+            closeHandle(executions.remove(configuration));
+            future.completeExceptionally(new RuntimeException("Gradle build failed: " + exception.getMessage(), exception));
+        } catch (GradleConnectionException exception) {
+            future.completeExceptionally(exception);
+        } catch (Throwable throwable) {
+            closeHandle(executions.remove(configuration));
+            future.completeExceptionally(throwable);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/JarApplicationRunConfigurationType.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/JarApplicationRunConfigurationType.java
new file mode 100644
index 00000000..e731b1c8
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/JarApplicationRunConfigurationType.java
@@ -0,0 +1,138 @@
+package dev.railroadide.railroad.ide.runconfig.defaults;
+
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationType;
+import dev.railroadide.railroad.ide.runconfig.defaults.data.JarApplicationRunConfigurationData;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.JDKManager;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroad.utility.icon.RailroadIcon;
+import javafx.scene.paint.Color;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class JarApplicationRunConfigurationType extends RunConfigurationType<JarApplicationRunConfigurationData> {
+    private final Map<RunConfiguration<?>, Process> runningProcesses = new ConcurrentHashMap<>();
+
+    public JarApplicationRunConfigurationType() {
+        super("railroad.runconfig.jar_application", RailroadIcon.JAR_FILE, Color.web("#e67e22"));
+    }
+
+    @Override
+    public CompletableFuture<Void> run(Project project, RunConfiguration<JarApplicationRunConfigurationData> configuration) {
+        return CompletableFuture.runAsync(() -> {
+            JarApplicationRunConfigurationData data = configuration.data();
+            JDK jre = requireJre(data);
+            Path jarPath = requireJarPath(data);
+            Path workingDirectory = resolveWorkingDirectory(project, data);
+            String[] vmOptions = data.getVmOptions() == null ? new String[0] : data.getVmOptions();
+            String[] programArguments = data.getProgramArguments() == null ? new String[0] : data.getProgramArguments();
+            Map<String, String> environmentVariables =
+                data.getEnvironmentVariables() == null ? Map.of() : data.getEnvironmentVariables();
+
+            try {
+                var builder = new ProcessBuilder()
+                    .command(buildCommand(jre, jarPath, vmOptions, programArguments))
+                    .directory(workingDirectory.toFile())
+                    .inheritIO(); // TODO: Delegate to IDE console
+                if (!environmentVariables.isEmpty()) {
+                    builder.environment().putAll(environmentVariables);
+                }
+                Process process = builder.start();
+                runningProcesses.put(configuration, process);
+                int exitCode = process.waitFor();
+                runningProcesses.remove(configuration);
+                if (exitCode != 0)
+                    throw new IllegalStateException("Jar Application process exited with code: " + exitCode);
+            } catch (IOException exception) {
+                throw new IllegalStateException("Failed to start Jar Application process", exception);
+            } catch (InterruptedException exception) {
+                Thread.currentThread().interrupt();
+                throw new IllegalStateException("Jar Application process was interrupted", exception);
+            }
+        });
+    }
+
+    private static String[] buildCommand(JDK jre, Path jarPath, String[] vmOptions, String[] programArguments) {
+        String javaExecutable = jre.path().resolve("bin").resolve(JDKManager.JAVA_EXECUTABLE_NAME).toString();
+        String jarOption = "-jar";
+        String jarFile = jarPath.toString();
+
+        String[] command = new String[3 + vmOptions.length + programArguments.length];
+        command[0] = javaExecutable;
+        System.arraycopy(vmOptions, 0, command, 1, vmOptions.length);
+        command[1 + vmOptions.length] = jarOption;
+        command[2 + vmOptions.length] = jarFile;
+        System.arraycopy(programArguments, 0, command, 3 + vmOptions.length, programArguments.length);
+
+        return command;
+    }
+
+    @Override
+    public CompletableFuture<Void> debug(Project project, RunConfiguration<JarApplicationRunConfigurationData> configuration) {
+        return CompletableFuture.failedFuture(
+            new UnsupportedOperationException("Debugging is not supported for Jar Application run configurations."));
+    }
+
+    @Override
+    public CompletableFuture<Void> stop(Project project, RunConfiguration<JarApplicationRunConfigurationData> configuration) {
+        Process process = runningProcesses.get(configuration);
+        if (process != null && process.isAlive()) {
+            process.destroy();
+            runningProcesses.remove(configuration);
+        }
+
+        return CompletableFuture.completedFuture(null);
+    }
+
+    @Override
+    public JarApplicationRunConfigurationData createDataInstance(Project project) {
+        var data = new JarApplicationRunConfigurationData();
+        data.setName("New Jar Application");
+        data.setWorkingDirectory(project.getPath());
+        data.setJarPath(project.getPath().resolve("app.jar"));
+        data.setJre(/*project.getJDKManager().getDefaultJDK()*/ JDKManager.getDefaultJDK()); // TODO
+        return data;
+    }
+
+    @Override
+    public Class<JarApplicationRunConfigurationData> getDataClass() {
+        return JarApplicationRunConfigurationData.class;
+    }
+
+    private static JDK requireJre(JarApplicationRunConfigurationData data) {
+        JDK jre = data.getJre();
+        if (jre == null)
+            throw new IllegalStateException("JRE must be specified for Jar Application run configurations.");
+
+        return jre;
+    }
+
+    private static Path requireJarPath(JarApplicationRunConfigurationData data) {
+        Path jarPath = data.getJarPath();
+        if (jarPath == null)
+            throw new IllegalStateException("Jar path must be specified.");
+
+        if (!Files.exists(jarPath))
+            throw new IllegalStateException("Jar file does not exist: " + jarPath);
+
+        return jarPath;
+    }
+
+    private static Path resolveWorkingDirectory(Project project, JarApplicationRunConfigurationData data) {
+        Path workingDirectory = data.getWorkingDirectory();
+        if (workingDirectory == null) {
+            workingDirectory = project.getPath();
+        }
+
+        if (Files.notExists(workingDirectory) || !Files.isDirectory(workingDirectory))
+            throw new IllegalStateException("Working directory does not exist or is not a directory: " + workingDirectory);
+
+        return workingDirectory;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/JavaApplicationRunConfigurationType.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/JavaApplicationRunConfigurationType.java
new file mode 100644
index 00000000..aa8aff85
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/JavaApplicationRunConfigurationType.java
@@ -0,0 +1,217 @@
+package dev.railroadide.railroad.ide.runconfig.defaults;
+
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationType;
+import dev.railroadide.railroad.ide.runconfig.defaults.data.JavaApplicationRunConfigurationData;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.JDKManager;
+import dev.railroadide.railroad.project.Project;
+import javafx.scene.paint.Color;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.ServerSocket;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class JavaApplicationRunConfigurationType extends RunConfigurationType<JavaApplicationRunConfigurationData> {
+    private final Map<RunConfiguration<?>, Process> runningProcesses = new ConcurrentHashMap<>();
+
+    public JavaApplicationRunConfigurationType() {
+        super("railroad.runconfig.java_application", FontAwesomeSolid.BOX, Color.web("#f89820"));
+    }
+
+    @Override
+    public CompletableFuture<Void> run(Project project, RunConfiguration<JavaApplicationRunConfigurationData> configuration) {
+        return execute(project, configuration, false).whenComplete((unused, throwable) -> {
+            if (throwable != null) {
+                Railroad.LOGGER.error("Failed to start run session for configuration: {}", configuration.data().getName(), throwable);
+            }
+        });
+    }
+
+    @Override
+    public CompletableFuture<Void> debug(Project project, RunConfiguration<JavaApplicationRunConfigurationData> configuration) {
+        return execute(project, configuration, true).whenComplete((unused, throwable) -> {
+            if (throwable != null) {
+                Railroad.LOGGER.error("Failed to start debug session for configuration: {}", configuration.data().getName(), throwable);
+            }
+        });
+    }
+
+    @Override
+    public CompletableFuture<Void> stop(Project project, RunConfiguration<JavaApplicationRunConfigurationData> configuration) {
+        Process process = runningProcesses.get(configuration);
+        if (process != null && process.isAlive()) {
+            process.destroy();
+            process.onExit().thenRun(() -> runningProcesses.remove(configuration));
+        }
+
+        return CompletableFuture.completedFuture(null);
+    }
+
+    @Override
+    public JavaApplicationRunConfigurationData createDataInstance(Project project) {
+        var data = new JavaApplicationRunConfigurationData();
+        data.setName("New Java Application");
+        data.setJdk(/*project.getJDKManager().getDefaultJDK()*/ JDKManager.getDefaultJDK()); // TODO
+        data.setWorkingDirectory(project.getPath());
+        return data;
+    }
+
+    @Override
+    public Class<JavaApplicationRunConfigurationData> getDataClass() {
+        return JavaApplicationRunConfigurationData.class;
+    }
+
+    private CompletableFuture<Void> execute(Project project, RunConfiguration<JavaApplicationRunConfigurationData> configuration, boolean debug) {
+        JavaApplicationRunConfigurationData data = configuration.data();
+        final JDK jdk = data.getJdk();
+        final String mainClass = data.getMainClass();
+        final Path workingDirectory = data.getWorkingDirectory();
+        final boolean buildBeforeRun = data.isBuildBeforeRun();
+        final String[] classpathEntries = data.getClasspathEntries();
+        final String[] programArguments = data.getProgramArguments();
+        final String[] vmOptions = data.getVmOptions();
+        final Map<String, String> environmentVariables = data.getEnvironmentVariables() == null
+            ? Map.of()
+            : data.getEnvironmentVariables();
+
+        if (jdk == null)
+            return CompletableFuture.failedFuture(new IllegalStateException("JDK is not specified"));
+
+        if (mainClass == null || mainClass.isBlank())
+            return CompletableFuture.failedFuture(new IllegalStateException("Main class is not specified"));
+
+        if (workingDirectory == null)
+            return CompletableFuture.failedFuture(new IllegalStateException("Working directory is not specified"));
+
+        if (Files.notExists(workingDirectory) || !Files.isDirectory(workingDirectory))
+            return CompletableFuture.failedFuture(new IllegalStateException("Working directory does not exist or is not a directory: " + workingDirectory));
+
+        CompletableFuture<Void> buildFuture = CompletableFuture.completedFuture(null);
+        if (buildBeforeRun) {
+            buildFuture = project.build(jdk).thenCompose(closeGradleConnection -> {
+                closeGradleConnection.run();
+                return CompletableFuture.completedFuture((Void) null);
+            }).exceptionally(throwable -> {
+                System.err.println("Build failed: " + throwable.getMessage());
+                throw new IllegalStateException("Build failed before running application", throwable);
+            });
+        }
+
+        return buildFuture.thenCompose(ignored -> CompletableFuture.supplyAsync(() -> {
+            try {
+                final int debugPort = debug ? findFreePort() : -1;
+                String[] command = buildCommand(jdk, mainClass, classpathEntries, programArguments, vmOptions, debug, debugPort);
+                ProcessBuilder builder = new ProcessBuilder(command)
+                    .directory(workingDirectory.toFile())
+                    .redirectOutput(ProcessBuilder.Redirect.PIPE)
+                    .redirectError(ProcessBuilder.Redirect.PIPE);
+                if (!environmentVariables.isEmpty()) {
+                    builder.environment().putAll(environmentVariables);
+                }
+
+                Process process = builder.start();
+                runningProcesses.put(configuration, process);
+
+                // Start consuming output (must be done asynchronously)
+                new ProcessOutputHandler(process, configuration.data().getName()).run();
+
+                if (debug && debugPort > 0) {
+                    // TODO: trigger IDE debugger attachment here
+                    Railroad.LOGGER.debug("DEBUG: IDE should attach debugger to port {} for configuration: {}", debugPort, configuration.data().getName());
+                }
+
+                process.onExit().thenAccept(p -> {
+                    runningProcesses.remove(configuration);
+                    if (p.exitValue() != 0) {
+                        Railroad.LOGGER.error("Application process exited with code: {}", p.exitValue());
+                    } else {
+                        Railroad.LOGGER.debug("Application process finished successfully.");
+                    }
+                });
+
+                return null;
+            } catch (IOException exception) {
+                throw new IllegalStateException("Failed to start Jar Application process", exception);
+            }
+        }));
+    }
+
+    private static String[] buildCommand(JDK jdk, String mainClass,
+                                         String[] classpathEntries, String[] programArguments,
+                                         String[] vmOptions, boolean debug, int debugPort) {
+        String javaExecutable = jdk.path().resolve("bin").resolve(JDKManager.JAVA_EXECUTABLE_NAME).toString();
+        String[] vm = vmOptions == null ? new String[0] : vmOptions;
+        String[] args = programArguments == null ? new String[0] : programArguments;
+        String classpath = String.join(File.pathSeparator, classpathEntries != null ? classpathEntries : new String[0]);
+
+        List<String> command = new ArrayList<>();
+        command.add(javaExecutable);
+
+        if (debug) {
+            if (debugPort <= 0) {
+                throw new IllegalStateException("Debug port must be provided when debug mode is enabled.");
+            }
+            command.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=%d".formatted(debugPort));
+        }
+
+        command.addAll(List.of(vm));
+        if (classpathEntries != null && classpathEntries.length > 0) {
+            command.add("-cp");
+            command.add(classpath);
+        }
+
+        command.add(mainClass);
+        command.addAll(List.of(args));
+        return command.toArray(new String[0]);
+    }
+
+    private static int findFreePort() {
+        try (var socket = new ServerSocket(0)) {
+            return socket.getLocalPort();
+        } catch (IOException exception) {
+            throw new RuntimeException("Failed to find a free port for debugging", exception);
+        }
+    }
+
+    private record ProcessOutputHandler(Process process, String name) implements Runnable {
+        @Override
+        public void run() {
+            // In the future IDE, we will read from process.getInputStream() and process.getErrorStream()
+            // and display it in the IDE console.
+            // For now, we just print to System.out/err.
+            new Thread(() -> {
+                try (var reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        System.out.println("[" + name + " OUT] " + line);
+                    }
+                } catch (IOException exception) {
+                    System.err.println("[" + name + " ERR] Error reading stdout: " + exception.getMessage());
+                }
+            }).start();
+
+            new Thread(() -> {
+                try (var reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        System.err.println("[" + name + " ERR] " + line);
+                    }
+                } catch (IOException exception) {
+                    System.err.println("[" + name + " ERR] Error reading stderr: " + exception.getMessage());
+                }
+            }).start();
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/ShellScriptRunConfigurationType.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/ShellScriptRunConfigurationType.java
new file mode 100644
index 00000000..64e64dd9
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/ShellScriptRunConfigurationType.java
@@ -0,0 +1,227 @@
+package dev.railroadide.railroad.ide.runconfig.defaults;
+
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationType;
+import dev.railroadide.railroad.ide.runconfig.defaults.data.ShellScriptRunConfigurationData;
+import dev.railroadide.railroad.ide.runconfig.defaults.data.ShellScriptRunConfigurationData.ExecuteMode;
+import dev.railroadide.railroad.project.Project;
+import javafx.scene.paint.Color;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class ShellScriptRunConfigurationType extends RunConfigurationType<ShellScriptRunConfigurationData> {
+    private final Map<RunConfiguration<?>, Process> runningProcesses = new ConcurrentHashMap<>();
+    private final Map<RunConfiguration<?>, Path> temporaryScripts = new ConcurrentHashMap<>();
+
+    public ShellScriptRunConfigurationType() {
+        super("railroad.runconfig.shellscript", FontAwesomeSolid.TERMINAL, Color.web("#919191"));
+    }
+
+    @Override
+    public CompletableFuture<Void> run(Project project, RunConfiguration<ShellScriptRunConfigurationData> configuration) {
+        return execute(project, configuration).whenComplete((unused, throwable) -> {
+            if (throwable != null) {
+                Railroad.LOGGER.error("Failed to start shell script for configuration: {}", configuration.data().getName(), throwable);
+            }
+        });
+    }
+
+    @Override
+    public CompletableFuture<Void> debug(Project project, RunConfiguration<ShellScriptRunConfigurationData> configuration) {
+        return CompletableFuture.failedFuture(
+            new UnsupportedOperationException("Debugging shell script run configurations is not supported."));
+    }
+
+    @Override
+    public CompletableFuture<Void> stop(Project project, RunConfiguration<ShellScriptRunConfigurationData> configuration) {
+        Process process = runningProcesses.get(configuration);
+        if (process != null && process.isAlive()) {
+            process.destroy();
+            process.onExit().thenRun(() -> {
+                runningProcesses.remove(configuration);
+                cleanupTemporaryScript(configuration);
+            });
+        } else {
+            cleanupTemporaryScript(configuration);
+        }
+
+        return CompletableFuture.completedFuture(null);
+    }
+
+    @Override
+    public ShellScriptRunConfigurationData createDataInstance(Project project) {
+        var data = new ShellScriptRunConfigurationData();
+        data.setName("New Shell Script");
+        data.setWorkingDirectory(project.getPath());
+        data.setScriptPath(project.getPath().resolve("script.sh"));
+        return data;
+    }
+
+    @Override
+    public Class<ShellScriptRunConfigurationData> getDataClass() {
+        return ShellScriptRunConfigurationData.class;
+    }
+
+    private CompletableFuture<Void> execute(Project project, RunConfiguration<ShellScriptRunConfigurationData> configuration) {
+        return CompletableFuture.runAsync(() -> {
+            ShellScriptRunConfigurationData data = configuration.data();
+            Path workingDirectory = resolveWorkingDirectory(project, data);
+            ScriptDescriptor scriptDescriptor = resolveScriptDescriptor(data, workingDirectory);
+            List<String> command = buildCommand(data, scriptDescriptor.scriptPath());
+            Map<String, String> environment = data.getEnvironmentVariables();
+
+            if (scriptDescriptor.isTemporary()) {
+                temporaryScripts.put(configuration, scriptDescriptor.scriptPath());
+            }
+
+            try {
+                ProcessBuilder builder = new ProcessBuilder(command).directory(workingDirectory.toFile());
+                if (data.isExecuteInTerminal()) {
+                    builder.inheritIO();
+                } else {
+                    builder.redirectOutput(ProcessBuilder.Redirect.PIPE).redirectError(ProcessBuilder.Redirect.PIPE);
+                }
+
+                if (!environment.isEmpty()) {
+                    builder.environment().putAll(environment);
+                }
+
+                Process process = builder.start();
+                runningProcesses.put(configuration, process);
+
+                if (!data.isExecuteInTerminal()) {
+                    new ProcessOutputHandler(process, configuration.data().getName()).run();
+                }
+
+                process.onExit().thenAccept(p -> {
+                    runningProcesses.remove(configuration);
+                    cleanupTemporaryScript(configuration);
+                    if (p.exitValue() != 0) {
+                        Railroad.LOGGER.error("Shell script exited with code {} for configuration: {}", p.exitValue(),
+                            configuration.data().getName());
+                    } else {
+                        Railroad.LOGGER.debug("Shell script finished successfully for configuration: {}", configuration.data().getName());
+                    }
+                });
+            } catch (IOException exception) {
+                cleanupTemporaryScript(configuration);
+                throw new IllegalStateException("Failed to start shell script process", exception);
+            }
+        });
+    }
+
+    private static Path resolveWorkingDirectory(Project project, ShellScriptRunConfigurationData data) {
+        Path workingDirectory = data.getWorkingDirectory();
+        if (workingDirectory == null) {
+            workingDirectory = project.getPath();
+        }
+
+        if (Files.notExists(workingDirectory) || !Files.isDirectory(workingDirectory))
+            throw new IllegalStateException("Working directory does not exist or is not a directory: " + workingDirectory);
+
+        return workingDirectory;
+    }
+
+    private static ScriptDescriptor resolveScriptDescriptor(ShellScriptRunConfigurationData data, Path workingDirectory) {
+        ExecuteMode mode = data.getExecuteMode() == null ? ExecuteMode.FILE : data.getExecuteMode();
+        return switch (mode) {
+            case FILE -> new ScriptDescriptor(resolveScriptPath(data.getScriptPath(), workingDirectory), false);
+            case TEXT -> new ScriptDescriptor(createScriptFromText(data.getScriptText()), true);
+        };
+    }
+
+    private static Path resolveScriptPath(Path scriptPath, Path workingDirectory) {
+        if (scriptPath == null)
+            throw new IllegalStateException("Script path must be specified when executing a file.");
+
+        Path resolved = scriptPath.isAbsolute() ? scriptPath : workingDirectory.resolve(scriptPath).normalize();
+        if (Files.notExists(resolved))
+            throw new IllegalStateException("Script file does not exist: " + resolved);
+
+        return resolved;
+    }
+
+    private static Path createScriptFromText(String scriptText) {
+        if (scriptText == null || scriptText.isBlank())
+            throw new IllegalStateException("Script text must be provided when executing inline content.");
+
+        try {
+            Path tempFile = Files.createTempFile("railroad-script-", ".tmp");
+            Files.writeString(tempFile, scriptText, StandardCharsets.UTF_8);
+            tempFile.toFile().deleteOnExit();
+            return tempFile;
+        } catch (IOException exception) {
+            throw new IllegalStateException("Failed to create temporary script file", exception);
+        }
+    }
+
+    private static List<String> buildCommand(ShellScriptRunConfigurationData data, Path scriptPath) {
+        String interpreterPath = Objects.requireNonNull(data.getInterpreterPath(), "interpreterPath");
+        if (interpreterPath.isBlank())
+            throw new IllegalStateException("Interpreter path is not specified");
+
+        String[] interpreterArgs = data.getInterpreterArgs() == null ? new String[0] : data.getInterpreterArgs();
+        String[] scriptArgs = data.getScriptArgs() == null ? new String[0] : data.getScriptArgs();
+
+        List<String> command = new ArrayList<>();
+        command.add(interpreterPath);
+        command.addAll(List.of(interpreterArgs));
+        command.add(scriptPath.toAbsolutePath().toString());
+        command.addAll(List.of(scriptArgs));
+        return command;
+    }
+
+    private void cleanupTemporaryScript(RunConfiguration<?> configuration) {
+        Path script = temporaryScripts.remove(configuration);
+        if (script != null) {
+            try {
+                Files.deleteIfExists(script);
+            } catch (IOException exception) {
+                Railroad.LOGGER.warn("Failed to delete temporary script file: {}", script, exception);
+            }
+        }
+    }
+
+    private record ScriptDescriptor(Path scriptPath, boolean isTemporary) {
+    }
+
+    private record ProcessOutputHandler(Process process, String name) implements Runnable {
+        @Override
+        public void run() {
+            new Thread(() -> {
+                try (var reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        System.out.println("[" + name + " OUT] " + line);
+                    }
+                } catch (IOException exception) {
+                    System.err.println("[" + name + " ERR] Error reading stdout: " + exception.getMessage());
+                }
+            }, name + "-stdout-reader").start();
+
+            new Thread(() -> {
+                try (var reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        System.err.println("[" + name + " ERR] " + line);
+                    }
+                } catch (IOException exception) {
+                    System.err.println("[" + name + " ERR] Error reading stderr: " + exception.getMessage());
+                }
+            }, name + "-stderr-reader").start();
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/CompoundRunConfigurationData.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/CompoundRunConfigurationData.java
new file mode 100644
index 00000000..ad593932
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/CompoundRunConfigurationData.java
@@ -0,0 +1,115 @@
+package dev.railroadide.railroad.ide.runconfig.defaults.data;
+
+import dev.railroadide.core.form.Form;
+import dev.railroadide.core.form.FormComponent;
+import dev.railroadide.core.form.FormData;
+import dev.railroadide.core.form.FormSection;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationData;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationType;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationTypes;
+import dev.railroadide.railroad.ide.runconfig.ui.form.RunConfigurationPickerComponent;
+import dev.railroadide.railroad.project.Project;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CompoundRunConfigurationData extends RunConfigurationData {
+    private RunMode runMode = RunMode.PARALLEL;
+    private final List<String> configurationIds = new ArrayList<>();
+
+    public void addConfiguration(RunConfiguration<?> configuration) {
+        if (configuration != null) {
+            configurationIds.add(configuration.uuid().toString());
+        }
+    }
+
+    public void removeConfiguration(RunConfiguration<?> configuration) {
+        if (configuration != null) {
+            configurationIds.remove(configuration.uuid().toString());
+        }
+    }
+
+    public List<RunConfiguration<?>> resolveConfigurations(List<RunConfiguration<?>> availableConfigurations) {
+        if (configurationIds.isEmpty() || availableConfigurations == null || availableConfigurations.isEmpty())
+            return List.of();
+
+        List<RunConfiguration<?>> resolved = new ArrayList<>(configurationIds.size());
+        for (String id : configurationIds) {
+            RunConfiguration<?> match = null;
+            if (id != null && !id.isBlank()) {
+                try {
+                    UUID uuid = UUID.fromString(id);
+                    for (RunConfiguration<?> candidate : availableConfigurations) {
+                        if (candidate != null && uuid.equals(candidate.uuid())) {
+                            match = candidate;
+                            break;
+                        }
+                    }
+                } catch (IllegalArgumentException ignored) {
+                    // TODO: Invalid UUID stored; keep null to present an issue during execution.
+                }
+            }
+
+            resolved.add(match);
+        }
+
+        return resolved;
+    }
+
+    @Override
+    public Form createConfigurationForm(Project project, RunConfiguration<?> configuration) {
+        return createBaseFormBuilder(project, configuration)
+            .appendSection(FormSection.create("railroad.runconfig.compound.configurations.title")
+                .appendComponent(FormComponent.radioButtonGroup("runMode", "railroad.runconfig.compound.configuration.runMode.label", RunMode.class)
+                    .required()
+                    .selected(() -> this.runMode != null ? this.runMode : RunMode.PARALLEL)
+                    .optionLabelProvider(RunMode::getLocalizationKey)
+                    .build())
+                .appendComponent(RunConfigurationPickerComponent.builder("configurations")
+                    .labelKey("railroad.runconfig.compound.configuration.configurations.label")
+                    .availableConfigurations(project.getRunConfigManager().getConfigurations())
+                    .filter(runConfig -> runConfig != null && (configuration == null || !runConfig.uuid().equals(configuration.uuid())))
+                    .initialSelectionSupplier(() -> resolveConfigurations(project.getRunConfigManager().getConfigurations()))
+                    .build())
+                .build())
+            .build();
+    }
+
+    @Override
+    public void applyConfigurationFormData(FormData formData) {
+        applyBaseFormData(formData);
+        this.configurationIds.clear();
+        RunConfiguration<?>[] submitted = formData.get("configurations", RunConfiguration[].class);
+        if (submitted != null) {
+            for (RunConfiguration<?> configuration : submitted) {
+                if (configuration != null) {
+                    configurationIds.add(configuration.uuid().toString());
+                }
+            }
+        }
+    }
+
+    @Override
+    public RunConfigurationType<?> getType() {
+        return RunConfigurationTypes.COMPOUND;
+    }
+
+    @Getter
+    public enum RunMode {
+        PARALLEL,
+        SEQUENTIAL;
+
+        private final String localizationKey;
+
+        RunMode() {
+            this.localizationKey = "railroad.runconfig.compound.runMode." + name().toLowerCase();
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/GradleRunConfigurationData.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/GradleRunConfigurationData.java
new file mode 100644
index 00000000..594ccba7
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/GradleRunConfigurationData.java
@@ -0,0 +1,339 @@
+package dev.railroadide.railroad.ide.runconfig.defaults.data;
+
+import dev.railroadide.core.form.*;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.gradle.model.GradleBuildModel;
+import dev.railroadide.railroad.gradle.service.GradleModelService;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationData;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationType;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationTypes;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.JDKManager;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroad.project.onboarding.ProjectValidators;
+import dev.railroadide.railroad.settings.ui.DetectedJdkListPane;
+import dev.railroadide.railroad.utility.StringUtils;
+import dev.railroadide.railroadplugin.dto.RailroadGradleTask;
+import dev.railroadide.railroadplugin.dto.RailroadGradleTaskArgument;
+import dev.railroadide.railroadplugin.dto.RailroadModule;
+import javafx.application.Platform;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableMap;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.util.Callback;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.gradle.tooling.model.DomainObjectSet;
+import org.jetbrains.annotations.Nullable;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class GradleRunConfigurationData extends RunConfigurationData {
+    private String task;
+    private Path gradleProjectPath; // TODO: A different data type(?) that represents a Gradle project model
+    private Map<String, String> environmentVariables = new HashMap<>();
+    private String[] vmOptions = new String[0];
+    private JDK javaHome;
+
+    @Override
+    public RunConfigurationType<?> getType() {
+        return RunConfigurationTypes.GRADLE;
+    }
+
+    @Override
+    public Form createConfigurationForm(Project project, RunConfiguration<?> configuration) {
+        ObjectProperty<ComboBox<JDK>> javaHomeComboBoxProperty = new SimpleObjectProperty<>();
+        javaHomeComboBoxProperty.addListener((observable, oldValue, newValue) -> {
+            if (newValue != null) {
+                newValue.setMinHeight(72);
+                newValue.setPrefHeight(72);
+                newValue.setMaxHeight(72);
+            }
+        });
+
+        ObservableMap<Path, List<? extends RailroadGradleTask>> gradleTasksCache = FXCollections.observableHashMap();
+        ObjectProperty<Path> gradleProjectPathProperty = new SimpleObjectProperty<>(this.gradleProjectPath);
+        gradleProjectPathProperty.addListener((observable, oldValue, newValue) ->
+            loadGradleTasksAsync(project, newValue, gradleTasksCache));
+        loadGradleTasksAsync(project, gradleProjectPathProperty.get(), gradleTasksCache);
+
+        return createBaseFormBuilder(project, configuration)
+            .appendSection(FormSection.create("railroad.runconfig.gradle.configuration.title")
+                .appendComponent(FormComponent.textField("task", "railroad.runconfig.gradle.configuration.task.label")
+                    .required()
+                    .text(() -> this.task != null ? this.task : "")
+                    .promptText("railroad.runconfig.gradle.configuration.task.prompt")
+                    .autoComplete(query ->
+                        filterGradleTaskSuggestions(query, gradleProjectPathProperty.get(), gradleTasksCache))
+                    .autoCompleteSuggestionCellFactory(createGradleTaskSuggestionCellFactory(
+                        gradleProjectPathProperty, gradleTasksCache))
+                    .autoCompleteShowSuggestionsOnEmpty(true)
+                    .validator(textField -> {
+                        String text = textField.getText();
+                        if (text == null || text.isBlank())
+                            return ValidationResult.error("railroad.runconfig.gradle.configuration.task.invalid");
+
+                        // TODO: Use a gradle project model to validate the task
+                        return ValidationResult.ok();
+                    })
+                    .build())
+                .appendComponent(FormComponent.directoryChooser("gradleProjectPath", "railroad.runconfig.gradle.configuration.projectPath.label")
+                    .required()
+                    .defaultPath(this.gradleProjectPath)
+                    .validator(ProjectValidators::validateGradleProjectPath)
+                    .listener((node, observable, oldValue, newValue) -> {
+                        Path normalizedPath = normalizeGradleProjectPath(newValue);
+                        if (normalizedPath == null) {
+                            gradleProjectPathProperty.set(null);
+                            this.gradleProjectPath = null;
+                            return;
+                        }
+
+                        if (!Files.isDirectory(normalizedPath))
+                            return;
+
+                        if (normalizedPath.equals(gradleProjectPathProperty.get()))
+                            return;
+
+                        gradleProjectPathProperty.set(normalizedPath);
+                        this.gradleProjectPath = normalizedPath;
+                    })
+                    .build())
+                .appendComponent(FormComponent.textField("environmentVariables", "railroad.runconfig.gradle.configuration.envVariables.label")
+                    .required()
+                    .text(() -> StringUtils.environmentVariablesToString(this.environmentVariables))
+                    .promptText("railroad.runconfig.gradle.configuration.envVariables.prompt")
+                    .validator(textField -> !StringUtils.isValidEnvironmentVariablesString(textField.getText()) ?
+                        ValidationResult.error("railroad.runconfig.gradle.configuration.envVariables.invalid") :
+                        ValidationResult.ok())
+                    .build())
+                .appendComponent(FormComponent.textField("vmOptions", "railroad.runconfig.gradle.configuration.vmOptions.label")
+                    .required()
+                    .text(() -> StringUtils.stringArrayToString(this.vmOptions, " "))
+                    .promptText("railroad.runconfig.gradle.configuration.vmOptions.prompt")
+                    .build())
+                .appendComponent(FormComponent.comboBox("javaHome", "railroad.runconfig.gradle.configuration.javaHome.label", JDK.class)
+                    .required()
+                    .defaultValue(this::getJavaHome)
+                    .items(JDKManager::getAvailableJDKs)
+                    .translate(false)
+                    .buttonCell(new DetectedJdkListPane.JdkCell())
+                    .cellFactory($ -> new DetectedJdkListPane.JdkCell())
+                    .keyFunction(jdk -> jdk != null ? jdk.path().toString() : "")
+                    .valueOfFunction(jdkPath -> JDKManager.getAvailableJDKs()
+                        .stream()
+                        .filter(jdk -> jdk.path().toString().equals(jdkPath))
+                        .findFirst()
+                        .orElse(null))
+                    .bindComboBoxTo(javaHomeComboBoxProperty)
+                    .build())
+            ).build();
+    }
+
+    private List<String> buildGradleTaskSuggestions(Path gradleProjectPath, ObservableMap<Path, List<? extends RailroadGradleTask>> gradleTasksCache) {
+        if (gradleProjectPath == null)
+            return List.of();
+
+        List<? extends RailroadGradleTask> cachedTasks = gradleTasksCache.get(gradleProjectPath);
+        if (cachedTasks == null || cachedTasks.isEmpty()) {
+            Railroad.LOGGER.debug("No cached Gradle tasks for {} yet", gradleProjectPath);
+            return List.of();
+        }
+
+        LinkedHashSet<String> suggestions = new LinkedHashSet<>();
+        for (RailroadGradleTask task : cachedTasks) {
+            if (task == null)
+                continue;
+
+            String taskName = task.getName();
+            if (taskName != null && !taskName.isBlank())
+                suggestions.add(taskName);
+
+            DomainObjectSet<? extends RailroadGradleTaskArgument> options = task.getArguments();
+            if (options != null && !options.isEmpty()) {
+                options.stream()
+                    .map(RailroadGradleTaskArgument::getName)
+                    .filter(name -> name != null && !name.isBlank())
+                    .forEach(suggestions::add);
+            }
+        }
+
+        List<String> result = List.copyOf(suggestions);
+        Railroad.LOGGER.debug("Providing {} suggestions for {}", result.size(), gradleProjectPath);
+        return result;
+    }
+
+    private Collection<String> filterGradleTaskSuggestions(String query, Path gradleProjectPath,
+                                                           ObservableMap<Path, List<? extends RailroadGradleTask>> gradleTasksCache) {
+        List<String> suggestions = buildGradleTaskSuggestions(gradleProjectPath, gradleTasksCache);
+        String token = currentToken(query);
+        if (token.isBlank()) {
+            return suggestions;
+        }
+
+        String normalized = token.toLowerCase(Locale.ROOT);
+        return suggestions.stream()
+            .filter(Objects::nonNull)
+            .filter(s -> s.toLowerCase(Locale.ROOT).contains(normalized))
+            .toList();
+    }
+
+    private String currentToken(String text) {
+        if (text == null || text.isBlank())
+            return "";
+
+        int lastSpace = Math.max(text.lastIndexOf(' '), text.lastIndexOf('\t'));
+        if (lastSpace == -1)
+            return text.trim();
+
+        if (lastSpace == text.length() - 1)
+            return "";
+
+        return text.substring(lastSpace + 1).trim();
+    }
+
+    private Callback<ListView<String>, ListCell<String>> createGradleTaskSuggestionCellFactory(
+        ObjectProperty<Path> gradleProjectPathProperty,
+        ObservableMap<Path, List<? extends RailroadGradleTask>> gradleTasksCache) {
+        return listView -> new ListCell<>() {
+            @Override
+            protected void updateItem(String item, boolean empty) {
+                super.updateItem(item, empty);
+                if (empty || item == null) {
+                    setText(null);
+                    return;
+                }
+
+                String description = findGradleTaskDescription(item, gradleProjectPathProperty.get(), gradleTasksCache);
+                if (description != null) {
+                    setText(item + " - " + description);
+                } else {
+                    setText(item);
+                }
+            }
+        };
+    }
+
+    private @Nullable String findGradleTaskDescription(String taskOrOptionName, Path gradleProjectPath,
+                                                       ObservableMap<Path, List<? extends RailroadGradleTask>> gradleTasksCache) {
+        if (taskOrOptionName == null || gradleProjectPath == null)
+            return null;
+
+        List<? extends RailroadGradleTask> tasks = gradleTasksCache.get(gradleProjectPath);
+        if (tasks == null || tasks.isEmpty())
+            return null;
+
+        for (RailroadGradleTask task : tasks) {
+            if (task == null)
+                continue;
+
+            if (taskOrOptionName.equals(task.getName())) {
+                String description = task.getDescription();
+                return description == null || description.isBlank() ? null : description;
+            }
+
+            DomainObjectSet<? extends RailroadGradleTaskArgument> arguments = task.getArguments();
+            if (arguments != null && !arguments.isEmpty()) {
+                for (RailroadGradleTaskArgument argument : arguments) {
+                    if (argument == null)
+                        continue;
+
+                    if (taskOrOptionName.equals(argument.getName())) {
+                        String description = argument.getDescription();
+                        if (description != null && !description.isBlank())
+                            return description;
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private void loadGradleTasksAsync(Project project, Path gradleProjectPath, ObservableMap<Path, List<? extends RailroadGradleTask>> gradleTasksCache) {
+        if (gradleProjectPath == null) {
+            if (Platform.isFxApplicationThread()) {
+                gradleTasksCache.clear();
+            } else {
+                Platform.runLater(gradleTasksCache::clear);
+            }
+
+            return;
+        }
+
+        Railroad.LOGGER.debug("Loading Gradle tasks for {}", gradleProjectPath);
+        CompletableFuture.supplyAsync(() -> fetchTasksForProject(project, gradleProjectPath))
+            .whenComplete((tasks, throwable) -> {
+                if (throwable != null) {
+                    Railroad.LOGGER.warn("Failed to load Gradle tasks for autocomplete", throwable);
+                    Platform.runLater(() -> gradleTasksCache.remove(gradleProjectPath));
+                    return;
+                }
+
+                Platform.runLater(() -> {
+                    gradleTasksCache.put(gradleProjectPath, tasks);
+                    Railroad.LOGGER.debug("Cached {} Gradle tasks for {}", tasks != null ? tasks.size() : 0, gradleProjectPath);
+                });
+            });
+    }
+
+    private static Path normalizeGradleProjectPath(String rawValue) {
+        if (rawValue == null || rawValue.isBlank())
+            return null;
+
+        try {
+            return Path.of(rawValue.trim()).toAbsolutePath().normalize();
+        } catch (Exception exception) {
+            return null;
+        }
+    }
+
+    private List<? extends RailroadGradleTask> fetchTasksForProject(Project project, Path gradleProjectPath) {
+        try {
+            GradleModelService modelService = project.getGradleManager().getGradleModelService();
+            GradleBuildModel model = modelService.refreshModel(false).get();
+            if (model == null)
+                return List.of();
+
+            for (RailroadModule module : model.project().getModules()) {
+                if (module == null)
+                    continue;
+
+                if (gradleProjectPath.equals(module.getGradleProject().getProjectDirectory().toPath())) {
+                    DomainObjectSet<? extends RailroadGradleTask> tasks = module.getTasks();
+                    return tasks != null ? tasks.stream().toList() : List.of();
+                }
+            }
+
+            return model.project().getModules().stream()
+                .flatMap(module -> module.getTasks().stream())
+                .filter(Objects::nonNull)
+                .findFirst()
+                .map(List::of)
+                .orElse(List.of());
+        } catch (Exception exception) {
+            Railroad.LOGGER.warn("Failed to fetch Gradle tasks for {}", gradleProjectPath, exception);
+            return List.of();
+        }
+    }
+
+    @Override
+    public void applyConfigurationFormData(FormData formData) {
+        applyBaseFormData(formData);
+        this.task = formData.get("task", String.class);
+        this.gradleProjectPath = Path.of(formData.get("gradleProjectPath", String.class));
+        this.environmentVariables = StringUtils.stringToEnvironmentVariables(formData.get("environmentVariables", String.class));
+        this.vmOptions = StringUtils.stringToStringArray(formData.get("vmOptions", String.class), " ");
+        this.javaHome = formData.get("javaHome", JDK.class);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/JarApplicationRunConfigurationData.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/JarApplicationRunConfigurationData.java
new file mode 100644
index 00000000..084902f9
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/JarApplicationRunConfigurationData.java
@@ -0,0 +1,95 @@
+package dev.railroadide.railroad.ide.runconfig.defaults.data;
+
+import dev.railroadide.core.form.*;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationData;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationType;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationTypes;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.JDKManager;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroad.project.onboarding.ProjectValidators;
+import dev.railroadide.railroad.settings.ui.DetectedJdkListPane;
+import dev.railroadide.railroad.utility.StringUtils;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class JarApplicationRunConfigurationData extends RunConfigurationData {
+    private Path jarPath;
+    private String[] vmOptions = new String[0];
+    private String[] programArguments = new String[0];
+    private Path workingDirectory;
+    private Map<String, String> environmentVariables = new HashMap<>();
+    private JDK jre; // TODO: JRE class(?)
+
+    @Override
+    public RunConfigurationType<?> getType() {
+        return RunConfigurationTypes.JAR_APPLICATION;
+    }
+
+    @Override
+    public Form createConfigurationForm(Project project, RunConfiguration<?> configuration) {
+        return createBaseFormBuilder(project, configuration)
+            .appendSection(FormSection.create("railroad.runconfig.jar_application.configuration.section.title")
+                .appendComponent(FormComponent.fileChooser("jarPath", "railroad.runconfig.jar_application.configuration.jarPath.label")
+                    .required()
+                    .defaultPath(this.jarPath)
+                    .validator(ProjectValidators::validateJarFilePath)
+                    .build())
+                .appendComponent(FormComponent.textField("vmOptions", "railroad.runconfig.jar_application.configuration.vmOptions.label")
+                    .required()
+                    .text(() -> StringUtils.stringArrayToString(this.vmOptions, " "))
+                    .promptText("railroad.runconfig.jar_application.configuration.vmOptions.prompt")
+                    .build())
+                .appendComponent(FormComponent.textField("programArguments", "railroad.runconfig.jar_application.configuration.programArguments.label")
+                    .required()
+                    .text(() -> StringUtils.stringArrayToString(this.programArguments, " "))
+                    .promptText("railroad.runconfig.jar_application.configuration.programArguments.prompt")
+                    .build())
+                .appendComponent(FormComponent.directoryChooser("workingDirectory", "railroad.runconfig.jar_application.configuration.workingDirectory.label")
+                    .required()
+                    .defaultPath(this.workingDirectory)
+                    .validator(ProjectValidators::validateDirectoryPath)
+                    .build())
+                .appendComponent(FormComponent.textField("environmentVariables", "railroad.runconfig.jar_application.configuration.envVariables.label")
+                    .required()
+                    .text(() -> StringUtils.environmentVariablesToString(this.environmentVariables))
+                    .promptText("railroad.runconfig.jar_application.configuration.envVariables.prompt")
+                    .validator(textField -> !StringUtils.isValidEnvironmentVariablesString(textField.getText()) ?
+                        ValidationResult.error("railroad.runconfig.jar_application.configuration.envVariables.invalid") :
+                        ValidationResult.ok())
+                    .build())
+                .appendComponent(FormComponent.comboBox("jre", "railroad.runconfig.jar_application.configuration.jre.label", JDK.class)
+                    .required()
+                    .defaultValue(this::getJre)
+                    .items(JDKManager::getAvailableJDKs)
+                    .translate(false)
+                    .buttonCell(new DetectedJdkListPane.JdkCell())
+                    .cellFactory($ -> new DetectedJdkListPane.JdkCell())
+                    .keyFunction(jre -> jre != null ? jre.path().toString() : "")
+                    .valueOfFunction(jdkPath -> JDKManager.getAvailableJDKs()
+                        .stream()
+                        .filter(jre -> jre.path().toString().equals(jdkPath))
+                        .findFirst()
+                        .orElse(null))
+                    .build()))
+            .build();
+    }
+
+    @Override
+    public void applyConfigurationFormData(FormData formData) {
+        applyBaseFormData(formData);
+        this.jarPath = Path.of(formData.get("jarPath", String.class));
+        this.vmOptions = StringUtils.stringToStringArray(formData.get("vmOptions", String.class), " ");
+        this.programArguments = StringUtils.stringToStringArray(formData.get("programArguments", String.class), " ");
+        this.workingDirectory = Path.of(formData.get("workingDirectory", String.class));
+        this.environmentVariables = StringUtils.stringToEnvironmentVariables(formData.get("environmentVariables", String.class));
+        this.jre = formData.get("jre", JDK.class);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/JavaApplicationRunConfigurationData.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/JavaApplicationRunConfigurationData.java
new file mode 100644
index 00000000..918ba3a0
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/JavaApplicationRunConfigurationData.java
@@ -0,0 +1,108 @@
+package dev.railroadide.railroad.ide.runconfig.defaults.data;
+
+import dev.railroadide.core.form.*;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationData;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationType;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationTypes;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.JDKManager;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroad.project.onboarding.ProjectValidators;
+import dev.railroadide.railroad.settings.ui.DetectedJdkListPane;
+import dev.railroadide.railroad.utility.StringUtils;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class JavaApplicationRunConfigurationData extends RunConfigurationData {
+    private boolean buildBeforeRun;
+    private JDK jdk;
+    private String mainClass = "";
+    private Path workingDirectory;
+    private String[] classpathEntries = new String[0];
+    private String[] programArguments = new String[0];
+    private String[] vmOptions = new String[0];
+    private Map<String, String> environmentVariables = new HashMap<>();
+
+    @Override
+    public RunConfigurationType<?> getType() {
+        return RunConfigurationTypes.JAVA_APPLICATION;
+    }
+
+    @Override
+    public Form createConfigurationForm(Project project, RunConfiguration<?> configuration) {
+        return createBaseFormBuilder(project, configuration)
+            .appendSection(FormSection.create("railroad.runconfig.java_application.configuration.section.title")
+                .appendComponent(FormComponent.checkBox("buildBeforeRun", "railroad.runconfig.java_application.configuration.buildBeforeRun.label")
+                    .selected(this.buildBeforeRun)
+                    .build())
+                .appendComponent(FormComponent.comboBox("jdk", "railroad.runconfig.java_application.configuration.jdk.label", JDK.class)
+                    .required()
+                    .defaultValue(this::getJdk)
+                    .items(JDKManager::getAvailableJDKs)
+                    .translate(false)
+                    .buttonCell(new DetectedJdkListPane.JdkCell())
+                    .cellFactory($ -> new DetectedJdkListPane.JdkCell())
+                    .keyFunction(jre -> jre != null ? jre.path().toString() : "")
+                    .valueOfFunction(jdkPath -> JDKManager.getAvailableJDKs()
+                        .stream()
+                        .filter(jre -> jre.path().toString().equals(jdkPath))
+                        .findFirst()
+                        .orElse(null))
+                    .build())
+                .appendComponent(FormComponent.textField("mainClass", "railroad.runconfig.java_application.configuration.mainClass.label")
+                    .required()
+                    .text(() -> this.mainClass)
+                    .promptText("railroad.runconfig.java_application.configuration.mainClass.prompt")
+                    .validator(ProjectValidators::validateQualifiedMainClass)
+                    .build())
+                .appendComponent(FormComponent.directoryChooser("workingDirectory", "railroad.runconfig.jar_application.configuration.workingDirectory.label")
+                    .required()
+                    .defaultPath(this.workingDirectory)
+                    .validator(ProjectValidators::validateDirectoryPath)
+                    .build())
+                .appendComponent(FormComponent.textField("classpathEntries", "railroad.runconfig.java_application.configuration.classpathEntries.label")
+                    .required()
+                    .text(() -> StringUtils.stringArrayToString(this.classpathEntries, ";"))
+                    .promptText("railroad.runconfig.java_application.configuration.classpathEntries.prompt")
+                    .build())
+                .appendComponent(FormComponent.textField("programArguments", "railroad.runconfig.java_application.configuration.programArguments.label")
+                    .required()
+                    .text(() -> StringUtils.stringArrayToString(this.programArguments, " "))
+                    .promptText("railroad.runconfig.java_application.configuration.programArguments.prompt")
+                    .build())
+                .appendComponent(FormComponent.textField("vmOptions", "railroad.runconfig.java_application.configuration.vmOptions.label")
+                    .required()
+                    .text(() -> StringUtils.stringArrayToString(this.vmOptions, " "))
+                    .promptText("railroad.runconfig.java_application.configuration.vmOptions.prompt")
+                    .build())
+                .appendComponent(FormComponent.textField("environmentVariables", "railroad.runconfig.java_application.configuration.envVariables.label")
+                    .required()
+                    .text(() -> StringUtils.environmentVariablesToString(this.environmentVariables))
+                    .promptText("railroad.runconfig.java_application.configuration.envVariables.prompt")
+                    .validator(textField -> !StringUtils.isValidEnvironmentVariablesString(textField.getText()) ?
+                        ValidationResult.error("railroad.runconfig.java_application.configuration.envVariables.invalid") :
+                        ValidationResult.ok())
+                    .build()))
+            .build();
+    }
+
+    @Override
+    public void applyConfigurationFormData(FormData formData) {
+        applyBaseFormData(formData);
+        this.buildBeforeRun = formData.get("buildBeforeRun", Boolean.class);
+        this.jdk = formData.get("jdk", JDK.class);
+        this.mainClass = formData.get("mainClass", String.class);
+        this.workingDirectory = Path.of(formData.get("workingDirectory", String.class));
+        this.classpathEntries = StringUtils.stringToStringArray(formData.get("classpathEntries", String.class), ";");
+        this.programArguments = StringUtils.stringToStringArray(formData.get("programArguments", String.class), " ");
+        this.vmOptions = StringUtils.stringToStringArray(formData.get("vmOptions", String.class), " ");
+        this.environmentVariables = StringUtils.stringToEnvironmentVariables(formData.get("environmentVariables", String.class));
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/ShellScriptRunConfigurationData.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/ShellScriptRunConfigurationData.java
new file mode 100644
index 00000000..0816e015
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/defaults/data/ShellScriptRunConfigurationData.java
@@ -0,0 +1,129 @@
+package dev.railroadide.railroad.ide.runconfig.defaults.data;
+
+import dev.railroadide.core.form.*;
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationData;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationType;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationTypes;
+import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroad.project.onboarding.ProjectValidators;
+import dev.railroadide.railroad.utility.StringUtils;
+import javafx.beans.binding.Bindings;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ShellScriptRunConfigurationData extends RunConfigurationData {
+    private ExecuteMode executeMode = ExecuteMode.FILE;
+    private Path scriptPath;
+    private String scriptText;
+    private String[] scriptArgs = new String[0];
+    private Path workingDirectory;
+    private Map<String, String> environmentVariables = new HashMap<>();
+    private String interpreterPath;
+    private String[] interpreterArgs = new String[0];
+    private boolean executeInTerminal = true;
+
+    public ShellScriptRunConfigurationData() {
+        this.interpreterPath = switch (OperatingSystem.CURRENT) {
+            case WINDOWS -> "powershell.exe";
+            case MAC, LINUX -> "/bin/bash";
+            default -> "";
+        };
+    }
+
+    @Override
+    public RunConfigurationType<?> getType() {
+        return RunConfigurationTypes.SHELL_SCRIPT;
+    }
+
+    @Override
+    public Form createConfigurationForm(Project project, RunConfiguration<?> configuration) {
+        var executeModeComponent = FormComponent.radioButtonGroup("executeMode", "railroad.runconfig.shell_script.configuration.executeMode.label", ExecuteMode.class)
+            .required()
+            .selected(() -> this.executeMode)
+            .build();
+
+        var modeValueProperty = executeModeComponent.getComponent().valueProperty();
+        var fileModeVisible = Bindings.createBooleanBinding(
+            () -> executeModeComponent.getComponent().getValue() == ExecuteMode.FILE,
+            modeValueProperty);
+        var textModeVisible = Bindings.createBooleanBinding(
+            () -> executeModeComponent.getComponent().getValue() == ExecuteMode.TEXT,
+            modeValueProperty);
+
+        var scriptArgsValue = this.scriptArgs == null ? new String[0] : this.scriptArgs;
+        var interpreterArgsValue = this.interpreterArgs == null ? new String[0] : this.interpreterArgs;
+        var environmentValues = this.environmentVariables == null ? Map.<String, String>of() : this.environmentVariables;
+
+        return createBaseFormBuilder(project, configuration)
+            .appendSection(FormSection.create("railroad.runconfig.shell_script.configuration.section.title")
+                .appendComponent(executeModeComponent)
+                .appendComponent(FormComponent.fileChooser("scriptPath", "railroad.runconfig.shell_script.configuration.scriptPath.label")
+                    .required()
+                    .defaultPath(this.scriptPath)
+                    .validator(field -> ProjectValidators.validateFilePath(field, null))
+                    .visible(fileModeVisible)
+                    .build())
+                .appendComponent(FormComponent.textArea("scriptText", "railroad.runconfig.shell_script.configuration.scriptText.label")
+                    .required()
+                    .text(() -> this.scriptText)
+                    .promptText("railroad.runconfig.shell_script.configuration.scriptText.prompt")
+                    .visible(textModeVisible)
+                    .build())
+                .appendComponent(FormComponent.textField("scriptArgs", "railroad.runconfig.shell_script.configuration.scriptArgs.label")
+                    .text(() -> StringUtils.stringArrayToString(scriptArgsValue, " "))
+                    .promptText("railroad.runconfig.shell_script.configuration.scriptArgs.prompt")
+                    .build())
+                .appendComponent(FormComponent.directoryChooser("workingDirectory", "railroad.runconfig.shell_script.configuration.workingDirectory.label")
+                    .required()
+                    .defaultPath(this.workingDirectory)
+                    .validator(ProjectValidators::validateDirectoryPath)
+                    .build())
+                .appendComponent(FormComponent.textField("environmentVariables", "railroad.runconfig.shell_script.configuration.envVariables.label")
+                    .text(() -> StringUtils.environmentVariablesToString(environmentValues))
+                    .promptText("railroad.runconfig.shell_script.configuration.envVariables.prompt")
+                    .validator(textField -> !StringUtils.isValidEnvironmentVariablesString(textField.getText()) ?
+                        ValidationResult.error("railroad.runconfig.shell_script.configuration.envVariables.invalid") :
+                        ValidationResult.ok())
+                    .build())
+                .appendComponent(FormComponent.fileChooser("interpreterPath", "railroad.runconfig.shell_script.configuration.interpreterPath.label")
+                    .required()
+                    .defaultPath(this.interpreterPath)
+                    .validator(field -> ProjectValidators.validateFilePath(field, null))
+                    .build())
+                .appendComponent(FormComponent.textField("interpreterArgs", "railroad.runconfig.shell_script.configuration.interpreterArgs.label")
+                    .text(() -> StringUtils.stringArrayToString(interpreterArgsValue, " "))
+                    .promptText("railroad.runconfig.shell_script.configuration.interpreterArgs.prompt")
+                    .build())
+                .appendComponent(FormComponent.checkBox("executeInTerminal", "railroad.runconfig.shell_script.configuration.executeInTerminal.label")
+                    .selected(this.executeInTerminal)
+                    .build()))
+            .build();
+    }
+
+    @Override
+    public void applyConfigurationFormData(FormData formData) {
+        applyBaseFormData(formData);
+        this.executeMode = formData.get("executeMode", ExecuteMode.class);
+        this.scriptPath = Path.of(formData.get("scriptPath", String.class));
+        this.scriptText = formData.get("scriptText", String.class);
+        this.scriptArgs = StringUtils.stringToStringArray(formData.get("scriptArgs", String.class), " ");
+        this.workingDirectory = Path.of(formData.get("workingDirectory", String.class));
+        this.environmentVariables = StringUtils.stringToEnvironmentVariables(formData.get("environmentVariables", String.class));
+        this.interpreterPath = formData.get("interpreterPath", String.class);
+        this.interpreterArgs = StringUtils.stringToStringArray(formData.get("interpreterArgs", String.class), " ");
+        this.executeInTerminal = formData.get("executeInTerminal", Boolean.class);
+    }
+
+    public enum ExecuteMode {
+        FILE,
+        TEXT
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/RunConfigurationContextMenuManager.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/RunConfigurationContextMenuManager.java
new file mode 100644
index 00000000..7b2e7f43
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/RunConfigurationContextMenuManager.java
@@ -0,0 +1,37 @@
+package dev.railroadide.railroad.ide.runconfig.ui;
+
+import javafx.geometry.Side;
+import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
+
+/**
+ * Ensures run configuration context menus do not stack on top of each other by
+ * hiding any existing menu before showing a new one.
+ */
+public final class RunConfigurationContextMenuManager {
+    private static ContextMenu currentlyShown;
+
+    private RunConfigurationContextMenuManager() {}
+
+    public static synchronized void show(Node anchor, ContextMenu menu, Side side) {
+        if (currentlyShown != null && currentlyShown != menu) {
+            currentlyShown.hide();
+        }
+
+        currentlyShown = menu;
+        var previousHiddenHandler = menu.getOnHidden();
+        menu.setOnHidden(event -> {
+            if (previousHiddenHandler != null) {
+                previousHiddenHandler.handle(event);
+            }
+
+            synchronized (RunConfigurationContextMenuManager.class) {
+                if (currentlyShown == menu) {
+                    currentlyShown = null;
+                }
+            }
+        });
+
+        menu.show(anchor, side, 0, 0);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/RunConfigurationEditorPane.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/RunConfigurationEditorPane.java
new file mode 100644
index 00000000..a4ce5864
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/RunConfigurationEditorPane.java
@@ -0,0 +1,282 @@
+package dev.railroadide.railroad.ide.runconfig.ui;
+
+import dev.railroadide.core.form.Form;
+import dev.railroadide.core.form.FormData;
+import dev.railroadide.core.ui.RRButton;
+import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.ui.RRVBox;
+import dev.railroadide.core.ui.localized.LocalizedLabel;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationType;
+import dev.railroadide.railroad.localization.L18n;
+import dev.railroadide.railroad.project.Project;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.geometry.Side;
+import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.SplitPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+
+public class RunConfigurationEditorPane extends RRVBox {
+    private final ObservableList<RunConfiguration<?>> configurations = FXCollections.observableArrayList();
+    private final ObjectProperty<RunConfiguration<?>> selectedConfiguration = new SimpleObjectProperty<>();
+    private final Project project;
+    private final RunConfigurationTreeView configurationTreeView;
+    private final SplitPane editorSplitPane;
+    private final StackPane detailContentContainer;
+    private final StackPane centerContentContainer;
+    private final Node noConfigurationsPane;
+    private final Node detailsEmptyStatePane;
+    private final Map<UUID, ConfigurationFormContext> configurationFormContexts = new HashMap<>();
+
+    public RunConfigurationEditorPane(Project project) {
+        this.project = project;
+        this.configurations.addAll(project.getRunConfigManager().getConfigurations());
+        this.noConfigurationsPane = createEmptyStatePane();
+        this.detailsEmptyStatePane = createEmptyStatePane();
+        this.configurationTreeView = new RunConfigurationTreeView(configurations);
+        this.detailContentContainer = new StackPane();
+        this.detailContentContainer.getStyleClass().add("run-configuration-details-pane");
+        this.centerContentContainer = new StackPane();
+        this.editorSplitPane = createEditorSplitPane();
+        this.selectedConfiguration.bindBidirectional(configurationTreeView.selectedConfigurationProperty());
+        this.selectedConfiguration.bindBidirectional(project.getRunConfigManager().getSelectedConfiguration());
+
+        getStyleClass().add("run-configuration-editor-pane");
+        initializeUI();
+        initializeBindings();
+        updateEditorContent();
+        updateDetailContent(selectedConfiguration.get());
+    }
+
+    private void initializeUI() {
+        var topButtonBar = createTopButtonBar(project);
+        getChildren().add(topButtonBar);
+
+        centerContentContainer.getChildren().setAll(configurations.isEmpty() ? noConfigurationsPane : editorSplitPane);
+        VBox.setVgrow(centerContentContainer, Priority.ALWAYS);
+        getChildren().add(centerContentContainer);
+
+        var bottomButtonBar = createBottomButtonBar(project);
+        getChildren().add(bottomButtonBar);
+    }
+
+    private void initializeBindings() {
+        configurations.addListener((ListChangeListener<RunConfiguration<?>>) change -> {
+            while (change.next()) {
+                if (change.wasRemoved()) {
+                    change.getRemoved().forEach(config -> configurationFormContexts.remove(config.uuid()));
+                }
+            }
+            updateEditorContent();
+        });
+
+        selectedConfiguration.addListener((obs, oldValue, newValue) -> updateDetailContent(newValue));
+    }
+
+    private void updateDetailContent(RunConfiguration<?> configuration) {
+        if (configuration == null) {
+            detailContentContainer.getChildren().setAll(detailsEmptyStatePane);
+            return;
+        }
+
+        detailContentContainer.getChildren().setAll(getConfigurationFormNode(configuration));
+    }
+
+    private void updateEditorContent() {
+        if (configurations.isEmpty()) {
+            centerContentContainer.getChildren().setAll(noConfigurationsPane);
+        } else {
+            centerContentContainer.getChildren().setAll(editorSplitPane);
+        }
+    }
+
+    private VBox createEmptyStatePane() {
+        var container = new RRVBox(8);
+        container.setAlignment(Pos.CENTER);
+        container.setPadding(new Insets(20));
+        container.getStyleClass().add("run-configuration-editor-empty-state");
+
+        var title = new LocalizedLabel("railroad.runconfig.details.empty.title");
+        title.getStyleClass().add("run-configuration-editor-empty-state-title");
+
+        var description = new LocalizedLabel("railroad.runconfig.details.empty.description");
+        description.getStyleClass().add("run-configuration-editor-empty-state-description");
+        description.setWrapText(true);
+        description.setMaxWidth(320);
+
+        container.getChildren().addAll(title, description);
+        return container;
+    }
+
+    private SplitPane createEditorSplitPane() {
+        detailContentContainer.getChildren().setAll(detailsEmptyStatePane);
+        var splitPane = new SplitPane(configurationTreeView, detailContentContainer);
+        splitPane.getStyleClass().add("run-configuration-editor-split-pane");
+        splitPane.setDividerPositions(0.3);
+        VBox.setVgrow(splitPane, Priority.ALWAYS);
+        return splitPane;
+    }
+
+    private HBox createTopButtonBar(Project project) {
+        var topButtonBar = new RRHBox(5);
+        topButtonBar.setAlignment(Pos.CENTER_LEFT);
+        topButtonBar.setPadding(new Insets(5));
+        topButtonBar.getStyleClass().add("run-configuration-editor-top-bar");
+
+        var addButton = createTopBarButton(FontAwesomeSolid.PLUS);
+        addButton.setOnAction($ -> {
+            ContextMenu contextMenu = createAddContextMenu(project);
+            contextMenu.show(addButton, Side.BOTTOM, 0, 0);
+        });
+
+        var removeButton = createTopBarButton(FontAwesomeSolid.MINUS);
+        removeButton.setOnAction($ -> {
+            RunConfiguration<?> selectedConfig = selectedConfiguration.get();
+            if (selectedConfig != null) {
+                configurations.remove(selectedConfig);
+                selectedConfiguration.set(configurations.isEmpty() ? null : configurations.getFirst());
+            }
+        });
+        removeButton.disableProperty().bind(selectedConfiguration.isNull());
+
+        var copyButton = createTopBarButton(FontAwesomeSolid.COPY);
+        copyButton.disableProperty().bind(selectedConfiguration.isNull());
+
+        var addFolderButton = createTopBarButton(FontAwesomeSolid.FOLDER_PLUS);
+
+        var renameButton = createTopBarButton(FontAwesomeSolid.PENCIL_ALT);
+        renameButton.disableProperty().bind(selectedConfiguration.isNull());
+
+        topButtonBar.getChildren().addAll(addButton, removeButton, copyButton, addFolderButton, renameButton);
+        return topButtonBar;
+    }
+
+    private static RRButton createTopBarButton(Ikon icon) {
+        var button = new RRButton("", icon);
+        button.setSquare(true);
+        button.setVariant(ButtonVariant.GHOST);
+        button.setButtonSize(ButtonSize.SMALL);
+        button.getStyleClass().add("run-configuration-editor-top-bar-button");
+        return button;
+    }
+
+    private ContextMenu createAddContextMenu(Project project) {
+        var contextMenu = new ContextMenu();
+        for (RunConfigurationType<?> runConfigurationType : RunConfigurationType.REGISTRY.values()) {
+            var graphic = new FontIcon(runConfigurationType.getIcon());
+            graphic.setIconColor(runConfigurationType.getIconColor());
+            graphic.getStyleClass().add("run-configuration-editor-add-menu-icon");
+            String runConfigTypeId = RunConfigurationType.REGISTRY.entries().entrySet().stream()
+                .filter(entry -> entry.getValue() == runConfigurationType)
+                .findFirst()
+                .map(entry -> entry.getKey().toLowerCase(Locale.ROOT))
+                .orElse("unknown");
+            graphic.getStyleClass().add("run-configuration-editor-add-menu-icon-" + runConfigTypeId);
+
+            var menuItem = new MenuItem(L18n.localize(runConfigurationType.getLocalizationKey()), graphic);
+            menuItem.setOnAction(event -> createRunConfiguration(project, runConfigurationType));
+            contextMenu.getItems().add(menuItem);
+        }
+
+        return contextMenu;
+    }
+
+    private void createRunConfiguration(Project project, RunConfigurationType<?> runConfigurationType) {
+        RunConfiguration<?> newConfiguration = runConfigurationType.createDefaultConfiguration(project);
+        configurations.add(newConfiguration);
+        selectedConfiguration.set(newConfiguration);
+    }
+
+    private HBox createBottomButtonBar(Project project) {
+        var bottomButtonBar = new RRHBox(5);
+        bottomButtonBar.setAlignment(Pos.CENTER_RIGHT);
+        bottomButtonBar.setPrefHeight(HBox.USE_COMPUTED_SIZE);
+        bottomButtonBar.setPadding(new Insets(5, 10, 5, 10));
+
+        var okButton = new RRButton("railroad.generic.ok", FontAwesomeSolid.CHECK);
+        okButton.setVariant(ButtonVariant.PRIMARY);
+        okButton.setOnAction(event -> {
+            if (!applySelectedConfigurationChanges())
+                return;
+
+            project.getRunConfigManager().sendUpdatedConfigurations(configurations);
+            getScene().getWindow().hide();
+        });
+
+        var cancelButton = new RRButton("railroad.generic.cancel", FontAwesomeSolid.TIMES);
+        cancelButton.setVariant(ButtonVariant.DANGER);
+        cancelButton.setOnAction(event -> getScene().getWindow().hide());
+
+        var applyButton = new RRButton("railroad.generic.apply", FontAwesomeSolid.CHECK_DOUBLE);
+        applyButton.setVariant(ButtonVariant.SUCCESS);
+        applyButton.setOnAction(event -> {
+            if (!applySelectedConfigurationChanges())
+                return;
+
+            project.getRunConfigManager().sendUpdatedConfigurations(configurations);
+        });
+
+        bottomButtonBar.getChildren().addAll(okButton, cancelButton, applyButton);
+        return bottomButtonBar;
+    }
+
+    public void selectConfiguration(RunConfiguration<?> runConfiguration) {
+        selectedConfiguration.set(runConfiguration);
+    }
+
+    private Node getConfigurationFormNode(RunConfiguration<?> configuration) {
+        ConfigurationFormContext context = configurationFormContexts.get(configuration.uuid());
+        if (context == null) {
+            Form form = configuration.data().createConfigurationForm(project, configuration);
+            Node formNode = form.createUI();
+            VBox.setVgrow(formNode, Priority.ALWAYS);
+            context = new ConfigurationFormContext(form, formNode);
+            configurationFormContexts.put(configuration.uuid(), context);
+        }
+
+        return context.node();
+    }
+
+    private boolean applySelectedConfigurationChanges() {
+        RunConfiguration<?> configuration = selectedConfiguration.get();
+        if (configuration == null)
+            return true;
+
+        ConfigurationFormContext context = configurationFormContexts.get(configuration.uuid());
+        if (context == null)
+            return true;
+
+        Form form = context.form();
+        form.runValidation();
+        if (!form.validate())
+            return false;
+
+        FormData formData = form.getFormData();
+        configuration.data().applyConfigurationFormData(formData);
+        return true;
+    }
+
+    private record ConfigurationFormContext(Form form, Node node) {
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/RunConfigurationListCell.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/RunConfigurationListCell.java
new file mode 100644
index 00000000..ae2115dc
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/RunConfigurationListCell.java
@@ -0,0 +1,103 @@
+package dev.railroadide.railroad.ide.runconfig.ui;
+
+import dev.railroadide.core.ui.RRButton;
+import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.ui.localized.LocalizedTooltip;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.localization.L18n;
+import dev.railroadide.railroad.project.Project;
+import javafx.geometry.Pos;
+import javafx.geometry.Side;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListCell;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+public class RunConfigurationListCell extends ListCell<RunConfiguration<?>> {
+    private final RRHBox container = new RRHBox(6);
+    private final Label nameLabel = new Label();
+    private final RRButton runButton = new RRButton("", FontAwesomeSolid.PLAY);
+    private final RRButton debugButton = new RRButton("", FontAwesomeSolid.BUG);
+    private final RRButton moreActionsButton = new RRButton("", FontAwesomeSolid.ELLIPSIS_V);
+
+    private final Project project;
+
+    public RunConfigurationListCell(Project project) {
+        this.project = project;
+
+        container.setAlignment(Pos.CENTER_LEFT);
+        container.getStyleClass().add("run-config-combobox-item");
+        var spacer = new Region();
+        HBox.setHgrow(spacer, Priority.ALWAYS);
+        container.getChildren().setAll(nameLabel, spacer, runButton, debugButton, moreActionsButton);
+
+        runButton.setTooltip(new LocalizedTooltip("railroad.runconfig.run.tooltip"));
+        runButton.setSquare(true);
+        runButton.setButtonSize(ButtonSize.SMALL);
+        runButton.setVariant(ButtonVariant.GHOST);
+        runButton.getStyleClass().add("run-button");
+        runButton.setFocusTraversable(false);
+        runButton.setOnAction(event -> {
+            RunConfiguration<?> config = getItem();
+            if (config != null) {
+                config.run(project);
+            }
+        });
+
+        debugButton.setTooltip(new LocalizedTooltip("railroad.runconfig.debug.tooltip"));
+        debugButton.setSquare(true);
+        debugButton.setButtonSize(ButtonSize.SMALL);
+        debugButton.setVariant(ButtonVariant.GHOST);
+        debugButton.getStyleClass().add("debug-button");
+        debugButton.setFocusTraversable(false);
+        debugButton.setOnAction(event -> {
+            RunConfiguration<?> config = getItem();
+            if (config != null) {
+                config.debug(project);
+            }
+        });
+
+        moreActionsButton.setTooltip(new LocalizedTooltip("railroad.runconfig.moreactions.tooltip"));
+        moreActionsButton.setSquare(true);
+        moreActionsButton.setButtonSize(ButtonSize.SMALL);
+        moreActionsButton.setVariant(ButtonVariant.GHOST);
+        moreActionsButton.getStyleClass().add("more-actions-button");
+        moreActionsButton.setFocusTraversable(false);
+        moreActionsButton.setOnAction(event -> {
+            RunConfiguration<?> config = getItem();
+            if (config != null) {
+                var menu = config.createContextMenu(project);
+                RunConfigurationContextMenuManager.show(moreActionsButton, menu, Side.BOTTOM);
+            }
+        });
+    }
+
+    @Override
+    protected void updateItem(RunConfiguration item, boolean empty) {
+        super.updateItem(item, empty);
+        if (empty) {
+            setText(null);
+            setGraphic(null);
+            setOnMouseClicked(null);
+            return;
+        }
+
+        if (item == null) {
+            nameLabel.setText(null);
+            setText(L18n.localize("railroad.ide.toolbar.edit_run_configurations"));
+            setGraphic(new FontIcon(FontAwesomeSolid.COG));
+            return;
+        }
+
+        setOnMouseClicked(null);
+        setText(null);
+        nameLabel.setText(item.data().getName());
+        debugButton.setDisable(!item.isDebuggingSupported(project));
+        setGraphic(container);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/RunConfigurationTreeView.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/RunConfigurationTreeView.java
new file mode 100644
index 00000000..db583084
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/RunConfigurationTreeView.java
@@ -0,0 +1,257 @@
+package dev.railroadide.railroad.ide.runconfig.ui;
+
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationType;
+import dev.railroadide.railroad.localization.L18n;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.scene.control.TreeCell;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeView;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+import java.util.*;
+
+/**
+ * Presents run configurations grouped by type and optional folder hierarchy.
+ */
+final class RunConfigurationTreeView extends TreeView<RunConfigurationTreeView.TreeEntry> {
+    private final ObservableList<RunConfiguration<?>> configurations;
+    private final Map<UUID, TreeItem<TreeEntry>> configurationTreeItems = new HashMap<>();
+    private final ObjectProperty<RunConfiguration<?>> selectedConfiguration = new SimpleObjectProperty<>();
+    private boolean updatingSelection;
+    private UUID pendingSelectionId;
+
+    RunConfigurationTreeView(ObservableList<RunConfiguration<?>> configurations) {
+        this.configurations = configurations;
+        setShowRoot(false);
+        getStyleClass().add("run-configuration-tree-view");
+        setCellFactory(tv -> new TreeCell<>() {
+            @Override
+            protected void updateItem(TreeEntry item, boolean empty) {
+                super.updateItem(item, empty);
+                if (empty || item == null) {
+                    setText(null);
+                    setGraphic(null);
+                    return;
+                }
+
+                switch (item) {
+                    case TypeTreeEntry(RunConfigurationType<?> type) -> {
+                        setText(L18n.localize(type.getLocalizationKey()));
+                        setGraphic(createTypeIcon(type));
+                    }
+                    case FolderTreeEntry(String name) -> {
+                        setText(name);
+                        setGraphic(new FontIcon(FontAwesomeSolid.FOLDER));
+                    }
+                    case ConfigurationTreeEntry(RunConfiguration<?> configuration) -> {
+                        setText(getConfigurationDisplayName(configuration));
+                        setGraphic(createTypeIcon(configuration.type()));
+                    }
+                    default -> {
+                        setText(null);
+                        setGraphic(null);
+                    }
+                }
+            }
+        });
+
+        configurations.addListener((ListChangeListener<RunConfiguration<?>>) change -> rebuildTree());
+        getSelectionModel().selectedItemProperty().addListener((obs, oldItem, newItem) -> {
+            if (updatingSelection)
+                return;
+
+            selectedConfiguration.set(extractConfiguration(newItem));
+        });
+
+        selectedConfiguration.addListener((obs, oldValue, newValue) -> handleExternalSelectionChange(newValue));
+
+        rebuildTree();
+    }
+
+    ObjectProperty<RunConfiguration<?>> selectedConfigurationProperty() {
+        return selectedConfiguration;
+    }
+
+    private void rebuildTree() {
+        TreeItem<TreeEntry> root = new TreeItem<>(new FolderTreeEntry("root"));
+        root.setExpanded(true);
+        configurationTreeItems.clear();
+
+        for (RunConfigurationType<?> runConfigurationType : RunConfigurationType.REGISTRY.values()) {
+            var typeItem = new TreeItem<TreeEntry>(new TypeTreeEntry(runConfigurationType));
+            typeItem.setExpanded(true);
+            populateTypeItem(typeItem, runConfigurationType);
+            root.getChildren().add(typeItem);
+        }
+
+        setRoot(root);
+        selectPendingOrCurrentConfiguration();
+    }
+
+    private void populateTypeItem(TreeItem<TreeEntry> typeItem, RunConfigurationType<?> type) {
+        List<RunConfiguration<?>> typeConfigurations = configurations.stream()
+            .filter(configuration -> Objects.equals(configuration.type(), type))
+            .sorted(Comparator.comparing(this::getConfigurationDisplayName, String.CASE_INSENSITIVE_ORDER))
+            .toList();
+
+        Map<String, TreeItem<TreeEntry>> folders = new HashMap<>();
+        folders.put("", typeItem);
+
+        for (RunConfiguration<?> configuration : typeConfigurations) {
+            TreeItem<TreeEntry> parent = typeItem;
+            String folderPath = sanitizeFolderPath(configuration.folderPath());
+            if (!folderPath.isBlank()) {
+                List<String> segments = extractFolderSegments(folderPath);
+                StringBuilder currentPath = new StringBuilder();
+                for (String segment : segments) {
+                    if (!currentPath.isEmpty())
+                        currentPath.append('/');
+                    currentPath.append(segment);
+                    String pathKey = currentPath.toString();
+                    TreeItem<TreeEntry> folderItem = folders.get(pathKey);
+                    if (folderItem == null) {
+                        folderItem = new TreeItem<>(new FolderTreeEntry(segment));
+                        folderItem.setExpanded(true);
+                        parent.getChildren().add(folderItem);
+                        folders.put(pathKey, folderItem);
+                    }
+                    parent = folderItem;
+                }
+            }
+
+            var configurationItem = new TreeItem<TreeEntry>(new ConfigurationTreeEntry(configuration));
+            parent.getChildren().add(configurationItem);
+            configurationTreeItems.put(configuration.uuid(), configurationItem);
+        }
+    }
+
+    private RunConfiguration<?> extractConfiguration(TreeItem<TreeEntry> item) {
+        if (item == null)
+            return null;
+
+        TreeEntry entry = item.getValue();
+        if (entry instanceof ConfigurationTreeEntry(RunConfiguration<?> configuration))
+            return configuration;
+
+        return null;
+    }
+
+    private void handleExternalSelectionChange(RunConfiguration<?> newValue) {
+        if (updatingSelection)
+            return;
+
+        if (newValue == null) {
+            pendingSelectionId = null;
+            clearTreeSelection();
+            return;
+        }
+
+        TreeItem<TreeEntry> treeItem = configurationTreeItems.get(newValue.uuid());
+        if (treeItem != null && hasVisibleRows()) {
+            selectTreeItem(treeItem);
+            pendingSelectionId = null;
+        } else {
+            pendingSelectionId = newValue.uuid();
+        }
+    }
+
+    private void selectPendingOrCurrentConfiguration() {
+        UUID targetId = pendingSelectionId;
+        if (targetId == null && selectedConfiguration.get() != null)
+            targetId = selectedConfiguration.get().uuid();
+
+        if (targetId == null) {
+            clearTreeSelection();
+            return;
+        }
+
+        TreeItem<TreeEntry> treeItem = configurationTreeItems.get(targetId);
+        if (treeItem == null) {
+            pendingSelectionId = targetId;
+            return;
+        }
+
+        if (hasVisibleRows()) {
+            selectTreeItem(treeItem);
+            pendingSelectionId = null;
+        } else {
+            pendingSelectionId = targetId;
+        }
+    }
+
+    private void selectTreeItem(TreeItem<TreeEntry> treeItem) {
+        updatingSelection = true;
+        try {
+            getSelectionModel().select(treeItem);
+            int row = getRow(treeItem);
+            if (row >= 0)
+                scrollTo(row);
+        } finally {
+            updatingSelection = false;
+        }
+    }
+
+    private void clearTreeSelection() {
+        updatingSelection = true;
+        try {
+            getSelectionModel().clearSelection();
+        } finally {
+            updatingSelection = false;
+        }
+    }
+
+    private boolean hasVisibleRows() {
+        return getExpandedItemCount() > 0;
+    }
+
+    private String getConfigurationDisplayName(RunConfiguration<?> configuration) {
+        String name = configuration.data().getName();
+        if (name == null || name.isBlank())
+            return configuration.uuid().toString();
+
+        return name;
+    }
+
+    private String sanitizeFolderPath(String folderPath) {
+        if (folderPath == null)
+            return "";
+
+        return folderPath.trim();
+    }
+
+    private List<String> extractFolderSegments(String folderPath) {
+        var segments = folderPath.split("[/\\\\]");
+        List<String> cleaned = new ArrayList<>();
+        for (String segment : segments) {
+            String trimmed = segment.trim();
+            if (!trimmed.isEmpty())
+                cleaned.add(trimmed);
+        }
+
+        return cleaned;
+    }
+
+    private FontIcon createTypeIcon(RunConfigurationType<?> type) {
+        var icon = new FontIcon(type.getIcon());
+        icon.setIconColor(type.getIconColor());
+        icon.getStyleClass().add("run-configuration-tree-icon");
+        return icon;
+    }
+
+    interface TreeEntry {
+    }
+
+    private record TypeTreeEntry(RunConfigurationType<?> type) implements TreeEntry {
+    }
+
+    private record FolderTreeEntry(String name) implements TreeEntry {
+    }
+
+    private record ConfigurationTreeEntry(RunConfiguration<?> configuration) implements TreeEntry {
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/form/FormRunConfigurationPicker.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/form/FormRunConfigurationPicker.java
new file mode 100644
index 00000000..45d0f9f0
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/form/FormRunConfigurationPicker.java
@@ -0,0 +1,356 @@
+package dev.railroadide.railroad.ide.runconfig.ui.form;
+
+import dev.railroadide.core.form.HasSetValue;
+import dev.railroadide.core.form.ui.InformativeLabeledHBox;
+import dev.railroadide.core.ui.RRButton;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
+import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.ui.RRListView;
+import dev.railroadide.core.ui.RRVBox;
+import dev.railroadide.core.ui.localized.LocalizedLabel;
+import dev.railroadide.core.ui.localized.LocalizedTooltip;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationType;
+import dev.railroadide.railroad.localization.L18n;
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.collections.transformation.FilteredList;
+import javafx.geometry.Pos;
+import javafx.geometry.Side;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.control.MenuItem;
+import javafx.scene.layout.Priority;
+import org.jetbrains.annotations.Nullable;
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+
+import java.util.*;
+import java.util.function.Predicate;
+
+/**
+ * Form field that lets users pick, order, and remove run configurations.
+ */
+public class FormRunConfigurationPicker extends InformativeLabeledHBox<RRVBox> implements HasSetValue {
+    private ObservableList<RunConfiguration<?>> selectedConfigurations;
+    private ReadOnlyObjectWrapper<RunConfiguration<?>[]> value;
+
+    private ObservableList<RunConfiguration<?>> availableConfigurations;
+    private Predicate<RunConfiguration<?>> filter;
+    private FilteredList<RunConfiguration<?>> selectableConfigurations;
+
+    private ContextMenu addMenu;
+    private ListView<RunConfiguration<?>> selectedListView;
+
+    private void ensureStateInitialized() {
+        if (selectedConfigurations == null) {
+            selectedConfigurations = FXCollections.observableArrayList();
+        }
+
+        if (value == null) {
+            value = new ReadOnlyObjectWrapper<>(new RunConfiguration<?>[0]);
+        }
+
+        if (addMenu == null) {
+            addMenu = new ContextMenu();
+        }
+    }
+
+    public FormRunConfigurationPicker(String labelKey,
+                                      boolean required,
+                                      ObservableList<RunConfiguration<?>> availableConfigurations,
+                                      Predicate<RunConfiguration<?>> filter,
+                                      List<RunConfiguration<?>> initialSelection) {
+        super(labelKey, required, Map.of(
+            "availableConfigurations", availableConfigurations,
+            "filter", filter == null ? (Predicate<RunConfiguration<?>>) Objects::nonNull : filter,
+            "initialSelection", initialSelection == null ? List.of() : initialSelection
+        ));
+        ensureStateInitialized();
+
+        selectedConfigurations.addListener((ListChangeListener<? super RunConfiguration<?>>) change -> {
+            updateValue();
+            refreshSelectablePredicate();
+        });
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public RRVBox createPrimaryComponent(Map<String, Object> params) {
+        ensureStateInitialized();
+        this.availableConfigurations = (ObservableList<RunConfiguration<?>>) params.get("availableConfigurations");
+        this.filter = (Predicate<RunConfiguration<?>>) params.get("filter");
+        List<RunConfiguration<?>> initialSelection = (List<RunConfiguration<?>>) params.get("initialSelection");
+
+        this.selectableConfigurations = new FilteredList<>(availableConfigurations);
+
+        selectedListView = new RRListView<>(selectedConfigurations);
+        selectedListView.setPrefHeight(200);
+        selectedListView.setCellFactory(listView -> new ListCell<>() {
+            @Override
+            protected void updateItem(RunConfiguration<?> item, boolean empty) {
+                super.updateItem(item, empty);
+                setText(empty ? null : formatDisplayName(item));
+            }
+        });
+        selectedListView.setPlaceholder(new LocalizedLabel("railroad.runconfig.compound.configuration.configurations.empty"));
+        RRVBox.setVgrow(selectedListView, Priority.ALWAYS);
+
+        var toolbar = new RRHBox(6);
+        toolbar.getStyleClass().add("runconfig-picker-toolbar");
+        toolbar.setAlignment(Pos.CENTER_LEFT);
+
+        RRButton addButton = createToolbarButton(FontAwesomeSolid.PLUS,
+            "railroad.runconfig.compound.configuration.configurations.add",
+            "add");
+        addButton.disableProperty().bind(Bindings.isEmpty(selectableConfigurations));
+        addButton.setOnAction(event -> toggleAddMenu(addButton));
+        toolbar.getChildren().add(addButton);
+
+        RRButton removeButton = createToolbarButton(FontAwesomeSolid.MINUS,
+            "railroad.runconfig.compound.configuration.configurations.remove",
+            "remove");
+        removeButton.disableProperty().bind(selectedListView.getSelectionModel().selectedItemProperty().isNull());
+        removeButton.setOnAction($ -> removeSelectedConfiguration());
+        toolbar.getChildren().add(removeButton);
+
+        RRButton moveUpButton = createToolbarButton(FontAwesomeSolid.ARROW_UP,
+            "railroad.runconfig.compound.configuration.configurations.move_up",
+            "move-up");
+        moveUpButton.disableProperty().bind(selectedListView.getSelectionModel().selectedIndexProperty().lessThanOrEqualTo(0));
+        moveUpButton.setOnAction($ -> moveSelection(-1));
+        toolbar.getChildren().add(moveUpButton);
+
+        RRButton moveDownButton = createToolbarButton(FontAwesomeSolid.ARROW_DOWN,
+            "railroad.runconfig.compound.configuration.configurations.move_down",
+            "move-down");
+        moveDownButton.disableProperty().bind(Bindings.createBooleanBinding(
+            () -> {
+                int selectedIndex = selectedListView.getSelectionModel().getSelectedIndex();
+                return selectedIndex < 0 || selectedIndex >= selectedConfigurations.size() - 1;
+            },
+            selectedListView.getSelectionModel().selectedIndexProperty(),
+            selectedConfigurations
+        ));
+        moveDownButton.setOnAction($ -> moveSelection(1));
+        toolbar.getChildren().add(moveDownButton);
+
+        var container = new RRVBox(8, toolbar, selectedListView);
+
+        availableConfigurations.addListener((ListChangeListener<? super RunConfiguration<?>>) change -> {
+            while (change.next()) {
+                if (change.wasRemoved() || change.wasAdded() || change.wasReplaced() || change.wasPermutated()) {
+                    break;
+                }
+            }
+
+            boolean selectionsChanged = synchronizeSelectionWithAvailable();
+            refreshSelectablePredicate();
+            if (selectionsChanged) {
+                updateValue();
+            }
+        });
+
+        if (initialSelection != null && !initialSelection.isEmpty()) {
+            selectedConfigurations.setAll(initialSelection);
+        } else {
+            refreshSelectablePredicate();
+            updateValue();
+        }
+
+        return container;
+    }
+
+    public ReadOnlyObjectProperty<RunConfiguration<?>[]> valueProperty() {
+        ensureStateInitialized();
+        return value.getReadOnlyProperty();
+    }
+
+    public RunConfiguration<?>[] getValue() {
+        ensureStateInitialized();
+        return value.get() == null ? new RunConfiguration[0] : value.get();
+    }
+
+    public ObservableList<RunConfiguration<?>> getSelectedConfigurations() {
+        ensureStateInitialized();
+        return FXCollections.unmodifiableObservableList(selectedConfigurations);
+    }
+
+    @Override
+    public void setValue(Object value) {
+        ensureStateInitialized();
+        Platform.runLater(() -> {
+            // Should be able to have a switch statement here, but for some reason Java doesn't like it (?)
+            if (value == null) {
+                selectedConfigurations.clear();
+            } else if (value instanceof RunConfiguration<?>[] array) {
+                selectedConfigurations.setAll(Arrays.asList(array));
+            } else if (value instanceof List<?> list) {
+                List<RunConfiguration<?>> sanitized = new ArrayList<>(list.size());
+                for (Object element : list) {
+                    if (element instanceof RunConfiguration<?> rc) {
+                        sanitized.add(rc);
+                    }
+                }
+
+                selectedConfigurations.setAll(sanitized);
+            } else
+                throw new IllegalArgumentException("Unsupported value type: " + value.getClass());
+        });
+    }
+
+    private RRButton createToolbarButton(Ikon icon, String tooltipKey, String styleSuffix) {
+        var button = new RRButton("", icon);
+        button.setVariant(ButtonVariant.GHOST);
+        button.setButtonSize(ButtonSize.SMALL);
+        button.setSquare(true);
+        button.setAccessibleText(L18n.localize(tooltipKey));
+        button.setTooltip(new LocalizedTooltip(tooltipKey));
+        button.getStyleClass().addAll("runconfig-picker-button", "runconfig-picker-button-" + styleSuffix);
+        return button;
+    }
+
+    private void toggleAddMenu(RRButton anchor) {
+        ensureStateInitialized();
+        if (addMenu == null) {
+            addMenu = new ContextMenu();
+        }
+
+        refreshAddMenuItems();
+        if (addMenu.getItems().isEmpty()) {
+            return;
+        }
+
+        if (addMenu.isShowing()) {
+            addMenu.hide();
+        } else {
+            addMenu.show(anchor, Side.BOTTOM, 0, 0);
+        }
+    }
+
+    private void refreshAddMenuItems() {
+        addMenu.getItems().clear();
+        if (selectableConfigurations == null)
+            return;
+
+        for (RunConfiguration<?> configuration : selectableConfigurations) {
+            var menuItem = new MenuItem(formatDisplayName(configuration));
+            menuItem.setOnAction($ -> addSelectedConfiguration(configuration));
+            addMenu.getItems().add(menuItem);
+        }
+
+        if (addMenu.getItems().isEmpty()) {
+            var emptyItem = new MenuItem(L18n.localize("railroad.runconfig.compound.configuration.configurations.empty"));
+            emptyItem.setDisable(true);
+            addMenu.getItems().add(emptyItem);
+        }
+    }
+
+    private void addSelectedConfiguration(RunConfiguration<?> toAdd) {
+        ensureStateInitialized();
+        if (toAdd != null && selectedConfigurations.stream().noneMatch(config -> config.uuid().equals(toAdd.uuid()))) {
+            selectedConfigurations.add(toAdd);
+        }
+
+        if (addMenu != null && addMenu.isShowing()) {
+            addMenu.hide();
+        }
+    }
+
+    private void removeSelectedConfiguration() {
+        ensureStateInitialized();
+        RunConfiguration<?> selected = selectedListView.getSelectionModel().getSelectedItem();
+        if (selected != null) {
+            selectedConfigurations.remove(selected);
+        }
+    }
+
+    private void moveSelection(int delta) {
+        ensureStateInitialized();
+        int index = selectedListView.getSelectionModel().getSelectedIndex();
+        if (index < 0)
+            return;
+
+        int target = index + delta;
+        if (target < 0 || target >= selectedConfigurations.size())
+            return;
+
+        Collections.swap(selectedConfigurations, index, target);
+        selectedListView.getSelectionModel().select(target);
+    }
+
+    private void refreshSelectablePredicate() {
+        ensureStateInitialized();
+        selectableConfigurations.setPredicate(configuration ->
+            configuration != null &&
+                filter.test(configuration) &&
+                selectedConfigurations.stream().noneMatch(selected -> selected.uuid().equals(configuration.uuid())));
+    }
+
+    private boolean synchronizeSelectionWithAvailable() {
+        ensureStateInitialized();
+        if (availableConfigurations == null || availableConfigurations.isEmpty()) {
+            if (selectedConfigurations.isEmpty())
+                return false;
+
+            selectedConfigurations.clear();
+            return true;
+        }
+
+        if (selectedConfigurations.isEmpty())
+            return false;
+
+        Map<UUID, RunConfiguration<?>> availableById = new HashMap<>();
+        for (RunConfiguration<?> available : availableConfigurations) {
+            if (available != null) {
+                availableById.put(available.uuid(), available);
+            }
+        }
+
+        boolean changed = false;
+        for (int i = selectedConfigurations.size() - 1; i >= 0; i--) {
+            RunConfiguration<?> selected = selectedConfigurations.get(i);
+            if (selected == null) {
+                selectedConfigurations.remove(i);
+                changed = true;
+                continue;
+            }
+
+            RunConfiguration<?> replacement = availableById.get(selected.uuid());
+            if (replacement == null) {
+                selectedConfigurations.remove(i);
+                changed = true;
+            } else if (replacement != selected) {
+                selectedConfigurations.set(i, replacement);
+                changed = true;
+            }
+        }
+
+        return changed;
+    }
+
+    private void updateValue() {
+        ensureStateInitialized();
+        value.set(selectedConfigurations.toArray(new RunConfiguration[0]));
+    }
+
+    private static String formatDisplayName(@Nullable RunConfiguration<?> configuration) {
+        if (configuration == null)
+            return "";
+
+        RunConfigurationType<?> type = configuration.type();
+        String typeName = type == null ? "" : L18n.localize(type.getLocalizationKey());
+        if (typeName == null || typeName.isBlank())
+            return configuration.data().getName();
+
+        return L18n.localize("railroad.runconfig.compound.configuration.configurations.entry_format",
+            configuration.data().getName(), typeName);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/form/RunConfigurationPickerComponent.java b/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/form/RunConfigurationPickerComponent.java
new file mode 100644
index 00000000..c6850de7
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/runconfig/ui/form/RunConfigurationPickerComponent.java
@@ -0,0 +1,198 @@
+package dev.railroadide.railroad.ide.runconfig.ui.form;
+
+import dev.railroadide.core.form.*;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Form component wrapping {@link FormRunConfigurationPicker}.
+ */
+public class RunConfigurationPickerComponent extends FormComponent<FormRunConfigurationPicker, RunConfigurationPickerComponent.Data, FormRunConfigurationPicker, RunConfiguration<?>[]> {
+    private final Supplier<List<RunConfiguration<?>>> initialSelectionSupplier;
+
+    public RunConfigurationPickerComponent(String dataKey,
+                                           Data data,
+                                           FormComponentValidator<FormRunConfigurationPicker> validator,
+                                           FormComponentChangeListener<FormRunConfigurationPicker, RunConfiguration<?>[]> listener,
+                                           BooleanBinding visible) {
+        super(dataKey,
+            data,
+            currentData -> new FormRunConfigurationPicker(
+                currentData.labelKey,
+                currentData.required,
+                currentData.availableConfigurations,
+                currentData.filter,
+                currentData.initialSelectionSupplier.get()),
+            validator,
+            listener,
+            List.of(),
+            visible);
+        this.initialSelectionSupplier = data.initialSelectionSupplier;
+    }
+
+    @Override
+    public ObservableValue<FormRunConfigurationPicker> getValidationNode() {
+        return componentProperty();
+    }
+
+    @Override
+    protected void applyListener(FormComponentChangeListener<FormRunConfigurationPicker, RunConfiguration<?>[]> listener) {
+        AtomicReference<ChangeListener<RunConfiguration<?>[]>> listenerRef = new AtomicReference<>();
+        componentProperty().addListener((observable, oldValue, newValue) -> {
+            if (oldValue != null && listenerRef.get() != null) {
+                oldValue.valueProperty().removeListener(listenerRef.get());
+            }
+
+            if (newValue != null) {
+                ChangeListener<RunConfiguration<?>[]> changeListener = (obs, oldArr, newArr) ->
+                    listener.changed(newValue, obs, oldArr, newArr);
+                listenerRef.set(changeListener);
+                newValue.valueProperty().addListener(changeListener);
+            }
+        });
+    }
+
+    @Override
+    protected void bindToFormData(FormData formData) {
+        componentProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue != null) {
+                registerBinding(newValue, formData);
+            }
+        });
+
+        if (componentProperty().get() != null) {
+            registerBinding(componentProperty().get(), formData);
+        }
+    }
+
+    @Override
+    public void reset() {
+        FormRunConfigurationPicker picker = componentProperty().get();
+        if (picker != null) {
+            List<RunConfiguration<?>> defaults = initialSelectionSupplier.get();
+            picker.setValue(defaults == null ? new RunConfiguration<?>[0] : defaults.toArray(new RunConfiguration[0]));
+        }
+    }
+
+    private void registerBinding(FormRunConfigurationPicker picker, FormData formData) {
+        picker.valueProperty().addListener((observable, oldValue, newValue) ->
+            formData.add(dataKey, newValue == null ? new RunConfiguration[0] : newValue));
+        formData.add(dataKey, picker.getValue());
+    }
+
+    public static Builder builder(String dataKey) {
+        return new Builder(dataKey);
+    }
+
+    public static class Builder implements FormComponentBuilder<RunConfigurationPickerComponent, FormRunConfigurationPicker, RunConfiguration<?>[], Builder> {
+        private final String dataKey;
+        private final Data data = new Data();
+        private FormComponentValidator<FormRunConfigurationPicker> validator;
+        private FormComponentChangeListener<FormRunConfigurationPicker, RunConfiguration<?>[]> listener;
+        private BooleanBinding visible;
+
+        private Builder(String dataKey) {
+            this.dataKey = Objects.requireNonNull(dataKey);
+            data.initialSelectionSupplier = ArrayList::new;
+            data.filter = Objects::nonNull;
+            data.required = true;
+        }
+
+        public Builder labelKey(String labelKey) {
+            data.labelKey = labelKey;
+            return this;
+        }
+
+        public Builder required(boolean required) {
+            data.required = required;
+            return this;
+        }
+
+        public Builder availableConfigurations(ObservableList<RunConfiguration<?>> configurations) {
+            data.availableConfigurations = configurations;
+            return this;
+        }
+
+        public Builder filter(Predicate<RunConfiguration<?>> predicate) {
+            data.filter = predicate;
+            return this;
+        }
+
+        public Builder initialSelectionSupplier(Supplier<List<RunConfiguration<?>>> supplier) {
+            data.initialSelectionSupplier = supplier;
+            return this;
+        }
+
+        @Override
+        public Builder validator(FormComponentValidator<FormRunConfigurationPicker> validator) {
+            this.validator = validator;
+            return this;
+        }
+
+        @Override
+        public Builder listener(FormComponentChangeListener<FormRunConfigurationPicker, RunConfiguration<?>[]> listener) {
+            this.listener = listener;
+            return this;
+        }
+
+        @Override
+        public <X> Builder addTransformer(ObservableValue<FormRunConfigurationPicker> fromComponent, Consumer<X> toComponentFunction, Function<RunConfiguration<?>[], X> valueMapper) {
+            throw new UnsupportedOperationException("Transformers are not supported for RunConfigurationPickerComponent.");
+        }
+
+        @Override
+        public <U extends Node, X> Builder addTransformer(ObservableValue<FormRunConfigurationPicker> fromComponent, ObservableValue<U> toComponent, Function<RunConfiguration<?>[], X> valueMapper) {
+            throw new UnsupportedOperationException("Transformers are not supported for RunConfigurationPickerComponent.");
+        }
+
+        @Override
+        public Builder visible(BooleanBinding visible) {
+            this.visible = visible;
+            return this;
+        }
+
+        @Override
+        public String dataKey() {
+            return dataKey;
+        }
+
+        @Override
+        public RunConfigurationPickerComponent build() {
+            if (data.availableConfigurations == null)
+                throw new IllegalStateException("availableConfigurations must be set");
+
+            if (data.labelKey == null)
+                throw new IllegalStateException("labelKey must be set");
+
+            FormComponentValidator<FormRunConfigurationPicker> validatorToUse = validator != null ? validator : picker -> {
+                if (data.required && picker.getSelectedConfigurations().isEmpty())
+                    return ValidationResult.error("railroad.runconfig.compound.configuration.configurations.validation.required");
+
+                return ValidationResult.ok();
+            };
+
+            return new RunConfigurationPickerComponent(dataKey, data, validatorToUse, listener, visible);
+        }
+    }
+
+    public static class Data {
+        private String labelKey;
+        private boolean required;
+        private ObservableList<RunConfiguration<?>> availableConfigurations;
+        private Predicate<RunConfiguration<?>> filter;
+        private Supplier<List<RunConfiguration<?>>> initialSelectionSupplier;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/signature/JdtSignatureHelpProvider.java b/src/main/java/dev/railroadide/railroad/ide/signature/JdtSignatureHelpProvider.java
new file mode 100644
index 00000000..45d7f973
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/signature/JdtSignatureHelpProvider.java
@@ -0,0 +1,239 @@
+package dev.railroadide.railroad.ide.signature;
+
+import dev.railroadide.railroad.ide.completion.JdtCompletionProvider;
+import org.eclipse.jdt.core.dom.*;
+import org.jetbrains.annotations.Nullable;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Signature help provider backed by Eclipse JDT. Responsible solely for
+ * analysing the document and producing {@link SignatureHelp} records; UI logic
+ * remains in the editor.
+ */
+public record JdtSignatureHelpProvider(Path filePath, String[] systemModulePaths) implements SignatureHelpProvider {
+    @Override
+    public @Nullable SignatureHelp compute(String document, int caretPosition) {
+        if (document == null || document.isEmpty() || caretPosition < 0)
+            return null;
+
+        ASTParser parser = ASTParser.newParser(AST.JLS21); // TODO: Detect version from project settings
+        parser.setSource(document.toCharArray());
+        parser.setKind(ASTParser.K_COMPILATION_UNIT);
+        parser.setResolveBindings(true);
+        parser.setBindingsRecovery(true);
+        parser.setStatementsRecovery(true);
+        parser.setUnitName(filePath.getFileName().toString());
+        parser.setEnvironment(systemModulePaths, null, null, false);
+
+        CompilationUnit unit = (CompilationUnit) parser.createAST(null);
+        int searchAt = Math.max(0, Math.min(Math.max(document.length() - 1, 0), caretPosition > 0 ? caretPosition - 1 : 0));
+        var finder = new NodeFinder(unit, searchAt, 0);
+        ASTNode node = finder.getCoveringNode();
+
+        while (node != null) {
+            SignatureHelp result = switch (node) {
+                case MethodInvocation invocation ->
+                    buildSignatureHelpForMethodInvocation(invocation, caretPosition, document);
+                case ClassInstanceCreation creation ->
+                    buildSignatureHelpForClassInstanceCreation(creation, caretPosition, document);
+                case SuperMethodInvocation invocation ->
+                    buildSignatureHelpForSuperMethodInvocation(invocation, caretPosition, document);
+                case ConstructorInvocation invocation ->
+                    buildSignatureHelpForConstructorInvocation(invocation, caretPosition, document);
+                case SuperConstructorInvocation invocation ->
+                    buildSignatureHelpForSuperConstructorInvocation(invocation, caretPosition, document);
+                default -> null;
+            };
+
+            if (result != null)
+                return result;
+
+            node = node.getParent();
+        }
+
+        return null;
+    }
+
+    private @Nullable SignatureHelp buildSignatureHelpForMethodInvocation(
+        MethodInvocation invocation,
+        int caretPosition,
+        String text
+    ) {
+        if (isInvalidBounds(caretPosition, findParenthesisBounds(invocation, text)))
+            return null;
+
+        IMethodBinding binding = invocation.resolveMethodBinding();
+        if (binding == null)
+            return null;
+
+        int argumentIndex = computeArgumentIndex(invocation.arguments(), caretPosition);
+        return createSignatureHelp(binding, argumentIndex);
+    }
+
+    private @Nullable SignatureHelp buildSignatureHelpForSuperMethodInvocation(
+        SuperMethodInvocation invocation,
+        int caretPosition,
+        String text
+    ) {
+        if (isInvalidBounds(caretPosition, findParenthesisBounds(invocation, text)))
+            return null;
+
+        IMethodBinding binding = invocation.resolveMethodBinding();
+        if (binding == null)
+            return null;
+
+        int argumentIndex = computeArgumentIndex(invocation.arguments(), caretPosition);
+        return createSignatureHelp(binding, argumentIndex);
+    }
+
+    private @Nullable SignatureHelp buildSignatureHelpForClassInstanceCreation(
+        ClassInstanceCreation creation,
+        int caretPosition,
+        String text
+    ) {
+        if (isInvalidBounds(caretPosition, findParenthesisBounds(creation, text)))
+            return null;
+
+        IMethodBinding binding = creation.resolveConstructorBinding();
+        if (binding == null)
+            return null;
+
+        int argumentIndex = computeArgumentIndex(creation.arguments(), caretPosition);
+        return createSignatureHelp(binding, argumentIndex);
+    }
+
+    private @Nullable SignatureHelp buildSignatureHelpForConstructorInvocation(
+        ConstructorInvocation invocation,
+        int caretPosition,
+        String text
+    ) {
+        if (isInvalidBounds(caretPosition, findParenthesisBounds(invocation, text)))
+            return null;
+
+        IMethodBinding binding = invocation.resolveConstructorBinding();
+        if (binding == null)
+            return null;
+
+        int argumentIndex = computeArgumentIndex(invocation.arguments(), caretPosition);
+        return createSignatureHelp(binding, argumentIndex);
+    }
+
+    private @Nullable SignatureHelp buildSignatureHelpForSuperConstructorInvocation(
+        SuperConstructorInvocation invocation,
+        int caretPosition,
+        String text
+    ) {
+        if (isInvalidBounds(caretPosition, findParenthesisBounds(invocation, text)))
+            return null;
+
+        IMethodBinding binding = invocation.resolveConstructorBinding();
+        if (binding == null)
+            return null;
+
+        int argumentIndex = computeArgumentIndex(invocation.arguments(), caretPosition);
+        return createSignatureHelp(binding, argumentIndex);
+    }
+
+    private boolean isInvalidBounds(int caretPosition, int[] bounds) {
+        int open = bounds[0];
+        int close = bounds[1];
+        if (open == -1 || caretPosition < open + 1)
+            return true;
+
+        return close != -1 && caretPosition > close;
+    }
+
+    private int[] findParenthesisBounds(ASTNode node, String text) {
+        int start = node.getStartPosition();
+        int length = Math.max(0, node.getLength());
+        int end = Math.min(text.length(), start + length);
+        if (start < 0 || start >= text.length())
+            return new int[]{-1, -1};
+
+        String snippet = text.substring(start, end);
+        int openOffset = snippet.indexOf('(');
+        if (openOffset < 0)
+            return new int[]{-1, -1};
+
+        int closeOffset = snippet.lastIndexOf(')');
+        int open = start + openOffset;
+        int close = closeOffset >= 0 ? start + closeOffset : -1;
+        return new int[]{open, close};
+    }
+
+    private int computeArgumentIndex(List<?> arguments, int caretPosition) {
+        if (arguments == null || arguments.isEmpty())
+            return 0;
+
+        for (int i = 0; i < arguments.size(); i++) {
+            Object obj = arguments.get(i);
+            if (obj instanceof ASTNode arg) {
+                int start = arg.getStartPosition();
+                int end = start + Math.max(0, arg.getLength());
+                if (caretPosition <= start || caretPosition <= end)
+                    return i;
+            }
+        }
+
+        return arguments.size();
+    }
+
+    private SignatureHelp createSignatureHelp(IMethodBinding binding, int requestedIndex) {
+        ITypeBinding declaring = binding.getDeclaringClass();
+        String ownerQualified = declaring != null ? JdtCompletionProvider.renderType(declaring) : "";
+        String ownerDisplay = declaring != null ? simpleName(ownerQualified) : "";
+        String methodName = binding.isConstructor() ? ownerDisplay : binding.getName();
+
+        ITypeBinding[] parameterTypes = binding.getParameterTypes();
+        List<SignatureHelp.ParameterInfo> parameters = new ArrayList<>(parameterTypes.length);
+        for (int i = 0; i < parameterTypes.length; i++) {
+            ITypeBinding parameterType = parameterTypes[i];
+            String typeLabel = JdtCompletionProvider.renderType(parameterType);
+            boolean varargs = binding.isVarargs() && i == parameterTypes.length - 1;
+            if (varargs && typeLabel.endsWith("[]")) {
+                typeLabel = typeLabel.substring(0, typeLabel.length() - 2) + "...";
+            }
+
+            String name = "arg" + i;
+            parameters.add(new SignatureHelp.ParameterInfo(typeLabel, name, varargs));
+        }
+
+        int activeIndex = computeActiveParameter(requestedIndex, parameters.size(), binding.isVarargs());
+        String returnType = binding.isConstructor() ? ownerQualified : JdtCompletionProvider.renderType(binding.getReturnType());
+
+        return new SignatureHelp(
+            ownerQualified,
+            ownerDisplay.isBlank() ? ownerQualified : ownerDisplay,
+            methodName,
+            parameters,
+            activeIndex,
+            binding.isConstructor(),
+            returnType,
+            binding.isVarargs()
+        );
+    }
+
+    private int computeActiveParameter(int requestedIndex, int parameterCount, boolean varargs) {
+        if (parameterCount == 0)
+            return -1;
+
+        if (requestedIndex < parameterCount)
+            return Math.max(0, requestedIndex);
+
+        return varargs ? parameterCount - 1 : parameterCount - 1;
+    }
+
+    private String simpleName(String qualified) {
+        if (qualified == null || qualified.isBlank())
+            return "";
+
+        int lastDot = qualified.lastIndexOf('.');
+        if (lastDot == -1)
+            return qualified;
+
+        return qualified.substring(lastDot + 1);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/signature/SignatureHelp.java b/src/main/java/dev/railroadide/railroad/ide/signature/SignatureHelp.java
new file mode 100644
index 00000000..5756479d
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/signature/SignatureHelp.java
@@ -0,0 +1,24 @@
+package dev.railroadide.railroad.ide.signature;
+
+import java.util.List;
+
+/**
+ * Immutable snapshot describing a method or constructor signature along with
+ * information about the active parameter at the caret.
+ */
+public record SignatureHelp(
+    String ownerQualified,
+    String ownerDisplay,
+    String methodName,
+    List<ParameterInfo> parameters,
+    int activeParameter,
+    boolean constructor,
+    String returnType,
+    boolean varargs
+) {
+    /**
+     * Immutable descriptor for a single parameter in a signature.
+     */
+    public record ParameterInfo(String type, String name, boolean varargs) {
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/signature/SignatureHelpProvider.java b/src/main/java/dev/railroadide/railroad/ide/signature/SignatureHelpProvider.java
new file mode 100644
index 00000000..c26766e1
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/signature/SignatureHelpProvider.java
@@ -0,0 +1,19 @@
+package dev.railroadide.railroad.ide.signature;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Computes signature metadata for the given caret position. Implementations may
+ * choose their own parsing backend.
+ */
+public interface SignatureHelpProvider {
+    /**
+     * Computes signature help for the supplied document snapshot.
+     *
+     * @param document      full document text
+     * @param caretPosition zero-based caret offset
+     * @return a {@link SignatureHelp} instance describing the active invocation, or {@code null} if none
+     */
+    @Nullable
+    SignatureHelp compute(String document, int caretPosition);
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/ui/IDEWelcomePane.java b/src/main/java/dev/railroadide/railroad/ide/ui/IDEWelcomePane.java
index 3756ed0a..29fbff8e 100644
--- a/src/main/java/dev/railroadide/railroad/ide/ui/IDEWelcomePane.java
+++ b/src/main/java/dev/railroadide/railroad/ide/ui/IDEWelcomePane.java
@@ -5,6 +5,7 @@
 import dev.railroadide.core.ui.RRHBox;
 import dev.railroadide.core.ui.RRVBox;
 import dev.railroadide.core.ui.localized.LocalizedText;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import dev.railroadide.core.utility.DesktopUtils;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -139,14 +140,14 @@ private RRCard createGettingStartedCard() {
         buttonsContainer.setSpacing(12);
 
         var wikiButton = new RRButton("railroad.ide.welcome.getting_started.wiki", FontAwesomeSolid.BOOK);
-        wikiButton.setVariant(RRButton.ButtonVariant.PRIMARY);
+        wikiButton.setVariant(ButtonVariant.PRIMARY);
         wikiButton.setOnAction(event -> {
             event.consume();
             DesktopUtils.openUrl("https://railroadide.dev");
         });
 
         var tutorialsButton = new RRButton("railroad.ide.welcome.getting_started.tutorials", FontAwesomeSolid.GRADUATION_CAP);
-        tutorialsButton.setVariant(RRButton.ButtonVariant.SECONDARY);
+        tutorialsButton.setVariant(ButtonVariant.SECONDARY);
         tutorialsButton.setOnAction(event -> {
             event.consume();
             DesktopUtils.openUrl("https://railroadide.dev/tutorials");
@@ -154,7 +155,7 @@ private RRCard createGettingStartedCard() {
 
         var discordButton = new RRButton("", FontAwesomeBrands.DISCORD);
         discordButton.setText("Discord");
-        discordButton.setVariant(RRButton.ButtonVariant.GHOST);
+        discordButton.setVariant(ButtonVariant.GHOST);
         discordButton.setOnAction(event -> {
             event.consume();
             DesktopUtils.openUrl("https://discord.turtywurty.dev/");
diff --git a/src/main/java/dev/railroadide/railroad/ide/ui/JavaCodeEditorPane.java b/src/main/java/dev/railroadide/railroad/ide/ui/JavaCodeEditorPane.java
index f5d53467..158247a4 100644
--- a/src/main/java/dev/railroadide/railroad/ide/ui/JavaCodeEditorPane.java
+++ b/src/main/java/dev/railroadide/railroad/ide/ui/JavaCodeEditorPane.java
@@ -2,9 +2,17 @@
 
 import dev.railroadide.core.ui.RRListView;
 import dev.railroadide.railroad.Railroad;
-import dev.railroadide.railroad.ide.classparser.stub.ClassStub;
-import dev.railroadide.railroad.ide.indexing.Autocomplete;
-import dev.railroadide.railroad.ide.indexing.Indexes;
+import dev.railroadide.railroad.ide.completion.CompletionItem;
+import dev.railroadide.railroad.ide.completion.CompletionProvider;
+import dev.railroadide.railroad.ide.completion.CompletionResult;
+import dev.railroadide.railroad.ide.completion.JdtCompletionProvider;
+import dev.railroadide.railroad.ide.diagnostics.DiagnosticsProvider;
+import dev.railroadide.railroad.ide.diagnostics.EditorDiagnostic;
+import dev.railroadide.railroad.ide.diagnostics.JdtDiagnosticsProvider;
+import dev.railroadide.railroad.ide.signature.JdtSignatureHelpProvider;
+import dev.railroadide.railroad.ide.signature.SignatureHelp;
+import dev.railroadide.railroad.ide.signature.SignatureHelp.ParameterInfo;
+import dev.railroadide.railroad.ide.signature.SignatureHelpProvider;
 import dev.railroadide.railroad.ide.syntaxhighlighting.TreeSitterJavaSyntaxHighlighting;
 import dev.railroadide.railroad.project.Project;
 import dev.railroadide.railroad.utility.ShutdownHooks;
@@ -12,603 +20,735 @@
 import io.github.palexdev.mfxresources.fonts.fontawesome.FontAwesomeSolid;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
-import javafx.collections.FXCollections;
-import javafx.collections.MapChangeListener;
-import javafx.collections.ObservableMap;
-import javafx.concurrent.Task;
 import javafx.geometry.Bounds;
 import javafx.geometry.Point2D;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
+import javafx.scene.control.ListCell;
 import javafx.scene.control.Tooltip;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.ColumnConstraints;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
+import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
+import javafx.scene.text.TextFlow;
 import javafx.stage.Popup;
-import javafx.util.Pair;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.core.dom.*;
 import org.fxmisc.richtext.event.MouseOverTextEvent;
+import org.fxmisc.richtext.model.PlainTextChange;
 import org.fxmisc.richtext.model.StyleSpans;
-import org.jetbrains.annotations.Nullable;
 
 import javax.tools.Diagnostic;
-import javax.tools.DiagnosticCollector;
-import javax.tools.JavaFileObject;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.IntFunction;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class JavaCodeEditorPane extends TextEditorPane {
-    private final ExecutorService executor0 = Executors.newFixedThreadPool(2);
-    private final ObservableMap<Diagnostic<? extends JavaFileObject>, Popup> errors = FXCollections.observableHashMap();
-    private final Map<Integer, Diagnostic.Kind> lineToSeverity = new HashMap<>();
+    private static final Duration HIGHLIGHT_DEBOUNCE = Duration.ofMillis(120);
+    private static final Duration DIAGNOSTIC_DEBOUNCE = Duration.ofMillis(300);
 
-    private final List<ClassStub> stubs = Indexes.scanStandardLibrary();
-    private final Autocomplete autocomplete = new Autocomplete(stubs);
-    private final AtomicReference<Popup> autoCompletePopup = new AtomicReference<>(null);
-    private final List<String> fullSuggestions = new ArrayList<>();
-    private int dotPosition = -1;
-    private ChangeListener<String> textListener;
+    private static final Map<Character, Character> OPENING_BRACKETS = Map.of('(', ')', '{', '}', '[', ']');
+    private static final Map<Character, Character> CLOSING_BRACKETS = Map.of(')', '(', '}', '{', ']', '[');
+
+    private static final String[] SYSTEM_MODULE_PATHS = resolveSystemModules();
+
+    private final ExecutorService worker = Executors.newFixedThreadPool(
+        Math.max(2, Runtime.getRuntime().availableProcessors() / 2),
+        namedThreadFactory("railroad-java-editor-"));
 
     private final Project project;
 
-    public JavaCodeEditorPane(Project project, Path item) {
-        super(item);
+    private final AtomicInteger highlightGeneration = new AtomicInteger();
+    private final AtomicInteger diagnosticsGeneration = new AtomicInteger();
+    private final AtomicInteger completionGeneration = new AtomicInteger();
 
-        this.project = project;
+    private volatile StyleSpans<Collection<String>> lastHighlight =
+        TreeSitterJavaSyntaxHighlighting.computeHighlighting("");
+    private volatile List<EditorDiagnostic> visibleDiagnostics = List.of();
+    private final Map<Integer, Diagnostic.Kind> lineSeverity = new ConcurrentHashMap<>();
 
-        marginErrors();
+    private final Popup diagnosticPopup = new Popup();
+    private final AtomicReference<Popup> activeCompletionPopup = new AtomicReference<>(null);
+    private final AtomicReference<RRListView<CompletionItem>> activeCompletionList = new AtomicReference<>(null);
+    private ChangeListener<String> completionFilterListener;
+    private final List<CompletionItem> completionCandidates = new ArrayList<>();
+    private volatile int completionDotIndex = -1;
 
-        syntaxHighlight();
-        errorHighlighting();
-        codeCompletion();
-        highlightBracketPairs();
+    private final CompletionProvider completionProvider;
+    private final Popup signaturePopup = new Popup();
+    private final TextFlow signatureTextFlow = new TextFlow();
+    private final AtomicInteger signatureGeneration = new AtomicInteger();
+    private final AtomicReference<SignatureHelp> activeSignatureHelp = new AtomicReference<>(null);
+    private final DiagnosticsProvider diagnosticsProvider;
+    private final SignatureHelpProvider signatureHelpProvider;
 
-        ShutdownHooks.addHook(executor0::shutdown);
-    }
+    private int[] bracketHighlightRange;
 
-    private void highlightBracketPairs() {
-        caretPositionProperty().addListener((observable, oldValue, newValue) -> {
-            String text = getText();
-            if (text.isBlank() || newValue < 0 || newValue > text.length())
-                return;
+    public JavaCodeEditorPane(Project project, Path item) {
+        super(item);
+        this.project = Objects.requireNonNull(project, "project");
+        this.completionProvider = new JdtCompletionProvider(filePath, SYSTEM_MODULE_PATHS);
+        this.diagnosticsProvider = new JdtDiagnosticsProvider(filePath);
+        this.signatureHelpProvider = new JdtSignatureHelpProvider(filePath, SYSTEM_MODULE_PATHS);
+
+        diagnosticPopup.setAutoHide(true);
+        signaturePopup.setAutoHide(false);
+        signaturePopup.setAutoFix(true);
+        signaturePopup.setHideOnEscape(true);
+        signatureTextFlow.getStyleClass().add("signature-help-text");
+        var signaturePopupContainer = new StackPane();
+        signaturePopupContainer.getStyleClass().add("signature-help-container");
+        signaturePopupContainer.getChildren().add(signatureTextFlow);
+        signaturePopup.getContent().add(signaturePopupContainer);
+
+        configureParagraphGraphics();
+        installSyntaxHighlighting();
+        installDiagnostics();
+        installCompletion();
+        installSignatureHelp();
+        installBracketHighlighting();
+        installDiagnosticPopupHandlers();
+
+        ShutdownHooks.addHook(worker::shutdownNow);
+    }
 
-            Map<Character, Character> bracketPairs = Map.of(
-                '(', ')',
-                '{', '}',
-                '[', ']',
-                ')', '(',
-                '}', '{',
-                ']', '['
-            );
+    private void installSignatureHelp() {
+        caretPositionProperty().addListener((obs, oldPos, newPos) -> requestSignatureHelp());
 
-            char currentChar = newValue < text.length() ? text.charAt(newValue) : '\0';
-            if (!bracketPairs.containsKey(currentChar) && newValue > 0) {
-                currentChar = text.charAt(newValue - 1);
-                newValue--;
-            }
+        plainTextChanges()
+            .successionEnds(Duration.ofMillis(120))
+            .subscribe(change -> requestSignatureHelp());
 
-            if (!bracketPairs.containsKey(currentChar)) {
-                clearBracketHighlights();
-                return;
+        focusedProperty().addListener((obs, oldValue, newValue) -> {
+            if (!newValue) {
+                hideSignatureHelp();
             }
+        });
+    }
 
-            boolean forward = (currentChar == '(' || currentChar == '{' || currentChar == '[');
+    private void requestSignatureHelp() {
+        String snapshot = getText();
+        int caret = getCaretPosition();
+        int generation = signatureGeneration.incrementAndGet();
 
-            highlightMatchingBracket(text, newValue, currentChar, bracketPairs.get(currentChar), forward);
-        });
+        CompletableFuture.supplyAsync(() -> signatureHelpProvider.compute(snapshot, caret), worker)
+            .thenAccept(help -> Platform.runLater(() -> applySignatureHelp(generation, help)))
+            .exceptionally(throwable -> {
+                Railroad.LOGGER.error("Failed to compute signature help", throwable);
+                return null;
+            });
     }
 
-    private void highlightMatchingBracket(String text, int position, char currentChar, char matchingBracket, boolean lookForward) {
-        int matchPos = findMatchingBracketPosition(text, position, currentChar, matchingBracket, lookForward);
-        clearBracketHighlights();
+    private void applySignatureHelp(int generation, SignatureHelp help) {
+        if (signatureGeneration.get() != generation)
+            return;
 
-        if (matchPos != -1) {
-            setStyleClass(position, position + 1, "bracket-highlight");
-            setStyleClass(matchPos, matchPos + 1, "bracket-highlight");
+        if (help == null) {
+            hideSignatureHelp();
+            return;
         }
-    }
 
-    private int findMatchingBracketPosition(String text, int pos, char open, char close, boolean forward) {
-        int balance = 0;
-        int length = text.length();
+        SignatureHelp previous = activeSignatureHelp.get();
+        if (previous != null && previous.equals(help)) {
+            positionSignaturePopup();
+            return;
+        }
 
-        if (forward) {
-            for (int index = pos; index < length; index++) {
-                char c = text.charAt(index);
-                if (c == open)
-                    balance++;
-                else if (c == close)
-                    balance--;
+        activeSignatureHelp.set(help);
+        showSignatureHelp(help);
+    }
 
-                if (balance == 0)
-                    return index;
+    private void showSignatureHelp(SignatureHelp help) {
+        signatureTextFlow.getChildren().clear();
+
+        String owner = help.ownerQualified().isBlank() ? help.ownerDisplay() : help.ownerQualified();
+        StringBuilder headerBuilder = new StringBuilder();
+        if (help.constructor()) {
+            headerBuilder.append("new ");
+            if (!owner.isBlank()) {
+                headerBuilder.append(owner);
             }
         } else {
-            for (int index = pos; index >= 0; index--) {
-                char c = text.charAt(index);
-                if (c == open)
-                    balance--;
-                else if (c == close)
-                    balance++;
-
-                if (balance == 0)
-                    return index;
+            if (!owner.isBlank()) {
+                headerBuilder.append(owner).append(".");
             }
+
+            headerBuilder.append(help.methodName());
         }
 
-        return -1;
-    }
+        headerBuilder.append("(");
 
-    private void clearBracketHighlights() {
-        int length = getLength();
-        setStyle(0, length, Collections.emptyList());
-        applyHighlighting(computeHighlighting(getText()));
-    }
-
-    private void marginErrors() {
-        IntFunction<Node> factory = line -> {
-            var grid = new GridPane();
-            grid.setHgap(5);
-            grid.getStyleClass().add("ide-java-code-editor-grid");
-
-            var lineNumberColumn = new ColumnConstraints();
-            lineNumberColumn.setHgrow(Priority.ALWAYS);
-
-            var iconColumn = new ColumnConstraints();
-            iconColumn.setPrefWidth(12);
-            iconColumn.setHgrow(Priority.NEVER);
-
-            grid.getColumnConstraints().addAll(lineNumberColumn, iconColumn);
-
-            var lineNumber = new Label(String.format("%4d", line + 1));
-            lineNumber.setTextAlignment(TextAlignment.RIGHT);
-            lineNumber.setTextFill(Color.LIGHTGRAY);
-            grid.add(lineNumber, 0, 0);
-
-            // Add icon and tooltip if there's an error or warning
-            Diagnostic.Kind kind = lineToSeverity.get(line + 1); // 1-based line numbers
-            if (kind != null) {
-                var icon = new MFXFontIcon(kind == Diagnostic.Kind.ERROR ?
-                    FontAwesomeSolid.CIRCLE_EXCLAMATION : FontAwesomeSolid.TRIANGLE_EXCLAMATION,
-                    12,
-                    kind == Diagnostic.Kind.ERROR ? Color.RED : Color.YELLOW);
-                grid.add(icon, 1, 0);
-
-                // Find the diagnostic message for this line
-                String message = errors.keySet().stream()
-                    .filter(d -> d.getLineNumber() == line + 1 &&
-                        (d.getKind() == kind || (kind == Diagnostic.Kind.WARNING &&
-                            d.getKind() == Diagnostic.Kind.MANDATORY_WARNING)))
-                    .map(d -> d.getMessage(null))
-                    .findFirst()
-                    .orElse("Unknown issue");
-
-                var tooltip = new Tooltip(message);
-                tooltip.setShowDelay(javafx.util.Duration.millis(200)); // Slight delay for smoother UX
-                Tooltip.install(icon, tooltip);
-            }
+        var header = new Text(headerBuilder.toString());
+        signatureTextFlow.getChildren().add(header);
 
-            return grid;
-        };
+        List<ParameterInfo> parameters = help.parameters();
+        int parameterCount = parameters.size();
+        int highlightIndex = help.activeParameter();
 
-        setParagraphGraphicFactory(factory);
-    }
+        for (int i = 0; i < parameterCount; i++) {
+            ParameterInfo parameter = parameters.get(i);
+            boolean highlight = highlightIndex == i ||
+                (help.varargs() && i == parameterCount - 1 && highlightIndex >= parameterCount - 1 && highlightIndex >= 0);
 
-    private void codeCompletion() {
-        plainTextChanges()
-            .successionEnds(Duration.ofMillis(500))
-            .retainLatestUntilLater(executor0)
-            .filter(change -> !change.getInserted().equals(change.getRemoved()))
-            .subscribe(change -> {
-                String inserted = change.getInserted();
-                if (inserted.endsWith(".")) {
-                    showAutoComplete(change.getPosition());
-                }
-            });
+            String paramLabel = parameter.type() + (parameter.name().isBlank() ? "" : " " + parameter.name());
+            var paramText = new Text(paramLabel);
+            if (highlight) {
+                paramText.getStyleClass().add("signature-param-active");
+            } else {
+                paramText.getStyleClass().add("signature-param");
+            }
 
-        // if the user clicks outside the popup, hide it
-        setOnMouseClicked(event -> {
-            if (autoCompletePopup.get() != null && autoCompletePopup.get().isShowing()) {
-                hideAutoComplete();
+            signatureTextFlow.getChildren().add(paramText);
+
+            if (i < parameterCount - 1) {
+                signatureTextFlow.getChildren().add(new Text(", "));
             }
-        });
+        }
+
+        var closing = new Text(")");
+        signatureTextFlow.getChildren().add(closing);
+
+        if (!help.constructor()) {
+            signatureTextFlow.getChildren().add(new Text(" : " + help.returnType()));
+        }
+
+        positionSignaturePopup();
     }
 
-    private @Nullable Pair<Integer, Integer> getIdentifierRangeBeforeDot(int dotPosition) {
-        String text = getText();
-        if (dotPosition < 0 || text.charAt(dotPosition) != '.') {
-            return null;
+    private void positionSignaturePopup() {
+        Optional<Bounds> caretBounds = getCaretBounds();
+        double x;
+        double y;
+        if (caretBounds.isPresent()) {
+            Bounds bounds = caretBounds.get();
+            x = bounds.getMinX();
+            y = bounds.getMaxY() + 6;
+        } else {
+            Point2D screen = localToScreen(0, 0);
+            x = screen.getX();
+            y = screen.getY();
         }
 
-        int start = dotPosition;
-        while (start > 0 && Character.isJavaIdentifierPart(text.charAt(start - 1))) {
-            start--;
+        if (!signaturePopup.isShowing()) {
+            signaturePopup.show(this, x, y);
+        } else {
+            signaturePopup.setX(x);
+            signaturePopup.setY(y);
         }
+    }
 
-        return new Pair<>(start, dotPosition - start + 1);
+    private void hideSignatureHelp() {
+        activeSignatureHelp.set(null);
+        if (signaturePopup.isShowing()) {
+            signaturePopup.hide();
+        }
     }
 
-    private void showAutoComplete(int position) {
-        ASTParser parser = ASTParser.newParser(AST.JLS21);
-        parser.setSource(getText().toCharArray());
-        parser.setKind(ASTParser.K_COMPILATION_UNIT);
-        parser.setResolveBindings(true);
-        parser.setBindingsRecovery(true);
-        parser.setStatementsRecovery(true);
-        parser.setUnitName(filePath.getFileName().toString());
-        String[] classpathEntries = new String[0];
+    private static String[] resolveSystemModules() {
         try {
-            var javaHome = Path.of(System.getProperty("java.home"));
-            var jmodsDir = javaHome.resolve("jmods");
-            if (Files.isDirectory(jmodsDir)) {
-                try (var stream = Files.list(jmodsDir)) {
-                    classpathEntries = stream
+            Path javaHome = Path.of(System.getProperty("java.home"));
+            Path jmods = javaHome.resolve("jmods");
+            if (Files.isDirectory(jmods)) {
+                try (Stream<Path> stream = Files.list(jmods)) {
+                    return stream
                         .map(Path::toString)
                         .toArray(String[]::new);
                 }
             }
         } catch (Exception exception) {
-            Railroad.LOGGER.error("Failed to resolve JDK modules", exception);
+            Railroad.LOGGER.warn("Unable to resolve system modules for Java analysis", exception);
         }
 
-        parser.setEnvironment(classpathEntries, null, null, false);
+        return new String[0];
+    }
 
-        CompilationUnit compilationUnit = (CompilationUnit) parser.createAST(null);
+    private void configureParagraphGraphics() {
+        setParagraphGraphicFactory(this::createParagraphGraphic);
+    }
 
-        Pair<Integer, Integer> range = getIdentifierRangeBeforeDot(position);
-        if (range == null) {
-            hideAutoComplete();
-            return;
+    private Node createParagraphGraphic(int line) {
+        var grid = new GridPane();
+        grid.setHgap(5);
+        grid.getStyleClass().add("ide-java-code-editor-grid");
+
+        var numberColumn = new ColumnConstraints();
+        numberColumn.setHgrow(Priority.ALWAYS);
+
+        var iconColumn = new ColumnConstraints();
+        iconColumn.setPrefWidth(12);
+        iconColumn.setHgrow(Priority.NEVER);
+
+        grid.getColumnConstraints().addAll(numberColumn, iconColumn);
+
+        var label = new Label(String.format("%4d", line + 1));
+        label.setTextAlignment(TextAlignment.RIGHT);
+        label.setTextFill(Color.LIGHTGRAY);
+        grid.add(label, 0, 0);
+
+        Diagnostic.Kind severity = lineSeverity.get(line + 1);
+        if (severity != null) {
+            FontAwesomeSolid iconType = severity == Diagnostic.Kind.ERROR ?
+                FontAwesomeSolid.CIRCLE_EXCLAMATION :
+                FontAwesomeSolid.TRIANGLE_EXCLAMATION;
+            Color color = severity == Diagnostic.Kind.ERROR ? Color.RED : Color.YELLOW;
+
+            var icon = new MFXFontIcon(iconType, 12, color);
+            grid.add(icon, 1, 0);
+
+            String tooltipText = visibleDiagnostics.stream()
+                .filter(diagnostic -> diagnostic.getLineNumber() == line + 1)
+                .map(diagnostic -> diagnostic.getMessage(Locale.getDefault()))
+                .findFirst()
+                .orElse(severity == Diagnostic.Kind.ERROR ? "Error" : "Warning");
+            Tooltip.install(icon, new Tooltip(tooltipText));
         }
 
-        int start = range.getKey();
-        int length = range.getValue();
+        return grid;
+    }
 
-        var finder = new NodeFinder(compilationUnit, start, length);
-        ASTNode node = finder.getCoveredNode();
-        if (node == null) {
-            node = finder.getCoveringNode();
-        }
+    private void installSyntaxHighlighting() {
+        requestHighlight(getText());
+        multiPlainChanges()
+            .successionEnds(HIGHLIGHT_DEBOUNCE)
+            .subscribe(changes -> requestHighlight(getText()));
+    }
 
-        if (node == null) {
-            hideAutoComplete();
+    private void requestHighlight(String snapshot) {
+        int generation = highlightGeneration.incrementAndGet();
+        CompletableFuture.supplyAsync(() -> TreeSitterJavaSyntaxHighlighting.computeHighlighting(snapshot), worker)
+            .thenAccept(spans -> Platform.runLater(() -> applyHighlightIfLatest(generation, spans)))
+            .exceptionally(throwable -> {
+                Railroad.LOGGER.error("Failed to compute Java syntax highlighting", throwable);
+                return null;
+            });
+    }
+
+    private void applyHighlightIfLatest(int generation, StyleSpans<Collection<String>> spans) {
+        if (highlightGeneration.get() != generation)
             return;
-        }
 
-        List<String> suggestions = new ArrayList<>();
-        if (node instanceof ExpressionStatement statement) {
-            node = statement.getExpression();
+        lastHighlight = spans;
+        setStyleSpans(0, spans);
+        overlayDiagnostics();
+        restoreBracketHighlight();
+    }
+
+    private void installDiagnostics() {
+        requestDiagnostics(getText());
+        multiPlainChanges()
+            .successionEnds(DIAGNOSTIC_DEBOUNCE)
+            .subscribe(changes -> requestDiagnostics(getText()));
+    }
+
+    private void requestDiagnostics(String snapshot) {
+        int generation = diagnosticsGeneration.incrementAndGet();
+        CompletableFuture.supplyAsync(() -> diagnosticsProvider.compute(snapshot), worker)
+            .thenAccept(result -> Platform.runLater(() -> applyDiagnosticsIfLatest(generation, result)))
+            .exceptionally(throwable -> {
+                Railroad.LOGGER.error("Failed to analyse Java diagnostics", throwable);
+                return null;
+            });
+    }
+
+    private void applyDiagnosticsIfLatest(int generation, List<EditorDiagnostic> diagnostics) {
+        if (diagnosticsGeneration.get() != generation)
+            return;
+
+        diagnosticPopup.hide();
+
+        visibleDiagnostics = diagnostics;
+        recomputeLineSeverity();
+
+        if (lastHighlight != null) {
+            setStyleSpans(0, lastHighlight);
         }
 
-        if (node instanceof Expression expr) {
-            ITypeBinding binding = expr.resolveTypeBinding();
-            if (binding != null) {
-                String typeName = binding.getQualifiedName();
-                suggestions.addAll(this.autocomplete.suggestMembers(typeName, ""));
+        overlayDiagnostics();
+        restoreBracketHighlight();
+        requestLayout();
+    }
+
+    private void recomputeLineSeverity() {
+        lineSeverity.clear();
+        for (EditorDiagnostic diagnostic : visibleDiagnostics) {
+            int line = (int) diagnostic.getLineNumber();
+            if (line <= 0)
+                continue;
+
+            Diagnostic.Kind kind = diagnostic.getKind();
+            if (kind == Diagnostic.Kind.ERROR) {
+                lineSeverity.put(line, Diagnostic.Kind.ERROR);
+            } else if (!lineSeverity.containsKey(line) || lineSeverity.get(line) == Diagnostic.Kind.WARNING) {
+                lineSeverity.put(line, Diagnostic.Kind.WARNING);
             }
         }
+    }
 
-        if (suggestions.isEmpty()) {
-            hideAutoComplete();
-            return;
+    private void overlayDiagnostics() {
+        for (EditorDiagnostic diagnostic : visibleDiagnostics) {
+            String style = diagnostic.getKind() == Diagnostic.Kind.ERROR ? "error" : "warning";
+            int start = (int) diagnostic.getStartPosition();
+            int end = (int) diagnostic.getEndPosition();
+            try {
+                if (start >= 0 && end >= start)
+                    setStyleClass(start, end, style);
+            } catch (IndexOutOfBoundsException ignored) {
+                // Ignore invalid ranges caused by parser desync
+            }
         }
+    }
 
-        this.fullSuggestions.clear();
-        this.fullSuggestions.addAll(suggestions);
-        this.dotPosition = position;
+    private void installDiagnosticPopupHandlers() {
+        addEventHandler(MouseOverTextEvent.MOUSE_OVER_TEXT_BEGIN, this::handleMouseOverText);
+        addEventHandler(MouseOverTextEvent.MOUSE_OVER_TEXT_END, event -> diagnosticPopup.hide());
+        addEventHandler(MouseEvent.MOUSE_MOVED, this::handleMouseMoved);
+    }
 
-        Platform.runLater(() -> {
-            var popup = new Popup();
-            var listView = new RRListView<String>();
-            listView.getItems().addAll(suggestions);
+    private EditorDiagnostic findDiagnosticAt(int index) {
+        if (index < 0)
+            return null;
 
-            listView.setOnMouseClicked(event -> {
-                String selected = listView.getSelectionModel().getSelectedItem();
-                if (selected != null) {
-                    int currentCaret = getCaretPosition();
-                    int startPos = this.dotPosition + 1; // After the dot
-                    replaceText(startPos, currentCaret, selected); // Replace prefix with selection
-                    hideAutoComplete();
-                }
-            });
+        for (EditorDiagnostic diagnostic : visibleDiagnostics) {
+            if (index >= diagnostic.getStartPosition() && index <= diagnostic.getEndPosition())
+                return diagnostic;
+        }
 
-            popup.getContent().add(listView);
-            int caretX = getCaretBounds().map(Bounds::getMaxX).map(Double::intValue).orElse(0);
-            int caretY = getCaretBounds().map(Bounds::getMaxY).map(Double::intValue).orElse(0);
-            popup.setAutoHide(true);
-            this.autoCompletePopup.set(popup);
-
-            textListener = (obs, oldText, newText) -> {
-                Popup currentPopup = autoCompletePopup.get();
-                if (currentPopup != null && currentPopup.isShowing()) {
-                    int currentCaret = getCaretPosition();
-                    if (currentCaret > dotPosition && getText().charAt(dotPosition) == '.') {
-                        String prefix = "";
-                        if (currentCaret > dotPosition + 1) {
-                            prefix = getText().substring(dotPosition + 1, currentCaret);
-                        }
-
-                        final String finalPrefix = prefix;
-                        List<String> filtered = fullSuggestions.stream()
-                            .filter(s -> s.startsWith(finalPrefix))
-                            .collect(Collectors.toList());
-                        listView.getItems().setAll(filtered);
-                    } else {
-                        hideAutoComplete();
-                    }
-                }
-            };
+        return null;
+    }
 
-            textProperty().addListener(textListener);
-            popup.show(this, caretX, caretY);
-        });
+    private void showDiagnosticPopup(EditorDiagnostic diagnostic, double screenX, double screenY) {
+        diagnosticPopup.getContent().clear();
+        diagnosticPopup.getContent().add(new DiagnosticPane(diagnostic));
+        diagnosticPopup.show(this, screenX, screenY);
     }
 
-    private void hideAutoComplete() {
-        Platform.runLater(() -> {
-            Popup currentPopup = autoCompletePopup.get();
-            if (currentPopup != null) {
-                currentPopup.hide();
-                autoCompletePopup.set(null);
+    private void installCompletion() {
+        plainTextChanges().subscribe(this::showAutocomplete);
+
+        setOnMouseClicked(event -> hideAutoComplete());
+        focusedProperty().addListener((obs, oldValue, newValue) -> {
+            if (!newValue) {
+                hideAutoComplete();
             }
+        });
 
-            if (textListener != null) {
-                textProperty().removeListener(textListener);
-                textListener = null;
+        caretPositionProperty().addListener((obs, oldPos, newPos) -> {
+            if (completionDotIndex >= 0 && newPos <= completionDotIndex) {
+                hideAutoComplete();
+            }
+        });
+
+        addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+            if (event.getCode() == KeyCode.ESCAPE) {
+                hideAutoComplete();
             }
         });
     }
 
-    private void errorHighlighting() {
-        Task<DiagnosticCollector<JavaFileObject>> task = requestErrorDiagnostics();
-        task.setOnSucceeded(event -> applyErrorHighlighting(task.getValue()));
-        task.setOnFailed(event -> Railroad.LOGGER.error("Failed to compile", task.getException()));
+    private void triggerCompletion(int dotIndex) {
+        String snapshot = getText();
+        int generation = completionGeneration.incrementAndGet();
+        CompletableFuture.supplyAsync(() -> completionProvider.compute(snapshot, dotIndex), worker)
+            .thenAccept(result -> Platform.runLater(() -> {
+                if (completionGeneration.get() != generation)
+                    return;
 
-        plainTextChanges()
-            .successionEnds(Duration.ofMillis(500))
-            .retainLatestUntilLater(executor0)
-            .supplyTask(this::requestErrorDiagnostics)
-            .awaitLatest(plainTextChanges())
-            .filterMap(throwable -> {
-                if (throwable.isSuccess()) {
-                    return throwable.toOptional();
+                if (result == null || result.items().isEmpty()) {
+                    hideAutoComplete();
                 } else {
-                    Railroad.LOGGER.error("Failed to compile", throwable.getFailure());
-                    return Optional.empty();
+                    handleCompletionResult(result);
                 }
-            })
-            .subscribe(this::applyErrorHighlighting);
-
-        this.errors.addListener((MapChangeListener<Diagnostic<? extends JavaFileObject>, Popup>) change -> {
-            if (change.wasRemoved()) {
-                change.getValueRemoved().hide();
-            }
-        });
+            }))
+            .exceptionally(throwable -> {
+                Railroad.LOGGER.error("Failed to compute Java code completion", throwable);
+                return null;
+            });
     }
 
-    private Task<DiagnosticCollector<JavaFileObject>> requestErrorDiagnostics() {
-        Task<DiagnosticCollector<JavaFileObject>> task = new Task<>() {
-            @Override
-            protected DiagnosticCollector<JavaFileObject> call() {
-                long startTime = System.currentTimeMillis();
+    private void handleCompletionResult(CompletionResult result) {
+        if (result.items().isEmpty()) {
+            hideAutoComplete();
+            return;
+        }
 
-                char[] source = getText().toCharArray();
+        completionCandidates.clear();
+        completionCandidates.addAll(result.items());
+        completionDotIndex = result.dotIndex();
+        showAutoComplete();
+    }
 
-                ASTParser parser = ASTParser.newParser(AST.JLS21);
-                parser.setKind(ASTParser.K_COMPILATION_UNIT);
-                Map<String, String> options = JavaCore.getOptions();
-                JavaCore.setComplianceOptions(JavaCore.VERSION_21, options);
-                parser.setCompilerOptions(options);
-                parser.setSource(source);
-                CompilationUnit unit = (CompilationUnit) parser.createAST(null);
+    private void showAutoComplete() {
+        hideAutoComplete(false);
 
-                IProblem[] problems = unit.getProblems();
+        RRListView<CompletionItem> listView = new RRListView<>();
+        listView.setCellFactory(view -> new CompletionItemListCell());
+        listView.getItems().setAll(completionCandidates);
+        listView.getSelectionModel().selectFirst();
+        listView.setOnMouseClicked(event -> completeFromSelection(listView));
 
-                DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector<>();
-                for (IProblem problem : problems) {
-                    Diagnostic.Kind kind = problem.isError() ? Diagnostic.Kind.ERROR :
-                        (problem.isWarning() ? Diagnostic.Kind.WARNING : Diagnostic.Kind.OTHER);
-                    if (kind == Diagnostic.Kind.OTHER) continue;
+        var popup = new Popup();
+        popup.setAutoHide(true);
+        popup.getContent().add(listView);
 
-                    int start = problem.getSourceStart();
-                    int end = problem.getSourceEnd() + 1;
-                    long line = problem.getSourceLineNumber();
-                    long column = computeColumn(source, start);
-                    String message = problem.getMessage();
+        activeCompletionList.set(listView);
+        activeCompletionPopup.set(popup);
 
-                    diagnostics.report(new ProblemDiagnostic(kind, start, end, line, column, message));
-                }
+        completionFilterListener = (obs, oldText, newText) -> filterAutoComplete(newText);
+        textProperty().addListener(completionFilterListener);
 
-                Railroad.LOGGER.debug("Error diagnostics took {}ms", System.currentTimeMillis() - startTime);
-                return diagnostics;
-            }
-        };
-
-        executor0.submit(task);
-        return task;
-    }
-
-    private void applyErrorHighlighting(DiagnosticCollector<JavaFileObject> diagnostics) {
-        long startTime = System.currentTimeMillis();
-
-        // Process diagnostics for both errors and warnings
-        Map<Diagnostic<? extends JavaFileObject>, Popup> diagnosticsMap = diagnostics.getDiagnostics().stream()
-            .filter(diagnostic -> diagnostic.getKind() == Diagnostic.Kind.ERROR ||
-                diagnostic.getKind() == Diagnostic.Kind.WARNING ||
-                diagnostic.getKind() == Diagnostic.Kind.MANDATORY_WARNING)
-            .sorted(Comparator.comparingLong(Diagnostic::getStartPosition))
-            .collect(HashMap::new, (map, diagnostic) -> {
-                int start = (int) diagnostic.getStartPosition();
-                int end = (int) diagnostic.getEndPosition();
-                String message = diagnostic.getMessage(null);
-                String styleClass = diagnostic.getKind() == Diagnostic.Kind.ERROR ? "error" : "warning";
-                setStyleClass(start, end, styleClass);
-
-                var popup = new Popup();
-                popup.getContent().add(new DiagnosticPane(diagnostic));
-
-                // Show popup on hover
-                addEventHandler(MouseOverTextEvent.MOUSE_OVER_TEXT_BEGIN, event -> {
-                    int position = event.getCharacterIndex();
-                    if (position >= start && position <= end) {
-                        Point2D screenPosition = event.getScreenPosition();
-                        popup.show(JavaCodeEditorPane.this, screenPosition.getX(), screenPosition.getY());
-                    }
-                });
-
-                // Hide popup when mouse leaves
-                addEventHandler(MouseEvent.MOUSE_MOVED, event -> {
-                    if (!popup.isShowing()) return;
-                    int charIndex = JavaCodeEditorPane.this.hit(event.getX(), event.getY())
-                        .getCharacterIndex().orElse(-1);
-                    if (charIndex < start || charIndex > end) {
-                        popup.hide();
-                    }
-                });
-
-                map.put(diagnostic, popup);
-                Railroad.LOGGER.error("Issue at L{}:{} - {}", diagnostic.getLineNumber(),
-                    diagnostic.getColumnNumber(), message);
-            }, HashMap::putAll);
-
-        // Update the errors map
-        this.errors.clear();
-        this.errors.putAll(diagnosticsMap);
-
-        // Update lineToSeverity map
-        lineToSeverity.clear();
-        for (Diagnostic<? extends JavaFileObject> diagnostic : diagnostics.getDiagnostics()) {
-            Diagnostic.Kind kind = diagnostic.getKind();
-            if (kind == Diagnostic.Kind.ERROR || kind == Diagnostic.Kind.WARNING ||
-                kind == Diagnostic.Kind.MANDATORY_WARNING) {
-                int line = (int) diagnostic.getLineNumber();
-                if (kind == Diagnostic.Kind.ERROR) {
-                    lineToSeverity.put(line, Diagnostic.Kind.ERROR); // Errors take precedence
-                } else if (!lineToSeverity.containsKey(line) ||
-                    lineToSeverity.get(line) != Diagnostic.Kind.ERROR) {
-                    lineToSeverity.put(line, Diagnostic.Kind.WARNING); // Warnings if no error
-                }
-            }
+        Optional<Bounds> caretBounds = getCaretBounds();
+        if (caretBounds.isPresent()) {
+            Bounds bounds = caretBounds.get();
+            popup.show(this, bounds.getMaxX(), bounds.getMaxY());
+        } else {
+            Point2D screen = localToScreen(0, 0);
+            popup.show(this, screen.getX(), screen.getY());
         }
+    }
 
-        // Force redraw of margin graphics
-        requestLayout();
+    private void completeFromSelection(RRListView<CompletionItem> listView) {
+        CompletionItem selected = listView.getSelectionModel().getSelectedItem();
+        if (selected == null)
+            return;
 
-        Railroad.LOGGER.debug("Error highlighting took {}ms", System.currentTimeMillis() - startTime);
+        int caret = getCaretPosition();
+        int start = Math.min(completionDotIndex + 1, caret);
+        String insert = selected.insertText();
+        replaceText(start, caret, insert);
+        moveTo(start + insert.length());
+        hideAutoComplete();
     }
 
-    private static long computeColumn(char[] source, int position) {
-        int column = 1;
-        for (int i = position - 1; i >= 0; i--) {
-            char c = source[i];
-            if (c == '\n' || c == '\r') {
-                break;
-            }
-            column++;
+    private void filterAutoComplete(String text) {
+        Popup popup = activeCompletionPopup.get();
+        RRListView<CompletionItem> listView = activeCompletionList.get();
+        if (popup == null || listView == null || !popup.isShowing())
+            return;
+
+        int caret = getCaretPosition();
+        if (completionDotIndex < 0 || completionDotIndex >= text.length() || text.charAt(completionDotIndex) != '.') {
+            hideAutoComplete();
+            return;
         }
-        return column;
-    }
 
-    private void syntaxHighlight() {
-        applyHighlighting(computeHighlighting(getText()));
-        multiPlainChanges()
-            .successionEnds(Duration.ofMillis(500))
-            .retainLatestUntilLater(executor0)
-            .supplyTask(this::computeHighlightingAsync)
-            .awaitLatest(multiPlainChanges())
-            .filterMap(throwable -> {
-                if (throwable.isSuccess()) {
-                    return throwable.toOptional();
-                } else {
-                    Railroad.LOGGER.error("Failed to compute highlighting", throwable.getFailure());
-                    return Optional.empty();
-                }
-            })
-            .subscribe(this::applyHighlighting);
-    }
+        if (caret <= completionDotIndex) {
+            hideAutoComplete();
+            return;
+        }
 
-    private Task<StyleSpans<Collection<String>>> computeHighlightingAsync() {
-        String text = getText();
-        Task<StyleSpans<Collection<String>>> task = new Task<>() {
-            @Override
-            protected StyleSpans<Collection<String>> call() {
-                return computeHighlighting(text);
-            }
-        };
+        String prefix = text.substring(completionDotIndex + 1, Math.min(caret, text.length()));
+        List<CompletionItem> filtered = completionCandidates.stream()
+            .filter(item -> item.insertText().startsWith(prefix))
+            .collect(Collectors.toList());
 
-        executor0.submit(task);
-        return task;
+        if (filtered.isEmpty()) {
+            hideAutoComplete();
+        } else {
+            listView.getItems().setAll(filtered);
+            listView.getSelectionModel().selectFirst();
+        }
     }
 
-    private void applyHighlighting(StyleSpans<Collection<String>> highlighting) {
-        setStyleSpans(0, highlighting);
+    private void hideAutoComplete() {
+        hideAutoComplete(true);
     }
 
-    private StyleSpans<Collection<String>> computeHighlighting(String text) {
-        return TreeSitterJavaSyntaxHighlighting.computeHighlighting(text);
-    }
+    private void hideAutoComplete(boolean clearState) {
+        Popup popup = activeCompletionPopup.getAndSet(null);
+        if (popup != null) {
+            popup.hide();
+        }
 
-    private record ProblemDiagnostic(Kind kind, int start, int end, long line, long column,
-                                     String message) implements Diagnostic<JavaFileObject> {
-        @Override
-        public Kind getKind() {
-            return kind;
+        activeCompletionList.set(null);
+
+        if (completionFilterListener != null) {
+            textProperty().removeListener(completionFilterListener);
+            completionFilterListener = null;
         }
 
-        @Override
-        public JavaFileObject getSource() {
-            return null;
+        if (clearState) {
+            completionCandidates.clear();
+            completionDotIndex = -1;
         }
+    }
 
-        @Override
-        public long getPosition() {
-            return start;
+    private void installBracketHighlighting() {
+        caretPositionProperty().addListener(
+            (obs, oldPos, newPos) -> updateBracketHighlight(newPos));
+    }
+
+    private void updateBracketHighlight(int caretPosition) {
+        String text = getText();
+        if (text.isEmpty()) {
+            clearBracketHighlight();
+            return;
         }
 
-        @Override
-        public long getStartPosition() {
-            return start;
+        int index = caretPosition - 1;
+        boolean lookForward;
+        if (index >= 0 && index < text.length() && OPENING_BRACKETS.containsKey(text.charAt(index))) {
+            lookForward = true;
+        } else if (caretPosition < text.length() && OPENING_BRACKETS.containsKey(text.charAt(caretPosition))) {
+            index = caretPosition;
+            lookForward = true;
+        } else if (index >= 0 && index < text.length() && CLOSING_BRACKETS.containsKey(text.charAt(index))) {
+            lookForward = false;
+        } else if (caretPosition < text.length() && CLOSING_BRACKETS.containsKey(text.charAt(caretPosition))) {
+            index = caretPosition;
+            lookForward = false;
+        } else {
+            clearBracketHighlight();
+            return;
         }
 
-        @Override
-        public long getEndPosition() {
-            return end;
+        Character bracket = text.charAt(index);
+        int match = lookForward
+            ? findMatchingForward(text, index, OPENING_BRACKETS.getOrDefault(bracket, bracket))
+            : findMatchingBackward(text, index, CLOSING_BRACKETS.getOrDefault(bracket, bracket));
+
+        if (match == -1) {
+            clearBracketHighlight();
+            return;
         }
 
-        @Override
-        public long getLineNumber() {
-            return line;
+        applyBracketHighlight(index, match);
+    }
+
+    private int findMatchingForward(String text, int start, char target) {
+        char opening = text.charAt(start);
+        int balance = 0;
+        for (int i = start; i < text.length(); i++) {
+            char c = text.charAt(i);
+            if (c == opening) {
+                balance++;
+            } else if (c == target) {
+                balance--;
+                if (balance == 0)
+                    return i;
+            }
         }
 
-        @Override
-        public long getColumnNumber() {
-            return column;
+        return -1;
+    }
+
+    private int findMatchingBackward(String text, int start, char target) {
+        char closing = text.charAt(start);
+        int balance = 0;
+        for (int i = start; i >= 0; i--) {
+            char c = text.charAt(i);
+            if (c == closing) {
+                balance++;
+            } else if (c == target) {
+                balance--;
+                if (balance == 0)
+                    return i;
+            }
         }
 
-        @Override
-        public String getCode() {
-            return null;
+        return -1;
+    }
+
+    private void applyBracketHighlight(int first, int second) {
+        clearBracketHighlight();
+        bracketHighlightRange = new int[]{first, second};
+        addBracketStyle(first);
+        addBracketStyle(second);
+    }
+
+    private void clearBracketHighlight() {
+        if (bracketHighlightRange == null)
+            return;
+
+        removeBracketStyle(bracketHighlightRange[0]);
+        removeBracketStyle(bracketHighlightRange[1]);
+        bracketHighlightRange = null;
+    }
+
+    private void restoreBracketHighlight() {
+        if (bracketHighlightRange == null)
+            return;
+
+        addBracketStyle(bracketHighlightRange[0]);
+        addBracketStyle(bracketHighlightRange[1]);
+    }
+
+    private void addBracketStyle(int position) {
+        if (position < 0 || position >= getLength())
+            return;
+
+        List<String> styles = new ArrayList<>(getStyleAtPosition(position));
+        if (!styles.contains("bracket-highlight")) {
+            styles.add("bracket-highlight");
         }
 
-        @Override
-        public String getMessage(Locale locale) {
-            return message;
+        setStyle(position, position + 1, styles);
+    }
+
+    private void removeBracketStyle(int position) {
+        if (position < 0 || position >= getLength())
+            return;
+
+        List<String> styles = new ArrayList<>(getStyleAtPosition(position));
+        if (styles.remove("bracket-highlight")) {
+            setStyle(position, position + 1, styles);
         }
     }
 
     public String getLanguageId() {
         return "java";
     }
+
+    private void handleMouseOverText(MouseOverTextEvent event) {
+        int index = event.getCharacterIndex();
+        EditorDiagnostic diagnostic = findDiagnosticAt(index);
+        if (diagnostic == null)
+            return;
+
+        Point2D position = event.getScreenPosition();
+        showDiagnosticPopup(diagnostic, position.getX(), position.getY() + 6);
+    }
+
+    private void handleMouseMoved(MouseEvent event) {
+        if (!diagnosticPopup.isShowing())
+            return;
+
+        int index = hit(event.getX(), event.getY())
+            .getCharacterIndex()
+            .orElse(-1);
+        if (index < 0 || findDiagnosticAt(index) == null) {
+            diagnosticPopup.hide();
+        }
+    }
+
+    private void showAutocomplete(PlainTextChange change) {
+        String inserted = change.getInserted();
+        if (inserted == null || inserted.isEmpty())
+            return;
+
+        if (inserted.endsWith(".")) {
+            int dotIndex = change.getPosition() + inserted.length() - 1;
+            triggerCompletion(dotIndex);
+        }
+    }
+
+    private static final class CompletionItemListCell extends ListCell<CompletionItem> {
+        @Override
+        protected void updateItem(CompletionItem item, boolean empty) {
+            super.updateItem(item, empty);
+            setText(empty || item == null ? null : item.displayText());
+        }
+    }
 }
diff --git a/src/main/java/dev/railroadide/railroad/ide/ui/JsonCodeEditorPane.java b/src/main/java/dev/railroadide/railroad/ide/ui/JsonCodeEditorPane.java
index 6759b056..ac82225c 100644
--- a/src/main/java/dev/railroadide/railroad/ide/ui/JsonCodeEditorPane.java
+++ b/src/main/java/dev/railroadide/railroad/ide/ui/JsonCodeEditorPane.java
@@ -92,6 +92,10 @@ private void autoInsertPairs() {
                 case "[" -> "]";
                 case "{" -> "}";
                 case "\"" -> "\"";
+                case "(" -> ")";
+                case "'" -> "'";
+                case "<" -> ">";
+                case "`" -> "`";
                 default -> null;
             };
 
diff --git a/src/main/java/dev/railroadide/railroad/ide/ui/MarkdownPreviewPane.java b/src/main/java/dev/railroadide/railroad/ide/ui/MarkdownPreviewPane.java
new file mode 100644
index 00000000..89662d88
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/ui/MarkdownPreviewPane.java
@@ -0,0 +1,214 @@
+package dev.railroadide.railroad.ide.ui;
+
+import dev.railroadide.core.ui.RRButton;
+import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.ui.RRVBox;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.settings.Settings;
+import dev.railroadide.railroad.theme.ThemeManager;
+import io.github.raghultech.markdown.javafx.preview.MarkdownWebView;
+import javafx.application.Platform;
+import javafx.geometry.Pos;
+import javafx.geometry.Side;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import javafx.scene.web.WebView;
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeBrands;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class MarkdownPreviewPane extends RRVBox {
+    private final MarkdownWebView preview;
+    private final Path markdownFile;
+
+    private TextEditorPane textEditorPane;
+    private WebView webViewPane;
+
+    private final HBox topRow;
+    private final HBox markdownButtons;
+    private final HBox switchButtons;
+
+    public MarkdownPreviewPane(Path markdownFile) {
+        this.markdownFile = markdownFile;
+
+        try {
+            preview = new MarkdownWebView(Files.readString(markdownFile), Railroad.getHostServicess());
+        } catch (IOException exception) {
+            Railroad.LOGGER.error("Unable to read markdown file when previewing.", exception);
+            throw new RuntimeException(exception);
+        }
+
+        markdownButtons = createMarkdownButtons();
+        HBox.setHgrow(markdownButtons, Priority.ALWAYS);
+        switchButtons = createViewButtons();
+
+        topRow = new RRHBox(markdownButtons, switchButtons);
+
+        preview.setDarkMode(ThemeManager.getTheme().contains("dark"));
+
+        Settings.THEME.addListener((ignored, newThemeName) ->
+            preview.setDarkMode(newThemeName.contains("dark")));
+
+        showContent(splitView(), topRow);
+    }
+
+    private TextEditorPane codeView() {
+        if (textEditorPane != null)
+            return textEditorPane;
+
+        textEditorPane = new TextEditorPane(markdownFile);
+        textEditorPane.textProperty().addListener(
+            (observable, oldValue, newValue) -> preview.setContent(newValue));
+
+        return textEditorPane;
+    }
+
+    private SplitPane splitView() {
+        var splitPane = new SplitPane(codeView(), previewView());
+        // ensure divider is applied after layout to avoid a 0 width child
+        Platform.runLater(() -> splitPane.setDividerPosition(0, 0.5));
+        return splitPane;
+    }
+
+    private WebView previewView() {
+        if (webViewPane != null)
+            return webViewPane;
+
+        webViewPane = preview.launch();
+        return webViewPane;
+    }
+
+    private void showContent(Node content, HBox topRow) {
+        getChildren().clear();
+        getChildren().addAll(topRow, content);
+        VBox.setVgrow(content, Priority.ALWAYS);
+        if (textEditorPane != null)
+            textEditorPane.scrollToPixel(0, 0);
+    }
+
+    private HBox createViewButtons(){
+        Button codeView = createButton(FontAwesomeSolid.CODE);
+        Button splitView = createButton(FontAwesomeSolid.COLUMNS);
+        Button previewView = createButton(FontAwesomeBrands.MARKDOWN);
+
+        var switchButtons = new RRHBox(codeView, splitView, previewView);
+        switchButtons.setAlignment(Pos.TOP_RIGHT);
+
+        codeView.setOnAction($ -> {
+            markdownButtons.setVisible(true);
+            showContent(codeView(), topRow);
+        });
+
+        splitView.setOnAction($ -> {
+            markdownButtons.setVisible(true);
+            showContent(splitView(), topRow);
+        });
+
+        previewView.setOnAction($ -> {
+            // hide markdown buttons in preview-only mode
+            markdownButtons.setVisible(false);
+            showContent(previewView(), topRow);
+        });
+
+        return switchButtons;
+    }
+
+    private HBox createMarkdownButtons(){
+        Button headingButton = createButton(FontAwesomeSolid.HEADING);
+
+        var headingMenu = new ContextMenu();
+
+        int[] headingFontSizes = {32, 24, 18, 16, 13, 10};
+
+        for (int level = 1; level <= 6; level++) {
+            CustomMenuItem item = createMenuItem(level, headingFontSizes, headingMenu);
+
+            headingMenu.getItems().add(item);
+        }
+
+        headingButton.setOnAction($ -> {
+            if (!headingMenu.isShowing()) {
+                headingMenu.show(headingButton, Side.BOTTOM, 0, 0);
+            } else {
+                headingMenu.hide();
+            }
+        });
+
+        Button boldButton = createButton(FontAwesomeSolid.BOLD);
+        setButtonOnAction(boldButton, "**", "**");
+        Button italicButton = createButton(FontAwesomeSolid.ITALIC);
+        setButtonOnAction(italicButton, "_", "_");
+
+        Button quoteButton = createButton(FontAwesomeSolid.QUOTE_LEFT);
+        setButtonOnAction(quoteButton, "> ");
+        Button codeButton = createButton(FontAwesomeSolid.CODE);
+        setButtonOnAction(codeButton, "`", "`");
+        Button linkButton = createButton(FontAwesomeSolid.LINK);
+        setButtonOnAction(linkButton, "[", "](url)");
+
+        Button unorderedListButton = createButton(FontAwesomeSolid.LIST_UL);
+        setButtonOnAction(unorderedListButton, "- ");
+        Button orderedListButton = createButton(FontAwesomeSolid.LIST_OL);
+        setButtonOnAction(orderedListButton, "1. ");
+
+        //TODO implement task list in markdown
+        //Button taskListButton = createButton(FontAwesomeSolid.TASKS);
+        //setButtonOnAction(taskListButton, "- [ ]");
+
+
+        return new RRHBox(headingButton, boldButton, italicButton, quoteButton, codeButton, linkButton,
+            unorderedListButton, orderedListButton);
+    }
+
+    private CustomMenuItem createMenuItem(int level, int[] headingFontSizes, ContextMenu headingMenu) {
+        String labelText = "H" + level;
+
+        var preview = new Label(labelText);
+        preview.getStyleClass().add("markdown-preview-heading-label");
+        preview.setStyle("-fx-font-size: " + headingFontSizes[level - 1] + "px;");
+
+        var item = new CustomMenuItem(preview, true);
+
+        item.setOnAction($ -> {
+            headingMenu.hide();
+            textEditorPane.insertText(textEditorPane.getCaretPosition(), "#".repeat(level) + " ");
+            textEditorPane.requestFocus();
+        });
+
+        return item;
+    }
+
+    private Button createButton(Ikon icon){
+        var button = new RRButton("", icon);
+        button.setSquare(true);
+        button.setRounded(false);
+        return button;
+    }
+
+    private void setButtonOnAction(Button button, String prefix){
+        button.setOnAction($ -> {
+            if (textEditorPane != null){
+                textEditorPane.insertText(textEditorPane.getCaretPosition(), prefix + " ");
+                textEditorPane.requestFocus();
+            }
+        });
+    }
+
+    private void setButtonOnAction(Button button, String prefix, String postfix){
+        button.setOnAction($ -> {
+            if (textEditorPane != null) {
+                int caretPosition = textEditorPane.getCaretPosition();
+                textEditorPane.insertText(caretPosition, prefix + postfix);
+                textEditorPane.moveTo(caretPosition + prefix.length());
+                textEditorPane.requestFocus();
+            }
+        });
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/ui/TextEditorPane.java b/src/main/java/dev/railroadide/railroad/ide/ui/TextEditorPane.java
index 7cb85e98..2d6bc958 100644
--- a/src/main/java/dev/railroadide/railroad/ide/ui/TextEditorPane.java
+++ b/src/main/java/dev/railroadide/railroad/ide/ui/TextEditorPane.java
@@ -5,75 +5,320 @@
 import dev.railroadide.railroad.utility.ShutdownHooks;
 import dev.railroadide.railroadpluginapi.events.FileEvent;
 import dev.railroadide.railroadpluginapi.events.FileModifiedEvent;
+import javafx.application.Platform;
 import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.util.Pair;
 import org.fxmisc.richtext.CodeArea;
 import org.fxmisc.richtext.LineNumberFactory;
 import org.fxmisc.richtext.model.PlainTextChange;
+import org.reactfx.Subscription;
 
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardWatchEventKinds;
+import java.nio.file.*;
 import java.time.Duration;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class TextEditorPane extends CodeArea {
     private static final int[] FONT_SIZES = {6, 8, 10, 12, 14, 16, 18, 20, 24, 26, 28, 30, 36, 40, 48, 56, 60};
+    private static final Duration SAVE_DELAY = Duration.ofMillis(400);
+    private static final Duration CHANGE_DEBOUNCE = Duration.ofMillis(150);
+
+    private static final ScheduledExecutorService SAVE_EXECUTOR = Executors.newScheduledThreadPool(
+        Math.max(2, Runtime.getRuntime().availableProcessors() / 2),
+        namedThreadFactory("railroad-editor-save-"));
+
+    static {
+        ShutdownHooks.addHook(() -> {
+            SAVE_EXECUTOR.shutdown();
+            try {
+                if (!SAVE_EXECUTOR.awaitTermination(5, TimeUnit.SECONDS)) {
+                    SAVE_EXECUTOR.shutdownNow();
+                }
+            } catch (InterruptedException interruptedException) {
+                Thread.currentThread().interrupt();
+                SAVE_EXECUTOR.shutdownNow();
+            }
+        });
+    }
+
     protected final Path filePath;
-    private final ExecutorService changeExecutor = Executors.newSingleThreadExecutor();
+
+    private final AtomicReference<String> lastSavedText = new AtomicReference<>("");
+    private final AtomicReference<String> pendingSnapshot = new AtomicReference<>("");
+    private final AtomicLong lastLocalWrite = new AtomicLong(0L);
+
+    private final ExecutorService watcherExecutor = Executors.newSingleThreadExecutor(
+        namedThreadFactory("railroad-editor-watch-"));
+
+    private WatchService watchService;
+    private Subscription changeSubscription;
+    private ScheduledFuture<?> pendingSaveTask;
+    private volatile boolean dirty;
+
     private int fontSizeIndex = 5;
 
     public TextEditorPane(Path item) {
-        this.filePath = item;
+        this.filePath = Objects.requireNonNull(item, "item");
 
         setParagraphGraphicFactory(LineNumberFactory.get(this));
         setMouseOverTextDelay(Duration.ofMillis(500));
 
-        listenForChanges();
-        resizableFont();
+        loadInitialContent();
+        configureFontControls();
+        subscribeToChanges();
+        startExternalWatcher();
+
+        Platform.runLater(() -> {
+            moveTo(0);
+            scrollToPixel(0, 0);
+        });
+
+        ShutdownHooks.addHook(() -> {
+            watcherExecutor.shutdownNow();
+            if (watchService != null) {
+                try {
+                    watchService.close();
+                } catch (IOException ignored) {
+                    // Nothing to do here
+                }
+            }
+
+            if (changeSubscription != null) {
+                changeSubscription.unsubscribe();
+            }
+        });
+    }
+
+    public static ThreadFactory namedThreadFactory(String prefix) {
+        var counter = new AtomicInteger();
+        return runnable -> {
+            var thread = new Thread(runnable, prefix + counter.incrementAndGet());
+            thread.setDaemon(true);
+            return thread;
+        };
+    }
+
+    private void loadInitialContent() {
+        try {
+            if (Files.exists(filePath)) {
+                String content = Files.readString(filePath);
+                replaceText(content);
+                lastSavedText.set(content);
+            } else {
+                replaceText("");
+                lastSavedText.set("");
+            }
+
+            dirty = false;
+        } catch (IOException exception) {
+            Railroad.LOGGER.error("Failed to read file {}", filePath, exception);
+            replaceText("");
+            lastSavedText.set("");
+            dirty = false;
+        }
+    }
+
+    private void configureFontControls() {
+        updateFontSizeClass();
+        setOnKeyPressed(this::handleFontResizing);
+    }
+
+    private void updateFontSizeClass() {
+        getStyleClass().removeIf(styleClass -> styleClass.startsWith("text-editor-font-size-"));
+        getStyleClass().add("text-editor-font-size-" + FONT_SIZES[fontSizeIndex]);
+    }
+
+    private void subscribeToChanges() {
+        changeSubscription = multiPlainChanges()
+            .successionEnds(CHANGE_DEBOUNCE)
+            .subscribe(changes -> {
+                dirty = true;
+                String snapshot = getText();
+                pendingSnapshot.set(snapshot);
+
+                List<FileModifiedEvent.Change> diff = changes.stream()
+                    .map(change -> buildChange(snapshot, change))
+                    .toList();
+                publishFileModifiedEvent(diff);
+
+                scheduleSave();
+            });
+    }
+
+    private void scheduleSave() {
+        synchronized (this) {
+            if (pendingSaveTask != null) {
+                pendingSaveTask.cancel(false);
+            }
+
+            pendingSaveTask = SAVE_EXECUTOR.schedule(() -> {
+                String snapshot = pendingSnapshot.get();
+                persistSnapshot(snapshot);
+            }, SAVE_DELAY.toMillis(), TimeUnit.MILLISECONDS);
+        }
+    }
+
+    private void persistSnapshot(String snapshot) {
+        if (snapshot == null)
+            return;
+
+        String lastSaved = lastSavedText.get();
+        if (snapshot.equals(lastSaved))
+            return;
+
+        try {
+            Path parent = filePath.getParent();
+            if (parent != null) {
+                Files.createDirectories(parent);
+            }
+
+            Files.writeString(filePath, snapshot, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+            lastSavedText.set(snapshot);
+            dirty = false;
+            lastLocalWrite.set(System.nanoTime());
+            Railroad.EVENT_BUS.publish(new FileEvent(document(), FileEvent.EventType.SAVED));
+        } catch (IOException exception) {
+            Railroad.LOGGER.error("Failed to write file {}", filePath, exception);
+        }
+    }
+
+    private void publishFileModifiedEvent(List<FileModifiedEvent.Change> changes) {
+        Railroad.EVENT_BUS.publish(new FileModifiedEvent(document(), changes));
+    }
+
+    private DefaultDocument document() {
+        return new DefaultDocument(filePath.getFileName().toString(), filePath);
+    }
+
+    private void startExternalWatcher() {
+        Path parent = filePath.getParent();
+        if (parent == null)
+            return;
+
+        try {
+            watchService = parent.getFileSystem().newWatchService();
+            parent.register(watchService,
+                StandardWatchEventKinds.ENTRY_MODIFY,
+                StandardWatchEventKinds.ENTRY_DELETE,
+                StandardWatchEventKinds.ENTRY_CREATE);
+        } catch (IOException exception) {
+            Railroad.LOGGER.error("Failed to start watch service for {}", filePath, exception);
+            return;
+        }
+
+        watcherExecutor.submit(this::watchLoop);
+    }
+
+    private void watchLoop() {
+        try {
+            while (!Thread.currentThread().isInterrupted()) {
+                WatchKey key = watchService.take();
+                for (WatchEvent<?> event : key.pollEvents()) {
+                    WatchEvent.Kind<?> kind = event.kind();
+                    if (kind == StandardWatchEventKinds.OVERFLOW)
+                        continue;
+
+                    Path changed = (Path) event.context();
+                    if (changed != null && changed.equals(filePath.getFileName())) {
+                        handleExternalChange(kind);
+                    }
+                }
+
+                if (!key.reset())
+                    break;
+            }
+        } catch (InterruptedException ignored) {
+            Thread.currentThread().interrupt();
+        } catch (ClosedWatchServiceException ignored) {
+            // watcher closed during shutdown
+        }
+    }
 
-        moveTo(0);
+    private void handleExternalChange(WatchEvent.Kind<?> kind) {
+        long lastWriteNanos = lastLocalWrite.get();
+        if (System.nanoTime() - lastWriteNanos < TimeUnit.MILLISECONDS.toNanos(250))
+            return;
+
+        if (kind == StandardWatchEventKinds.ENTRY_DELETE) {
+            Platform.runLater(() -> {
+                replaceText("");
+                lastSavedText.set("");
+                dirty = false;
+            });
+
+            return;
+        }
+
+        if (dirty)
+            return;
+
+        try {
+            if (!Files.exists(filePath)) {
+                Platform.runLater(() -> {
+                    replaceText("");
+                    lastSavedText.set("");
+                    dirty = false;
+                });
+
+                return;
+            }
+
+            String disk = Files.readString(filePath);
+            if (disk.equals(lastSavedText.get()))
+                return;
+
+            Platform.runLater(() -> {
+                int caret = getCaretPosition();
+                replaceText(disk);
+                moveTo(Math.min(caret, getLength()));
+                lastSavedText.set(disk);
+                dirty = false;
+            });
+        } catch (IOException exception) {
+            Railroad.LOGGER.error("Failed to reload file {}", filePath, exception);
+        }
     }
 
-    private static FileModifiedEvent.Change getChange(String text, PlainTextChange change) {
+    private static FileModifiedEvent.Change buildChange(String text, PlainTextChange change) {
         String inserted = change.getInserted();
         String removed = change.getRemoved();
         int position = change.getPosition();
         int netLength = change.getNetLength();
 
-        Pair<Integer, Integer> startPos = getLineAndColumn(text, position);
-        Pair<Integer, Integer> endPos = getLineAndColumn(text, position + netLength);
+        Pair<Integer, Integer> start = getLineAndColumn(text, position);
+        Pair<Integer, Integer> end = getLineAndColumn(text, position + netLength);
 
         return new FileModifiedEvent.Change(
-            getChangeType(change),
+            detectChangeType(inserted, removed),
             removed,
             inserted,
-            new FileModifiedEvent.Range(
-                startPos.getKey(), startPos.getValue(),
-                endPos.getKey(), endPos.getValue()));
+            new FileModifiedEvent.Range(start.getKey(), start.getValue(), end.getKey(), end.getValue())
+        );
     }
 
-    private static FileModifiedEvent.Change.Type getChangeType(PlainTextChange change) {
-        String inserted = change.getInserted();
-        String removed = change.getRemoved();
-
-        if (!inserted.isEmpty() && removed.isEmpty()) {
+    private static FileModifiedEvent.Change.Type detectChangeType(String inserted, String removed) {
+        if (!inserted.isEmpty() && removed.isEmpty())
             return FileModifiedEvent.Change.Type.ADDED;
-        } else if (inserted.isEmpty() && !removed.isEmpty()) {
+        else if (inserted.isEmpty() && !removed.isEmpty())
             return FileModifiedEvent.Change.Type.REMOVED;
-        } else {
+        else
             return FileModifiedEvent.Change.Type.MODIFIED;
-        }
     }
 
     private static Pair<Integer, Integer> getLineAndColumn(String text, int position) {
         int line = 0;
         int column = 0;
+        int limit = Math.min(position, text.length());
 
-        for (int i = 0; i < position && i < text.length(); i++) {
-            if (text.charAt(i) == '\n') {
+        for (int i = 0; i < limit; i++) {
+            char c = text.charAt(i);
+            if (c == '\n') {
                 line++;
                 column = 0;
             } else {
@@ -84,90 +329,20 @@ private static Pair<Integer, Integer> getLineAndColumn(String text, int position
         return new Pair<>(line, column);
     }
 
-    private void resizableFont() {
-        updateFontSizeClass();
+    private void handleFontResizing(KeyEvent event) {
+        if (!event.isControlDown())
+            return;
 
-        setOnKeyPressed(event -> {
-            if (!event.isControlDown())
-                return;
+        KeyCode code = event.getCode();
+        if (code != KeyCode.EQUALS && code != KeyCode.MINUS)
+            return;
 
-            KeyCode code = event.getCode();
-            if (code != KeyCode.EQUALS && code != KeyCode.MINUS)
-                return;
+        int newIndex = fontSizeIndex + (code == KeyCode.EQUALS ? 1 : -1);
+        if (newIndex < 0 || newIndex >= FONT_SIZES.length)
+            return;
 
-            int index = fontSizeIndex + (code == KeyCode.EQUALS ? 1 : -1);
-            if (index < 0 || index >= FONT_SIZES.length)
-                return;
-
-            fontSizeIndex = index;
-            updateFontSizeClass();
-        });
-    }
-
-    private void updateFontSizeClass() {
-        getStyleClass().removeIf(styleClass -> styleClass.startsWith("text-editor-font-size-"));
-        getStyleClass().add("text-editor-font-size-" + FONT_SIZES[fontSizeIndex]);
-    }
-
-    private void listenForChanges() {
-        try {
-            replaceText(0, 0, Files.readString(this.filePath));
-
-            try (var watcher = this.filePath.getFileSystem().newWatchService()) {
-                this.filePath.getParent().register(watcher, StandardWatchEventKinds.ENTRY_MODIFY);
-
-                ExecutorService executor1 = Executors.newSingleThreadExecutor();
-                executor1.submit(() -> {
-                    while (!Thread.interrupted()) {
-                        try {
-                            var key = watcher.take();
-                            for (var event : key.pollEvents()) {
-                                if (event.context().equals(this.filePath.getFileName())) {
-                                    String content = Files.readString(this.filePath);
-                                    String text = getText();
-                                    if (!text.equals(content)) {
-                                        replaceText(0, 0, content);
-                                    }
-                                }
-                            }
-                            key.reset();
-                        } catch (InterruptedException exception) {
-                            Railroad.LOGGER.error("File watcher interrupted", exception);
-                        } catch (IOException exception) {
-                            Railroad.LOGGER.error("Failed to watch file", exception);
-                        }
-                    }
-                });
-
-                ShutdownHooks.addHook(executor1::shutdown);
-            } catch (IOException exception) {
-                Railroad.LOGGER.error("Failed to watch file", exception);
-            }
-
-            multiPlainChanges()
-                .successionEnds(Duration.ofMillis(500))
-                .retainLatestUntilLater(changeExecutor)
-                .map(changes -> changes.stream()
-                    .map(change -> TextEditorPane.getChange(getText(), change))
-                    .toList())
-                .subscribe(changes -> {
-                    var document = new DefaultDocument(this.filePath.getFileName().toString(), this.filePath);
-                    Railroad.EVENT_BUS.publish(new FileModifiedEvent(document, changes));
-
-                    String text = getText();
-                    try {
-                        if (!Files.readString(this.filePath).equals(text)) {
-                            Files.writeString(this.filePath, text);
-                            Railroad.EVENT_BUS.publish(new FileEvent(
-                                document,
-                                FileEvent.EventType.SAVED));
-                        }
-                    } catch (IOException exception) {
-                        Railroad.LOGGER.error("Failed to write file", exception);
-                    }
-                });
-        } catch (IOException exception) {
-            Railroad.LOGGER.error("Failed to read file", exception);
-        }
+        fontSizeIndex = newIndex;
+        updateFontSizeClass();
+        event.consume();
     }
 }
diff --git a/src/main/java/dev/railroadide/railroad/ide/ui/setup/IDEMenuBarFactory.java b/src/main/java/dev/railroadide/railroad/ide/ui/setup/IDEMenuBarFactory.java
new file mode 100644
index 00000000..524a0708
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/ui/setup/IDEMenuBarFactory.java
@@ -0,0 +1,161 @@
+package dev.railroadide.railroad.ide.ui.setup;
+
+import dev.railroadide.core.settings.keybinds.KeybindData;
+import dev.railroadide.core.ui.RRMenuBar;
+import dev.railroadide.core.ui.localized.LocalizedCheckMenuItem;
+import dev.railroadide.core.ui.localized.LocalizedMenu;
+import dev.railroadide.core.ui.localized.LocalizedMenuItem;
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.settings.ui.SettingsPane;
+import dev.railroadide.railroad.window.WindowManager;
+import javafx.application.Platform;
+import javafx.scene.control.MenuBar;
+import javafx.scene.control.SeparatorMenuItem;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyCodeCombination;
+import javafx.scene.input.KeyCombination;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+/**
+ * Builds the main IDE menu bar with all menu items, accelerators, and icons.
+ */
+public final class IDEMenuBarFactory {
+    private IDEMenuBarFactory() {
+    }
+
+    public static MenuBar create() {
+        var newFileItem = new LocalizedMenuItem("railroad.menu.file.new_file");
+        newFileItem.setGraphic(new FontIcon(FontAwesomeSolid.FILE));
+        newFileItem.setKeybindData(new KeybindData(KeyCode.N, new KeyCombination.Modifier[]{KeyCombination.SHORTCUT_DOWN}));
+
+        var openFileItem = new LocalizedMenuItem("railroad.menu.file.open_file");
+        openFileItem.setGraphic(new FontIcon(FontAwesomeSolid.FOLDER_OPEN));
+        openFileItem.setAccelerator(new KeyCodeCombination(KeyCode.O, KeyCombination.SHORTCUT_DOWN));
+
+        var saveItem = new LocalizedMenuItem("railroad.menu.file.save");
+        saveItem.setGraphic(new FontIcon(FontAwesomeSolid.SAVE));
+        saveItem.setAccelerator(new KeyCodeCombination(KeyCode.S, KeyCombination.SHORTCUT_DOWN));
+
+        var saveAsItem = new LocalizedMenuItem("railroad.menu.file.save_as");
+        saveAsItem.setGraphic(new FontIcon(FontAwesomeSolid.SAVE));
+        saveAsItem.setAccelerator(new KeyCodeCombination(KeyCode.S, KeyCombination.SHORTCUT_DOWN, KeyCombination.SHIFT_DOWN));
+
+        var exitItem = new LocalizedMenuItem("railroad.menu.file.exit");
+        exitItem.setGraphic(new FontIcon(FontAwesomeSolid.SIGN_OUT_ALT));
+        exitItem.setAccelerator(new KeyCodeCombination(KeyCode.Q, KeyCombination.SHORTCUT_DOWN));
+        exitItem.setOnAction(e -> Platform.exit());
+
+        var undoItem = new LocalizedMenuItem("railroad.menu.edit.undo");
+        undoItem.setGraphic(new FontIcon(FontAwesomeSolid.UNDO));
+        undoItem.setAccelerator(new KeyCodeCombination(KeyCode.Z, KeyCombination.SHORTCUT_DOWN));
+
+        var redoItem = new LocalizedMenuItem("railroad.menu.edit.redo");
+        redoItem.setGraphic(new FontIcon(FontAwesomeSolid.REDO));
+        redoItem.setAccelerator(new KeyCodeCombination(KeyCode.Y, KeyCombination.SHORTCUT_DOWN));
+
+        var cutItem = new LocalizedMenuItem("railroad.menu.edit.cut");
+        cutItem.setGraphic(new FontIcon(FontAwesomeSolid.CUT));
+        cutItem.setAccelerator(new KeyCodeCombination(KeyCode.X, KeyCombination.SHORTCUT_DOWN));
+
+        var copyItem = new LocalizedMenuItem("railroad.menu.edit.copy");
+        copyItem.setGraphic(new FontIcon(FontAwesomeSolid.COPY));
+        copyItem.setAccelerator(new KeyCodeCombination(KeyCode.C, KeyCombination.SHORTCUT_DOWN));
+
+        var pasteItem = new LocalizedMenuItem("railroad.menu.edit.paste");
+        pasteItem.setGraphic(new FontIcon(FontAwesomeSolid.PASTE));
+        pasteItem.setAccelerator(new KeyCodeCombination(KeyCode.V, KeyCombination.SHORTCUT_DOWN));
+
+        var findItem = new LocalizedMenuItem("railroad.menu.edit.find");
+        findItem.setGraphic(new FontIcon(FontAwesomeSolid.SEARCH));
+        findItem.setAccelerator(new KeyCodeCombination(KeyCode.F, KeyCombination.SHORTCUT_DOWN));
+
+        var replaceItem = new LocalizedMenuItem("railroad.menu.edit.replace");
+        replaceItem.setGraphic(new FontIcon(FontAwesomeSolid.SEARCH_PLUS));
+        replaceItem.setAccelerator(new KeyCodeCombination(KeyCode.H, KeyCombination.CONTROL_DOWN));
+
+        var projectExplorerItem = new LocalizedCheckMenuItem("railroad.menu.view.project_explorer", true);
+        projectExplorerItem.setGraphic(new FontIcon(FontAwesomeSolid.FOLDER));
+        projectExplorerItem.setAccelerator(new KeyCodeCombination(KeyCode.DIGIT1, KeyCombination.SHORTCUT_DOWN));
+
+        var propertiesItem = new LocalizedCheckMenuItem("railroad.menu.view.properties", true);
+        propertiesItem.setGraphic(new FontIcon(FontAwesomeSolid.INFO_CIRCLE));
+        propertiesItem.setAccelerator(new KeyCodeCombination(KeyCode.DIGIT2, KeyCombination.SHORTCUT_DOWN));
+
+        var consoleItem = new LocalizedCheckMenuItem("railroad.menu.view.console", true);
+        consoleItem.setGraphic(new FontIcon(FontAwesomeSolid.TERMINAL));
+        consoleItem.setAccelerator(new KeyCodeCombination(KeyCode.DIGIT3, KeyCombination.SHORTCUT_DOWN));
+
+        var fullScreenItem = new LocalizedMenuItem("railroad.menu.view.full_screen");
+        fullScreenItem.setGraphic(new FontIcon(FontAwesomeSolid.EXPAND));
+        fullScreenItem.setOnAction($ -> WindowManager.toggleFullScreen());
+
+        var runItem = new LocalizedMenuItem("railroad.menu.run.run");
+        runItem.setGraphic(new FontIcon(FontAwesomeSolid.PLAY));
+        runItem.setAccelerator(new KeyCodeCombination(KeyCode.F5));
+
+        var debugItem = new LocalizedMenuItem("railroad.menu.run.debug");
+        debugItem.setGraphic(new FontIcon(FontAwesomeSolid.BUG));
+        debugItem.setAccelerator(new KeyCodeCombination(KeyCode.F6));
+
+        var stopItem = new LocalizedMenuItem("railroad.menu.run.stop");
+        stopItem.setGraphic(new FontIcon(FontAwesomeSolid.STOP));
+        stopItem.setAccelerator(new KeyCodeCombination(KeyCode.F7));
+
+        var settingsItem = new LocalizedMenuItem("railroad.menu.tools.settings");
+        settingsItem.setGraphic(new FontIcon(FontAwesomeSolid.COG));
+        settingsItem.setAccelerator(new KeyCodeCombination(KeyCode.COMMA, KeyCombination.SHORTCUT_DOWN));
+        settingsItem.setOnAction($ -> SettingsPane.openSettingsWindow());
+
+        var pluginsItem = new LocalizedMenuItem("railroad.menu.tools.plugins");
+        pluginsItem.setGraphic(new FontIcon(FontAwesomeSolid.PUZZLE_PIECE));
+        pluginsItem.setOnAction($ -> SettingsPane.openPluginsWindow());
+
+        var terminalItem = new LocalizedMenuItem("railroad.menu.tools.terminal");
+        terminalItem.setGraphic(new FontIcon(FontAwesomeSolid.TERMINAL));
+        terminalItem.setAccelerator(new KeyCodeCombination(KeyCode.T, KeyCombination.SHORTCUT_DOWN, KeyCombination.SHIFT_DOWN));
+
+        var fileMenu = new LocalizedMenu("railroad.menu.file");
+        fileMenu.getItems().addAll(newFileItem, openFileItem, saveItem, saveAsItem, new SeparatorMenuItem(), exitItem);
+        fileMenu.getStyleClass().add("rr-menu");
+
+        var editMenu = new LocalizedMenu("railroad.menu.edit");
+        editMenu.getItems().addAll(
+            undoItem,
+            redoItem,
+            new SeparatorMenuItem(),
+            cutItem,
+            copyItem,
+            pasteItem,
+            new SeparatorMenuItem(),
+            findItem,
+            replaceItem
+        );
+        editMenu.getStyleClass().add("rr-menu");
+
+        var viewMenu = new LocalizedMenu("railroad.menu.view");
+        viewMenu.getItems().addAll(
+            projectExplorerItem,
+            propertiesItem,
+            consoleItem,
+            new SeparatorMenuItem(),
+            fullScreenItem
+        );
+        viewMenu.getStyleClass().add("rr-menu");
+
+        var runMenu = new LocalizedMenu("railroad.menu.run");
+        runMenu.getItems().addAll(runItem, debugItem, stopItem);
+        runMenu.getStyleClass().add("rr-menu");
+
+        var toolsMenu = new LocalizedMenu("railroad.menu.tools");
+        toolsMenu.getItems().addAll(settingsItem, pluginsItem, terminalItem);
+        toolsMenu.getStyleClass().add("rr-menu");
+
+        var menuBar = new RRMenuBar(true, fileMenu, editMenu, viewMenu, runMenu, toolsMenu);
+        if (OperatingSystem.isMac()) {
+            menuBar.useSystemMenuBarProperty().set(true);
+        }
+        menuBar.getStyleClass().add("rr-menu-bar");
+        return menuBar;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/ui/setup/NotImplementedPaneFactory.java b/src/main/java/dev/railroadide/railroad/ide/ui/setup/NotImplementedPaneFactory.java
new file mode 100644
index 00000000..160365a4
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/ui/setup/NotImplementedPaneFactory.java
@@ -0,0 +1,44 @@
+package dev.railroadide.railroad.ide.ui.setup;
+
+import dev.railroadide.core.ui.RRCard;
+import dev.railroadide.core.ui.localized.LocalizedLabel;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.text.TextAlignment;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+/**
+ * Simple factory for the placeholder pane used when a feature has not been implemented yet.
+ */
+public final class NotImplementedPaneFactory {
+    private NotImplementedPaneFactory() {
+    }
+
+    public static Node create() {
+        var card = new RRCard(16);
+        card.setPadding(new Insets(32, 32, 32, 32));
+        card.setMaxWidth(Double.MAX_VALUE);
+        card.setAlignment(Pos.CENTER);
+
+        var icon = new FontIcon(FontAwesomeSolid.TOOLS);
+        icon.setIconSize(48);
+        icon.getStyleClass().add("not-implemented-icon");
+
+        var title = new LocalizedLabel("not_implemented.title");
+        title.getStyleClass().add("not-implemented-title");
+        title.setAlignment(Pos.CENTER);
+        title.setTextAlignment(TextAlignment.CENTER);
+        title.setWrapText(true);
+
+        var subtitle = new LocalizedLabel("not_implemented.subtitle");
+        subtitle.getStyleClass().add("not-implemented-subtitle");
+        subtitle.setWrapText(true);
+        subtitle.setAlignment(Pos.CENTER);
+        subtitle.setTextAlignment(TextAlignment.CENTER);
+
+        card.addContent(icon, title, subtitle);
+        return card;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/ui/setup/PaneIconBarFactory.java b/src/main/java/dev/railroadide/railroad/ide/ui/setup/PaneIconBarFactory.java
new file mode 100644
index 00000000..2c815b6b
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/ui/setup/PaneIconBarFactory.java
@@ -0,0 +1,94 @@
+package dev.railroadide.railroad.ide.ui.setup;
+
+import com.panemu.tiwulfx.control.dock.DetachableTabPane;
+import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.ui.RRVBox;
+import javafx.collections.ListChangeListener;
+import javafx.geometry.Orientation;
+import javafx.scene.Node;
+import javafx.scene.control.SplitPane;
+import javafx.scene.control.Tab;
+import javafx.scene.control.ToggleButton;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.function.Consumer;
+
+/**
+ * Builds the vertical/horizontal icon bars that toggle DetachableTabPanes via toolbar buttons.
+ */
+public final class PaneIconBarFactory {
+    private PaneIconBarFactory() {
+    }
+
+    public static Node create(
+        DetachableTabPane pane,
+        SplitPane split,
+        Orientation orientation,
+        int originalIndex,
+        Map<String, String> iconsByName
+    ) {
+        var bar = orientation == Orientation.HORIZONTAL ? new RRHBox(4) : new RRVBox(4);
+        bar.getStyleClass().add("icon-bar-" + orientation.name().toLowerCase(Locale.ROOT));
+
+        Map<Tab, ToggleButton> btnMap = new LinkedHashMap<>();
+
+        Consumer<Tab> addButtonFor = tab -> {
+            String name = tab.getText();
+            String icon = iconsByName.getOrDefault(name, FontAwesomeSolid.EYE.getDescription());
+            var btn = new ToggleButton("", new FontIcon(icon));
+            btn.getStyleClass().add("icon-button");
+
+            btn.setOnAction(e -> {
+                boolean isVisible = split.getItems().contains(pane);
+                Tab selected = pane.getSelectionModel().getSelectedItem();
+
+                if (isVisible && selected == tab) {
+                    split.getItems().remove(pane);
+                    btnMap.values().forEach(b -> b.setSelected(false));
+                } else {
+                    if (!isVisible) {
+                        split.getItems().add(Math.min(originalIndex, split.getItems().size()), pane);
+                    }
+                    pane.getSelectionModel().select(tab);
+                    btnMap.values().forEach(b -> b.setSelected(b == btn));
+                }
+            });
+
+            btnMap.put(tab, btn);
+            bar.getChildren().add(btn);
+        };
+
+        Consumer<Tab> removeButtonFor = tab -> {
+            var btn = btnMap.remove(tab);
+            if (btn != null) bar.getChildren().remove(btn);
+        };
+
+        pane.getTabs().addListener((ListChangeListener<Tab>) change -> {
+            while (change.next()) {
+                if (change.wasAdded()) {
+                    change.getAddedSubList().forEach(addButtonFor);
+                }
+                if (change.wasRemoved()) {
+                    change.getRemoved().forEach(removeButtonFor);
+                }
+            }
+        });
+
+        pane.getTabs().forEach(addButtonFor);
+
+        pane.getSelectionModel().selectedItemProperty().addListener((obs, oldT, newT) -> {
+            btnMap.forEach((tab, btn) -> btn.setSelected(tab == newT));
+        });
+
+        Tab init = pane.getSelectionModel().getSelectedItem();
+        if (init != null) {
+            btnMap.get(init).setSelected(true);
+        }
+
+        return bar;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/ui/setup/RunControlsPane.java b/src/main/java/dev/railroadide/railroad/ide/ui/setup/RunControlsPane.java
new file mode 100644
index 00000000..8e2e8359
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/ui/setup/RunControlsPane.java
@@ -0,0 +1,403 @@
+package dev.railroadide.railroad.ide.ui.setup;
+
+import dev.railroadide.core.localization.LocalizationService;
+import dev.railroadide.core.ui.RRButton;
+import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.ui.localized.LocalizedComboBox;
+import dev.railroadide.core.ui.localized.LocalizedTooltip;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
+import dev.railroadide.core.utility.ServiceLocator;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.ide.IDESetup;
+import dev.railroadide.railroad.ide.runconfig.RunConfiguration;
+import dev.railroadide.railroad.ide.runconfig.ui.RunConfigurationContextMenuManager;
+import dev.railroadide.railroad.ide.runconfig.ui.RunConfigurationListCell;
+import dev.railroadide.railroad.project.Project;
+import javafx.application.Platform;
+import javafx.collections.ListChangeListener;
+import javafx.geometry.Pos;
+import javafx.geometry.Side;
+import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.SeparatorMenuItem;
+import org.jetbrains.annotations.Nullable;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Encapsulates the run/debug/stop controls shown in the IDE toolbar.
+ * Handles synchronization with the project's run configuration manager and
+ * manages tracking of currently running configurations to support multiple instances.
+ */
+public final class RunControlsPane extends RRHBox {
+    private final Project project;
+    private final LocalizedComboBox<RunConfiguration<?>> runConfigurationsComboBox;
+    private final RRButton runButton = new RRButton("", FontAwesomeSolid.PLAY);
+    private final RRButton debugButton = new RRButton("", FontAwesomeSolid.BUG);
+    private final RRButton stopButton = new RRButton("", FontAwesomeSolid.STOP);
+    private final RRButton moreActionsButton = new RRButton("", FontAwesomeSolid.ELLIPSIS_V);
+    private final Map<UUID, Integer> runningConfigurations = new HashMap<>();
+    private final Set<UUID> stoppingConfigurations = new HashSet<>();
+    private final LocalizedTooltip runButtonTooltip = new LocalizedTooltip("railroad.ide.toolbar.run.tooltip");
+    private final LocalizedTooltip restartButtonTooltip = new LocalizedTooltip("railroad.ide.toolbar.restart.tooltip");
+    private final LocalizedTooltip debugButtonTooltip = new LocalizedTooltip("railroad.ide.toolbar.debug.tooltip");
+    private final LocalizedTooltip debugRestartTooltip = new LocalizedTooltip("railroad.ide.toolbar.debug.restart.tooltip");
+
+    public static Node create(Project project) {
+        return new RunControlsPane(project);
+    }
+
+    private RunControlsPane(Project project) {
+        super(4);
+        this.project = project;
+        setAlignment(Pos.CENTER_LEFT);
+
+        runConfigurationsComboBox = createRunConfigurationsComboBox();
+        configureButtons();
+
+        getChildren().addAll(
+            runConfigurationsComboBox,
+            runButton,
+            debugButton,
+            stopButton,
+            moreActionsButton
+        );
+    }
+
+    private LocalizedComboBox<RunConfiguration<?>> createRunConfigurationsComboBox() {
+        var comboBox = new LocalizedComboBox<RunConfiguration<?>>(object -> {
+            if (object == null)
+                return "railroad.ide.toolbar.edit_run_configurations";
+
+            return object.uuid().toString();
+        });
+
+        comboBox.getItems().setAll(project.getRunConfigManager().getConfigurations());
+        comboBox.getItems().add(null);
+
+        project.getRunConfigManager().getConfigurations().addListener(
+            (ListChangeListener<? super RunConfiguration<?>>) change -> {
+                RunConfiguration<?> selected = comboBox.getValue();
+                UUID selectedUuid = selected != null ? selected.uuid() : null;
+
+                var configurations = project.getRunConfigManager().getConfigurations();
+                comboBox.getItems().setAll(configurations);
+                comboBox.getItems().add(null); // For "Edit Run Configurations" option
+
+                if (selectedUuid != null) {
+                    RunConfiguration<?> updatedSelection = project.getRunConfigManager().getConfigurationByUUID(selectedUuid);
+                    if (updatedSelection != null) {
+                        comboBox.setValue(updatedSelection);
+                        return;
+                    }
+                }
+
+                comboBox.getSelectionModel().selectFirst();
+            });
+
+        var localizationService = ServiceLocator.getService(LocalizationService.class);
+        comboBox.getStyleClass().add("run-config-combobox");
+        comboBox.setTooltip(new LocalizedTooltip("railroad.ide.toolbar.run_configurations.tooltip"));
+        comboBox.setPrefWidth(200);
+        comboBox.setCellFactory(param -> new RunConfigurationListCell(project));
+        comboBox.setButtonCell(new ListCell<>() {
+            @Override
+            protected void updateItem(RunConfiguration<?> item, boolean empty) {
+                super.updateItem(item, empty);
+                if (empty) {
+                    setText(null);
+                    return;
+                }
+
+                if (item == null) {
+                    if (project.getRunConfigManager().getConfigurations().isEmpty()) {
+                        setText(localizationService.get("railroad.ide.toolbar.no_run_configurations"));
+                    } else {
+                        setText(localizationService.get("railroad.ide.toolbar.edit_run_configurations"));
+                    }
+
+                    return;
+                }
+
+                setText(item.data().getName());
+            }
+        });
+
+        return comboBox;
+    }
+
+    private void configureButtons() {
+        runButton.setSquare(true);
+        runButton.setButtonSize(ButtonSize.SMALL);
+        runButton.setVariant(ButtonVariant.GHOST);
+        runButton.setTooltip(runButtonTooltip);
+        runButton.getStyleClass().addAll("toolbar-button", "run-button");
+        runButton.setFocusTraversable(false);
+        runButton.setDisable(true);
+        runButton.setOnAction(event -> {
+            RunConfiguration<?> selected = runConfigurationsComboBox.getValue();
+            if (selected == null || isConfigurationStopping(selected))
+                return;
+
+            if (isConfigurationRunning(selected) && !allowsMultipleInstances(selected)) {
+                restartConfiguration(selected, false);
+            } else {
+                startConfigurationExecution(false);
+            }
+        });
+
+        debugButton.setSquare(true);
+        debugButton.setButtonSize(ButtonSize.SMALL);
+        debugButton.setVariant(ButtonVariant.GHOST);
+        debugButton.setTooltip(debugButtonTooltip);
+        debugButton.getStyleClass().addAll("toolbar-button", "debug-button");
+        debugButton.setFocusTraversable(false);
+        debugButton.setDisable(true);
+        debugButton.setOnAction(event -> {
+            RunConfiguration<?> selected = runConfigurationsComboBox.getValue();
+            if (selected == null || isConfigurationStopping(selected) || !selected.isDebuggingSupported(project))
+                return;
+
+            if (isConfigurationRunning(selected) && !allowsMultipleInstances(selected)) {
+                restartConfiguration(selected, true);
+            } else {
+                startConfigurationExecution(true);
+            }
+        });
+
+        stopButton.setSquare(true);
+        stopButton.setButtonSize(ButtonSize.SMALL);
+        stopButton.setVariant(ButtonVariant.GHOST);
+        stopButton.setTooltip(new LocalizedTooltip("railroad.ide.toolbar.stop.tooltip"));
+        stopButton.getStyleClass().addAll("toolbar-button", "stop-button");
+        stopButton.setFocusTraversable(false);
+        stopButton.setDisable(true);
+        stopButton.setVisible(false);
+        stopButton.managedProperty().bind(stopButton.visibleProperty());
+        stopButton.setOnAction(event -> {
+            var runningConfigs = getRunningConfigurations();
+            if (runningConfigs.size() > 1) {
+                showStopMenu(runningConfigs);
+            } else {
+                stopActiveConfiguration();
+            }
+        });
+
+        moreActionsButton.setSquare(true);
+        moreActionsButton.setButtonSize(ButtonSize.SMALL);
+        moreActionsButton.setVariant(ButtonVariant.GHOST);
+        moreActionsButton.setTooltip(new LocalizedTooltip("railroad.ide.toolbar.run_configurations.more_actions.tooltip"));
+        moreActionsButton.getStyleClass().addAll("toolbar-button", "more-actions-button");
+        moreActionsButton.setFocusTraversable(false);
+        moreActionsButton.setOnAction(event -> {
+            RunConfiguration<?> item = runConfigurationsComboBox.getValue();
+            if (item == null) {
+                IDESetup.showEditRunConfigurationsWindow(project, null);
+                return;
+            }
+
+            var menu = item.createContextMenu(project);
+            RunConfigurationContextMenuManager.show(moreActionsButton, menu, Side.BOTTOM);
+        });
+
+        runConfigurationsComboBox.valueProperty().addListener((observable, oldValue, newValue) -> updateRunControls());
+        runConfigurationsComboBox.getSelectionModel().selectFirst();
+        updateRunControls();
+    }
+
+    private void startConfigurationExecution(boolean debug) {
+        startConfigurationExecution(runConfigurationsComboBox.getValue(), debug);
+    }
+
+    private void startConfigurationExecution(@Nullable RunConfiguration<?> configuration, boolean debug) {
+        if (configuration == null)
+            return;
+
+        if (!allowsMultipleInstances(configuration) && isConfigurationRunning(configuration))
+            return;
+
+        incrementRunningConfiguration(configuration);
+        updateRunControls();
+
+        var execution = debug ?
+            configuration.debug(project) :
+            configuration.run(project);
+
+        execution.whenComplete((ignored, throwable) -> Platform.runLater(() -> {
+            if (throwable != null) {
+                Railroad.LOGGER.error("Run configuration '{}' failed", configuration.data().getName(), throwable);
+            }
+
+            decrementRunningConfiguration(configuration);
+            updateRunControls();
+        }));
+    }
+
+    private void stopActiveConfiguration() {
+        RunConfiguration<?> active = runConfigurationsComboBox.getValue();
+        stopConfiguration(active);
+    }
+
+    private CompletableFuture<Void> stopConfiguration(@Nullable RunConfiguration<?> configuration) {
+        var future = new CompletableFuture<Void>();
+        if (configuration == null) {
+            future.complete(null);
+            return future;
+        }
+
+        boolean isSelectedConfig = Objects.equals(configuration, runConfigurationsComboBox.getValue());
+        if (!isConfigurationRunning(configuration)) {
+            if (isSelectedConfig) {
+                stopButton.setDisable(true);
+            }
+
+            future.complete(null);
+            return future;
+        }
+
+        if (isSelectedConfig) {
+            stopButton.setDisable(true);
+        }
+
+        markStoppingConfiguration(configuration);
+        CompletableFuture<Void> stopOperation;
+        try {
+            stopOperation = configuration.stop(project);
+        } catch (Throwable throwable) {
+            Railroad.LOGGER.warn("Failed to stop run configuration {}", configuration.data().getName(), throwable);
+            unmarkStoppingConfiguration(configuration);
+            updateRunControls();
+            future.completeExceptionally(throwable);
+            return future;
+        }
+
+        stopOperation.whenComplete((ignored, throwable) -> Platform.runLater(() -> {
+            if (throwable != null) {
+                Railroad.LOGGER.warn("Failed to stop run configuration {}", configuration.data().getName(), throwable);
+            }
+
+            unmarkStoppingConfiguration(configuration);
+            updateRunControls();
+            if (throwable != null) {
+                future.completeExceptionally(throwable);
+            } else {
+                future.complete(null);
+            }
+        }));
+
+        return future;
+    }
+
+    private void restartConfiguration(RunConfiguration<?> configuration, boolean debug) {
+        stopConfiguration(configuration).thenAccept(ignored ->
+            startConfigurationExecution(configuration, debug));
+    }
+
+    private void updateRunControls() {
+        RunConfiguration<?> selected = runConfigurationsComboBox.getValue();
+        boolean hasSelection = selected != null;
+        boolean isRunning = hasSelection && isConfigurationRunning(selected);
+        boolean isStopping = hasSelection && isConfigurationStopping(selected);
+        boolean allowsParallel = hasSelection && allowsMultipleInstances(selected);
+        boolean debugSupported = hasSelection && selected.isDebuggingSupported(project);
+        boolean canRestart = hasSelection && isRunning && !allowsParallel && !isStopping;
+        boolean canStartNew = hasSelection && (!isRunning || allowsParallel) && !isStopping;
+        boolean canDebugRestart = debugSupported && isRunning && !allowsParallel && !isStopping;
+        boolean canStartDebug = debugSupported && (!isRunning || allowsParallel) && !isStopping;
+
+        runButton.setDisable(!(canRestart || canStartNew));
+        runButton.setIcon(canRestart ? FontAwesomeSolid.FORWARD : FontAwesomeSolid.PLAY);
+        runButton.setTooltip(canRestart ? restartButtonTooltip : runButtonTooltip);
+        debugButton.setDisable(!(canDebugRestart || canStartDebug));
+        debugButton.setTooltip(canDebugRestart ? debugRestartTooltip : debugButtonTooltip);
+        stopButton.setDisable(!isRunning || isStopping);
+        stopButton.setVisible(isRunning);
+    }
+
+    private void incrementRunningConfiguration(RunConfiguration<?> configuration) {
+        runningConfigurations.merge(configuration.uuid(), 1, Integer::sum);
+    }
+
+    private void decrementRunningConfiguration(RunConfiguration<?> configuration) {
+        runningConfigurations.computeIfPresent(configuration.uuid(), (uuid, count) -> count > 1 ? count - 1 : null);
+        unmarkStoppingConfiguration(configuration);
+    }
+
+    private boolean isConfigurationRunning(@Nullable RunConfiguration<?> configuration) {
+        return configuration != null && runningConfigurations.getOrDefault(configuration.uuid(), 0) > 0;
+    }
+
+    private boolean isConfigurationStopping(@Nullable RunConfiguration<?> configuration) {
+        return configuration != null && stoppingConfigurations.contains(configuration.uuid());
+    }
+
+    private void markStoppingConfiguration(@Nullable RunConfiguration<?> configuration) {
+        if (configuration == null)
+            return;
+
+        stoppingConfigurations.add(configuration.uuid());
+    }
+
+    private void unmarkStoppingConfiguration(@Nullable RunConfiguration<?> configuration) {
+        if (configuration == null)
+            return;
+
+        stoppingConfigurations.remove(configuration.uuid());
+    }
+
+    private static boolean allowsMultipleInstances(@Nullable RunConfiguration<?> configuration) {
+        return configuration != null && configuration.data().isAllowMultipleInstances();
+    }
+
+    private List<RunConfiguration<?>> getRunningConfigurations() {
+        var manager = project.getRunConfigManager();
+        var configs = new ArrayList<RunConfiguration<?>>();
+        for (UUID uuid : runningConfigurations.keySet()) {
+            RunConfiguration<?> configuration = manager.getConfigurationByUUID(uuid);
+            if (configuration != null) {
+                configs.add(configuration);
+            }
+        }
+
+        return configs;
+    }
+
+    private void showStopMenu(List<RunConfiguration<?>> runningConfigs) {
+        var localizationService = ServiceLocator.getService(LocalizationService.class);
+        var menu = new ContextMenu();
+
+        for (RunConfiguration<?> configuration : runningConfigs) {
+            int instanceCount = runningConfigurations.getOrDefault(configuration.uuid(), 0);
+            String label = configuration.data().getName();
+            if (instanceCount > 1) {
+                label += " (" + instanceCount + ")";
+            }
+
+            var item = new MenuItem(label);
+            item.setOnAction(event -> {
+                runConfigurationsComboBox.setValue(configuration);
+                stopConfiguration(configuration);
+            });
+            menu.getItems().add(item);
+        }
+
+        if (!menu.getItems().isEmpty()) {
+            menu.getItems().add(new SeparatorMenuItem());
+        }
+
+        var stopAllItem = new MenuItem(localizationService.get("railroad.ide.toolbar.stop.all"));
+        stopAllItem.setOnAction(event -> {
+            for (RunConfiguration<?> configuration : runningConfigs) {
+                stopConfiguration(configuration);
+            }
+        });
+        menu.getItems().add(stopAllItem);
+
+        menu.show(stopButton, Side.BOTTOM, 0, 0);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/ide/ui/setup/TerminalFactory.java b/src/main/java/dev/railroadide/railroad/ide/ui/setup/TerminalFactory.java
new file mode 100644
index 00000000..3179dc71
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/ide/ui/setup/TerminalFactory.java
@@ -0,0 +1,26 @@
+package dev.railroadide.railroad.ide.ui.setup;
+
+import com.kodedu.terminalfx.Terminal;
+import com.kodedu.terminalfx.TerminalBuilder;
+import com.kodedu.terminalfx.config.TerminalConfig;
+import javafx.scene.paint.Color;
+
+import java.nio.file.Path;
+
+/**
+ * Creates configured TerminalFX instances pointing at a specific project path.
+ */
+public final class TerminalFactory {
+    private TerminalFactory() {
+    }
+
+    public static Terminal create(Path path) {
+        var terminalConfig = new TerminalConfig();
+        terminalConfig.setBackgroundColor(Color.rgb(16, 16, 16));
+        terminalConfig.setForegroundColor(Color.rgb(240, 240, 240));
+        terminalConfig.setCursorColor(Color.rgb(255, 0, 0, 0.5));
+        var terminalBuilder = new TerminalBuilder(terminalConfig);
+        terminalBuilder.setTerminalPath(path);
+        return terminalBuilder.newTerminal().getTerminal();
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/JDK.java b/src/main/java/dev/railroadide/railroad/java/JDK.java
new file mode 100644
index 00000000..3dd45133
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/JDK.java
@@ -0,0 +1,250 @@
+package dev.railroadide.railroad.java;
+
+import dev.railroadide.railroad.java.cli.JDKCLI;
+import dev.railroadide.railroad.utility.JavaVersion;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeBrands;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Properties;
+
+/**
+ * A descriptor for a Java Development Kit (JDK) installation.
+ * This class encapsulates information about a JDK, including its installation path, name,
+ * Java version, and brand (e.g., Oracle, Adoptium). It also provides utility methods
+ * for interacting with the JDK's command-line interface tools.
+ */
+@ToString(exclude = "cli")
+@EqualsAndHashCode
+public final class JDK {
+    private final Path path;
+    private final String name;
+    private final JavaVersion version;
+    private final Brand brand;
+    private transient final JDKCLI cli;
+
+    /**
+     * Constructs a new {@code JDK} instance with the specified path, name, version, and brand.
+     *
+     * @param path The absolute path to the JDK installation directory.
+     * @param name The display name of the JDK.
+     * @param version The Java version of this JDK.
+     * @param brand The brand of this JDK (e.g., Oracle, Adoptium).
+     */
+    public JDK(Path path, String name, JavaVersion version, Brand brand) {
+        this.path = path;
+        this.name = name;
+        this.version = version;
+        this.brand = brand;
+        this.cli = new JDKCLI(this);
+    }
+
+    /**
+     * Constructs a new {@code JDK} instance with the specified path, name, and version.
+     * The brand will be automatically determined based on the JDK's properties.
+     *
+     * @param path The absolute path to the JDK installation directory.
+     * @param name The display name of the JDK.
+     * @param version The Java version of this JDK.
+     */
+    public JDK(Path path, String name, JavaVersion version) {
+        this.path = path;
+        this.name = name;
+        this.version = version;
+        this.brand = Brand.from(this);
+        this.cli = new JDKCLI(this);
+    }
+
+    /**
+     * Returns the absolute path to the JDK installation directory.
+     * @return The path to the JDK.
+     */
+    public Path path() {
+        return path;
+    }
+
+    /**
+     * Returns the display name of this JDK.
+     * @return The name of the JDK.
+     */
+    public String name() {
+        return name;
+    }
+
+    /**
+     * Returns the Java version of this JDK.
+     * @return The Java version.
+     */
+    public JavaVersion version() {
+        return version;
+    }
+
+    /**
+     * Returns the brand of this JDK.
+     * @return The JDK brand.
+     */
+    public Brand brand() {
+        return brand;
+    }
+
+    /**
+     * Returns the command-line interface (CLI) utility for this JDK.
+     * @return The JDKCLI instance.
+     */
+    public JDKCLI cli() {
+        return cli;
+    }
+
+    /**
+     * Resolves the absolute path to a tool executable within this JDK installation.
+     *
+     * @param executableName filename of the CLI tool (e.g. {@code jar} or {@code keytool})
+     * @return absolute path to the executable, best-effort even when this JDK descriptor points directly to {@code bin}
+     */
+    public Path executablePath(String executableName) {
+        Objects.requireNonNull(executableName, "Executable name cannot be null");
+        Path binDirectory = path.resolve("bin");
+        Path candidate = binDirectory.resolve(executableName);
+        if (Files.exists(candidate))
+            return candidate;
+
+        return path.resolve(executableName);
+    }
+
+    /**
+     * Represents the brand or vendor of a JDK distribution.
+     */
+    public enum Brand {
+        ORACLE("oracle", "/images/Oracle-icon.svg"),
+        ADOPTIUM("temurin", "/images/Adoptium-icon.svg", "adoptopenjdk", "adoptium", "eclipse"),
+        AZUL("zulu", "/images/Azul-icon.svg", "azul"),
+        CORRETTO("corretto", FontAwesomeBrands.AMAZON, "amazon"),
+        BELL_SOFT("liberica", "/images/Liberica-icon.svg", "bellsoft"),
+        GRAAL("graalvm", "/images/GraalVM-icon.svg", "graal"),
+        SAP("sapmachine", "/images/SAP-icon.svg", "sap"),
+        RED_HAT("redhat", FontAwesomeBrands.REDHAT, "red hat", "rhel"),
+        MICROSOFT("microsoft", FontAwesomeBrands.MICROSOFT, "ms"),
+        IBM("ibm", "/images/IBM-icon.svg", "semeru"),
+        UNKNOWN("java", FontAwesomeBrands.JAVA);
+
+        private final String key;
+        private final String[] aliases;
+        @Getter
+        private Ikon icon;
+        @Getter
+        private String imagePath;
+
+        /**
+         * Constructs a Brand with a key, Ikon, and optional aliases.
+         * @param key The primary identifier for the brand.
+         * @param icon The Ikon associated with the brand.
+         * @param aliases Additional names or identifiers for the brand.
+         */
+        Brand(String key, Ikon icon, String... aliases) {
+            this.key = key;
+            this.icon = icon;
+            this.aliases = aliases;
+        }
+
+        /**
+         * Constructs a Brand with a key, image path, and optional aliases.
+         * @param key The primary identifier for the brand.
+         * @param imagePath The path to the image icon associated with the brand.
+         * @param aliases Additional names or identifiers for the brand.
+         */
+        Brand(String key, String imagePath, String... aliases) {
+            this.key = key;
+            this.imagePath = imagePath;
+            this.aliases = aliases;
+        }
+
+        /**
+         * Constructs a Brand with a key and an Ikon, with no aliases.
+         * @param key The primary identifier for the brand.
+         * @param icon The Ikon associated with the brand.
+         */
+        Brand(String key, Ikon icon) {
+            this(key, icon, (String[]) null);
+        }
+
+        /**
+         * Constructs a Brand with a key and an image path, with no aliases.
+         * @param key The primary identifier for the brand.
+         * @param imagePath The path to the image icon associated with the brand.
+         */
+        Brand(String key, String imagePath) {
+            this(key, imagePath, (String[]) null);
+        }
+
+        /**
+         * Checks if this brand has an associated Ikon.
+         * @return {@code true} if an Ikon is present, {@code false} otherwise.
+         */
+        public boolean isIkon() {
+            return icon != null;
+        }
+
+        /**
+         * Checks if this brand has an associated image path.
+         * @return {@code true} if an image path is present, {@code false} otherwise.
+         */
+        public boolean isImage() {
+            return imagePath != null;
+        }
+
+        /**
+         * Determines the {@code Brand} of a given JDK based on its properties and name.
+         * It first attempts to resolve the brand from the JDK's release properties (IMPLEMENTOR, VENDOR),
+         * then falls back to string matching on the JDK's name and path if properties are inconclusive.
+         *
+         * @param jdk The {@code JDK} instance to determine the brand for.
+         * @return The resolved {@code Brand}, or {@code UNKNOWN} if no specific brand can be identified.
+         */
+        private static Brand from(JDK jdk) {
+            String rawName = jdk.name();
+            String path = jdk.path().toAbsolutePath().toString().toLowerCase(Locale.ROOT);
+            String name = (rawName == null ? "" : rawName).toLowerCase(Locale.ROOT);
+            Properties props = JDKUtils.readReleaseProperties(jdk.path());
+            String implVendor = props.getProperty("IMPLEMENTOR", "").toLowerCase(Locale.ROOT);
+            String vendor = props.getProperty("VENDOR", "").toLowerCase(Locale.ROOT);
+            for (Brand brand : values()) {
+                if (brand == UNKNOWN)
+                    continue;
+
+                if (implVendor.contains(brand.key) || vendor.contains(brand.key))
+                    return brand;
+
+                if (brand.aliases != null) {
+                    for (String alias : brand.aliases) {
+                        if (implVendor.contains(alias) || vendor.contains(alias))
+                            return brand;
+                    }
+                }
+            }
+
+            // If release properties are inconclusive, fall back to string matching on name and path
+            for (Brand brand : values()) {
+                if (brand == UNKNOWN)
+                    continue;
+
+                if (name.contains(brand.key) || path.contains(brand.key))
+                    return brand;
+
+                if (brand.aliases != null) {
+                    for (String alias : brand.aliases) {
+                        if (name.contains(alias) || path.contains(alias))
+                            return brand;
+                    }
+                }
+            }
+
+            return UNKNOWN;
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/JDKManager.java b/src/main/java/dev/railroadide/railroad/java/JDKManager.java
new file mode 100644
index 00000000..7645a61b
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/JDKManager.java
@@ -0,0 +1,320 @@
+package dev.railroadide.railroad.java;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.settings.Settings;
+import dev.railroadide.railroad.utility.FileUtils;
+import dev.railroadide.railroad.utility.JavaVersion;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * Locates locally installed JDK distributions across supported platforms and caches the results
+ * for quick lookup. Provides helpers to refresh the cache and query the discovered installations.
+ */
+public class JDKManager {
+    /**
+     * The name of the Java executable, platform-dependent (e.g., "java.exe" on Windows, "java" on Linux/macOS).
+     */
+    public static final String JAVA_EXECUTABLE_NAME = OperatingSystem.CURRENT == OperatingSystem.WINDOWS ? "java.exe" : "java";
+
+    private static final List<String> WIN_JDK_PATHS = List.of(
+        "{drive}:\\Program Files\\Java",
+        "{drive}:\\Program Files (x86)\\Java",
+        "{drive}:\\Program Files\\Eclipse Adoptium",
+        "{drive}:\\Program Files (x86)\\Eclipse Adoptium",
+        "{drive}:\\Program Files\\Azul",
+        "{drive}:\\Program Files (x86)\\Azul",
+        "{drive}:\\Program Files\\Zulu",
+        "{drive}:\\Program Files (x86)\\Zulu",
+        "{drive}:\\Program Files\\Amazon Corretto",
+        "{drive}:\\Program Files (x86)\\Amazon Corretto",
+        "{drive}:\\Program Files\\BellSoft",
+        "{drive}:\\Program Files\\GraalVM"
+    );
+    private static final List<String> LINUX_JDK_PATHS = List.of(
+        "/usr/lib/jvm",
+        "/usr/java",
+        "/opt/java",
+        "/opt/jdk"
+    );
+    private static final List<JDK> JDKS = new CopyOnWriteArrayList<>();
+
+    /**
+     * Returns all discovered JDKs from the most recent scan.
+     *
+     * @return cached, unmodifiable list of JDK descriptors
+     */
+    public static List<JDK> getAvailableJDKs() {
+        return Collections.unmodifiableList(JDKS);
+    }
+
+    /**
+     * Retrieves the first discovered JDK from the cached list, or {@code null} if no JDKs are found.
+     *
+     * @return first available JDK or {@code null} when none are detected
+     */
+    public static @Nullable JDK getDefaultJDK() {
+        List<JDK> jdks = getAvailableJDKs();
+        if (jdks.isEmpty())
+            return null;
+
+        return jdks.getFirst();
+    }
+
+    /**
+     * Re-scans all known sources (environment variables, PATH entries, and configured directories)
+     * to rebuild the cached list of JDK installations.
+     */
+    public static void refreshJDKs() {
+        JDKS.clear();
+        JDKS.addAll(discoverJDKs());
+
+        for (JDK jdk : JDKS) {
+            Railroad.LOGGER.debug("Detected JDK: {} (brand: {}, version: {}, path: {})",
+                jdk.name(), jdk.brand(), jdk.version(), jdk.path());
+        }
+    }
+
+    /**
+     * Filters cached JDKs to only those whose version falls within the provided range.
+     *
+     * @param minVersion inclusive lower bound; pass {@code null} to ignore the lower bound
+     * @param maxVersion inclusive upper bound; pass {@code null} to ignore the upper bound
+     * @return list of JDKs whose {@link JavaVersion} is within the requested bounds
+     */
+    public static List<JDK> getJDKsInVersionRange(JavaVersion minVersion, JavaVersion maxVersion) {
+        List<JDK> filtered = new ArrayList<>();
+        for (JDK jdk : JDKS) {
+            if ((minVersion == null || jdk.version().compareTo(minVersion) >= 0) &&
+                (maxVersion == null || jdk.version().compareTo(maxVersion) <= 0)) {
+                filtered.add(jdk);
+            }
+        }
+
+        return filtered;
+    }
+
+    /**
+     * Scans every configured source of JDK installations and produces a deduplicated list.
+     *
+     * @return list of discovered {@link JDK} descriptors
+     */
+    private static List<JDK> discoverJDKs() {
+        // Location 1a: JAVA_HOME environment variable
+        List<JDK> jdks = new ArrayList<>();
+        List<Path> excludedPaths = FileUtils.normalizePaths(Settings.EXCLUDED_JDK_SCAN_PATHS.getOrDefaultValue());
+        List<Path> manualJdkPaths = FileUtils.normalizePaths(Settings.ADDITIONAL_JDKS.getOrDefaultValue());
+        String javaHome = System.getenv("JAVA_HOME");
+        if (javaHome != null && !javaHome.isEmpty()) {
+            addIfValid(jdks, JDKUtils.createJDKFromAnyPath(javaHome), excludedPaths);
+        }
+
+        // Location 1b: JDK_HOME environment variable
+        String jdkHome = System.getenv("JDK_HOME");
+        if (jdkHome != null && !jdkHome.isEmpty()) {
+            addIfValid(jdks, JDKUtils.createJDKFromAnyPath(jdkHome), excludedPaths);
+        }
+
+        // Location 2: System PATH
+        String javaPath = JDKUtils.findJavaOnPath();
+        if (javaPath != null) {
+            addIfValid(jdks, JDKUtils.createJDKFromAnyPath(javaPath), excludedPaths);
+        }
+
+        // Location 3: Common installation directories
+        discoverJDKsInCommonDirectories(jdks, excludedPaths);
+
+        // Location 4: User-provided JDK executables
+        for (Path manualPath : manualJdkPaths) {
+            addIfValid(jdks, JDKUtils.createJDKFromAnyPath(manualPath.toString()), excludedPaths);
+        }
+
+        return removeDuplicateJDKs(jdks, excludedPaths);
+    }
+
+    /**
+     * Traverses known installation directories (SDKMAN, vendor folders, etc.) and registers any
+     * detected JDK executables while respecting the provided exclusion list.
+     *
+     * @param jdks          collection being populated with discovered JDKs
+     * @param excludedPaths normalized paths that should be ignored during discovery
+     */
+    private static void discoverJDKsInCommonDirectories(List<JDK> jdks, List<Path> excludedPaths) {
+        for (Path dir : getPossibleJDKPaths()) {
+            if (isExcluded(dir, excludedPaths))
+                continue;
+
+            if (Files.exists(dir) && Files.isDirectory(dir)) {
+                try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
+                    for (Path entry : stream) {
+                        if (!Files.isDirectory(entry))
+                            continue;
+
+                        if (isExcluded(entry, excludedPaths))
+                            continue;
+
+                        Path exe;
+                        if (OperatingSystem.CURRENT == OperatingSystem.MAC) {
+                            // Try bundle layout first
+                            Path bundle = entry.resolve("Contents").resolve("Home").resolve("bin").resolve(JAVA_EXECUTABLE_NAME);
+                            // Fallback: plain folder layout (SDKMAN/asdf/.gradle/jdks, etc.)
+                            Path flat = entry.resolve("bin").resolve(JAVA_EXECUTABLE_NAME);
+                            exe = Files.isExecutable(bundle) ? bundle : flat;
+                        } else {
+                            exe = entry.resolve("bin").resolve(JAVA_EXECUTABLE_NAME);
+                        }
+
+                        addIfValid(jdks, JDKUtils.createJDKFromAnyPath(exe.toString()), excludedPaths);
+                    }
+                } catch (IOException exception) {
+                    Railroad.LOGGER.warn("Failed to read JDKs from directory: {}", dir, exception);
+                }
+            }
+        }
+    }
+
+    /**
+     * Adds the supplied JDK to the running list when it is non-null and not excluded.
+     *
+     * @param jdks          aggregate list being populated
+     * @param jdk           potential discovery result
+     * @param excludedPaths paths that should be filtered out
+     */
+    private static void addIfValid(List<JDK> jdks, JDK jdk, List<Path> excludedPaths) {
+        if (jdk == null)
+            return;
+
+        Path jdkPath = jdk.path();
+        if (isExcluded(jdkPath, excludedPaths))
+            return;
+
+        jdks.add(jdk);
+    }
+
+    /**
+     * Inserts the JDK into the map keyed by path when the location is not excluded.
+     *
+     * @param uniqueJDKs    map keyed by canonical JDK path
+     * @param jdk           descriptor to consider for insertion
+     * @param excludedPaths normalized paths that should be skipped
+     */
+    private static void addIfNotExcluded(Map<String, JDK> uniqueJDKs, JDK jdk, List<Path> excludedPaths) {
+        Path jdkPath = jdk.path();
+        if (isExcluded(jdkPath, excludedPaths))
+            return;
+
+        uniqueJDKs.putIfAbsent(jdk.path().toString(), jdk);
+    }
+
+    /**
+     * Consolidates the provided discoveries by normalizing their paths and removing duplicates.
+     *
+     * @param jdks          discovered JDK entries
+     * @param excludedPaths normalized paths that should be ignored
+     * @return list with duplicate locations removed
+     */
+    private static List<JDK> removeDuplicateJDKs(List<JDK> jdks, List<Path> excludedPaths) {
+        Map<String, JDK> uniqueJDKs = new LinkedHashMap<>();
+        for (JDK jdk : jdks) {
+            try {
+                Path normalizedPath = jdk.path().toRealPath();
+                if (!isExcluded(normalizedPath, excludedPaths)) {
+                    uniqueJDKs.putIfAbsent(normalizedPath.toString(), new JDK(normalizedPath, jdk.name(), jdk.version()));
+                }
+            } catch (IOException | InvalidPathException ignored) {
+                addIfNotExcluded(uniqueJDKs, jdk, excludedPaths);
+            }
+        }
+
+        return new ArrayList<>(uniqueJDKs.values());
+    }
+
+    /**
+     * Determines whether the candidate path should be skipped based on the exclusion list.
+     *
+     * @param candidate     path to evaluate
+     * @param excludedPaths normalized paths to exclude
+     * @return {@code true} when the candidate is equal to or inside any excluded path
+     */
+    private static boolean isExcluded(Path candidate, List<Path> excludedPaths) {
+        if (candidate == null || excludedPaths == null || excludedPaths.isEmpty())
+            return false;
+
+        Path normalizedCandidate = candidate.toAbsolutePath().normalize();
+        for (Path excluded : excludedPaths) {
+            if (excluded == null)
+                continue;
+
+            if (normalizedCandidate.equals(excluded) || normalizedCandidate.startsWith(excluded))
+                return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Produces a platform-aware list of default directories that commonly contain JDK installations,
+     * augmented with user-level managers such as SDKMAN and Gradle caches.
+     *
+     * @return candidate directories to probe for JDKs
+     */
+    private static List<Path> getPossibleJDKPaths() {
+        Set<Path> candidates = new LinkedHashSet<>();
+
+        switch (OperatingSystem.CURRENT) {
+            case WINDOWS -> {
+                for (String basePath : WIN_JDK_PATHS) {
+                    for (char drive = 'C'; drive <= 'Z'; drive++) { // Start from C, A/B are usually floppy
+                        Path driveRoot = Path.of(drive + ":\\");
+                        if (Files.exists(driveRoot)) {
+                            String path = basePath.replace("{drive}", String.valueOf(drive));
+                            candidates.add(FileUtils.normalizePath(Path.of(path)));
+                        }
+                    }
+                }
+            }
+            case MAC -> {
+                // System-wide JDK bundles
+                candidates.add(FileUtils.normalizePath(Path.of("/Library/Java/JavaVirtualMachines")));
+
+                // User-scoped JDK bundles (JetBrains downloader often ends up here)
+                String home = System.getProperty("user.home");
+                if (home != null && !home.isBlank()) {
+                    candidates.add(FileUtils.normalizePath(Path.of(home, "Library", "Java", "JavaVirtualMachines")));
+                }
+
+                // Homebrew (Apple Silicon + Intel)
+                candidates.add(FileUtils.normalizePath(Path.of("/opt/homebrew/opt")));   // ARM
+                candidates.add(FileUtils.normalizePath(Path.of("/usr/local/opt")));      // Intel
+            }
+            case LINUX -> LINUX_JDK_PATHS.forEach(path -> candidates.add(FileUtils.normalizePath(Path.of(path))));
+        }
+
+        String userHome = System.getProperty("user.home");
+        if (userHome != null && !userHome.isBlank()) {
+            candidates.add(FileUtils.normalizePath(Path.of(userHome, ".sdkman", "candidates", "java")));
+            candidates.add(FileUtils.normalizePath(Path.of(userHome, ".asdf", "installs", "java")));
+            candidates.add(FileUtils.normalizePath(Path.of(userHome, ".jdks")));
+            candidates.add(FileUtils.normalizePath(Path.of(userHome, ".gradle", "jdks")));
+        }
+
+        String gradleUserHome = System.getenv("GRADLE_USER_HOME");
+        if (gradleUserHome != null && !gradleUserHome.isBlank()) {
+            candidates.add(FileUtils.normalizePath(Path.of(gradleUserHome, "jdks")));
+        }
+
+        for (Path path : FileUtils.normalizePaths(Settings.ADDITIONAL_JDK_SCAN_PATHS.getOrDefaultValue())) {
+            candidates.add(FileUtils.normalizePath(path));
+        }
+
+        return new ArrayList<>(candidates);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/JDKUtils.java b/src/main/java/dev/railroadide/railroad/java/JDKUtils.java
new file mode 100644
index 00000000..2eda1378
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/JDKUtils.java
@@ -0,0 +1,343 @@
+package dev.railroadide.railroad.java;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.settings.Settings;
+import dev.railroadide.railroad.utility.JavaVersion;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Utility helpers for working with installed JDK distributions. Provides functionality for
+ * resolving JDK home directories and parsing version metadata sourced from release files or
+ * java executables.
+ */
+public final class JDKUtils {
+    private static final Pattern JAVA_VERSION_PATTERN =
+        Pattern.compile("^(\\d+)(?:\\.(\\d+))?(?:\\.\\d+)?(?:_\\d+)?$");
+
+    private JDKUtils() {
+        // static helper class
+    }
+
+    /**
+     * Loads the {@code release} metadata file from the supplied Java home directory, if present.
+     *
+     * @param javaHome root directory of the JDK installation
+     * @return properties parsed from the file; empty if the file is missing or unreadable
+     */
+    public static Properties readReleaseProperties(Path javaHome) {
+        var props = new Properties();
+        Path release = javaHome.resolve("release");
+        if (Files.isRegularFile(release)) {
+            try (BufferedReader bufferedReader = Files.newBufferedReader(release)) {
+                props.load(bufferedReader);
+            } catch (IOException ignored) {
+            }
+        }
+
+        return props;
+    }
+
+    /**
+     * Reads the JDK version metadata from the supplied home directory.
+     *
+     * @param javaHome           root directory of the JDK installation
+     * @param javaExecutableName preferred executable filename for the current OS (e.g., {@code java.exe})
+     * @return parsed {@link JavaVersion} or {@code null} if detection failed
+     */
+    public static JavaVersion readJavaVersion(Path javaHome, String javaExecutableName) {
+        var properties = readReleaseProperties(javaHome);
+        String versionStr = stripQuotes(properties.getProperty("JAVA_VERSION"));
+        JavaVersion version = parseJavaVersionString(versionStr);
+        if (version != null)
+            return version;
+
+        String exe = javaHome.resolve("bin").resolve(javaExecutableName).toString();
+        return getJavaVersionFromProcess(exe);
+    }
+
+    /**
+     * Parses a Java version string into a {@link JavaVersion} descriptor.
+     *
+     * @param version raw version string from the metadata or {@code java -version} output
+     * @return structured version, or {@code null} when the input cannot be parsed
+     */
+    public static JavaVersion parseJavaVersionString(String version) {
+        if (version == null)
+            return null;
+
+        Matcher matcher = JAVA_VERSION_PATTERN.matcher(version);
+        if (!matcher.find())
+            return null;
+
+        try {
+            int major = Integer.parseInt(matcher.group(1));
+            Integer minor = null;
+            if (matcher.group(2) != null) {
+                try {
+                    minor = Integer.parseInt(matcher.group(2));
+                } catch (NumberFormatException exception) {
+                    Railroad.LOGGER.warn("Failed to parse minor version from Java version string: {}", version, exception);
+                }
+            }
+
+            if (major == 1 && minor != null) {
+                major = minor;
+                minor = 0;
+            }
+            return new JavaVersion(major, minor != null ? minor : 0);
+        } catch (NumberFormatException exception) {
+            Railroad.LOGGER.warn("Failed to parse Java version string: {}", version, exception);
+            return null;
+        }
+    }
+
+    /**
+     * Removes wrapping double quotes from the supplied string.
+     *
+     * @param str string that may contain surrounding quotes
+     * @return unquoted string if applicable
+     */
+    public static String stripQuotes(String str) {
+        if (str == null)
+            return null;
+
+        return str.length() >= 2 && str.startsWith("\"") && str.endsWith("\"") ?
+            str.substring(1, str.length() - 1) :
+            str;
+    }
+
+    /**
+     * Attempts to resolve the Java home directory given a file or directory anywhere within the JDK.
+     *
+     * @param candidate          path that may reference the JDK root, {@code bin/java}, or other known layouts
+     * @param javaExecutableName preferred executable filename for the current OS (e.g., {@code java.exe})
+     * @return resolved home directory if one could be derived; otherwise {@code null}
+     */
+    public static Path resolveJavaHome(Path candidate, String javaExecutableName) {
+        Path resolved = maybeRealPath(candidate);
+        if (Files.isDirectory(resolved)) {
+            if (Files.isExecutable(resolved.resolve("bin").resolve(javaExecutableName))) {
+                return isMacSystemJavaStub(resolved) ?
+                    resolveMacJavaHome(javaExecutableName) :
+                    resolved;
+
+            }
+
+            if (Files.isExecutable(resolved.resolve("jre").resolve("bin").resolve(javaExecutableName)))
+                return resolved;
+
+            Path macHome = resolved.resolve("Contents").resolve("Home");
+            if (Files.isExecutable(macHome.resolve("bin").resolve(javaExecutableName)))
+                return macHome;
+
+            if (resolved.getFileName() != null && resolved.getFileName().toString().equalsIgnoreCase("bin")) {
+                Path parent = resolved.getParent();
+                if (parent != null) {
+                    if (isMacSystemJavaStub(parent))
+                        return resolveMacJavaHome(javaExecutableName);
+
+                    if (Files.isExecutable(parent.resolve("bin").resolve(javaExecutableName)))
+                        return parent;
+                }
+            }
+
+            return null;
+        }
+
+        Path parent = resolved.getParent();
+        if (parent == null)
+            return null;
+
+        String parentName = parent.getFileName() != null ? parent.getFileName().toString() : "";
+        if (parentName.equals("bin") && parent.getParent() != null &&
+            parent.getParent().getFileName() != null &&
+            parent.getParent().getFileName().toString().equals("Home")) {
+            Path home = parent.getParent();
+            if (home.getParent() != null && home.getParent().getFileName() != null &&
+                home.getParent().getFileName().toString().equals("Contents")) {
+                return home;
+            }
+        }
+
+        if (parentName.equalsIgnoreCase("bin")) {
+            Path home = parent.getParent();
+            if (home != null) {
+                if (isMacSystemJavaStub(home))
+                    return resolveMacJavaHome(javaExecutableName);
+
+                if (Files.isExecutable(home.resolve("bin").resolve(javaExecutableName)))
+                    return home;
+            }
+        }
+
+        if (parentName.equalsIgnoreCase("bin") && parent.getParent() != null &&
+            parent.getParent().getFileName() != null &&
+            parent.getParent().getFileName().toString().equalsIgnoreCase("jre")) {
+            return parent.getParent().getParent();
+        }
+
+        return null;
+    }
+
+    /**
+     * Scans the current {@code PATH} for a Java executable matching the platform-specific name.
+     *
+     * @return absolute path to the first matching executable, or {@code null} when none are found
+     */
+    public static String findJavaOnPath() {
+        String pathEnv = System.getenv("PATH");
+        if (pathEnv == null)
+            return null;
+
+        for (String raw : pathEnv.split(File.pathSeparator)) {
+            String path = stripQuotes(raw.trim());
+            if (path.isEmpty())
+                continue;
+
+            Path javaPath = Path.of(path, JDKManager.JAVA_EXECUTABLE_NAME);
+            if (Files.exists(javaPath) && Files.isExecutable(javaPath))
+                return javaPath.toAbsolutePath().toString();
+        }
+
+        return null;
+    }
+
+    /**
+     * Attempts to construct a {@link JDK} instance by interpreting the provided path as either a JDK
+     * home directory or a nested Java binary within the home.
+     *
+     * @param javaHomeOrExe path to inspect for a JDK installation
+     * @return {@link JDK} descriptor if the path can be resolved to a valid installation; otherwise {@code null}
+     */
+    public static JDK createJDKFromAnyPath(String javaHomeOrExe) {
+        Path path;
+        try {
+            path = Path.of(javaHomeOrExe);
+        } catch (InvalidPathException ignored) {
+            return null;
+        }
+
+        if (Files.notExists(path))
+            return null;
+
+        Path home = resolveJavaHome(path, JDKManager.JAVA_EXECUTABLE_NAME);
+        if (home == null)
+            return null;
+
+        JavaVersion version = readJavaVersion(home, JDKManager.JAVA_EXECUTABLE_NAME);
+        if (version == null)
+            return null;
+
+        String name = home.getFileName() != null ? home.getFileName().toString() : home.toString();
+        return new JDK(home.toAbsolutePath(), name, version);
+    }
+
+    /**
+     * Resolves the active JDK home reported by {@code /usr/libexec/java_home} on macOS systems.
+     *
+     * @param javaExecutableName platform-specific executable name (e.g. {@code java} or {@code java.exe})
+     * @return resolved JDK home when available; otherwise {@code null}
+     */
+    private static Path resolveMacJavaHome(String javaExecutableName) {
+        if (OperatingSystem.CURRENT != OperatingSystem.MAC)
+            return null;
+
+        try {
+            Process process = new ProcessBuilder("/usr/libexec/java_home")
+                .redirectErrorStream(true)
+                .start();
+
+            String homeDir;
+            try (var bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+                homeDir = bufferedReader.readLine();
+            }
+
+            process.waitFor(Settings.JAVA_VERSION_DETECTION_TIMEOUT_MS.getOrDefaultValue(), TimeUnit.MILLISECONDS);
+            if (homeDir == null || homeDir.isBlank())
+                return null;
+
+            Path home = Path.of(homeDir.trim());
+            return Files.isExecutable(home.resolve("bin").resolve(javaExecutableName)) ? home : null;
+        } catch (IOException ignored) {
+        } catch (InterruptedException ignored) {
+            Thread.currentThread().interrupt();
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns whether the supplied home path corresponds to the macOS system shim (e.g. {@code /usr}).
+     *
+     * @param home candidate home directory
+     * @return {@code true} when the path represents the system stub rather than a real JDK
+     */
+    private static boolean isMacSystemJavaStub(Path home) {
+        return OperatingSystem.CURRENT == OperatingSystem.MAC &&
+            home != null &&
+            home.toAbsolutePath().normalize().equals(Path.of("/usr"));
+    }
+
+    /**
+     * Executes the provided Java runtime with {@code -version} and attempts to parse the output.
+     *
+     * @param javaExe absolute path to the Java executable
+     * @return discovered {@link JavaVersion} or {@code null} if the process fails or output is unparseable
+     */
+    private static JavaVersion getJavaVersionFromProcess(String javaExe) {
+        try {
+            Process process = new ProcessBuilder(javaExe, "-version")
+                .redirectErrorStream(true)
+                .start();
+
+            String line;
+            try (var bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+                while ((line = bufferedReader.readLine()) != null) {
+                    int q1 = line.indexOf('"');
+                    int q2 = line.indexOf('"', q1 + 1);
+                    if (q1 >= 0 && q2 > q1) {
+                        String versionStr = line.substring(q1 + 1, q2);
+                        JavaVersion version = parseJavaVersionString(versionStr);
+                        if (version != null) {
+                            process.waitFor(Settings.JAVA_VERSION_DETECTION_TIMEOUT_MS.getOrDefaultValue(), TimeUnit.MILLISECONDS);
+                            return version;
+                        }
+                    }
+                }
+            }
+
+            process.waitFor(Settings.JAVA_VERSION_DETECTION_TIMEOUT_MS.getOrDefaultValue(), TimeUnit.MILLISECONDS);
+        } catch (IOException ignored) {
+        } catch (InterruptedException ignored) {
+            Thread.currentThread().interrupt();
+        }
+
+        return null;
+    }
+
+    /**
+     * Attempts to resolve the real path for the provided candidate while tolerating resolution failures.
+     *
+     * @param candidate path that may contain symlinks
+     * @return canonical real path when available; otherwise the original candidate
+     */
+    private static Path maybeRealPath(Path candidate) {
+        try {
+            return candidate.toRealPath();
+        } catch (IOException exception) {
+            return candidate;
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/CLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/CLIBuilder.java
new file mode 100644
index 00000000..a715535b
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/CLIBuilder.java
@@ -0,0 +1,75 @@
+package dev.railroadide.railroad.java.cli;
+
+import java.nio.file.Path;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Defines a generic, fluent-style builder for constructing and executing command-line processes.
+ * This interface provides a common structure for setting arguments, environment variables,
+ * and other execution parameters.
+ *
+ * @param <R> The result type returned by the {@link #run()} method (e.g., {@link Process}).
+ * @param <T> The concrete type of the builder implementation, enabling method chaining.
+ */
+public interface CLIBuilder<R, T extends CLIBuilder<R, T>> {
+    /**
+     * Adds a single command-line argument to the process.
+     *
+     * @param arg The argument to add.
+     * @return The builder instance for chaining.
+     */
+    T addArgument(String arg);
+
+    /**
+     * Sets the working directory for the process.
+     *
+     * @param path The path to the working directory.
+     * @return The builder instance for chaining.
+     */
+    T setWorkingDirectory(Path path);
+
+    /**
+     * Sets a custom environment variable for the process.
+     *
+     * @param key   The name of the environment variable.
+     * @param value The value of the environment variable.
+     * @return The builder instance for chaining.
+     */
+    T setEnvironmentVariable(String key, String value);
+
+    /**
+     * Specifies whether the process should inherit the environment variables of the current process.
+     *
+     * @param useSystemVars {@code true} to inherit system environment variables, {@code false} otherwise.
+     * @return The builder instance for chaining.
+     */
+    T useSystemEnvironmentVariables(boolean useSystemVars);
+
+    /**
+     * Sets a timeout for the process execution.
+     *
+     * @param seconds The timeout duration in seconds.
+     * @return The builder instance for chaining.
+     */
+    default T setTimeout(long seconds) {
+        return setTimeout(seconds, TimeUnit.SECONDS);
+    }
+
+    /**
+     * Sets a timeout for the process execution with a specific time unit.
+     *
+     * @param duration The timeout duration.
+     * @param unit     The {@link TimeUnit} of the duration.
+     * @return The builder instance for chaining.
+     */
+    T setTimeout(long duration, TimeUnit unit);
+
+    /**
+     * Executes the configured command-line process.
+     *
+     * @return The result of the process execution, typically a {@link Process} object.
+     * @throws IllegalStateException if the builder is not in a runnable state (e.g., missing required parameters).
+     * @throws RuntimeException      if the process fails to start.
+     */
+    R run();
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/JDKCLI.java b/src/main/java/dev/railroadide/railroad/java/cli/JDKCLI.java
new file mode 100644
index 00000000..22207b4e
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/JDKCLI.java
@@ -0,0 +1,276 @@
+package dev.railroadide.railroad.java.cli;
+
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.impl.*;
+
+import java.nio.file.Path;
+import java.util.Objects;
+
+/**
+ * Provides a fluent API for accessing and executing command-line tools within a specific {@link JDK}.
+ * This class acts as a factory for creating specialized {@link CLIBuilder} instances for various JDK executables
+ * like {@code java}, {@code jar}, {@code javadoc}, etc.
+ *
+ * @param jdk The {@link JDK} instance this CLI toolset is bound to.
+ */
+public record JDKCLI(JDK jdk) {
+    public JDKCLI(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a builder for launching a Java application from a compiled class file.
+     *
+     * @param mainClassPath The path to the main {@code .class} file.
+     * @return A new {@link JavaExecutableCLIBuilder} instance.
+     */
+    public JavaExecutableCLIBuilder launchMainClass(Path mainClassPath) {
+        return JavaExecutableCLIBuilder.classFile(jdk, mainClassPath);
+    }
+
+    /**
+     * Creates a builder for launching a Java application from an executable JAR file.
+     *
+     * @param jarFilePath The path to the {@code .jar} file.
+     * @return A new {@link JavaExecutableCLIBuilder} instance.
+     */
+    public JavaExecutableCLIBuilder launchJar(Path jarFilePath) {
+        return JavaExecutableCLIBuilder.jarFile(jdk, jarFilePath);
+    }
+
+    /**
+     * Creates a builder for launching a Java application from a module.
+     *
+     * @param moduleName The name of the module to launch.
+     * @return A new {@link JavaExecutableCLIBuilder} instance.
+     */
+    public JavaExecutableCLIBuilder launchModule(String moduleName) {
+        return JavaExecutableCLIBuilder.module(jdk, moduleName);
+    }
+
+    /**
+     * Creates a builder for launching a single-file Java source-code program.
+     *
+     * @param sourceFilePath The path to the {@code .java} source file.
+     * @return A new {@link JavaExecutableCLIBuilder} instance.
+     */
+    public JavaExecutableCLIBuilder launchSourceFile(Path sourceFilePath) {
+        return JavaExecutableCLIBuilder.sourceFile(jdk, sourceFilePath);
+    }
+
+    /**
+     * Returns a builder that exercises the {@code jar} tool to create, update, or inspect archive files.
+     *
+     * @return a new {@link JarCLIBuilder}
+     */
+    public JarCLIBuilder jar() {
+        return JarCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for the {@code jarsigner} tool to sign or verify Java archives.
+     *
+     * @return a new {@link JarsignerCLIBuilder}
+     */
+    public JarsignerCLIBuilder jarsigner() {
+        return JarsignerCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder that runs {@code javadoc} to generate API documentation from source files.
+     *
+     * @return a new {@link JavadocCLIBuilder}
+     */
+    public JavadocCLIBuilder javadoc() {
+        return JavadocCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code javap} to disassemble class files and inspect their signatures.
+     *
+     * @return a new {@link JavapCLIBuilder}
+     */
+    public JavapCLIBuilder javap() {
+        return JavapCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code jcmd} to issue diagnostic commands to a running JVM.
+     *
+     * @return a new {@link JcmdCLIBuilder}
+     */
+    public JcmdCLIBuilder jcmd() {
+        return JcmdCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code jdb} to attach a debugger to a JVM session.
+     *
+     * @return a new {@link JdbCLIBuilder}
+     */
+    public JdbCLIBuilder jdb() {
+        return JdbCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder that runs {@code jdeprscan} to scan for deprecated API usage.
+     *
+     * @return a new {@link JdeprscanCLIBuilder}
+     */
+    public JdeprscanCLIBuilder jdeprscan() {
+        return JdeprscanCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code jdeps} to analyze module and package dependencies.
+     *
+     * @return a new {@link JdepsCLIBuilder}
+     */
+    public JdepsCLIBuilder jdeps() {
+        return JdepsCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder that interacts with {@code jfr} to manage Java Flight Recorder sessions.
+     *
+     * @return a new {@link JfrCLIBuilder}
+     */
+    public JfrCLIBuilder jfr() {
+        return JfrCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code jinfo} to print JVM configuration and system properties.
+     *
+     * @return a new {@link JinfoCLIBuilder}
+     */
+    public JinfoCLIBuilder jinfo() {
+        return JinfoCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder that drives {@code jlink} to create custom runtime images.
+     *
+     * @return a new {@link JlinkCLIBuilder}
+     */
+    public JlinkCLIBuilder jlink() {
+        return JlinkCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code jmap} to inspect heap and memory maps of a JVM.
+     *
+     * @return a new {@link JmapCLIBuilder}
+     */
+    public JmapCLIBuilder jmap() {
+        return JmapCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code jmod} to create, describe, or verify modules.
+     *
+     * @return a new {@link JmodCLIBuilder}
+     */
+    public JmodCLIBuilder jmod() {
+        return JmodCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code jpackage} to package self-contained applications.
+     *
+     * @return a new {@link JpackageCLIBuilder}
+     */
+    public JpackageCLIBuilder jpackage() {
+        return JpackageCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code jps} to list the Java processes running on the machine.
+     *
+     * @return a new {@link JpsCLIBuilder}
+     */
+    public JpsCLIBuilder jps() {
+        return JpsCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder that launches {@code jshell} for interactive REPL sessions.
+     *
+     * @return a new {@link JshellCLIBuilder}
+     */
+    public JshellCLIBuilder jshell() {
+        return JshellCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code jstack} to capture thread stack traces from a JVM.
+     *
+     * @return a new {@link JstackCLIBuilder}
+     */
+    public JstackCLIBuilder jstack() {
+        return JstackCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code jstat} to query runtime statistics of a JVM.
+     *
+     * @return a new {@link JstatCLIBuilder}
+     */
+    public JstatCLIBuilder jstat() {
+        return JstatCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder that starts {@code jstatd} for remote JVM monitoring.
+     *
+     * @return a new {@link JstatdCLIBuilder}
+     */
+    public JstatdCLIBuilder jstatd() {
+        return JstatdCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code keytool} to manage keystores and certificates.
+     *
+     * @return a new {@link KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder keytool() {
+        return KeytoolCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code rmic} to generate RMI stubs and skeletons.
+     *
+     * @return a new {@link RmicCLIBuilder}
+     */
+    public RmicCLIBuilder rmic() {
+        return RmicCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code rmid} to launch the RMI activation daemon.
+     *
+     * @return a new {@link RmidCLIBuilder}
+     */
+    public RmidCLIBuilder rmid() {
+        return RmidCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder that starts {@code rmiregistry} on a specified port.
+     *
+     * @return a new {@link RmiregistryCLIBuilder}
+     */
+    public RmiregistryCLIBuilder rmiregistry() {
+        return RmiregistryCLIBuilder.create(jdk);
+    }
+
+    /**
+     * Returns a builder for {@code serialver} to obtain {@code serialVersionUID} values for classes.
+     *
+     * @return a new {@link SerialverCLIBuilder}
+     */
+    public SerialverCLIBuilder serialver() {
+        return SerialverCLIBuilder.create(jdk);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/ProcessExecution.java b/src/main/java/dev/railroadide/railroad/java/cli/ProcessExecution.java
new file mode 100644
index 00000000..33855518
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/ProcessExecution.java
@@ -0,0 +1,58 @@
+package dev.railroadide.railroad.java.cli;
+
+import java.util.Locale;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A utility class for managing external {@link Process} instances, primarily for enforcing execution timeouts.
+ */
+public final class ProcessExecution {
+    private ProcessExecution() {
+    }
+
+    /**
+     * Waits for a process to complete, enforcing a specified timeout. If the process does not
+     * finish within the given duration, it is forcibly terminated.
+     *
+     * @param process  The {@link Process} to monitor.
+     * @param duration The maximum time to wait. If zero or negative, no timeout is enforced.
+     * @param unit     The {@link TimeUnit} for the duration.
+     * @param toolName The name of the tool being executed, used for logging and error messages.
+     * @throws RuntimeException if the process times out or the waiting thread is interrupted.
+     */
+    public static void enforceTimeout(Process process, long duration, TimeUnit unit, String toolName) {
+        Objects.requireNonNull(process, "Process cannot be null");
+        Objects.requireNonNull(toolName, "Tool name cannot be null");
+        if (duration <= 0)
+            return;
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        boolean finished;
+        try {
+            finished = process.waitFor(duration, unit);
+        } catch (InterruptedException exception) {
+            Thread.currentThread().interrupt();
+            destroyProcess(process);
+            throw new RuntimeException("Interrupted while waiting for " + toolName + " process to finish.", exception);
+        }
+
+        if (!finished) {
+            destroyProcess(process);
+            throw new RuntimeException(toolName + " process timed out after "
+                + duration + " " + unit.toString().toLowerCase(Locale.ROOT));
+        }
+    }
+
+    /**
+     * Forcefully terminates a process, trying a graceful destruction first, followed by a forcible one if it remains alive.
+     *
+     * @param process The process to destroy.
+     */
+    private static void destroyProcess(Process process) {
+        process.destroy();
+        if (process.isAlive()) {
+            process.destroyForcibly();
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JarCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JarCLIBuilder.java
new file mode 100644
index 00000000..5be88298
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JarCLIBuilder.java
@@ -0,0 +1,575 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+import lombok.Getter;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A fluent builder for creating and executing {@code jar} commands.
+ * <p>
+ * This builder provides methods for specifying all major operations of the {@code jar} tool,
+ * such as creating, updating, listing, and extracting archives. It supports setting various
+ * options like the main class, manifest, module version, and file entries.
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jar.html">jar command documentation</a>
+ */
+public class JarCLIBuilder implements CLIBuilder<Process, JarCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jar.exe" : "jar";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final List<String> fileEntries = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+    private OperationMode operationMode;
+    private String generateIndexTarget;
+
+    private JarCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a new {@link JarCLIBuilder} for the specified JDK.
+     *
+     * @param jdk The JDK to use for running the {@code jar} command.
+     * @return A new builder instance.
+     */
+    public static JarCLIBuilder create(JDK jdk) {
+        return new JarCLIBuilder(jdk);
+    }
+
+    @Override
+    public JarCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JarCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JarCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JarCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JarCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    private JarCLIBuilder operation(OperationMode mode) {
+        this.operationMode = Objects.requireNonNull(mode, "Operation mode cannot be null");
+        if (mode != OperationMode.GENERATE_INDEX) {
+            this.generateIndexTarget = null;
+        }
+
+        return this;
+    }
+
+    /**
+     * Sets the operation mode to create a new archive ({@code --create}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder createArchive() {
+        return operation(OperationMode.CREATE);
+    }
+
+    /**
+     * Sets the operation mode to list the contents of an archive ({@code --list}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder listContents() {
+        return operation(OperationMode.LIST);
+    }
+
+    /**
+     * Sets the operation mode to update an existing archive ({@code --update}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder updateArchive() {
+        return operation(OperationMode.UPDATE);
+    }
+
+    /**
+     * Sets the operation mode to extract files from an archive ({@code --extract}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder extractArchive() {
+        return operation(OperationMode.EXTRACT);
+    }
+
+    /**
+     * Sets the operation mode to describe the module details of an archive ({@code --describe-module}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder describeModule() {
+        return operation(OperationMode.DESCRIBE_MODULE);
+    }
+
+    /**
+     * Sets the operation mode to validate an archive ({@code --validate}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder validateArchive() {
+        return operation(OperationMode.VALIDATE);
+    }
+
+    /**
+     * Sets the operation mode to generate index information for a set of JAR files ({@code --generate-index}).
+     *
+     * @param jarFile The main JAR file for which the index is generated.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder generateIndex(Path jarFile) {
+        Objects.requireNonNull(jarFile, "JAR file path cannot be null");
+        this.generateIndexTarget = jarFile.toString();
+        return operation(OperationMode.GENERATE_INDEX);
+    }
+
+    /**
+     * Specifies the archive file name ({@code --file}).
+     *
+     * @param jarFile The path to the JAR file.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder archiveFile(Path jarFile) {
+        Objects.requireNonNull(jarFile, "Archive file path cannot be null");
+        this.arguments.add("--file " + jarFile);
+        return this;
+    }
+
+    /**
+     * Specifies the archive file name ({@code --file}).
+     *
+     * @param jarFile The path to the JAR file as a string.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder archiveFile(String jarFile) {
+        Objects.requireNonNull(jarFile, "Archive file path cannot be null");
+        this.arguments.add("--file " + jarFile);
+        return this;
+    }
+
+    /**
+     * Adds multi-release versioned entries to the JAR ({@code --release}).
+     *
+     * @param version The release version (must be 9 or greater).
+     * @return This builder instance.
+     */
+    public JarCLIBuilder releaseEntries(int version) {
+        if (version < 9)
+            throw new IllegalArgumentException("Release version must be 9 or greater");
+
+        this.fileEntries.add("--release " + version);
+        return this;
+    }
+
+    /**
+     * Enables verbose output ({@code --verbose}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder verbose() {
+        this.arguments.add("--verbose");
+        return this;
+    }
+
+    /**
+     * Sets the main class for an executable JAR ({@code --main-class}).
+     *
+     * @param className The fully qualified name of the main class.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder mainClass(String className) {
+        Objects.requireNonNull(className, "Main class cannot be null");
+        this.arguments.add("--main-class " + className);
+        return this;
+    }
+
+    /**
+     * Includes a custom manifest file ({@code --manifest}).
+     *
+     * @param manifestPath The path to the manifest file.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder manifest(Path manifestPath) {
+        Objects.requireNonNull(manifestPath, "Manifest path cannot be null");
+        this.arguments.add("--manifest " + manifestPath);
+        return this;
+    }
+
+    /**
+     * Includes a custom manifest file ({@code --manifest}).
+     *
+     * @param manifestPath The path to the manifest file as a string.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder manifest(String manifestPath) {
+        Objects.requireNonNull(manifestPath, "Manifest path cannot be null");
+        this.arguments.add("--manifest " + manifestPath);
+        return this;
+    }
+
+    /**
+     * Prevents the creation of a manifest file for the entries ({@code --no-manifest}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder noManifest() {
+        this.arguments.add("--no-manifest");
+        return this;
+    }
+
+    /**
+     * Sets the module version for a modular JAR ({@code --module-version}).
+     *
+     * @param version The module version string.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder moduleVersion(String version) {
+        Objects.requireNonNull(version, "Module version cannot be null");
+        this.arguments.add("--module-version " + version);
+        return this;
+    }
+
+    /**
+     * Computes and records hashes of modules matched by the given pattern ({@code --hash-modules}).
+     *
+     * @param pattern The module hashing pattern.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder hashModules(String pattern) {
+        Objects.requireNonNull(pattern, "Module hash pattern cannot be null");
+        this.arguments.add("--hash-modules " + pattern);
+        return this;
+    }
+
+    /**
+     * Specifies the module path ({@code --module-path}).
+     *
+     * @param modulePaths An array of paths to modules.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder modulePath(String... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module paths cannot be null");
+        this.arguments.add("--module-path " + String.join(File.pathSeparator, modulePaths));
+        return this;
+    }
+
+    /**
+     * Specifies the module path ({@code --module-path}).
+     *
+     * @param modulePaths An array of paths to modules.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder modulePath(Path... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module paths cannot be null");
+        String[] pathStrings = Arrays.stream(modulePaths).map(Path::toString).toArray(String[]::new);
+        return modulePath(pathStrings);
+    }
+
+    /**
+     * Reads additional arguments from a file ({@code @file}).
+     *
+     * @param argFilePath The path to the argument file.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder argumentFile(Path argFilePath) {
+        Objects.requireNonNull(argFilePath, "Argument file path cannot be null");
+        this.arguments.add("@" + argFilePath);
+        return this;
+    }
+
+    /**
+     * Disables compression for the archive ({@code --no-compress}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder noCompress() {
+        this.arguments.add("--no-compress");
+        return this;
+    }
+
+    /**
+     * Sets a timestamp for all entries in the archive ({@code --date}).
+     *
+     * @param isoTimestamp The timestamp in ISO-8601 format.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder entryTimestamp(String isoTimestamp) {
+        Objects.requireNonNull(isoTimestamp, "Timestamp cannot be null");
+        this.arguments.add("--date " + isoTimestamp);
+        return this;
+    }
+
+    /**
+     * Displays the help message ({@code --help}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder help() {
+        this.arguments.add("--help");
+        return this;
+    }
+
+    /**
+     * Displays the compatibility help message ({@code --help:compat}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder helpCompat() {
+        this.arguments.add("--help:compat");
+        return this;
+    }
+
+    /**
+     * Displays extra help information ({@code --help-extra}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder helpExtra() {
+        this.arguments.add("--help-extra");
+        return this;
+    }
+
+    /**
+     * Displays the version information ({@code --version}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder versionInfo() {
+        this.arguments.add("--version");
+        return this;
+    }
+
+    /**
+     * Changes the directory during execution ({@code -C}).
+     *
+     * @param directory The directory to change to.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder changeDirectory(Path directory) {
+        Objects.requireNonNull(directory, "Directory cannot be null");
+        this.fileEntries.add("-C " + directory);
+        return this;
+    }
+
+    /**
+     * Changes the directory during execution ({@code -C}).
+     *
+     * @param directory The directory to change to.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder changeDirectory(String directory) {
+        Objects.requireNonNull(directory, "Directory cannot be null");
+        this.fileEntries.add("-C " + directory);
+        return this;
+    }
+
+    /**
+     * Adds a file to be included in the archive.
+     *
+     * @param filePath The path to the file.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder addFile(Path filePath) {
+        Objects.requireNonNull(filePath, "File path cannot be null");
+        this.fileEntries.add(filePath.toString());
+        return this;
+    }
+
+    /**
+     * Adds a file to be included in the archive.
+     *
+     * @param filePath The path to the file as a string.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder addFile(String filePath) {
+        Objects.requireNonNull(filePath, "File path cannot be null");
+        this.fileEntries.add(filePath);
+        return this;
+    }
+
+    /**
+     * Adds multiple files to be included in the archive.
+     *
+     * @param files An array of file paths.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder addFiles(String... files) {
+        Objects.requireNonNull(files, "Files cannot be null");
+        for (String file : files) {
+            addFile(file);
+        }
+
+        return this;
+    }
+
+    /**
+     * Adds multiple files to be included in the archive.
+     *
+     * @param files An array of file paths.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder addFiles(Path... files) {
+        Objects.requireNonNull(files, "Files cannot be null");
+        for (Path file : files) {
+            addFile(file);
+        }
+
+        return this;
+    }
+
+    /**
+     * Specifies the destination directory for extracted files ({@code --dir}).
+     *
+     * @param directory The destination directory.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder destinationDirectory(Path directory) {
+        Objects.requireNonNull(directory, "Directory cannot be null");
+        this.arguments.add("--dir " + directory);
+        return this;
+    }
+
+    /**
+     * Specifies the destination directory for extracted files ({@code --dir}).
+     *
+     * @param directory The destination directory as a string.
+     * @return This builder instance.
+     */
+    public JarCLIBuilder destinationDirectory(String directory) {
+        Objects.requireNonNull(directory, "Directory cannot be null");
+        this.arguments.add("--dir " + directory);
+        return this;
+    }
+
+    /**
+     * Keeps existing files when extracting ({@code --keep-old-files}).
+     *
+     * @return This builder instance.
+     */
+    public JarCLIBuilder keepOldFiles() {
+        this.arguments.add("--keep-old-files");
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        if (operationMode == null)
+            throw new IllegalStateException("An operation mode must be specified before running the jar command.");
+
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+
+        if (operationMode == OperationMode.GENERATE_INDEX) {
+            if (generateIndexTarget == null)
+                throw new IllegalStateException("Generate-index operation requires a target jar file.");
+
+            command.add(operationMode.getFlag() + "=" + generateIndexTarget);
+        } else {
+            command.add(operationMode.getFlag());
+        }
+
+        command.addAll(arguments);
+        command.addAll(fileEntries);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jar");
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jar process", exception);
+        }
+    }
+
+    /**
+     * Represents the primary operation modes for the {@code jar} command.
+     */
+    @Getter
+    public enum OperationMode {
+        /**
+         * Corresponds to the {@code --create} flag.
+         */
+        CREATE("--create"),
+        /**
+         * Corresponds to the {@code --list} flag.
+         */
+        LIST("--list"),
+        /**
+         * Corresponds to the {@code --update} flag.
+         */
+        UPDATE("--update"),
+        /**
+         * Corresponds to the {@code --extract} flag.
+         */
+        EXTRACT("--extract"),
+        /**
+         * Corresponds to the {@code --validate} flag.
+         */
+        VALIDATE("--validate"),
+        /**
+         * Corresponds to the {@code --describe-module} flag.
+         */
+        DESCRIBE_MODULE("--describe-module"),
+        /**
+         * Corresponds to the {@code --generate-index} flag.
+         */
+        GENERATE_INDEX("--generate-index");
+
+        private final String flag;
+
+        OperationMode(String flag) {
+            this.flag = flag;
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JarsignerCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JarsignerCLIBuilder.java
new file mode 100644
index 00000000..626d78da
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JarsignerCLIBuilder.java
@@ -0,0 +1,802 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+import lombok.Getter;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A fluent builder for constructing and executing {@code jarsigner} commands.
+ * <p>
+ * This builder provides methods to configure various options for signing and verifying JAR files,
+ * including keystore details, passwords, algorithms, and verbose output.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jarsigner.html">jarsigner command documentation</a>
+ */
+public class JarsignerCLIBuilder implements CLIBuilder<Process, JarsignerCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jarsigner.exe" : "jarsigner";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final List<String> verifyAliases = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+    private OperationMode operationMode = OperationMode.SIGN;
+    private String jarFile;
+    private String signingAlias;
+
+    private JarsignerCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a new {@code JarsignerCLIBuilder} instance.
+     *
+     * @param jdk The JDK to use for executing the {@code jarsigner} command.
+     * @return A new builder instance.
+     */
+    public static JarsignerCLIBuilder create(JDK jdk) {
+        return new JarsignerCLIBuilder(jdk);
+    }
+
+    @Override
+    public JarsignerCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JarsignerCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JarsignerCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JarsignerCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JarsignerCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Configures the builder to sign a JAR file with a specified alias.
+     *
+     * @param jarFile The path to the JAR file to sign.
+     * @param alias   The alias of the signer in the keystore.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder sign(Path jarFile, String alias) {
+        Objects.requireNonNull(jarFile, "JAR file cannot be null");
+        Objects.requireNonNull(alias, "Alias cannot be null");
+        this.operationMode = OperationMode.SIGN;
+        this.jarFile = jarFile.toString();
+        this.signingAlias = alias;
+        this.verifyAliases.clear();
+        return this;
+    }
+
+    /**
+     * Configures the builder to sign a JAR file with a specified alias.
+     *
+     * @param jarFile The path to the JAR file to sign.
+     * @param alias   The alias of the signer in the keystore.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder sign(String jarFile, String alias) {
+        Objects.requireNonNull(jarFile, "JAR file cannot be null");
+        Objects.requireNonNull(alias, "Alias cannot be null");
+        this.operationMode = OperationMode.SIGN;
+        this.jarFile = jarFile;
+        this.signingAlias = alias;
+        this.verifyAliases.clear();
+        return this;
+    }
+
+    /**
+     * Configures the builder to verify a JAR file.
+     *
+     * @param jarFile The path to the JAR file to verify.
+     * @param aliases Optional aliases to verify against.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder verify(Path jarFile, String... aliases) {
+        Objects.requireNonNull(jarFile, "JAR file cannot be null");
+        this.operationMode = OperationMode.VERIFY;
+        this.jarFile = jarFile.toString();
+        this.signingAlias = null;
+        this.verifyAliases.clear();
+        if (aliases != null) {
+            for (String alias : aliases) {
+                addVerifyAlias(alias);
+            }
+        }
+
+        return this;
+    }
+
+    /**
+     * Configures the builder to verify a JAR file.
+     *
+     * @param jarFile The path to the JAR file to verify.
+     * @param aliases Optional aliases to verify against.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder verify(String jarFile, String... aliases) {
+        Objects.requireNonNull(jarFile, "JAR file cannot be null");
+        this.operationMode = OperationMode.VERIFY;
+        this.jarFile = jarFile;
+        this.signingAlias = null;
+        this.verifyAliases.clear();
+        if (aliases != null) {
+            for (String alias : aliases) {
+                addVerifyAlias(alias);
+            }
+        }
+
+        return this;
+    }
+
+    /**
+     * Configures the builder to display version information for {@code jarsigner}.
+     *
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder version() {
+        this.operationMode = OperationMode.VERSION;
+        this.jarFile = null;
+        this.signingAlias = null;
+        this.verifyAliases.clear();
+        return this;
+    }
+
+    /**
+     * Sets the JAR file to be signed or verified.
+     *
+     * @param jarFile The path to the JAR file.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder jarFile(Path jarFile) {
+        Objects.requireNonNull(jarFile, "JAR file cannot be null");
+        this.jarFile = jarFile.toString();
+        return this;
+    }
+
+    /**
+     * Sets the JAR file to be signed or verified.
+     *
+     * @param jarFile The path to the JAR file.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder jarFile(String jarFile) {
+        Objects.requireNonNull(jarFile, "JAR file cannot be null");
+        this.jarFile = jarFile;
+        return this;
+    }
+
+    /**
+     * Sets the alias of the signer in the keystore.
+     *
+     * @param alias The alias of the signer.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder signingAlias(String alias) {
+        Objects.requireNonNull(alias, "Alias cannot be null");
+        this.signingAlias = alias;
+        return this;
+    }
+
+    /**
+     * Adds an alias to verify against when in verify mode.
+     *
+     * @param alias The alias to add.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder addVerifyAlias(String alias) {
+        Objects.requireNonNull(alias, "Alias cannot be null");
+        this.verifyAliases.add(alias);
+        return this;
+    }
+
+    /**
+     * Adds multiple aliases to verify against when in verify mode.
+     *
+     * @param aliases The aliases to add.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder addVerifyAliases(String... aliases) {
+        Objects.requireNonNull(aliases, "Aliases cannot be null");
+        for (String alias : aliases) {
+            addVerifyAlias(alias);
+        }
+
+        return this;
+    }
+
+    /**
+     * Specifies the keystore to use. Corresponds to the {@code -keystore} option.
+     *
+     * @param keystorePath The path to the keystore file.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder keystore(Path keystorePath) {
+        Objects.requireNonNull(keystorePath, "Keystore path cannot be null");
+        return keystore(keystorePath.toString());
+    }
+
+    /**
+     * Specifies the keystore to use. Corresponds to the {@code -keystore} option.
+     *
+     * @param location The location of the keystore.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder keystore(String location) {
+        Objects.requireNonNull(location, "Keystore location cannot be null");
+        this.arguments.add("-keystore " + location);
+        return this;
+    }
+
+    /**
+     * Sets the password for the keystore. Corresponds to the {@code -storepass} option.
+     *
+     * @param password The keystore password.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder storePassword(String password) {
+        return addPasswordArgument("-storepass", PasswordSource.DIRECT, password);
+    }
+
+    /**
+     * Sets the keystore password from an environment variable. Corresponds to the {@code -storepass:env} option.
+     *
+     * @param envVariable The name of the environment variable.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder storePasswordFromEnv(String envVariable) {
+        return addPasswordArgument("-storepass", PasswordSource.ENVIRONMENT, envVariable);
+    }
+
+    /**
+     * Sets the keystore password from a file. Corresponds to the {@code -storepass:file} option.
+     *
+     * @param file The path to the password file.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder storePasswordFromFile(Path file) {
+        Objects.requireNonNull(file, "Password file cannot be null");
+        return addPasswordArgument("-storepass", PasswordSource.FILE, file.toString());
+    }
+
+    /**
+     * Sets the keystore password from a file. Corresponds to the {@code -storepass:file} option.
+     *
+     * @param file The path to the password file.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder storePasswordFromFile(String file) {
+        return addPasswordArgument("-storepass", PasswordSource.FILE, file);
+    }
+
+    /**
+     * Sets the keystore type. Corresponds to the {@code -storetype} option.
+     *
+     * @param storeType The keystore type.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder storeType(String storeType) {
+        Objects.requireNonNull(storeType, "Store type cannot be null");
+        this.arguments.add("-storetype " + storeType);
+        return this;
+    }
+
+    /**
+     * Sets the password for the private key. Corresponds to the {@code -keypass} option.
+     *
+     * @param password The private key password.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder keyPassword(String password) {
+        return addPasswordArgument("-keypass", PasswordSource.DIRECT, password);
+    }
+
+    /**
+     * Sets the private key password from an environment variable. Corresponds to the {@code -keypass:env} option.
+     *
+     * @param envVariable The name of the environment variable.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder keyPasswordFromEnv(String envVariable) {
+        return addPasswordArgument("-keypass", PasswordSource.ENVIRONMENT, envVariable);
+    }
+
+    /**
+     * Sets the private key password from a file. Corresponds to the {@code -keypass:file} option.
+     *
+     * @param file The path to the password file.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder keyPasswordFromFile(Path file) {
+        Objects.requireNonNull(file, "Password file cannot be null");
+        return addPasswordArgument("-keypass", PasswordSource.FILE, file.toString());
+    }
+
+    /**
+     * Sets the private key password from a file. Corresponds to the {@code -keypass:file} option.
+     *
+     * @param file The path to the password file.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder keyPasswordFromFile(String file) {
+        return addPasswordArgument("-keypass", PasswordSource.FILE, file);
+    }
+
+    /**
+     * Specifies an alternative certificate chain file. Corresponds to the {@code -certchain} option.
+     *
+     * @param certChainFile The path to the certificate chain file.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder certificateChain(Path certChainFile) {
+        Objects.requireNonNull(certChainFile, "Certificate chain file cannot be null");
+        this.arguments.add("-certchain " + certChainFile);
+        return this;
+    }
+
+    /**
+     * Specifies an alternative certificate chain file. Corresponds to the {@code -certchain} option.
+     *
+     * @param certChainFile The path to the certificate chain file.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder certificateChain(String certChainFile) {
+        Objects.requireNonNull(certChainFile, "Certificate chain file cannot be null");
+        this.arguments.add("-certchain " + certChainFile);
+        return this;
+    }
+
+    /**
+     * Specifies the base name for the signature file. Corresponds to the {@code -sigfile} option.
+     *
+     * @param baseName The base name for the signature file.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder signatureFile(String baseName) {
+        Objects.requireNonNull(baseName, "Signature file base name cannot be null");
+        this.arguments.add("-sigfile " + baseName);
+        return this;
+    }
+
+    /**
+     * Specifies the name of the signed JAR file. Corresponds to the {@code -signedjar} option.
+     *
+     * @param signedJarPath The path to the signed JAR file.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder signedJar(Path signedJarPath) {
+        Objects.requireNonNull(signedJarPath, "Signed JAR path cannot be null");
+        this.arguments.add("-signedjar " + signedJarPath);
+        return this;
+    }
+
+    /**
+     * Specifies the name of the signed JAR file. Corresponds to the {@code -signedjar} option.
+     *
+     * @param signedJarPath The path to the signed JAR file.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder signedJar(String signedJarPath) {
+        Objects.requireNonNull(signedJarPath, "Signed JAR path cannot be null");
+        this.arguments.add("-signedjar " + signedJarPath);
+        return this;
+    }
+
+    /**
+     * Specifies the digest algorithm to use. Corresponds to the {@code -digestalg} option.
+     *
+     * @param algorithm The digest algorithm.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder digestAlgorithm(String algorithm) {
+        Objects.requireNonNull(algorithm, "Digest algorithm cannot be null");
+        this.arguments.add("-digestalg " + algorithm);
+        return this;
+    }
+
+    /**
+     * Specifies the signature algorithm to use. Corresponds to the {@code -sigalg} option.
+     *
+     * @param algorithm The signature algorithm.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder signatureAlgorithm(String algorithm) {
+        Objects.requireNonNull(algorithm, "Signature algorithm cannot be null");
+        this.arguments.add("-sigalg " + algorithm);
+        return this;
+    }
+
+    /**
+     * Enables verbose output. Corresponds to the {@code -verbose} option.
+     *
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder verbose() {
+        this.arguments.add("-verbose");
+        return this;
+    }
+
+    /**
+     * Enables verbose output with a specified detail level. Corresponds to the {@code -verbose:detail} option.
+     *
+     * @param detail The level of verbose detail.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder verbose(VerboseDetail detail) {
+        Objects.requireNonNull(detail, "Verbose detail cannot be null");
+        if (detail == VerboseDetail.ALL) {
+            this.arguments.add("-verbose");
+        } else {
+            this.arguments.add("-verbose:" + detail.getToken());
+        }
+
+        return this;
+    }
+
+    /**
+     * Includes certificate details in the output. Corresponds to the {@code -certs} option.
+     *
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder includeCertificateDetails() {
+        this.arguments.add("-certs");
+        return this;
+    }
+
+    /**
+     * Enables revocation checking. Corresponds to the {@code -revCheck} option.
+     *
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder enableRevocationCheck() {
+        this.arguments.add("-revCheck");
+        return this;
+    }
+
+    /**
+     * Specifies the URL of the Timestamping Authority (TSA). Corresponds to the {@code -tsa} option.
+     *
+     * @param url The URL of the TSA.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder timestampAuthority(String url) {
+        Objects.requireNonNull(url, "TSA URL cannot be null");
+        this.arguments.add("-tsa " + url);
+        return this;
+    }
+
+    /**
+     * Specifies the alias of the Timestamping Authority (TSA) certificate. Corresponds to the {@code -tsacert} option.
+     *
+     * @param alias The alias of the TSA certificate.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder timestampAuthorityCertificate(String alias) {
+        Objects.requireNonNull(alias, "TSA certificate alias cannot be null");
+        this.arguments.add("-tsacert " + alias);
+        return this;
+    }
+
+    /**
+     * Specifies the timestamp policy ID. Corresponds to the {@code -tsapolicyid} option.
+     *
+     * @param policyId The timestamp policy ID.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder timestampPolicyId(String policyId) {
+        Objects.requireNonNull(policyId, "Policy ID cannot be null");
+        this.arguments.add("-tsapolicyid " + policyId);
+        return this;
+    }
+
+    /**
+     * Specifies the digest algorithm for the timestamp. Corresponds to the {@code -tsadigestalg} option.
+     *
+     * @param algorithm The timestamp digest algorithm.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder timestampDigestAlgorithm(String algorithm) {
+        Objects.requireNonNull(algorithm, "Timestamp digest algorithm cannot be null");
+        this.arguments.add("-tsadigestalg " + algorithm);
+        return this;
+    }
+
+    /**
+     * Includes the signature file in the signature block. Corresponds to the {@code -internalsf} option.
+     *
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder includeSignatureFileInBlock() {
+        this.arguments.add("-internalsf");
+        return this;
+    }
+
+    /**
+     * Only signs or verifies sections of the JAR file. Corresponds to the {@code -sectionsonly} option.
+     *
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder sectionsOnly() {
+        this.arguments.add("-sectionsonly");
+        return this;
+    }
+
+    /**
+     * Specifies whether protected authentication is required. Corresponds to the {@code -protected} option.
+     *
+     * @param required {@code true} if protected authentication is required, {@code false} otherwise.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder protectedAuthentication(boolean required) {
+        this.arguments.add("-protected " + required);
+        return this;
+    }
+
+    /**
+     * Specifies the name of the cryptographic service provider. Corresponds to the {@code -providerName} option.
+     *
+     * @param providerName The name of the provider.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder providerName(String providerName) {
+        Objects.requireNonNull(providerName, "Provider name cannot be null");
+        this.arguments.add("-providerName " + providerName);
+        return this;
+    }
+
+    /**
+     * Adds a cryptographic service provider by name. Corresponds to the {@code -addprovider} option.
+     *
+     * @param providerName The name of the provider to add.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder addProvider(String providerName) {
+        Objects.requireNonNull(providerName, "Provider name cannot be null");
+        this.arguments.add("-addprovider " + providerName);
+        return this;
+    }
+
+    /**
+     * Adds a cryptographic service provider by name and an argument. Corresponds to the {@code -addprovider} and {@code -providerArg} options.
+     *
+     * @param providerName The name of the provider to add.
+     * @param providerArg  An argument for the provider.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder addProvider(String providerName, String providerArg) {
+        Objects.requireNonNull(providerName, "Provider name cannot be null");
+        this.arguments.add("-addprovider " + providerName);
+        Objects.requireNonNull(providerArg, "Provider argument cannot be null");
+        this.arguments.add("-providerArg " + providerArg);
+        return this;
+    }
+
+    /**
+     * Specifies the class name of the cryptographic service provider. Corresponds to the {@code -providerClass} option.
+     *
+     * @param className The class name of the provider.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder providerClass(String className) {
+        Objects.requireNonNull(className, "Provider class cannot be null");
+        this.arguments.add("-providerClass " + className);
+        return this;
+    }
+
+    /**
+     * Specifies the class name of the cryptographic service provider and an argument. Corresponds to the {@code -providerClass} and {@code -providerArg} options.
+     *
+     * @param className   The class name of the provider.
+     * @param providerArg An argument for the provider.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder providerClass(String className, String providerArg) {
+        Objects.requireNonNull(className, "Provider class cannot be null");
+        this.arguments.add("-providerClass " + className);
+        Objects.requireNonNull(providerArg, "Provider argument cannot be null");
+        this.arguments.add("-providerArg " + providerArg);
+        return this;
+    }
+
+    /**
+     * Specifies the classpath for the provider. Corresponds to the {@code -providerPath} option.
+     *
+     * @param classpath The classpath for the provider.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder providerPath(String classpath) {
+        Objects.requireNonNull(classpath, "Provider path cannot be null");
+        this.arguments.add("-providerPath " + classpath);
+        return this;
+    }
+
+    /**
+     * Passes an option to the Java Virtual Machine. Corresponds to the {@code -J} option.
+     *
+     * @param option The option to pass to the JVM.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder javaOption(String option) {
+        Objects.requireNonNull(option, "Java option cannot be null");
+        this.arguments.add("-J" + option);
+        return this;
+    }
+
+    /**
+     * Enables strict mode for verification. Corresponds to the {@code -strict} option.
+     *
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder strictMode() {
+        this.arguments.add("-strict");
+        return this;
+    }
+
+    /**
+     * Specifies a configuration file. Corresponds to the {@code -conf} option.
+     *
+     * @param url The URL of the configuration file.
+     * @return This builder instance.
+     */
+    public JarsignerCLIBuilder configurationFile(String url) {
+        Objects.requireNonNull(url, "Configuration URL cannot be null");
+        this.arguments.add("-conf " + url);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        if (operationMode == OperationMode.SIGN) {
+            if (jarFile == null)
+                throw new IllegalStateException("A JAR file must be specified when signing.");
+            if (signingAlias == null)
+                throw new IllegalStateException("An alias must be provided when signing.");
+        } else if (operationMode == OperationMode.VERIFY) {
+            if (jarFile == null)
+                throw new IllegalStateException("A JAR file must be specified when verifying.");
+        }
+
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        if (operationMode.getFlag() != null) {
+            command.add(operationMode.getFlag());
+        }
+
+        command.addAll(arguments);
+        if (operationMode != OperationMode.VERSION && jarFile != null) {
+            command.add(jarFile);
+            if (operationMode == OperationMode.SIGN) {
+                command.add(signingAlias);
+            } else if (operationMode == OperationMode.VERIFY && !verifyAliases.isEmpty()) {
+                command.addAll(verifyAliases);
+            }
+        }
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jarsigner");
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jarsigner process", exception);
+        }
+    }
+
+    /**
+     * Adds a password argument to the command.
+     *
+     * @param option The command-line option for the password (e.g., "-storepass", "-keypass").
+     * @param source The source of the password (direct, environment variable, or file).
+     * @param value  The password value, environment variable name, or file path.
+     * @return This builder instance.
+     */
+    private JarsignerCLIBuilder addPasswordArgument(String option, PasswordSource source, String value) {
+        Objects.requireNonNull(option, "Option cannot be null");
+        Objects.requireNonNull(source, "Password source cannot be null");
+        Objects.requireNonNull(value, "Password value cannot be null");
+        StringBuilder builder = new StringBuilder(option);
+        if (!source.getSuffix().isEmpty()) {
+            builder.append(source.getSuffix());
+        }
+
+        builder.append(" ").append(value);
+        this.arguments.add(builder.toString());
+        return this;
+    }
+
+    /**
+     * Represents the level of detail for verbose output.
+     */
+    @Getter
+    public enum VerboseDetail {
+        ALL("all"),
+        GROUPED("grouped"),
+        SUMMARY("summary");
+
+        private final String token;
+
+        VerboseDetail(String token) {
+            this.token = token;
+        }
+    }
+
+    /**
+     * Represents the source of a password argument.
+     */
+    @Getter
+    private enum PasswordSource {
+        DIRECT(""),
+        ENVIRONMENT(":env"),
+        FILE(":file");
+
+        private final String suffix;
+
+        PasswordSource(String suffix) {
+            this.suffix = suffix;
+        }
+    }
+
+    /**
+     * Represents the operation mode for the {@code jarsigner} command.
+     */
+    @Getter
+    private enum OperationMode {
+        SIGN(null),
+        VERIFY("-verify"),
+        VERSION("-version");
+
+        private final String flag;
+
+        OperationMode(String flag) {
+            this.flag = flag;
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JavaExecutableCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JavaExecutableCLIBuilder.java
new file mode 100644
index 00000000..137c5044
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JavaExecutableCLIBuilder.java
@@ -0,0 +1,3885 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.JDKManager;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * A fluent builder for creating and executing {@code java} commands.
+ * <p>
+ * This comprehensive builder supports a wide array of standard, extended (-X), and advanced (-XX)
+ * options for the Java launcher. It allows for detailed configuration of the classpath, module path,
+ * garbage collection, memory management, JIT compilation, and much more.
+ * <p>
+ * Methods in this builder correspond to specific command-line flags. Version-specific options
+ * will throw an {@link UnsupportedOperationException} if used with an incompatible JDK version.
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/java.html">java command documentation</a>
+ */
+// NOTE: Some options are version-specific; ensure compatibility with the selected JDK version
+public class JavaExecutableCLIBuilder implements CLIBuilder<Process, JavaExecutableCLIBuilder> {
+    private final JDK jdk;
+    private final String primaryArgument;
+    private final List<String> arguments = new ArrayList<>();
+    private Path workingDirectory;
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+    private boolean enableConsole = false;
+    private final LaunchType launchType;
+
+    private JavaExecutableCLIBuilder(LaunchType launchType, JDK jdk, String primaryArgument) {
+        this.launchType = Objects.requireNonNull(launchType, "Launch type cannot be null");
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+        this.primaryArgument = Objects.requireNonNull(primaryArgument, "Primary argument cannot be null");
+    }
+
+    /**
+     * Creates a builder to launch a {@code .class} file.
+     *
+     * @param jdk           The JDK to use.
+     * @param classFilePath The path to the class file.
+     * @return A new builder instance.
+     */
+    public static JavaExecutableCLIBuilder classFile(JDK jdk, Path classFilePath) {
+        Objects.requireNonNull(classFilePath, "Class file path cannot be null");
+        if (!classFilePath.toString().endsWith(".class"))
+            throw new IllegalArgumentException("Provided path is not a .class file: " + classFilePath);
+        return new JavaExecutableCLIBuilder(LaunchType.CLASS_FILE, jdk, classFilePath.toString());
+    }
+
+    /**
+     * Creates a builder to launch an executable {@code .jar} file.
+     *
+     * @param jdk         The JDK to use.
+     * @param jarFilePath The path to the JAR file.
+     * @return A new builder instance.
+     */
+    public static JavaExecutableCLIBuilder jarFile(JDK jdk, Path jarFilePath) {
+        Objects.requireNonNull(jarFilePath, "JAR file path cannot be null");
+        if (!jarFilePath.toString().endsWith(".jar"))
+            throw new IllegalArgumentException("Provided path is not a .jar file: " + jarFilePath);
+
+        return new JavaExecutableCLIBuilder(LaunchType.JAR_FILE, jdk, jarFilePath.toString());
+    }
+
+    /**
+     * Creates a builder to launch a module.
+     *
+     * @param jdk        The JDK to use.
+     * @param moduleName The name of the module to launch.
+     * @return A new builder instance.
+     */
+    public static JavaExecutableCLIBuilder module(JDK jdk, String moduleName) {
+        Objects.requireNonNull(moduleName, "Module name cannot be null");
+        return new JavaExecutableCLIBuilder(LaunchType.MODULE, jdk, moduleName);
+    }
+
+    /**
+     * Creates a builder to launch a single-file {@code .java} source program.
+     *
+     * @param jdk            The JDK to use.
+     * @param sourceFilePath The path to the source file.
+     * @return A new builder instance.
+     */
+    public static JavaExecutableCLIBuilder sourceFile(JDK jdk, Path sourceFilePath) {
+        Objects.requireNonNull(sourceFilePath, "Source file path cannot be null");
+        if (!sourceFilePath.toString().endsWith(".java"))
+            throw new IllegalArgumentException("Provided path is not a .java file: " + sourceFilePath);
+
+        return new JavaExecutableCLIBuilder(LaunchType.SOURCE_FILE, jdk, sourceFilePath.toString());
+    }
+
+    @Override
+    public JavaExecutableCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JavaExecutableCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JavaExecutableCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JavaExecutableCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JavaExecutableCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * On Windows, specifies whether to use {@code java.exe} (with a console) or {@code javaw.exe} (without a console).
+     * This setting has no effect on other operating systems.
+     *
+     * @param enableConsole {@code true} to use {@code java.exe}, {@code false} to use {@code javaw.exe}.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableConsole(boolean enableConsole) {
+        this.enableConsole = enableConsole;
+        return this;
+    }
+
+    /**
+     * Loads a native agent library (e.g., for profiling or debugging). Corresponds to the {@code -agentlib} flag.
+     *
+     * @param agentLib The name of the agent library.
+     * @param options  Optional arguments for the agent.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder agentlib(String agentLib, String... options) {
+        Objects.requireNonNull(agentLib, "Agent library cannot be null");
+        Objects.requireNonNull(options, "Options array cannot be null");
+        var agentArgument = new StringBuilder("-agentlib:").append(agentLib);
+        if (options.length > 0) {
+            agentArgument.append("=");
+            agentArgument.append(String.join(",", options));
+        }
+
+        this.arguments.addFirst(agentArgument.toString());
+        return this;
+    }
+
+    /**
+     * Loads a native agent library by its full path. Corresponds to the {@code -agentpath} flag.
+     *
+     * @param agentPath The path to the agent library.
+     * @param options   Optional arguments for the agent.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder agentpath(Path agentPath, String... options) {
+        Objects.requireNonNull(agentPath, "Agent path cannot be null");
+        Objects.requireNonNull(options, "Options array cannot be null");
+        var agentArgument = new StringBuilder("-agentpath:").append(agentPath);
+        if (options.length > 0) {
+            agentArgument.append("=");
+            agentArgument.append(String.join(",", options));
+        }
+
+        this.arguments.add(agentArgument.toString());
+        return this;
+    }
+
+    /**
+     * Sets the class search path. Corresponds to the {@code -cp} or {@code -classpath} flag.
+     *
+     * @param classpathEntries The entries for the classpath.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder classpath(String... classpathEntries) {
+        Objects.requireNonNull(classpathEntries, "Classpath entries cannot be null");
+        this.arguments.add("-cp " + String.join(File.pathSeparator, classpathEntries));
+        return this;
+    }
+
+    /**
+     * Disables the use of argument files ({@code @files}).
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder disableAtFiles() {
+        this.arguments.add("--disable-@files");
+        return this;
+    }
+
+    /**
+     * Enables preview language features. Corresponds to the {@code --enable-preview} flag.
+     *
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if the JDK version is less than 12.
+     */
+    public JavaExecutableCLIBuilder enablePreviewFeatures() {
+        if (jdk.version().major() < 12)
+            throw new UnsupportedOperationException("Preview features are only supported in JDK 12 and above.");
+
+        this.arguments.add("--enable-preview");
+        return this;
+    }
+
+    /**
+     * Enables native access for a specific module. Corresponds to the {@code --enable-native-access} flag.
+     *
+     * @param moduleName The name of the module to grant native access to.
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if the JDK version is less than 16.
+     */
+    public JavaExecutableCLIBuilder enableNativeAccess(String moduleName) {
+        if (jdk.version().major() < 16)
+            throw new UnsupportedOperationException("Enabling native access is only supported in JDK 16 and above.");
+
+        Objects.requireNonNull(moduleName, "Module name cannot be null");
+        this.arguments.add("--enable-native-access=" + moduleName);
+        return this;
+    }
+
+    /**
+     * Enables native access for all unnamed modules.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableNativeAccess() {
+        return enableNativeAccess("ALL-UNNAMED");
+    }
+
+    /**
+     * Sets the behavior for illegal native access. Corresponds to the {@code --illegal-native-access} flag.
+     *
+     * @param mode The access mode to set.
+     * @return This builder instance.
+     * @deprecated As of Java 25, this flag is for removal.
+     */
+    @Deprecated(forRemoval = true, since = "Java 25")
+    public JavaExecutableCLIBuilder illegalNativeAccess(AccessMode mode) {
+        if (jdk.version().major() < 24)
+            throw new UnsupportedOperationException("Setting illegal native access mode is only supported in JDK 24 and above.");
+        if (mode == AccessMode.DEBUG)
+            throw new UnsupportedOperationException("DEBUG mode is not available for illegal native access.");
+
+        Objects.requireNonNull(mode, "Native access mode cannot be null");
+        this.arguments.add("--illegal-native-access=" + mode.getMode());
+        return this;
+    }
+
+    /**
+     * Enables or disables finalization. Corresponds to the {@code --finalization} flag.
+     *
+     * @param state The desired state of finalization.
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if the JDK version is less than 18.
+     */
+    public JavaExecutableCLIBuilder finalization(EnabledDisabled state) {
+        if (jdk.version().major() < 18)
+            throw new UnsupportedOperationException("Controlling finalization is only supported in JDK 18 and above.");
+
+        Objects.requireNonNull(state, "Finalization state cannot be null");
+        this.arguments.add("--finalization=" + state.getState());
+        return this;
+    }
+
+    /**
+     * Sets the module path. Corresponds to the {@code --module-path} or {@code -p} flag.
+     *
+     * @param modulePaths The entries for the module path.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder modulePath(String... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module path entries cannot be null");
+        this.arguments.add("--module-path " + String.join(File.pathSeparator, modulePaths));
+        return this;
+    }
+
+    /**
+     * Sets the upgrade module path. Corresponds to the {@code --upgrade-module-path} flag.
+     *
+     * @param upgradeModulePaths The entries for the upgrade module path.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder upgradeModulePath(String... upgradeModulePaths) {
+        Objects.requireNonNull(upgradeModulePaths, "Upgrade module path entries cannot be null");
+        this.arguments.add("--upgrade-module-path " + String.join(File.pathSeparator, upgradeModulePaths));
+        return this;
+    }
+
+    /**
+     * Adds a set of root modules to the initial resolution. Corresponds to the {@code --add-modules} flag.
+     *
+     * @param modules The names of the modules to add.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder addModules(String... modules) {
+        Objects.requireNonNull(modules, "Modules cannot be null");
+        this.arguments.add("--add-modules " + String.join(",", modules));
+        return this;
+    }
+
+    /**
+     * Adds a predefined set of root modules (e.g., all system modules).
+     *
+     * @param rootModule The predefined set of modules to add.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder addModules(RootModule rootModule) {
+        Objects.requireNonNull(rootModule, "Root module cannot be null");
+        this.arguments.add("--add-modules " + rootModule.getModule());
+        return this;
+    }
+
+    /**
+     * Lists the observable modules and exits. Corresponds to the {@code --list-modules} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder listModules() {
+        this.arguments.add("--list-modules");
+        return this;
+    }
+
+    /**
+     * Describes a given module and exits. Corresponds to the {@code --describe-module} flag.
+     *
+     * @param moduleName The name of the module to describe.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder describeModule(String moduleName) {
+        Objects.requireNonNull(moduleName, "Module name cannot be null");
+        this.arguments.add("--describe-module " + moduleName);
+        return this;
+    }
+
+    /**
+     * Performs a dry run of the module system and exits. Corresponds to the {@code --dry-run} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder dryRun() {
+        this.arguments.add("--dry-run");
+        return this;
+    }
+
+    /**
+     * Validates the module graph and exits. Corresponds to the {@code --validate-modules} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder validateModules() {
+        this.arguments.add("--validate-modules");
+        return this;
+    }
+
+    /**
+     * Sets a system property. Corresponds to the {@code -Dkey=value} flag.
+     *
+     * @param key   The property key.
+     * @param value The property value.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder systemProperty(String key, String value) {
+        Objects.requireNonNull(key, "System property key cannot be null");
+        Objects.requireNonNull(value, "System property value cannot be null");
+        String normalizedValue = value.startsWith("\"") && value.endsWith("\"") ? value : "\"" + value + "\"";
+        this.arguments.add("-D" + key + "=" + normalizedValue);
+        return this;
+    }
+
+    /**
+     * Disables assertions for all classes. Corresponds to the {@code -da} or {@code -disableassertions} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder disableAssertions() {
+        this.arguments.add("-da");
+        return this;
+    }
+
+    /**
+     * Disables assertions for a specific package or class.
+     *
+     * @param packageOrClassName The name of the package or class.
+     * @param subpackages        If {@code true}, also applies to subpackages.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder disableAssertions(String packageOrClassName, boolean subpackages) {
+        Objects.requireNonNull(packageOrClassName, "Package or class name cannot be null");
+        this.arguments.add("-da:" + packageOrClassName + (subpackages ? "..." : ""));
+        return this;
+    }
+
+    /**
+     * Disables assertions for a specific package or class.
+     *
+     * @param packageOrClassName The name of the package or class.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder disableAssertions(String packageOrClassName) {
+        return disableAssertions(packageOrClassName, false);
+    }
+
+    /**
+     * Disables assertions in all system classes. Corresponds to the {@code -dsa} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder disableSystemAssertions() {
+        this.arguments.add("-dsa");
+        return this;
+    }
+
+    /**
+     * Enables assertions for all classes. Corresponds to the {@code -ea} or {@code -enableassertions} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableAssertions() {
+        this.arguments.add("-ea");
+        return this;
+    }
+
+    /**
+     * Enables assertions for a specific package or class.
+     *
+     * @param packageOrClassName The name of the package or class.
+     * @param subpackages        If {@code true}, also applies to subpackages.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableAssertions(String packageOrClassName, boolean subpackages) {
+        Objects.requireNonNull(packageOrClassName, "Package or class name cannot be null");
+        this.arguments.add("-ea:" + packageOrClassName + (subpackages ? "..." : ""));
+        return this;
+    }
+
+    /**
+     * Enables assertions for a specific package or class.
+     *
+     * @param packageOrClassName The name of the package or class.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableAssertions(String packageOrClassName) {
+        return enableAssertions(packageOrClassName, false);
+    }
+
+    /**
+     * Enables assertions in all system classes. Corresponds to the {@code -esa} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableSystemAssertions() {
+        this.arguments.add("-esa");
+        return this;
+    }
+
+    /**
+     * Prints the help message. Corresponds to the {@code -help} or {@code --help} flag.
+     *
+     * @param errorOutput If {@code true}, prints to standard error.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder help(boolean errorOutput) {
+        this.arguments.add(errorOutput ? "-help" : "--help");
+        return this;
+    }
+
+    /**
+     * Loads a Java programming language agent. Corresponds to the {@code -javaagent} flag.
+     *
+     * @param javaAgentPath The path to the agent JAR file.
+     * @param options       Optional arguments for the agent.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder javaagent(String javaAgentPath, String... options) {
+        Objects.requireNonNull(javaAgentPath, "Java agent path cannot be null");
+        Objects.requireNonNull(options, "Options array cannot be null");
+        var agentArgument = new StringBuilder("-javaagent:").append(javaAgentPath);
+        if (options.length > 0) {
+            agentArgument.append("=");
+            agentArgument.append(String.join(",", options));
+        }
+
+        this.arguments.addFirst(agentArgument.toString());
+        return this;
+    }
+
+    /**
+     * Loads a Java programming language agent. Corresponds to the {@code -javaagent} flag.
+     *
+     * @param javaAgentPath The path to the agent JAR file.
+     * @param options       Optional arguments for the agent.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder javaagent(Path javaAgentPath, String... options) {
+        Objects.requireNonNull(javaAgentPath, "Java agent path cannot be null");
+        return javaagent(javaAgentPath.toString(), options);
+    }
+
+    /**
+     * Shows version information and continues execution. Corresponds to the {@code -showversion} or {@code --showversion} flag.
+     *
+     * @param errorOutput If {@code true}, prints to standard error.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder showVersion(boolean errorOutput) {
+        this.arguments.add(errorOutput ? "-showversion" : "--showversion");
+        return this;
+    }
+
+    /**
+     * Shows the module resolution output. Corresponds to the {@code --show-module-resolution} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder showModuleResolution() {
+        this.arguments.add("--show-module-resolution");
+        return this;
+    }
+
+    /**
+     * Shows the splash screen with a specified image. Corresponds to the {@code --splash} flag.
+     *
+     * @param splashImagePath The path to the splash screen image.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder splashScreen(String splashImagePath) {
+        Objects.requireNonNull(splashImagePath, "Splash image path cannot be null");
+        this.arguments.add("--splash:" + splashImagePath);
+        return this;
+    }
+
+    /**
+     * Shows the splash screen with a specified image. Corresponds to the {@code --splash} flag.
+     *
+     * @param splashImagePath The path to the splash screen image.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder splashScreen(Path splashImagePath) {
+        Objects.requireNonNull(splashImagePath, "Splash image path cannot be null");
+        return splashScreen(splashImagePath.toString());
+    }
+
+    /**
+     * Enables verbose output for a specific component. Corresponds to the {@code -verbose} flag.
+     *
+     * @param component The component to make verbose (e.g., gc, class, jni).
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder verbose(VerboseComponent component) {
+        Objects.requireNonNull(component, "Verbose component cannot be null");
+        this.arguments.add("-verbose:" + component.getComponent());
+        return this;
+    }
+
+    /**
+     * Prints version information and exits. Corresponds to the {@code -version} or {@code --version} flag.
+     *
+     * @param errorOutput If {@code true}, prints to standard error.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder version(boolean errorOutput) {
+        this.arguments.add(errorOutput ? "-version" : "--version");
+        return this;
+    }
+
+    /**
+     * Shows help on extra non-standard options. Corresponds to the {@code -X} or {@code --help-extra} flag.
+     *
+     * @param errorOutput If {@code true}, prints to standard error.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder extraOptionsHelp(boolean errorOutput) {
+        this.arguments.add(errorOutput ? "-X" : "--help-extra");
+        return this;
+    }
+
+    /**
+     * Reads additional arguments from a file.
+     *
+     * @param argFilePath The path to the argument file.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder addArgFile(Path argFilePath) {
+        Objects.requireNonNull(argFilePath, "Argument file path cannot be null");
+        this.arguments.add("@" + argFilePath);
+        return this;
+    }
+
+    /**
+     * Disables background compilation. Corresponds to the {@code -Xbatch} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder disableBackgroundCompilation() {
+        this.arguments.add("-Xbatch");
+        return this;
+    }
+
+    /**
+     * Appends entries to the bootstrap class path. Corresponds to the {@code -Xbootclasspath/a:} flag.
+     *
+     * @param bootClassPathEntries The entries to append.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder appendBootClassPath(String... bootClassPathEntries) {
+        Objects.requireNonNull(bootClassPathEntries, "Boot class path entries cannot be null");
+        this.arguments.add("-Xbootclasspath/a:" + String.join(File.pathSeparator, bootClassPathEntries));
+        return this;
+    }
+
+    /**
+     * Performs additional, more rigorous JNI checks. Corresponds to the {@code -Xcheck:jni} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder performAdditionalJNIChecks() {
+        this.arguments.add("-Xcheck:jni");
+        return this;
+    }
+
+    /**
+     * Forces compilation of all methods on first invocation. Corresponds to the {@code -Xcomp} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder exerciseJITCompiler() {
+        this.arguments.add("-Xcomp");
+        return this;
+    }
+
+    /**
+     * Enables debugging support.
+     *
+     * @return This builder instance.
+     * @deprecated As of Java 5, use {@code -agentlib:jdwp} instead.
+     */
+    @Deprecated(forRemoval = true, since = "Java 5")
+    public JavaExecutableCLIBuilder enableDebuggingSupport() {
+        this.arguments.add("-Xdebug");
+        return this;
+    }
+
+    /**
+     * Enables additional diagnostic messages. Corresponds to the {@code -Xdiag} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder additionalDiagnosticMessages() {
+        this.arguments.add("-Xdiag");
+        return this;
+    }
+
+    /**
+     * Runs the application in interpreted-only mode. Corresponds to the {@code -Xint} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder interpretOnlyMode() {
+        this.arguments.add("-Xint");
+        return this;
+    }
+
+    /**
+     * Prints internal version information. Corresponds to the {@code -Xinternalversion} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder internalVersionInfo() {
+        this.arguments.add("-Xinternalversion");
+        return this;
+    }
+
+    /**
+     * Configures or disables logging. Corresponds to the {@code -Xlog} flag.
+     *
+     * @param loggingOptions The raw logging configuration string.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder configureLogging(String loggingOptions) {
+        Objects.requireNonNull(loggingOptions, "Logging options cannot be null");
+        this.arguments.add("-Xlog:" + loggingOptions);
+        return this;
+    }
+
+    /**
+     * Configures logging using a fluent builder.
+     *
+     * @param configuration The logging configuration object.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder configureLogging(LoggingConfiguration configuration) {
+        Objects.requireNonNull(configuration, "Logging configuration cannot be null");
+        return configureLogging(configuration.asArgument());
+    }
+
+    /**
+     * Creates a new logging configuration builder.
+     *
+     * @return A new {@link LoggingConfiguration} instance.
+     */
+    public static LoggingConfiguration loggingConfiguration() {
+        return new LoggingConfiguration();
+    }
+
+    /**
+     * Runs the application in mixed mode (compiled and interpreted). Corresponds to the {@code -Xmixed} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder mixedMode() {
+        this.arguments.add("-Xmixed");
+        return this;
+    }
+
+    /**
+     * Sets the size of the young generation heap. Corresponds to the {@code -Xmn} flag.
+     *
+     * @param size The size.
+     * @param unit The unit of size (e.g., MEGABYTES).
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder generationalMaxHeapSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Heap size cannot be null");
+        this.arguments.add("-Xmn" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the initial heap size. Corresponds to the {@code -Xms} flag.
+     *
+     * @param size The size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder minimumHeapSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Heap size cannot be null");
+        this.arguments.add("-Xms" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the maximum heap size. Corresponds to the {@code -Xmx} flag.
+     *
+     * @param size The size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maximumHeapSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Heap size cannot be null");
+        this.arguments.add("-Xmx" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Disables garbage collection of classes. Corresponds to the {@code -Xnoclassgc} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder disableClassGC() {
+        this.arguments.add("-Xnoclassgc");
+        return this;
+    }
+
+    /**
+     * Reduces the use of OS signals by the JVM. Corresponds to the {@code -Xrs} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder reduceSignalUsage() {
+        this.arguments.add("-Xrs");
+        return this;
+    }
+
+    /**
+     * Sets the class data sharing mode. Corresponds to the {@code -Xshare} flag.
+     *
+     * @param mode The desired mode (auto, on, off).
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder setClassDataSharingMode(AutoOnOff mode) {
+        Objects.requireNonNull(mode, "Class Data Sharing mode cannot be null");
+        this.arguments.add("-Xshare:class" + mode.getMode());
+        return this;
+    }
+
+    /**
+     * Shows all JVM settings and exits. Corresponds to the {@code -XshowSettings} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder showSettings() {
+        this.arguments.add("-XshowSettings");
+        return this;
+    }
+
+    /**
+     * Shows settings for a specific category and exits.
+     *
+     * @param category The category of settings to show.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder showSettings(SettingCategory category) {
+        Objects.requireNonNull(category, "Setting category cannot be null");
+        if (category == SettingCategory.SYSTEM && !OperatingSystem.isLinux())
+            throw new UnsupportedOperationException("Showing system settings is only supported on Linux systems.");
+
+        this.arguments.add("-XshowSettings:" + category.getCategoryName());
+        return this;
+    }
+
+    /**
+     * Sets the thread stack size. Corresponds to the {@code -Xss} flag.
+     *
+     * @param size The size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder threadStackSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Stack size unit cannot be null");
+        this.arguments.add("-Xss" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Adds a read edge from a source module to target modules. Corresponds to the {@code --add-reads} flag.
+     *
+     * @param sourceModule  The source module.
+     * @param targetModules The target modules.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder addReads(String sourceModule, String... targetModules) {
+        Objects.requireNonNull(sourceModule, "Source module cannot be null");
+        Objects.requireNonNull(targetModules, "Target modules cannot be null");
+
+        this.arguments.add("--add-reads " + sourceModule + "=" + String.join(",", targetModules));
+        return this;
+    }
+
+    /**
+     * Adds a read edge from a source module to all unnamed modules.
+     *
+     * @param sourceModule The source module.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder addReadsAllUnnamed(String sourceModule) {
+        return addReads(sourceModule, "ALL-UNNAMED");
+    }
+
+    /**
+     * Adds an export of a package from a source module to target modules. Corresponds to the {@code --add-exports} flag.
+     *
+     * @param sourceModule  The source module.
+     * @param packageName   The package to export.
+     * @param targetModules The target modules.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder addExports(String sourceModule, String packageName, String... targetModules) {
+        Objects.requireNonNull(sourceModule, "Source module cannot be null");
+        Objects.requireNonNull(packageName, "Package name cannot be null");
+        Objects.requireNonNull(targetModules, "Target modules cannot be null");
+
+        this.arguments.add("--add-exports " + sourceModule + "/" + packageName + "=" + String.join(",", targetModules));
+        return this;
+    }
+
+    /**
+     * Adds an export of a package from a source module to all unnamed modules.
+     *
+     * @param sourceModule The source module.
+     * @param packageName  The package to export.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder addExportsAllUnnamed(String sourceModule, String packageName) {
+        return addExports(sourceModule, packageName, "ALL-UNNAMED");
+    }
+
+    /**
+     * Adds an open of a package from a source module to target modules. Corresponds to the {@code --add-opens} flag.
+     *
+     * @param sourceModule  The source module.
+     * @param packageName   The package to open.
+     * @param targetModules The target modules.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder addOpens(String sourceModule, String packageName, String... targetModules) {
+        Objects.requireNonNull(sourceModule, "Source module cannot be null");
+        Objects.requireNonNull(packageName, "Package name cannot be null");
+        Objects.requireNonNull(targetModules, "Target modules cannot be null");
+
+        this.arguments.add("--add-opens " + sourceModule + "/" + packageName + "=" + String.join(",", targetModules));
+        return this;
+    }
+
+    /**
+     * Adds an open of a package from a source module to all unnamed modules.
+     *
+     * @param sourceModule The source module.
+     * @param packageName  The package to open.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder addOpensAllUnnamed(String sourceModule, String packageName) {
+        return addOpens(sourceModule, packageName, "ALL-UNNAMED");
+    }
+
+    /**
+     * Limits the universe of observable modules. Corresponds to the {@code --limit-modules} flag.
+     *
+     * @param modules The modules to limit to.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder limitModules(String... modules) {
+        Objects.requireNonNull(modules, "Modules cannot be null");
+        this.arguments.add("--limit-modules " + String.join(",", modules));
+        return this;
+    }
+
+    /**
+     * Patches a module with classes and resources from specified paths. Corresponds to the {@code --patch-module} flag.
+     *
+     * @param moduleName The module to patch.
+     * @param patchPaths The paths to the patch content.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder patchModule(String moduleName, String... patchPaths) {
+        Objects.requireNonNull(moduleName, "Module name cannot be null");
+        Objects.requireNonNull(patchPaths, "Patch paths cannot be null");
+        this.arguments.add("--patch-module " + moduleName + "=" + String.join(File.pathSeparator, patchPaths));
+        return this;
+    }
+
+    /**
+     * Sets the source version for single-file source-code programs. Corresponds to the {@code --source} flag.
+     *
+     * @param version The source version.
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if not launching a source file.
+     */
+    public JavaExecutableCLIBuilder sourceVersion(String version) {
+        if (launchType != LaunchType.SOURCE_FILE)
+            throw new UnsupportedOperationException("Setting source version is only supported when launching a source file.");
+
+        Objects.requireNonNull(version, "Source version cannot be null");
+        this.arguments.add("--source " + version);
+        return this;
+    }
+
+    /**
+     * Sets the access mode for {@code sun.misc.Unsafe} memory access. Corresponds to the {@code --sun-misc-unsafe-memory-access} flag.
+     *
+     * @param mode The access mode.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder sunMiscUnsafeMemoryAccess(AccessMode mode) {
+        Objects.requireNonNull(mode, "Unsafe memory access mode cannot be null");
+        this.arguments.add("--sun-misc-unsafe-memory-access=" + mode.getMode());
+        return this;
+    }
+
+    /**
+     * Ensures the main thread is the first thread on macOS. Corresponds to the {@code -XstartOnFirstThread} flag.
+     *
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if not on macOS.
+     */
+    public JavaExecutableCLIBuilder startOnFirstThread() {
+        if (!OperatingSystem.isMac())
+            throw new UnsupportedOperationException("Starting on first thread is only supported on macOS.");
+
+        this.arguments.add("-XstartOnFirstThread");
+        return this;
+    }
+
+    /**
+     * Sets the application name in the macOS dock. Corresponds to the {@code -Xdock:name} flag.
+     *
+     * @param appName The application name.
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if not on macOS.
+     */
+    public JavaExecutableCLIBuilder dockName(String appName) {
+        if (!OperatingSystem.isMac())
+            throw new UnsupportedOperationException("Setting dock name is only supported on macOS.");
+
+        Objects.requireNonNull(appName, "Application name cannot be null");
+        this.arguments.add("-Xdock:name=" + appName);
+        return this;
+    }
+
+    /**
+     * Sets the application icon in the macOS dock. Corresponds to the {@code -Xdock:icon} flag.
+     *
+     * @param iconPath The path to the icon file.
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if not on macOS.
+     */
+    public JavaExecutableCLIBuilder dockIcon(Path iconPath) {
+        if (!OperatingSystem.isMac())
+            throw new UnsupportedOperationException("Setting dock icon is only supported on macOS.");
+
+        Objects.requireNonNull(iconPath, "Icon path cannot be null");
+        this.arguments.add("-Xdock:icon=" + iconPath);
+        return this;
+    }
+
+    /**
+     * Unlocks diagnostic VM options. Corresponds to the {@code -XX:+UnlockDiagnosticVMOptions} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder unlockDiagnosticVMOptions() {
+        this.arguments.add("-XX:+UnlockDiagnosticVMOptions");
+        return this;
+    }
+
+    /**
+     * Unlocks experimental VM options. Corresponds to the {@code -XX:+UnlockExperimentalVMOptions} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder unlockExperimentalVMOptions() {
+        this.arguments.add("-XX:+UnlockExperimentalVMOptions");
+        return this;
+    }
+
+    /**
+     * Sets the number of active processors for the VM to use. Corresponds to the {@code -XX:ActiveProcessorCount} flag.
+     *
+     * @param count The number of processors.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder activeProcessorCount(int count) {
+        if (count <= 0)
+            throw new IllegalArgumentException("Active processor count must be positive.");
+
+        this.arguments.add("-XX:ActiveProcessorCount=" + count);
+        return this;
+    }
+
+    /**
+     * Specifies a path for NUMA interleaving memory allocation. Corresponds to the {@code -XX:AllocateHeapAt} flag.
+     *
+     * @param path The allocation path.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder allocateHeapAt(Path path) {
+        Objects.requireNonNull(path, "Heap allocation path cannot be null");
+        this.arguments.add("-XX:AllocateHeapAt=" + path);
+        return this;
+    }
+
+    /**
+     * Disables the use of compact strings. Corresponds to the {@code -XX:-CompactStrings} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder disableCompactStrings() {
+        this.arguments.add("-XX:-CompactStrings");
+        return this;
+    }
+
+    /**
+     * Sets the path for writing fatal error logs. Corresponds to the {@code -XX:ErrorFile} flag.
+     *
+     * @param errorFilePath The path to the error file.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder errorFile(Path errorFilePath) {
+        Objects.requireNonNull(errorFilePath, "Error file path cannot be null");
+        this.arguments.add("-XX:ErrorFile=" + errorFilePath);
+        return this;
+    }
+
+    /**
+     * Enables extensive error reports. Corresponds to the {@code -XX:+ExtensiveErrorReports} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableExtensiveErrorReports() {
+        this.arguments.add("-XX:+ExtensiveErrorReports");
+        return this;
+    }
+
+    /**
+     * Configures Java Flight Recorder (JFR) options. Corresponds to the {@code -XX:FlightRecorderOptions} flag.
+     *
+     * @param options The JFR options to set.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder flightRecorderOptions(FlightRecorderOption... options) {
+        Objects.requireNonNull(options, "Flight recorder options cannot be null");
+        List<String> optionStrings = new ArrayList<>();
+        for (FlightRecorderOption option : options) {
+            optionStrings.add(option.name() + "=" + option.value());
+        }
+
+        this.arguments.add("-XX:FlightRecorderOptions:" + String.join(",", optionStrings));
+        return this;
+    }
+
+    /**
+     * Sets the large page size. Corresponds to the {@code -XX:LargePageSizeInBytes} flag.
+     *
+     * @param size The page size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder largePageSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Page size unit cannot be null");
+        this.arguments.add("-XX:LargePageSizeInBytes=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the maximum size for direct memory allocation. Corresponds to the {@code -XX:MaxDirectMemorySize} flag.
+     *
+     * @param size The memory size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxDirectMemorySize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Direct memory size unit cannot be null");
+        this.arguments.add("-XX:MaxDirectMemorySize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Disables the limit on the number of file descriptors. Corresponds to the {@code -XX:-MaxFDLimit} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder disableMaxFileDescriptorLimit() {
+        this.arguments.add("-XX:-MaxFDLimit");
+        return this;
+    }
+
+    /**
+     * Configures native memory tracking. Corresponds to the {@code -XX:NativeMemoryTracking} flag.
+     *
+     * @param tracking The tracking mode.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder nativeMemoryTracking(NativeMemoryTracking tracking) {
+        Objects.requireNonNull(tracking, "Native memory tracking mode cannot be null");
+        this.arguments.add("-XX:NativeMemoryTracking=" + tracking.getState());
+        return this;
+    }
+
+    /**
+     * Sets the interval for trimming the native heap on Linux. Corresponds to the {@code -XX:TrimNativeHeapInterval} flag.
+     *
+     * @param interval The interval duration.
+     * @param unit     The time unit of the interval.
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if not on Linux.
+     */
+    public JavaExecutableCLIBuilder trimNativeHeapInterval(long interval, TimeUnit unit) {
+        if (!OperatingSystem.isLinux())
+            throw new UnsupportedOperationException("TrimNativeHeapInterval is only supported on Linux systems.");
+
+        if (interval < 0)
+            throw new IllegalArgumentException("Trim interval cannot be negative.");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.arguments.add("-XX:TrimNativeHeapInterval=" + unit.toMillis(interval));
+        return this;
+    }
+
+    /**
+     * Emulates the client VM. Corresponds to the {@code -XX:+NeverActAsServerClassMachine} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableClientVMEmulation() {
+        this.arguments.add("-XX:+NeverActAsServerClassMachine");
+        return this;
+    }
+
+    /**
+     * Sets the object alignment in bytes. Corresponds to the {@code -XX:ObjectAlignmentInBytes} flag.
+     *
+     * @param alignment The alignment value (must be a power of two between 8 and 256).
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder objectAlignmentInBytes(int alignment) {
+        if (alignment <= 0 || (alignment & (alignment - 1)) != 0)
+            throw new IllegalArgumentException("Object alignment must be a positive power of two.");
+
+        if (alignment < 8 || alignment > 256)
+            throw new IllegalArgumentException("Object alignment must be between 8 and 256 bytes.");
+
+        this.arguments.add("-XX:ObjectAlignmentInBytes=" + alignment);
+        return this;
+    }
+
+    /**
+     * Specifies a command to run on a fatal error. Corresponds to the {@code -XX:OnError} flag.
+     *
+     * @param command The command to execute.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder onError(String command) {
+        Objects.requireNonNull(command, "OnError command cannot be null");
+        this.arguments.add("-XX:OnError=\"" + command + "\"");
+        return this;
+    }
+
+    /**
+     * Specifies a command to run on an OutOfMemoryError. Corresponds to the {@code -XX:OnOutOfMemoryError} flag.
+     *
+     * @param command The command to execute.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder onOutOfMemoryError(String command) {
+        Objects.requireNonNull(command, "OnOutOfMemoryError command cannot be null");
+        this.arguments.add("-XX:OnOutOfMemoryError=\"" + command + "\"");
+        return this;
+    }
+
+    /**
+     * Enables printing of command-line flags. Corresponds to the {@code -XX:+PrintCommandLineFlags} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enablePrintingCommandLineFlags() {
+        this.arguments.add("-XX:+PrintCommandLineFlags");
+        return this;
+    }
+
+    /**
+     * Enables or disables preserving the frame pointer. Corresponds to the {@code -XX:+/-PreserveFramePointer} flag.
+     *
+     * @param preserve {@code true} to preserve, {@code false} to omit.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder preserveFramePointer(boolean preserve) {
+        this.arguments.add(preserve ? "-XX:+PreserveFramePointer" : "-XX:-PreserveFramePointer");
+        return this;
+    }
+
+    /**
+     * Enables printing of native memory tracking statistics. Corresponds to the {@code -XX:+PrintNMTStatistics} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enablePrintingNMTStatistics() {
+        this.arguments.add("-XX:+PrintNMTStatistics");
+        return this;
+    }
+
+    /**
+     * Specifies the path to the shared archive file. Corresponds to the {@code -XX:SharedArchiveFile} flag.
+     *
+     * @param archivePath The path to the archive.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder sharedArchiveFile(Path archivePath) {
+        Objects.requireNonNull(archivePath, "Shared archive file path cannot be null");
+        this.arguments.add("-XX:SharedArchiveFile=" + archivePath);
+        return this;
+    }
+
+    /**
+     * Specifies the path to the dynamic shared archive file.
+     *
+     * @param dynamicArchivePath The path to the dynamic archive.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder sharedArchiveFileDynamic(Path dynamicArchivePath) {
+        Objects.requireNonNull(dynamicArchivePath, "Dynamic shared archive file path cannot be null");
+        this.arguments.add("-XX:SharedArchiveFile=," + dynamicArchivePath);
+        return this;
+    }
+
+    /**
+     * Specifies paths to both static and dynamic shared archive files.
+     *
+     * @param staticArchivePath  The path to the static archive.
+     * @param dynamicArchivePath The path to the dynamic archive.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder sharedArchiveFile(Path staticArchivePath, Path dynamicArchivePath) {
+        Objects.requireNonNull(staticArchivePath, "Static shared archive file path cannot be null");
+        Objects.requireNonNull(dynamicArchivePath, "Dynamic shared archive file path cannot be null");
+        this.arguments.add("-XX:SharedArchiveFile=" + staticArchivePath + File.pathSeparator + dynamicArchivePath);
+        return this;
+    }
+
+    /**
+     * Verifies shared spaces. Corresponds to the {@code -XX:+VerifySharedSpaces} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder verifySharedSpaces() {
+        this.arguments.add("-XX:+VerifySharedSpaces");
+        return this;
+    }
+
+    /**
+     * Specifies the shared archive configuration file. Corresponds to the {@code -XX:SharedArchiveConfigFile} flag.
+     *
+     * @param configFilePath The path to the config file.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder sharedArchiveConfigFile(Path configFilePath) {
+        Objects.requireNonNull(configFilePath, "Shared archive config file path cannot be null");
+        this.arguments.add("-XX:SharedArchiveConfigFile=" + configFilePath);
+        return this;
+    }
+
+    /**
+     * Specifies the shared class list file for creating a CDS archive. Corresponds to the {@code -XX:SharedClassListFile} flag.
+     *
+     * @param classListFilePath The path to the class list file.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder sharedClassListFile(Path classListFilePath) {
+        Objects.requireNonNull(classListFilePath, "Shared class list file path cannot be null");
+        this.arguments.add("-XX:SharedClassListFile=" + classListFilePath);
+        return this;
+    }
+
+    /**
+     * Shows detailed code information in exception messages. Corresponds to the {@code -XX:+ShowCodeDetailsInExceptionMessages} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder showCodeDetailsInExceptionMessages() {
+        this.arguments.add("-XX:+ShowCodeDetailsInExceptionMessages");
+        return this;
+    }
+
+    /**
+     * Shows a message box on a fatal error. Corresponds to the {@code -XX:+ShowMessageBoxOnError} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder showMessageBoxOnError() {
+        this.arguments.add("-XX:+ShowMessageBoxOnError");
+        return this;
+    }
+
+    /**
+     * Starts a Java Flight Recorder (JFR) recording. Corresponds to the {@code -XX:StartFlightRecording} flag.
+     *
+     * @param parameters The JFR parameters.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder startFlightRecording(FlightRecorderParameters parameters) {
+        Objects.requireNonNull(parameters, "Flight recorder parameters cannot be null");
+        this.arguments.add("-XX:StartFlightRecording=" + parameters);
+        return this;
+    }
+
+    /**
+     * Sets the thread stack size in kilobytes. Corresponds to the {@code -Xss} flag.
+     *
+     * @param sizeInKB The stack size in kilobytes.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder threadStackSize(int sizeInKB) {
+        if (sizeInKB <= 0)
+            throw new IllegalArgumentException("Stack size must be positive.");
+
+        this.arguments.add("-Xss" + sizeInKB + "K");
+        return this;
+    }
+
+    /**
+     * Uses compact object headers. Corresponds to the {@code -XX:+UseCompactObjectHeaders} flag.
+     *
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if the JDK version is less than 25.
+     */
+    public JavaExecutableCLIBuilder useCompactObjectHeaders() {
+        if (jdk.version().major() < 25)
+            throw new UnsupportedOperationException("Compact object headers are only supported in JDK 25 and above.");
+
+        this.arguments.add("-XX:+UseCompactObjectHeaders");
+        return this;
+    }
+
+    /**
+     * Disables compressed object pointers. Corresponds to the {@code -XX:-UseCompressedOops} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder disableCompressedPointers() {
+        this.arguments.add("-XX:-UseCompressedOops");
+        return this;
+    }
+
+    /**
+     * Disables container support on Linux. Corresponds to the {@code -XX:-UseContainerSupport} flag.
+     *
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if not on Linux.
+     */
+    public JavaExecutableCLIBuilder disableContainerSupport() {
+        if (!OperatingSystem.isLinux())
+            throw new UnsupportedOperationException("Disabling container support is only supported on Linux systems.");
+
+        this.arguments.add("-XX:-UseContainerSupport");
+        return this;
+    }
+
+    /**
+     * Enables the use of large pages for memory allocation. Corresponds to the {@code -XX:+UseLargePages} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder useLargePages() {
+        this.arguments.add("-XX:+UseLargePages");
+        return this;
+    }
+
+    /**
+     * Enables the use of transparent huge pages on Linux. Corresponds to the {@code -XX:+UseTransparentHugePages} flag.
+     *
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if not on Linux.
+     */
+    public JavaExecutableCLIBuilder useTransparentHugePages() {
+        if (!OperatingSystem.isLinux())
+            throw new UnsupportedOperationException("UseTransparentHugePages is only supported on Linux systems.");
+
+        this.arguments.add("-XX:+UseTransparentHugePages");
+        return this;
+    }
+
+    /**
+     * Allows user-defined signal handlers. Corresponds to the {@code -XX:+AllowUserSignalHandlers} flag.
+     *
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if on Windows.
+     */
+    public JavaExecutableCLIBuilder allowInstallingSignalHandlers() {
+        if (OperatingSystem.isWindows())
+            throw new UnsupportedOperationException("Installing signal handlers is not supported on Windows systems.");
+
+        this.arguments.add("-XX:+AllowUserSignalHandlers");
+        return this;
+    }
+
+    /**
+     * Specifies a file from which to load VM options. Corresponds to the {@code -XX:VMOptionsFile} flag.
+     *
+     * @param vmOptionsFilePath The path to the VM options file.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder vmOptionsFile(Path vmOptionsFilePath) {
+        Objects.requireNonNull(vmOptionsFilePath, "VM options file path cannot be null");
+        this.arguments.add("-XX:VMOptionsFile=" + vmOptionsFilePath);
+        return this;
+    }
+
+    /**
+     * Sets the branch protection mode on AArch64 Linux. Corresponds to the {@code -XX:BranchProtection} flag.
+     *
+     * @param mode The branch protection mode.
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if not on AArch64 Linux.
+     */
+    public JavaExecutableCLIBuilder branchProtectionMode(BranchProtectionMode mode) {
+        if (!OperatingSystem.isLinux())
+            throw new UnsupportedOperationException("Branch protection mode is only supported on Linux (AArch64) systems.");
+
+        Objects.requireNonNull(mode, "Branch protection mode cannot be null");
+        this.arguments.add("-XX:BranchProtection=" + mode.getMode());
+        return this;
+    }
+
+    /**
+     * Sets the number of cache lines to prefetch on instance allocation. Corresponds to the {@code -XX:AllocateInstancePrefetchLines} flag.
+     *
+     * @param lineCount The number of lines.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder allocateInstancePrefetchLines(int lineCount) {
+        if (lineCount < 0)
+            throw new IllegalArgumentException("Line count cannot be negative.");
+
+        this.arguments.add("-XX:AllocateInstancePrefetchLines=" + lineCount);
+        return this;
+    }
+
+    /**
+     * Sets the prefetch distance for object allocation. Corresponds to the {@code -XX:AllocatePrefetchDistance} flag.
+     *
+     * @param distance The distance.
+     * @param unit     The unit of distance.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder allocatePrefetchDistance(long distance, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Prefetch distance unit cannot be null");
+        if (distance < -1)
+            throw new IllegalArgumentException("Prefetch distance cannot be negative.");
+
+        this.arguments.add("-XX:AllocatePrefetchDistance=" + distance + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the prefetch instruction type for allocation. Corresponds to the {@code -XX:AllocatePrefetchInstr} flag.
+     *
+     * @param instructionType The instruction type (0-3).
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder allocatePrefetchInstruction(byte instructionType) {
+        if (instructionType < 0 || instructionType > 3)
+            throw new IllegalArgumentException("Instruction type must be 0, 1, 2, or 3.");
+
+        this.arguments.add("-XX:AllocatePrefetchInstr=" + instructionType);
+        return this;
+    }
+
+    /**
+     * Sets the number of cache lines to prefetch ahead of the current allocation pointer. Corresponds to the {@code -XX:AllocatePrefetchLines} flag.
+     *
+     * @param lineCount The number of lines.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder allocatePrefetchLines(int lineCount) {
+        if (lineCount < 0)
+            throw new IllegalArgumentException("Line count cannot be negative.");
+
+        this.arguments.add("-XX:AllocatePrefetchLines=" + lineCount);
+        return this;
+    }
+
+    /**
+     * Sets the prefetch step size. Corresponds to the {@code -XX:AllocatePrefetchStepSize} flag.
+     *
+     * @param stepSize The step size.
+     * @param unit     The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder allocatePrefetchStepSize(int stepSize, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Step size unit cannot be null");
+        if (stepSize < 0)
+            throw new IllegalArgumentException("Step size cannot be negative.");
+
+        this.arguments.add("-XX:AllocatePrefetchStepSize=" + stepSize + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the prefetch style for allocation. Corresponds to the {@code -XX:AllocatePrefetchStyle} flag.
+     *
+     * @param style The prefetch style.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder allocatePrefetchStyle(PrefetchStyle style) {
+        Objects.requireNonNull(style, "Prefetch style cannot be null");
+        this.arguments.add("-XX:AllocatePrefetchStyle=" + style.asInt());
+        return this;
+    }
+
+    /**
+     * Enables background compilation. Corresponds to the {@code -XX:+BackgroundCompilation} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableBackgroundCompilation() {
+        this.arguments.add("-XX:+BackgroundCompilation");
+        return this;
+    }
+
+    /**
+     * Sets the number of compiler threads for compilation. Corresponds to the {@code -XX:CompilerThreadsForCompilation} flag.
+     *
+     * @param threadCount The number of threads.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder compilerThreadsForCompilation(int threadCount) {
+        if (threadCount <= 0)
+            throw new IllegalArgumentException("Thread count must be positive.");
+
+        this.arguments.add("-XX:CompilerThreadsForCompilation=" + threadCount);
+        return this;
+    }
+
+    /**
+     * Enables dynamic adjustment of the number of compiler threads. Corresponds to the {@code -XX:+UseDynamicNumberOfCompilerThreads} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder useDynamicNumberOfCompilerThreads() {
+        this.arguments.add("-XX:+UseDynamicNumberOfCompilerThreads");
+        return this;
+    }
+
+    /**
+     * Specifies a command to be executed on a method. Corresponds to the {@code -XX:CompileCommand} flag.
+     *
+     * @param command     The compile command (e.g., quiet, print, exclude).
+     * @param methodSpecs The method specifications.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder compileCommand(CompileCommand command, String... methodSpecs) {
+        Objects.requireNonNull(command, "Compile command cannot be null");
+        Objects.requireNonNull(methodSpecs, "Method specifications cannot be null");
+
+        this.arguments.add("-XX:CompileCommand=\"" + command.getCommand() + "," + String.join(",", methodSpecs) + "\"");
+        return this;
+    }
+
+    /**
+     * Specifies a file from which to read JIT compiler commands. Corresponds to the {@code -XX:CompileCommandFile} flag.
+     *
+     * @param commandFilePath The path to the command file.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder compileCommandFile(Path commandFilePath) {
+        Objects.requireNonNull(commandFilePath, "Command file path cannot be null");
+        this.arguments.add("-XX:CompileCommandFile=" + commandFilePath);
+        return this;
+    }
+
+    /**
+     * Specifies a file from which to read JIT compiler directives. Corresponds to the {@code -XX:CompilerDirectivesFile} flag.
+     *
+     * @param directivesFilePath The path to the directives file.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder compilerDirectivesFile(Path directivesFilePath) {
+        Objects.requireNonNull(directivesFilePath, "Directives file path cannot be null");
+        this.arguments.add("-XX:CompilerDirectivesFile=" + directivesFilePath);
+        return this;
+    }
+
+    /**
+     * Enables printing of compiler directives. Corresponds to the {@code -XX:+PrintCompilerDirectives} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder shouldPrintCompilerDirectives() {
+        this.arguments.add("-XX:+PrintCompilerDirectives");
+        return this;
+    }
+
+    /**
+     * Compiles only the specified methods. Corresponds to the {@code -XX:CompileOnly} flag.
+     *
+     * @param methodSpecs The method specifications.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder compileOnly(String... methodSpecs) {
+        Objects.requireNonNull(methodSpecs, "Method specifications cannot be null");
+
+        this.arguments.add("-XX:CompileOnly=" + String.join(",", methodSpecs));
+        return this;
+    }
+
+    /**
+     * Scales the compilation threshold. Corresponds to the {@code -XX:CompileThresholdScale} flag.
+     *
+     * @param scale The scale factor.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder compileThresholdScale(int scale) {
+        if (scale <= 0)
+            throw new IllegalArgumentException("Scale must be positive.");
+
+        this.arguments.add("-XX:CompileThresholdScale=" + scale);
+        return this;
+    }
+
+    /**
+     * Enables or disables escape analysis. Corresponds to the {@code -XX:+/-DoEscapeAnalysis} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableEscapeAnalysis(boolean enable) {
+        this.arguments.add(enable ? "-XX:+DoEscapeAnalysis" : "-XX:-DoEscapeAnalysis");
+        return this;
+    }
+
+    /**
+     * Sets the initial code cache size. Corresponds to the {@code -XX:InitialCodeCacheSize} flag.
+     *
+     * @param size The size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder initialCodeCacheSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Code cache size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("Initial code cache size cannot be negative.");
+
+        this.arguments.add("-XX:InitialCodeCacheSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Enables or disables method inlining. Corresponds to the {@code -XX:+/-Inline} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableMethodInlining(boolean enable) {
+        this.arguments.add(enable ? "-XX:+Inline" : "-XX:-Inline");
+        return this;
+    }
+
+    /**
+     * Sets the maximum size of a method to be inlined. Corresponds to the {@code -XX:InlineSmallCode} flag.
+     *
+     * @param size The size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder inlineSmallCode(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Code size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("Inline small code size cannot be negative.");
+
+        this.arguments.add("-XX:InlineSmallCode=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Enables logging of compilation activity to a {@code hotspot.log} file. Corresponds to the {@code -XX:+LogCompilation} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableCompilationLogging() {
+        this.arguments.add("-XX:+LogCompilation");
+        return this;
+    }
+
+    /**
+     * Sets the maximum bytecode size of a frequently executed method to be inlined. Corresponds to the {@code -XX:FreqInlineSize} flag.
+     *
+     * @param size The size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder hotMethodInlineSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Code size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("Hot method inline size cannot be negative.");
+
+        this.arguments.add("-XX:FreqInlineSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the maximum bytecode size of a method to be inlined. Corresponds to the {@code -XX:MaxInlineSize} flag.
+     *
+     * @param size The size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxInlineSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Code size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("Max inline size cannot be negative.");
+
+        this.arguments.add("-XX:MaxInlineSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the maximum bytecode size for a C1-compiled method to be inlined. Corresponds to the {@code -XX:C1MaxInlineSize} flag.
+     *
+     * @param size The size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder c1MaxInlineSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Code size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("C1 max inline size cannot be negative.");
+
+        this.arguments.add("-XX:C1MaxInlineSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the maximum bytecode size of a trivial method to be inlined. Corresponds to the {@code -XX:MaxTrivialSize} flag.
+     *
+     * @param size The size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxTrivialSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Code size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("Max trivial size cannot be negative.");
+
+        this.arguments.add("-XX:MaxTrivialSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the maximum bytecode size for a trivial C1-compiled method to be inlined. Corresponds to the {@code -XX:C1MaxTrivialSize} flag.
+     *
+     * @param size The size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder c1MaxTrivialSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Code size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("C1 max trivial size cannot be negative.");
+
+        this.arguments.add("-XX:C1MaxTrivialSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the maximum number of nodes for a method to be compiled. Corresponds to the {@code -XX:MaxNodeLimit} flag.
+     *
+     * @param limit The node limit.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxNodeLimit(int limit) {
+        if (limit < 0)
+            throw new IllegalArgumentException("Max node limit cannot be negative.");
+
+        this.arguments.add("-XX:MaxNodeLimit=" + limit);
+        return this;
+    }
+
+    /**
+     * Sets the size of the non-method code heap. Corresponds to the {@code -XX:NonNMethodCodeHeapSize} flag.
+     *
+     * @param sizeInBytes The size in bytes.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder nonmethodCodeHeapSize(long sizeInBytes) {
+        if (sizeInBytes < 0)
+            throw new IllegalArgumentException("Non-method code heap size cannot be negative.");
+
+        this.arguments.add("-XX:NonNMethodCodeHeapSize=" + sizeInBytes);
+        return this;
+    }
+
+    /**
+     * Sets the size of the non-profiled code heap. Corresponds to the {@code -XX:NonProfiledCodeHeapSize} flag.
+     *
+     * @param sizeInBytes The size in bytes.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder nonprofiledCodeHeapSize(long sizeInBytes) {
+        if (sizeInBytes < 0)
+            throw new IllegalArgumentException("Non-profiled code heap size cannot be negative.");
+
+        this.arguments.add("-XX:NonProfiledCodeHeapSize=" + sizeInBytes);
+        return this;
+    }
+
+    /**
+     * Enables or disables the optimization of string concatenation. Corresponds to the {@code -XX:+/-OptimizeStringConcat} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableOptimizingStringConcat(boolean enable) {
+        this.arguments.add(enable ? "-XX:+OptimizeStringConcat" : "-XX:-OptimizeStringConcat");
+        return this;
+    }
+
+    /**
+     * Enables printing of assembly code for compiled methods. Corresponds to the {@code -XX:+PrintAssembly} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enablePrintingAssemblyCode() {
+        this.arguments.add("-XX:+PrintAssembly");
+        return this;
+    }
+
+    /**
+     * Sets the size of the profiled code heap. Corresponds to the {@code -XX:ProfiledCodeHeapSize} flag.
+     *
+     * @param sizeInBytes The size in bytes.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder profiledCodeHeapSize(long sizeInBytes) {
+        if (sizeInBytes < 0)
+            throw new IllegalArgumentException("Profiled code heap size cannot be negative.");
+
+        this.arguments.add("-XX:ProfiledCodeHeapSize=" + sizeInBytes);
+        return this;
+    }
+
+    /**
+     * Enables printing of method compilation information. Corresponds to the {@code -XX:+PrintCompilation} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableMethodCompilationPrinting() {
+        this.arguments.add("-XX:+PrintCompilation");
+        return this;
+    }
+
+    /**
+     * Enables printing of inlining decisions. Corresponds to the {@code -XX:+PrintInlining} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableInliningInfoPrinting() {
+        this.arguments.add("-XX:+PrintInlining");
+        return this;
+    }
+
+    /**
+     * Sets the reserved code cache size. Corresponds to the {@code -XX:ReservedCodeCacheSize} flag.
+     *
+     * @param size The size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder reserveCodeCacheSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Code cache size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("Reserved code cache size cannot be negative.");
+
+        if (unit.toBytes(size) > ByteUnit.GIGABYTES.toBytes(2))
+            throw new IllegalArgumentException("Reserved code cache size cannot exceed 2 GB.");
+
+        this.arguments.add("-XX:ReservedCodeCacheSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Enables the use of a segmented code cache. Corresponds to the {@code -XX:+SegmentedCodeCache} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableSegmentedCodeCache() {
+        this.arguments.add("-XX:+SegmentedCodeCache");
+        return this;
+    }
+
+    /**
+     * Sets the percentage of heap occupancy at which to start aggressive sweeping. Corresponds to the {@code -XX:AggressiveHeapSweepingAt} flag.
+     *
+     * @param percentage The percentage (0-100).
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder startAggressiveSweepingAt(int percentage) {
+        if (percentage < 0 || percentage > 100)
+            throw new IllegalArgumentException("Percentage must be between 0 and 100.");
+
+        this.arguments.add("-XX:AggressiveHeapSweepingAt=" + percentage);
+        return this;
+    }
+
+    /**
+     * Disables tiered compilation. Corresponds to the {@code -XX:-TieredCompilation} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder disableTieredCompilation() {
+        this.arguments.add("-XX:-TieredCompilation");
+        return this;
+    }
+
+    /**
+     * Sets the version of the SSE instruction set to use. Corresponds to the {@code -XX:UseSSE} flag.
+     *
+     * @param version The SSE version.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder sseInstructionSetVersion(String version) {
+        Objects.requireNonNull(version, "SSE instruction set version cannot be null");
+        this.arguments.add("-XX:UseSSE=" + version);
+        return this;
+    }
+
+    /**
+     * Sets the version of the AVX instruction set to use. Corresponds to the {@code -XX:UseAVX} flag.
+     *
+     * @param version The AVX version.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder avxInstructionSetVersion(String version) {
+        Objects.requireNonNull(version, "AVX instruction set version cannot be null");
+        this.arguments.add("-XX:UseAVX=" + version);
+        return this;
+    }
+
+    /**
+     * Enables or disables hardware-based AES intrinsics. Corresponds to the {@code -XX:+/-UseAES} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableAES(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseAES" : "-XX:-UseAES");
+        return this;
+    }
+
+    /**
+     * Enables or disables AES intrinsics. Corresponds to the {@code -XX:+/-UseAESIntrinsics} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableAESIntrinsics(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseAESIntrinsics" : "-XX:-UseAESIntrinsics");
+        return this;
+    }
+
+    /**
+     * Enables or disables AES/CTR intrinsics. Corresponds to the {@code -XX:+/-UseAESCTRIntrinsics} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableAESCTRIntrinsics(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseAESCTRIntrinsics" : "-XX:-UseAESCTRIntrinsics");
+        return this;
+    }
+
+    /**
+     * Enables or disables GHASH intrinsics. Corresponds to the {@code -XX:+/-UseGHASHIntrinsics} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableGHASHIntrinsics(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseGHASHIntrinsics" : "-XX:-UseGHASHIntrinsics");
+        return this;
+    }
+
+    /**
+     * Enables or disables ChaCha20 intrinsics. Corresponds to the {@code -XX:+/-UseChaCha20Intrinsics} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableChaCha20Intrinsics(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseChaCha20Intrinsics" : "-XX:-UseChaCha20Intrinsics");
+        return this;
+    }
+
+    /**
+     * Enables or disables Poly1305 intrinsics. Corresponds to the {@code -XX:+/-UsePoly1305Intrinsics} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enablePoly1305Intrinsics(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UsePoly1305Intrinsics" : "-XX:-UsePoly1305Intrinsics");
+        return this;
+    }
+
+    /**
+     * Enables or disables BASE64 intrinsics. Corresponds to the {@code -XX:+/-UseBASE64Intrinsics} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableBASE64Intrinsics(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseBASE64Intrinsics" : "-XX:-UseBASE64Intrinsics");
+        return this;
+    }
+
+    /**
+     * Enables or disables Adler32 intrinsics. Corresponds to the {@code -XX:+/-UseAdler32Intrinsics} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableAdler32Intrinsics(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseAdler32Intrinsics" : "-XX:-UseAdler32Intrinsics");
+        return this;
+    }
+
+    /**
+     * Enables or disables CRC32 intrinsics. Corresponds to the {@code -XX:+/-UseCRC32Intrinsics} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableCRC32Intrinsics(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseCRC32Intrinsics" : "-XX:-UseCRC32Intrinsics");
+        return this;
+    }
+
+    /**
+     * Enables or disables CRC32C intrinsics. Corresponds to the {@code -XX:+/-UseCRC32CIntrinsics} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableCRC32CIntrinsics(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseCRC32CIntrinsics" : "-XX:-UseCRC32CIntrinsics");
+        return this;
+    }
+
+    /**
+     * Enables or disables hardware-based SHA crypto intrinsics. Corresponds to the {@code -XX:+/-UseSHA} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableSHA(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseSHA" : "-XX:-UseSHA");
+        return this;
+    }
+
+    /**
+     * Enables or disables SHA-1 intrinsics. Corresponds to the {@code -XX:+/-UseSHA1Intrinsics} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableSHA1Intrinsics(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseSHA1Intrinsics" : "-XX:-UseSHA1Intrinsics");
+        return this;
+    }
+
+    /**
+     * Enables or disables SHA-256 intrinsics. Corresponds to the {@code -XX:+/-UseSHA256Intrinsics} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableSHA256Intrinsics(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseSHA256Intrinsics" : "-XX:-UseSHA256Intrinsics");
+        return this;
+    }
+
+    /**
+     * Enables or disables SHA-512 intrinsics. Corresponds to the {@code -XX:+/-UseSHA512Intrinsics} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableSHA512Intrinsics(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseSHA512Intrinsics" : "-XX:-UseSHA512Intrinsics");
+        return this;
+    }
+
+    /**
+     * Enables or disables {@code Math.exact} intrinsics. Corresponds to the {@code -XX:+/-UseMathExactIntrinsics} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableMathExactIntrinsics(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseMathExactIntrinsics" : "-XX:-UseMathExactIntrinsics");
+        return this;
+    }
+
+    /**
+     * Enables or disables the {@code multiplyToLen} intrinsic. Corresponds to the {@code -XX:+/-UseMultiplyToLenIntrinsic} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableMultiplyToLenIntrinsic(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseMultiplyToLenIntrinsic" : "-XX:-UseMultiplyToLenIntrinsic");
+        return this;
+    }
+
+    /**
+     * Enables or disables the {@code squareToLen} intrinsic. Corresponds to the {@code -XX:+/-UseSquareToLenIntrinsic} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableSquareToLenIntrinsic(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseSquareToLenIntrinsic" : "-XX:-UseSquareToLenIntrinsic");
+        return this;
+    }
+
+    /**
+     * Enables or disables the {@code mulAdd} intrinsic. Corresponds to the {@code -XX:+/-UseMulAddIntrinsic} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableMulAddIntrinsic(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseMulAddIntrinsic" : "-XX:-UseMulAddIntrinsic");
+        return this;
+    }
+
+    /**
+     * Enables or disables the Montgomery multiply intrinsic. Corresponds to the {@code -XX:+/-UseMontgomeryMultiplyIntrinsic} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableMontgomeryMultiplyIntrinsic(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseMontgomeryMultiplyIntrinsic" : "-XX:-UseMontgomeryMultiplyIntrinsic");
+        return this;
+    }
+
+    /**
+     * Enables or disables the Montgomery square intrinsic. Corresponds to the {@code -XX:+/-UseMontgomerySquareIntrinsic} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableMontgomerySquareIntrinsic(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseMontgomerySquareIntrinsic" : "-XX:-UseMontgomerySquareIntrinsic");
+        return this;
+    }
+
+    /**
+     * Enables or disables the unconditional use of CMove instructions. Corresponds to the {@code -XX:+/-UseCMoveUnconditionally} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableCMoveUnconditionally(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseCMoveUnconditionally" : "-XX:-UseCMoveUnconditionally");
+        return this;
+    }
+
+    /**
+     * Enables or disables code cache flushing. Corresponds to the {@code -XX:+/-UseCodeCacheFlushing} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableCodeCacheFlushing(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseCodeCacheFlushing" : "-XX:-UseCodeCacheFlushing");
+        return this;
+    }
+
+    /**
+     * Enables or disables conditional card marking. Corresponds to the {@code -XX:+/-UseCondCardMark} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableCondCardMark(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseCondCardMark" : "-XX:-UseCondCardMark");
+        return this;
+    }
+
+    /**
+     * Enables or disables counted loop safepoints. Corresponds to the {@code -XX:+/-UseCountedLoopSafepoints} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableCountedLoopSafepoints(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseCountedLoopSafepoints" : "-XX:-UseCountedLoopSafepoints");
+        return this;
+    }
+
+    /**
+     * Sets the number of iterations for loop strip mining. Corresponds to the {@code -XX:LoopStripMiningIter} flag.
+     *
+     * @param iterationCount The number of iterations.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder loopStripMiningIterations(int iterationCount) {
+        if (iterationCount <= 0)
+            throw new IllegalArgumentException("Iteration count must be positive.");
+
+        this.arguments.add("-XX:LoopStripMiningIter=" + iterationCount);
+        return this;
+    }
+
+    /**
+     * Sets the number of iterations for loop strip mining in short loops. Corresponds to the {@code -XX:LoopStripMiningIterShortLoop} flag.
+     *
+     * @param iterationCount The number of iterations.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder loopStripMiningIterationsForShortLoops(int iterationCount) {
+        if (iterationCount <= 0)
+            throw new IllegalArgumentException("Iteration count must be positive.");
+
+        this.arguments.add("-XX:LoopStripMiningIterShortLoop=" + iterationCount);
+        return this;
+    }
+
+    /**
+     * Enables or disables the use of Fused Multiply-Add instructions. Corresponds to the {@code -XX:+/-UseFMA} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableFMA(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseFMA" : "-XX:-UseFMA");
+        return this;
+    }
+
+    /**
+     * Enables or disables the use of superword optimizations. Corresponds to the {@code -XX:+/-UseSuperWord} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableSuperWord(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseSuperWord" : "-XX:-UseSuperWord");
+        return this;
+    }
+
+    /**
+     * Disables the attach mechanism. Corresponds to the {@code -XX:+DisableAttachMechanism} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder disableAttachMechanism() {
+        this.arguments.add("-XX:+DisableAttachMechanism");
+        return this;
+    }
+
+    /**
+     * Enables DTrace allocation probes. Corresponds to the {@code -XX:+DTraceAllocProbes} flag.
+     *
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if not on macOS or Linux.
+     */
+    public JavaExecutableCLIBuilder enableDTraceAllocProbes() {
+        if (!OperatingSystem.isLinux() && !OperatingSystem.isMac())
+            throw new UnsupportedOperationException("DTrace allocation probes are only supported on macOS and Linux systems.");
+
+        this.arguments.add("-XX:+DTraceAllocProbes");
+        return this;
+    }
+
+    /**
+     * Enables DTrace method probes. Corresponds to the {@code -XX:+DTraceMethodProbes} flag.
+     *
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if not on macOS or Linux.
+     */
+    public JavaExecutableCLIBuilder enableDTraceMethodProbes() {
+        if (!OperatingSystem.isLinux() && !OperatingSystem.isMac())
+            throw new UnsupportedOperationException("DTrace method probes are only supported on macOS and Linux systems.");
+
+        this.arguments.add("-XX:+DTraceMethodProbes");
+        return this;
+    }
+
+    /**
+     * Enables DTrace monitor probes. Corresponds to the {@code -XX:+DTraceMonitorProbes} flag.
+     *
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if not on macOS or Linux.
+     */
+    public JavaExecutableCLIBuilder enableDTraceMonitorProbes() {
+        if (!OperatingSystem.isLinux() && !OperatingSystem.isMac())
+            throw new UnsupportedOperationException("DTrace monitor probes are only supported on macOS and Linux systems.");
+
+        this.arguments.add("-XX:+DTraceMonitorProbes");
+        return this;
+    }
+
+    /**
+     * Enables dumping of the heap to a file on an {@link OutOfMemoryError}. Corresponds to the {@code -XX:+HeapDumpOnOutOfMemoryError} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableDumpingHeapOnOutOfMemoryError() {
+        this.arguments.add("-XX:+HeapDumpOnOutOfMemoryError");
+        return this;
+    }
+
+    /**
+     * Sets the path for the heap dump file. Corresponds to the {@code -XX:HeapDumpPath} flag.
+     *
+     * @param dumpPath The path to the heap dump file.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder heapDumpPath(Path dumpPath) {
+        Objects.requireNonNull(dumpPath, "Heap dump path cannot be null");
+        this.arguments.add("-XX:HeapDumpPath=" + dumpPath);
+        return this;
+    }
+
+    /**
+     * Sets the path for the log file. Corresponds to the {@code -XX:LogFile} flag.
+     *
+     * @param logFilePath The path to the log file.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder logFile(Path logFilePath) {
+        Objects.requireNonNull(logFilePath, "Log file path cannot be null");
+        this.arguments.add("-XX:LogFile=" + logFilePath);
+        return this;
+    }
+
+    /**
+     * Enables printing of a class instance histogram after a {@code Control+C} event. Corresponds to the {@code -XX:+PrintClassHistogram} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enablePrintingClassHistogram() {
+        this.arguments.add("-XX:+PrintClassHistogram");
+        return this;
+    }
+
+    /**
+     * Enables printing of concurrent locks after a {@code Control+C} event. Corresponds to the {@code -XX:+PrintConcurrentLocks} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder printConcurrentLocks() {
+        this.arguments.add("-XX:+PrintConcurrentLocks");
+        return this;
+    }
+
+    /**
+     * Prints the ranges of all VM flags. Corresponds to the {@code -XX:+PrintFlagRanges} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder printFlagRanges() {
+        this.arguments.add("-XX:+PrintFlagRanges");
+        return this;
+    }
+
+    /**
+     * Saves performance data to a file on exit. Corresponds to the {@code -XX:+PerfDataSaveToFile} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder perfDataSaveToFile() {
+        this.arguments.add("-XX:+PerfDataSaveToFile");
+        return this;
+    }
+
+    /**
+     * Enables or disables the use of performance data. Corresponds to the {@code -XX:+/-UsePerfData} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableUsingPerfData(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UsePerfData" : "-XX:-UsePerfData");
+        return this;
+    }
+
+    /**
+     * Enables aggressive heap management. Corresponds to the {@code -XX:+AggressiveHeap} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableAggressiveHeap() {
+        this.arguments.add("-XX:+AggressiveHeap");
+        return this;
+    }
+
+    /**
+     * Pre-touches all pages of the heap during initialization. Corresponds to the {@code -XX:+AlwaysPreTouch} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder alwaysPreTouch() {
+        this.arguments.add("-XX:+AlwaysPreTouch");
+        return this;
+    }
+
+    /**
+     * Sets the number of threads for concurrent garbage collection. Corresponds to the {@code -XX:ConcGCThreads} flag.
+     *
+     * @param threadCount The number of threads.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder concurrentGCThreads(int threadCount) {
+        if (threadCount <= 0)
+            throw new IllegalArgumentException("Thread count must be positive.");
+
+        this.arguments.add("-XX:ConcGCThreads=" + threadCount);
+        return this;
+    }
+
+    /**
+     * Disables explicit garbage collection calls (e.g., from {@code System.gc()}). Corresponds to the {@code -XX:+DisableExplicitGC} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder disableExplicitGC() {
+        this.arguments.add("-XX:+DisableExplicitGC");
+        return this;
+    }
+
+    /**
+     * Enables concurrent invocation of explicit garbage collection. Corresponds to the {@code -XX:+ExplicitGCInvokesConcurrent} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableConcurrentExplicitGCInvokes() {
+        this.arguments.add("-XX:+ExplicitGCInvokesConcurrent");
+        return this;
+    }
+
+    /**
+     * Sets the number of initial samples for G1 adaptive IHOP. Corresponds to the {@code -XX:G1AdaptiveIHOPNumInitialSamples} flag.
+     *
+     * @param sampleCount The number of samples.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder G1AdaptiveIHOPNumInitialSamples(int sampleCount) {
+        if (sampleCount < 0)
+            throw new IllegalArgumentException("Sample count cannot be negative.");
+
+        this.arguments.add("-XX:G1AdaptiveIHOPNumInitialSamples=" + sampleCount);
+        return this;
+    }
+
+    /**
+     * Sets the size of a G1 heap region. Corresponds to the {@code -XX:G1HeapRegionSize} flag.
+     *
+     * @param size The size of the region.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder G1HeapRegionSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Heap region size unit cannot be null");
+
+        if (unit.toBytes(size) < ByteUnit.MEGABYTES.toBytes(1) || unit.toBytes(size) > ByteUnit.MEGABYTES.toBytes(32))
+            throw new IllegalArgumentException("G1 heap region size must be between 1 MB and 32 MB.");
+
+        this.arguments.add("-XX:G1HeapRegionSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the percentage of heap waste allowed for G1 GC. Corresponds to the {@code -XX:G1HeapWastePercent} flag.
+     *
+     * @param percent The percentage of heap waste.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder G1HeapWastePercent(int percent) {
+        if (percent < 0 || percent > 100)
+            throw new IllegalArgumentException("Heap waste percent must be between 0 and 100.");
+
+        this.arguments.add("-XX:G1HeapWastePercent=" + percent);
+        return this;
+    }
+
+    /**
+     * Sets the maximum percentage of the heap to be used for the young generation with G1 GC. Corresponds to the {@code -XX:G1MaxNewSizePercent} flag.
+     *
+     * @param percent The percentage of the heap.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder G1MaxNewSizePercent(int percent) {
+        if (percent < 0 || percent > 100)
+            throw new IllegalArgumentException("Max new size percent must be between 0 and 100.");
+
+        this.arguments.add("-XX:G1MaxNewSizePercent=" + percent);
+        return this;
+    }
+
+    /**
+     * Sets the target number of mixed GCs after a marking cycle for G1 GC. Corresponds to the {@code -XX:G1MixedGCCountTarget} flag.
+     *
+     * @param targetCount The target number of mixed GCs.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder G1MixedGCCountTarget(int targetCount) {
+        if (targetCount < 0)
+            throw new IllegalArgumentException("Target count cannot be negative.");
+
+        this.arguments.add("-XX:G1MixedGCCountTarget=" + targetCount);
+        return this;
+    }
+
+    /**
+     * Sets the live threshold percentage for a region to be included in a mixed GC cycle with G1 GC. Corresponds to the {@code -XX:G1MixedGCLiveThresholdPercent} flag.
+     *
+     * @param percent The live threshold percentage.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder G1MixedGCLiveThresholdPercent(int percent) {
+        if (percent < 0 || percent > 100)
+            throw new IllegalArgumentException("Live threshold percent must be between 0 and 100.");
+
+        this.arguments.add("-XX:G1MixedGCLiveThresholdPercent=" + percent);
+        return this;
+    }
+
+    /**
+     * Sets the percentage of the heap to use for the young generation with G1 GC. Corresponds to the {@code -XX:G1NewSizePercent} flag.
+     *
+     * @param percent The percentage of the heap.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder G1NewSizePercent(int percent) {
+        if (percent < 0 || percent > 100)
+            throw new IllegalArgumentException("New size percent must be between 0 and 100.");
+
+        this.arguments.add("-XX:G1NewSizePercent=" + percent);
+        return this;
+    }
+
+    /**
+     * Sets the threshold percentage for including old regions in a G1 collection set. Corresponds to the {@code -XX:G1OldCSetRegionThresholdPercent} flag.
+     *
+     * @param percent The threshold percentage.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder G1OldCSetRegionThresholdPercent(int percent) {
+        if (percent < 0 || percent > 100)
+            throw new IllegalArgumentException("Old CSet region threshold percent must be between 0 and 100.");
+
+        this.arguments.add("-XX:G1OldCSetRegionThresholdPercent=" + percent);
+        return this;
+    }
+
+    /**
+     * Sets the percentage of the heap to reserve for G1 GC to reduce the risk of promotion failure. Corresponds to the {@code -XX:G1ReservePercent} flag.
+     *
+     * @param percent The percentage of the heap to reserve.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder G1ReservePercent(int percent) {
+        if (percent < 0 || percent > 100)
+            throw new IllegalArgumentException("Reserve percent must be between 0 and 100.");
+
+        this.arguments.add("-XX:G1ReservePercent=" + percent);
+        return this;
+    }
+
+    /**
+     * Enables G1 adaptive IHOP. Corresponds to the {@code -XX:+G1UseAdaptiveIHOP} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableG1AdaptiveIHOP() {
+        this.arguments.add("-XX:+G1UseAdaptiveIHOP");
+        return this;
+    }
+
+    /**
+     * Sets the initial heap size. Corresponds to the {@code -XX:InitialHeapSize} flag.
+     *
+     * @param size The initial heap size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder initialHeapSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Heap size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("Initial heap size cannot be negative.");
+
+        if (unit.toBytes(size) < ByteUnit.MEGABYTES.toBytes(1) || (unit.toBytes(size) % 1024) != 0)
+            throw new IllegalArgumentException("Initial heap size must be at least 1 MB and a multiple of 1024 bytes.");
+
+        this.arguments.add("-XX:InitialHeapSize" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the initial survivor space ratio. Corresponds to the {@code -XX:InitialSurvivorRatio} flag.
+     *
+     * @param ratio The initial survivor space ratio.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder initialSurvivorRatio(int ratio) {
+        if (ratio <= 0)
+            throw new IllegalArgumentException("Initial survivor ratio must be positive.");
+
+        this.arguments.add("-XX:InitialSurvivorRatio=" + ratio);
+        return this;
+    }
+
+    /**
+     * Sets the heap occupancy percentage at which to start a concurrent GC cycle. Corresponds to the {@code -XX:InitiatingHeapOccupancyPercent} flag.
+     *
+     * @param percent The heap occupancy percentage.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder initiatingHeapOccupancyPercent(int percent) {
+        if (percent < 0 || percent > 100)
+            throw new IllegalArgumentException("Initiating heap occupancy percent must be between 0 and 100.");
+
+        this.arguments.add("-XX:InitiatingHeapOccupancyPercent=" + percent);
+        return this;
+    }
+
+    /**
+     * Sets the maximum GC pause time goal. Corresponds to the {@code -XX:MaxGCPauseMillis} flag.
+     *
+     * @param time The maximum pause time.
+     * @param unit The unit of time.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxGCPause(long time, TimeUnit unit) {
+        Objects.requireNonNull(unit, "Time unit cannot be null");
+
+        if (time < 0)
+            throw new IllegalArgumentException("Max GC pause time cannot be negative.");
+
+        this.arguments.add("-XX:MaxGCPauseMillis=" + unit.toMillis(time));
+        return this;
+    }
+
+    /**
+     * Sets the maximum heap size. Corresponds to the {@code -XX:MaxHeapSize} flag.
+     *
+     * @param size The maximum heap size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxHeapSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Heap size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("Max heap size cannot be negative.");
+
+        if (unit.toBytes(size) < ByteUnit.MEGABYTES.toBytes(2) || (unit.toBytes(size) % 1024) != 0)
+            throw new IllegalArgumentException("Max heap size must be at least 2 MB and a multiple of 1024 bytes.");
+
+        this.arguments.add("-XX:MaxHeapSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the maximum percentage of free heap space after a GC to avoid shrinking. Corresponds to the {@code -XX:MaxHeapFreeRatio} flag.
+     *
+     * @param percent The maximum free heap ratio percentage.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxHeapFreeRatioPercent(int percent) {
+        if (percent < 0 || percent > 100)
+            throw new IllegalArgumentException("Max heap free ratio percent must be between 0 and 100.");
+
+        this.arguments.add("-XX:MaxHeapFreeRatio=" + percent);
+        return this;
+    }
+
+    /**
+     * Sets the maximum metaspace size. Corresponds to the {@code -XX:MaxMetaspaceSize} flag.
+     *
+     * @param size The maximum metaspace size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxMetaspaceSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Metaspace size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("Max metaspace size cannot be negative.");
+
+        this.arguments.add("-XX:MaxMetaspaceSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the maximum size of the young generation. Corresponds to the {@code -XX:MaxNewSize} flag.
+     *
+     * @param size The maximum size of the young generation.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxNewSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "New size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("Max new size cannot be negative.");
+
+        this.arguments.add("-XX:MaxNewSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the maximum RAM to be used by the JVM. Corresponds to the {@code -XX:MaxRAM} flag.
+     *
+     * @param size The maximum RAM size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxRAM(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "RAM size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("Max RAM size cannot be negative.");
+
+        if (unit.toBytes(size) > ByteUnit.GIGABYTES.toBytes(128))
+            throw new IllegalArgumentException("Max RAM size cannot exceed 128 GB.");
+
+        this.arguments.add("-XX:MaxRAM=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the maximum percentage of RAM to be used by the JVM. Corresponds to the {@code -XX:MaxRAMPercentage} flag.
+     *
+     * @param percent The maximum RAM percentage.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxRAMPercent(int percent) {
+        if (percent < 0 || percent > 100)
+            throw new IllegalArgumentException("Max RAM percent must be between 0 and 100.");
+
+        this.arguments.add("-XX:MaxRAMPercent=" + percent);
+        return this;
+    }
+
+    /**
+     * Sets the maximum tenuring threshold for promoting objects to the old generation. Corresponds to the {@code -XX:MaxTenuringThreshold} flag.
+     *
+     * @param threshold The maximum tenuring threshold.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxTenuringThreshold(int threshold) {
+        if (threshold < 0)
+            throw new IllegalArgumentException("Max tenuring threshold cannot be negative.");
+
+        if (threshold > 15)
+            throw new IllegalArgumentException("Max tenuring threshold cannot exceed 15.");
+
+        this.arguments.add("-XX:MaxTenuringThreshold=" + threshold);
+        return this;
+    }
+
+    /**
+     * Sets the initial metaspace size. Corresponds to the {@code -XX:MetaspaceSize} flag.
+     *
+     * @param size The initial metaspace size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder metaspaceSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "Metaspace size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("Metaspace size cannot be negative.");
+
+        this.arguments.add("-XX:MetaspaceSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the minimum percentage of free heap space after a GC to avoid expansion. Corresponds to the {@code -XX:MinHeapFreeRatio} flag.
+     *
+     * @param percent The minimum free heap ratio percentage.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder minHeapFreeRatioPercent(int percent) {
+        if (percent < 0 || percent > 100)
+            throw new IllegalArgumentException("Min heap free ratio percent must be between 0 and 100.");
+
+        this.arguments.add("-XX:MinHeapFreeRatio=" + percent);
+        return this;
+    }
+
+    /**
+     * Sets the ratio between the young and old generation sizes. Corresponds to the {@code -XX:NewRatio} flag.
+     *
+     * @param ratio The ratio of the young to the old generation.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder newRatio(int ratio) {
+        if (ratio <= 0)
+            throw new IllegalArgumentException("New ratio must be positive.");
+
+        this.arguments.add("-XX:NewRatio=" + ratio);
+        return this;
+    }
+
+    /**
+     * Sets the initial size of the young generation. Corresponds to the {@code -XX:NewSize} flag.
+     *
+     * @param size The initial size of the young generation.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder newSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "New size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("New size cannot be negative.");
+
+        this.arguments.add("-XX:NewSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Sets the number of threads for parallel garbage collection. Corresponds to the {@code -XX:ParallelGCThreads} flag.
+     *
+     * @param threadCount The number of threads.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder parallelGCThreads(int threadCount) {
+        if (threadCount <= 0)
+            throw new IllegalArgumentException("Thread count must be positive.");
+
+        this.arguments.add("-XX:ParallelGCThreads=" + threadCount);
+        return this;
+    }
+
+    /**
+     * Enables or disables parallel reference processing. Corresponds to the {@code -XX:+/-ParallelRefProcEnabled} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableParallelRefProc(boolean enable) {
+        this.arguments.add(enable ? "-XX:+ParallelRefProcEnabled" : "-XX:-ParallelRefProcEnabled");
+        return this;
+    }
+
+    /**
+     * Enables printing of adaptive generation sizing information. Corresponds to the {@code -XX:+PrintAdaptiveSizePolicy} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enablePrintingAdaptiveSizePolicy() {
+        this.arguments.add("-XX:+PrintAdaptiveSizePolicy");
+        return this;
+    }
+
+    /**
+     * Sets the amount of time a softly reachable object will be kept alive for each megabyte of free heap space. Corresponds to the {@code -XX:SoftRefLRUPolicyMSPerMB} flag.
+     *
+     * @param time The time to keep softly reachable objects alive.
+     * @param unit The unit of time.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder softRefLRUPolicyMSPerMB(long time, TimeUnit unit) {
+        Objects.requireNonNull(unit, "Time unit cannot be null");
+
+        if (time < 0)
+            throw new IllegalArgumentException("Time cannot be negative.");
+
+        this.arguments.add("-XX:SoftRefLRUPolicyMSPerMB=" + unit.toMillis(time));
+        return this;
+    }
+
+    /**
+     * Incrementally reduces the Java heap size. Corresponds to the {@code -XX:-ShrinkHeapInSteps} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder incrementallyReduceJavaHeapSize() {
+        this.arguments.add("-XX:-ShrinkHeapInSteps");
+        return this;
+    }
+
+    /**
+     * Sets the age threshold for string deduplication. Corresponds to the {@code -XX:StringDeduplicationAgeThreshold} flag.
+     *
+     * @param threshold The age threshold.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder stringDeduplicationAgeThreshold(int threshold) {
+        if (threshold < 0)
+            throw new IllegalArgumentException("String deduplication age threshold cannot be negative.");
+
+        this.arguments.add("-XX:StringDeduplicationAgeThreshold=" + threshold);
+        return this;
+    }
+
+    /**
+     * Sets the ratio of survivor space to eden space. Corresponds to the {@code -XX:SurvivorRatio} flag.
+     *
+     * @param ratio The survivor space ratio.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder survivorRatio(int ratio) {
+        if (ratio <= 0)
+            throw new IllegalArgumentException("Survivor ratio must be positive.");
+
+        this.arguments.add("-XX:SurvivorRatio=" + ratio);
+        return this;
+    }
+
+    /**
+     * Sets the target survivor space occupancy percentage after a young GC. Corresponds to the {@code -XX:TargetSurvivorRatio} flag.
+     *
+     * @param percent The target survivor ratio percentage.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder targetSurvivorRatioPercent(int percent) {
+        if (percent < 0 || percent > 100)
+            throw new IllegalArgumentException("Target survivor ratio percent must be between 0 and 100.");
+
+        this.arguments.add("-XX:TargetSurvivorRatio=" + percent);
+        return this;
+    }
+
+    /**
+     * Sets the size of a thread-local allocation buffer (TLAB). Corresponds to the {@code -XX:TLABSize} flag.
+     *
+     * @param size The TLAB size.
+     * @param unit The unit of size.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder TLABSize(long size, ByteUnit unit) {
+        Objects.requireNonNull(unit, "TLAB size unit cannot be null");
+
+        if (size < 0)
+            throw new IllegalArgumentException("TLAB size cannot be negative.");
+
+        this.arguments.add("-XX:TLABSize=" + size + unit.getUnit());
+        return this;
+    }
+
+    /**
+     * Enables or disables adaptive generation sizing. Corresponds to the {@code -XX:+/-UseAdaptiveSizePolicy} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableAdaptiveSizePolicy(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseAdaptiveSizePolicy" : "-XX:-UseAdaptiveSizePolicy");
+        return this;
+    }
+
+    /**
+     * Enables the G1 garbage collector. Corresponds to the {@code -XX:+UseG1GC} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableG1GC() {
+        this.arguments.add("-XX:+UseG1GC");
+        return this;
+    }
+
+    /**
+     * Enables the GC overhead limit. Corresponds to the {@code -XX:+UseGCOverheadLimit} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableGCOverheadLimit() {
+        this.arguments.add("-XX:+UseGCOverheadLimit");
+        return this;
+    }
+
+    /**
+     * Enables NUMA-aware memory allocation. Corresponds to the {@code -XX:+UseNUMA} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableNUMA() {
+        this.arguments.add("-XX:+UseNUMA");
+        return this;
+    }
+
+    /**
+     * Enables the parallel garbage collector. Corresponds to the {@code -XX:+UseParallelGC} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableParallelGC() {
+        this.arguments.add("-XX:+UseParallelGC");
+        return this;
+    }
+
+    /**
+     * Enables the serial garbage collector. Corresponds to the {@code -XX:+UseSerialGC} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableSerialGC() {
+        this.arguments.add("-XX:+UseSerialGC");
+        return this;
+    }
+
+    /**
+     * Enables or disables string deduplication. Corresponds to the {@code -XX:+/-UseStringDeduplication} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableStringDeduplication(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseStringDeduplication" : "-XX:-UseStringDeduplication");
+        return this;
+    }
+
+    /**
+     * Enables or disables thread-local allocation buffers (TLABs). Corresponds to the {@code -XX:+/-UseTLAB} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableTLAB(boolean enable) {
+        this.arguments.add(enable ? "-XX:+UseTLAB" : "-XX:-UseTLAB");
+        return this;
+    }
+
+    /**
+     * Enables the Z garbage collector (ZGC). Corresponds to the {@code -XX:+UseZGC} flag.
+     *
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableZGC() {
+        this.arguments.add("-XX:+UseZGC");
+        return this;
+    }
+
+    /**
+     * Sets the allocation spike tolerance for ZGC. Corresponds to the {@code -XX:ZAllocationSpikeTolerance} flag.
+     *
+     * @param tolerance The allocation spike tolerance.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder allocationSpikeToleranceForZGC(float tolerance) {
+        this.arguments.add("-XX:ZAllocationSpikeTolerance=" + tolerance);
+        return this;
+    }
+
+    /**
+     * Sets the maximum collection interval for ZGC. Corresponds to the {@code -XX:ZCollectionInterval} flag.
+     *
+     * @param time The maximum collection interval.
+     * @param unit The unit of time.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxCollectionIntervalForZGC(long time, TimeUnit unit) {
+        Objects.requireNonNull(unit, "Time unit cannot be null");
+
+        if (time < 0)
+            throw new IllegalArgumentException("Max collection interval cannot be negative.");
+
+        this.arguments.add("-XX:ZCollectionInterval=" + unit.toSeconds(time));
+        return this;
+    }
+
+    /**
+     * Sets the maximum fragmentation limit percentage for ZGC. Corresponds to the {@code -XX:ZFragmentationLimit} flag.
+     *
+     * @param percent The maximum fragmentation limit percentage.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder maxFragmentationLimitPercentForZGC(int percent) {
+        if (percent < 0 || percent > 100)
+            throw new IllegalArgumentException("Max fragmentation limit percent must be between 0 and 100.");
+
+        this.arguments.add("-XX:ZFragmentationLimit=" + percent);
+        return this;
+    }
+
+    /**
+     * Enables or disables proactive GC cycles for ZGC. Corresponds to the {@code -XX:+/-ZProactiveGCCycles} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableProactiveGCCyclesForZGC(boolean enable) {
+        this.arguments.add(enable ? "-XX:+ZProactiveGCCycles" : "-XX:-ZProactiveGCCycles");
+        return this;
+    }
+
+    /**
+     * Enables or disables uncommitting unused memory for ZGC. Corresponds to the {@code -XX:+/-ZUncommit} flag.
+     *
+     * @param enable {@code true} to enable, {@code false} to disable.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder enableUncommitForZGC(boolean enable) {
+        this.arguments.add(enable ? "-XX:+ZUncommit" : "-XX:-ZUncommit");
+        return this;
+    }
+
+    /**
+     * Sets the uncommit delay for ZGC. Corresponds to the {@code -XX:ZUncommitDelay} flag.
+     *
+     * @param time The uncommit delay.
+     * @param unit The unit of time.
+     * @return This builder instance.
+     */
+    public JavaExecutableCLIBuilder uncommitDelayForZGC(long time, TimeUnit unit) {
+        Objects.requireNonNull(unit, "Time unit cannot be null");
+
+        if (time < 0)
+            throw new IllegalArgumentException("Uncommit delay cannot be negative.");
+
+        this.arguments.add("-XX:ZUncommitDelay=" + unit.toSeconds(time));
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(resolveExecutableName(enableConsole)).toString());
+        String preArgument = launchType.getPreArgument();
+        if (!preArgument.isEmpty()) {
+            command.add(preArgument);
+        }
+        command.add(primaryArgument);
+        command.addAll(arguments);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, resolveExecutableName(enableConsole));
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start Java process", exception);
+        }
+    }
+
+    /**
+     * Resolves the name of the Java executable based on the operating system and console enablement.
+     *
+     * @param enableConsole {@code true} if a console is enabled (Windows only), {@code false} otherwise.
+     * @return The name of the executable (e.g., "java.exe", "javaw.exe", "java").
+     */
+    private static String resolveExecutableName(boolean enableConsole) {
+        if (OperatingSystem.isWindows() && !enableConsole)
+            return "javaw.exe";
+
+        return JDKManager.JAVA_EXECUTABLE_NAME;
+    }
+
+    /**
+     * Represents the different ways a Java application can be launched.
+     */
+    @Getter
+    public enum LaunchType {
+        CLASS_FILE,
+        JAR_FILE("-jar"),
+        MODULE("-m"),
+        SOURCE_FILE;
+
+        private final String preArgument;
+
+        LaunchType(String preArgument) {
+            this.preArgument = preArgument;
+        }
+
+        LaunchType() {
+            this.preArgument = "";
+        }
+    }
+
+    /**
+     * Represents different access modes for certain VM options.
+     */
+    @Getter
+    public enum AccessMode {
+        ALLOW("allow"),
+        WARN("warn"),
+        DENY("deny"),
+        DEBUG("debug");
+
+        private final String mode;
+
+        AccessMode(String mode) {
+            this.mode = mode;
+        }
+    }
+
+    /**
+     * Represents an enabled or disabled state.
+     */
+    @Getter
+    public enum EnabledDisabled {
+        ENABLED,
+        DISABLED;
+
+        private final String state;
+
+        EnabledDisabled() {
+            this.state = name().toLowerCase(Locale.ROOT);
+        }
+    }
+
+    /**
+     * Represents predefined sets of root modules.
+     */
+    @Getter
+    public enum RootModule {
+        ALL_DEFAULT,
+        ALL_SYSTEM,
+        ALL_MODULE_PATH;
+
+        private final String module;
+
+        RootModule() {
+            this.module = name().toLowerCase(Locale.ROOT).replace('_', '-');
+        }
+    }
+
+    /**
+     * Represents components for which verbose output can be enabled.
+     */
+    @Getter
+    public enum VerboseComponent {
+        CLASS,
+        GC,
+        JNI,
+        MODULE;
+
+        private final String component;
+
+        VerboseComponent() {
+            this.component = name().toLowerCase(Locale.ROOT);
+        }
+    }
+
+    /**
+     * A builder for configuring logging options for the JVM.
+     */
+    public static final class LoggingConfiguration {
+        private final List<LogSelection> selections = new ArrayList<>();
+        private LogOutput output;
+        private final EnumSet<LogDecorator> decorators = EnumSet.noneOf(LogDecorator.class);
+
+        public LoggingConfiguration select(LogSelection selection) {
+            Objects.requireNonNull(selection, "Log selection cannot be null");
+            this.selections.add(selection);
+            return this;
+        }
+
+        public LoggingConfiguration select(LogSelection... selectionArray) {
+            Objects.requireNonNull(selectionArray, "Log selections cannot be null");
+            for (LogSelection selection : selectionArray) {
+                select(selection);
+            }
+
+            return this;
+        }
+
+        public LoggingConfiguration output(LogOutput output) {
+            this.output = Objects.requireNonNull(output, "Log output cannot be null");
+            return this;
+        }
+
+        public LoggingConfiguration decorators(LogDecorator... decoratorArray) {
+            Objects.requireNonNull(decoratorArray, "Log decorators cannot be null");
+            for (LogDecorator decorator : decoratorArray) {
+                Objects.requireNonNull(decorator, "Decorator cannot be null");
+                this.decorators.add(decorator);
+            }
+
+            return this;
+        }
+
+        private String asArgument() {
+            StringBuilder builder = new StringBuilder();
+            if (!selections.isEmpty()) {
+                builder.append(selections.stream().map(LogSelection::asToken).collect(Collectors.joining(",")));
+            }
+
+            boolean hasOutput = output != null;
+            boolean hasDecorators = !decorators.isEmpty();
+            boolean hasOutputOptions = hasOutput && output.hasOptions();
+
+            if (hasOutput || hasDecorators) {
+                if (!builder.isEmpty())
+                    builder.append(":");
+
+                if (hasOutput) {
+                    builder.append(output.destination());
+                }
+            }
+
+            if (hasDecorators || hasOutputOptions) {
+                builder.append(":");
+                if (hasDecorators) {
+                    builder.append(decorators.stream().map(LogDecorator::token).collect(Collectors.joining(",")));
+                }
+            }
+
+            if (hasOutputOptions) {
+                builder.append(":").append(output.optionsToken());
+            }
+
+            return builder.toString();
+        }
+    }
+
+    /**
+     * Represents a selection of log tags and a log level for logging configuration.
+     */
+    public static final class LogSelection {
+        private final List<String> tags = new ArrayList<>();
+        private LogLevel level = LogLevel.INFO;
+        private String literalToken;
+
+        public static LogSelection create() {
+            return new LogSelection();
+        }
+
+        public static LogSelection literal(String token) {
+            LogSelection selection = new LogSelection();
+            selection.literalToken = Objects.requireNonNull(token, "Log selector literal cannot be null");
+            return selection;
+        }
+
+        public static LogSelection all(LogLevel level) {
+            return create().level(level);
+        }
+
+        public LogSelection tags(String... tags) {
+            Objects.requireNonNull(tags, "Log tags cannot be null");
+            for (String tag : tags) {
+                if (tag == null || tag.isBlank())
+                    throw new IllegalArgumentException("Log tag cannot be null or blank");
+                this.tags.add(tag);
+            }
+
+            return this;
+        }
+
+        public LogSelection level(LogLevel level) {
+            this.level = Objects.requireNonNull(level, "Log level cannot be null");
+            return this;
+        }
+
+        private String asToken() {
+            if (literalToken != null) {
+                return literalToken;
+            }
+
+            String selector = tags.isEmpty() ? "*" : String.join("+", tags);
+            return selector + "=" + level.token();
+        }
+    }
+
+    /**
+     * Represents different logging levels.
+     */
+    public enum LogLevel {
+        TRACE("trace"),
+        DEBUG("debug"),
+        INFO("info"),
+        WARNING("warning"),
+        ERROR("error"),
+        OFF("off");
+
+        private final String token;
+
+        LogLevel(String token) {
+            this.token = token;
+        }
+
+        public String token() {
+            return token;
+        }
+    }
+
+    /**
+     * Represents different decorators for log output.
+     */
+    public enum LogDecorator {
+        TIME("time"),
+        UPTIME("uptime"),
+        TIMEMILLIS("timemillis"),
+        UPTIMEMILLIS("uptimemillis"),
+        TIMEDELTA("timedelta"),
+        USTAMP("ustamp"),
+        PID("pid"),
+        TID("tid"),
+        LEVEL("level"),
+        TAGS("tags"),
+        HOSTNAME("hostname");
+
+        private final String token;
+
+        LogDecorator(String token) {
+            this.token = token;
+        }
+
+        public String token() {
+            return token;
+        }
+    }
+
+    /**
+     * Represents the output destination for logging.
+     */
+    public static final class LogOutput {
+        private final String destination;
+        private final List<String> options = new ArrayList<>();
+
+        private LogOutput(String destination) {
+            this.destination = Objects.requireNonNull(destination, "Log output destination cannot be null");
+        }
+
+        public static LogOutput stdout() {
+            return new LogOutput("stdout");
+        }
+
+        public static LogOutput stderr() {
+            return new LogOutput("stderr");
+        }
+
+        public static LogOutput file(Path path) {
+            Objects.requireNonNull(path, "Log file path cannot be null");
+            return new LogOutput("file=" + path);
+        }
+
+        public static LogOutput custom(String destination) {
+            return new LogOutput(destination);
+        }
+
+        public LogOutput option(String key, String value) {
+            Objects.requireNonNull(key, "Output option key cannot be null");
+            Objects.requireNonNull(value, "Output option value cannot be null");
+            this.options.add(key + "=" + value);
+            return this;
+        }
+
+        public LogOutput rotateFiles(int fileCount, long fileSize, ByteUnit unit) {
+            if (fileCount <= 0)
+                throw new IllegalArgumentException("File count must be positive");
+            if (fileSize <= 0)
+                throw new IllegalArgumentException("File size must be positive");
+            Objects.requireNonNull(unit, "Byte unit cannot be null");
+            this.options.add("filecount=" + fileCount);
+            this.options.add("filesize=" + fileSize + unit.getUnit());
+            return this;
+        }
+
+        private boolean hasOptions() {
+            return !options.isEmpty();
+        }
+
+        private String optionsToken() {
+            return String.join(",", options);
+        }
+
+        private String destination() {
+            return destination;
+        }
+    }
+
+    /**
+     * Represents different byte units for specifying sizes.
+     */
+    @Getter
+    public enum ByteUnit {
+        BYTES(""),
+        KILOBYTES("K"),
+        MEGABYTES("M"),
+        GIGABYTES("G");
+
+        private static final long MULTIPLIER = 1024L;
+
+        private final String unit;
+
+        ByteUnit(String unit) {
+            this.unit = unit;
+        }
+
+        public long toBytes(long size) {
+            return switch (this) {
+                case BYTES -> size;
+                case KILOBYTES -> BYTES.toBytes(size) * MULTIPLIER;
+                case MEGABYTES -> KILOBYTES.toBytes(size) * MULTIPLIER;
+                case GIGABYTES -> MEGABYTES.toBytes(size) * MULTIPLIER;
+            };
+        }
+    }
+
+    /**
+     * Represents an auto, on, or off state.
+     */
+    @Getter
+    public enum AutoOnOff {
+        AUTO,
+        ON,
+        OFF;
+
+        private final String mode;
+
+        AutoOnOff() {
+            this.mode = name().toLowerCase(Locale.ROOT);
+        }
+    }
+
+    /**
+     * Represents different categories of JVM settings.
+     */
+    @Getter
+    public enum SettingCategory {
+        ALL,
+        LOCALE,
+        PROPERTIES,
+        SECURITY_ALL,
+        SECURITY_PROPERTIES,
+        SECURITY_PROVIDERS,
+        SECURITY_TLS,
+        VM,
+        SYSTEM;
+
+        private final String categoryName;
+
+        SettingCategory() {
+            this.categoryName = name().toLowerCase(Locale.ROOT).replace('_', ':');
+        }
+    }
+
+    /**
+     * Represents an option for Java Flight Recorder (JFR).
+     */
+    public record FlightRecorderOption(String name, String value) {
+        public static FlightRecorderOption globalBufferSize(long size, ByteUnit unit) {
+            Objects.requireNonNull(unit, "Byte unit cannot be null");
+
+            if (size < 0)
+                throw new IllegalArgumentException("Global buffer size cannot be negative.");
+
+            return new FlightRecorderOption("globalbuffersize", size + unit.getUnit());
+        }
+
+        public static FlightRecorderOption maxChunkSize(long size, ByteUnit unit) {
+            Objects.requireNonNull(unit, "Byte unit cannot be null");
+
+            if (size < 0)
+                throw new IllegalArgumentException("Max chunk size cannot be negative.");
+
+            return new FlightRecorderOption("maxchunksize", size + unit.getUnit());
+        }
+
+        public static FlightRecorderOption memorySize(long size, ByteUnit unit) {
+            Objects.requireNonNull(unit, "Byte unit cannot be null");
+
+            if (size < 0)
+                throw new IllegalArgumentException("Memory size cannot be negative.");
+
+            return new FlightRecorderOption("memorysize", size + unit.getUnit());
+        }
+
+        public static FlightRecorderOption numGlobalBuffers(int count) {
+            if (count < 0)
+                throw new IllegalArgumentException("Number of global buffers cannot be negative.");
+
+            return new FlightRecorderOption("numglobalbuffers", Integer.toString(count));
+        }
+
+        public static FlightRecorderOption oldObjectQueueSize(int size) {
+            if (size < 0)
+                throw new IllegalArgumentException("Old object queue size cannot be negative.");
+
+            return new FlightRecorderOption("oldobjectqueuesize", Integer.toString(size));
+        }
+
+        public static FlightRecorderOption preserveRepository(boolean preserve) {
+            return new FlightRecorderOption("preserverecording", Boolean.toString(preserve));
+        }
+
+        public static FlightRecorderOption repositoryPath(Path path) {
+            Objects.requireNonNull(path, "Path cannot be null");
+            return new FlightRecorderOption("repositorypath", path.toString());
+        }
+
+        public static FlightRecorderOption retransformEventClasses(boolean retransform) {
+            return new FlightRecorderOption("retransform", Boolean.toString(retransform));
+        }
+
+        public static FlightRecorderOption stackDepth(int depth) {
+            if (depth < 0)
+                throw new IllegalArgumentException("Stack depth cannot be negative.");
+
+            return new FlightRecorderOption("stackdepth", Integer.toString(depth));
+        }
+
+        public static FlightRecorderOption threadBufferSize(long size, ByteUnit unit) {
+            Objects.requireNonNull(unit, "Byte unit cannot be null");
+            return new FlightRecorderOption("threadbuffersize", size + unit.getUnit());
+        }
+    }
+
+    /**
+     * Represents parameters for starting a Java Flight Recorder (JFR) recording.
+     */
+    public record FlightRecorderParameters(String name, String value) {
+        public static FlightRecorderParameters delay(long duration, TimeUnit unit) {
+            Objects.requireNonNull(unit, "TimeUnit cannot be null");
+
+            if (duration < 0)
+                throw new IllegalArgumentException("Delay duration cannot be negative.");
+
+            return new FlightRecorderParameters("delay", Long.toString(unit.toMillis(duration)));
+        }
+
+        public static FlightRecorderParameters writeToDisk(boolean toDisk) {
+            return new FlightRecorderParameters("disk", Boolean.toString(toDisk));
+        }
+
+        public static FlightRecorderParameters dumpOnExit(boolean dump) {
+            return new FlightRecorderParameters("dumponexit", Boolean.toString(dump));
+        }
+
+        public static FlightRecorderParameters duration(long duration, TimeUnit unit) {
+            Objects.requireNonNull(unit, "TimeUnit cannot be null");
+
+            if (duration < 0)
+                throw new IllegalArgumentException("Duration cannot be negative.");
+
+            return new FlightRecorderParameters("duration", Long.toString(unit.toMillis(duration)));
+        }
+
+        public static FlightRecorderParameters filename(Path path) {
+            Objects.requireNonNull(path, "Path cannot be null");
+            return new FlightRecorderParameters("filename", path.toString());
+        }
+
+        public static FlightRecorderParameters name(String identifier) {
+            Objects.requireNonNull(identifier, "Identifier cannot be null");
+            return new FlightRecorderParameters("name", identifier);
+        }
+
+        public static FlightRecorderParameters maxAge(long age, TimeUnit unit) {
+            Objects.requireNonNull(unit, "TimeUnit cannot be null");
+
+            if (age < 0)
+                throw new IllegalArgumentException("Max age cannot be negative.");
+
+            if (unit != TimeUnit.SECONDS && unit != TimeUnit.MINUTES && unit != TimeUnit.HOURS && unit != TimeUnit.DAYS)
+                throw new IllegalArgumentException("Max age must be specified in seconds, minutes, hours, or days.");
+
+            return new FlightRecorderParameters("maxage", age + unit.toString().substring(0, 1).toLowerCase(Locale.ROOT));
+        }
+
+        public static FlightRecorderParameters maxSize(long size, ByteUnit unit) {
+            Objects.requireNonNull(unit, "Byte unit cannot be null.");
+
+            if (size < 0)
+                throw new IllegalArgumentException("Max size cannot be negative.");
+
+            if (unit == ByteUnit.BYTES || unit == ByteUnit.KILOBYTES)
+                throw new IllegalArgumentException("Max size must be specified in MB or GB.");
+
+            return new FlightRecorderParameters("maxsize", size + unit.getUnit());
+        }
+
+        public static FlightRecorderParameters collectPathToGCRoots(boolean collect) {
+            return new FlightRecorderParameters("path-to-gc-roots", Boolean.toString(collect));
+        }
+
+        public static FlightRecorderParameters nameToReportOnExit(String name) {
+            Objects.requireNonNull(name, "Name cannot be null");
+            return new FlightRecorderParameters("report-on-exit", name);
+        }
+
+        public static FlightRecorderParameters settingsFile(Path path) {
+            Objects.requireNonNull(path, "Path cannot be null");
+            return new FlightRecorderParameters("settings", path.toString());
+        }
+
+        public static FlightRecorderParameters option(String value) {
+            Objects.requireNonNull(value, "Option value cannot be null");
+            return new FlightRecorderParameters("option", value);
+        }
+
+        public static FlightRecorderParameters eventSetting(String value) {
+            Objects.requireNonNull(value, "Event setting value cannot be null");
+            return new FlightRecorderParameters("event-setting", value);
+        }
+
+        @Override
+        public @NotNull String toString() {
+            return name + "=" + value;
+        }
+    }
+
+    /**
+     * Represents different modes for native memory tracking.
+     */
+    @Getter
+    public enum NativeMemoryTracking {
+        OFF,
+        SUMMARY,
+        DETAIL;
+
+        private final String state;
+
+        NativeMemoryTracking() {
+            this.state = name().toLowerCase(Locale.ROOT);
+        }
+    }
+
+    /**
+     * Represents different branch protection modes for AArch64 Linux.
+     */
+    @Getter
+    public enum BranchProtectionMode {
+        NONE("none"),
+        STANDARD("standard"),
+        PAC_RET("pac-ret");
+
+        private final String mode;
+
+        BranchProtectionMode(String mode) {
+            this.mode = mode;
+        }
+    }
+
+    /**
+     * Represents different prefetch styles for allocation.
+     */
+    public enum PrefetchStyle {
+        DO_NOT(0),
+        AFTER_ALLOCATE(1),
+        TLAB_WATERMARK_POINTER(2),
+        PER_CACHE_LINE(3);
+
+        private final int styleInt;
+
+        PrefetchStyle(int styleInt) {
+            this.styleInt = styleInt;
+        }
+
+        public int asInt() {
+            return styleInt;
+        }
+    }
+
+    /**
+     * Represents different commands for the JIT compiler.
+     */
+    @Getter
+    public enum CompileCommand {
+        BREAK("break"),
+        COMPILE_ONLY("compileonly"),
+        DO_NOT_INLINE("dontinline"),
+        EXCLUDE("exclude"),
+        HELP("help"),
+        INLINE("inline"),
+        LOG("log"),
+        OPTION("option"),
+        PRINT("print"),
+        QUIET("quiet");
+
+        private final String command;
+
+        CompileCommand(String command) {
+            this.command = command;
+        }
+    }
+
+    /**
+     * Represents different data models (32-bit or 64-bit).
+     */
+    @Getter
+    public enum DataModel {
+        DATA_32("d32"),
+        DATA_64("d64");
+
+        private final String model;
+
+        DataModel(String model) {
+            this.model = model;
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JavadocCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JavadocCLIBuilder.java
new file mode 100644
index 00000000..6668a151
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JavadocCLIBuilder.java
@@ -0,0 +1,1830 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.io.File;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A fluent builder for constructing and executing {@code javadoc} commands.
+ * <p>
+ * This builder provides comprehensive options for generating API documentation,
+ * including source path configuration, module-related options, doclet customization,
+ * and various output formatting controls.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/javadoc.html">javadoc command documentation</a>
+ */
+public class JavadocCLIBuilder implements CLIBuilder<Process, JavadocCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "javadoc.exe" : "javadoc";
+    private static final DateTimeFormatter ISO_OFFSET_FORMATTER = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final List<String> packageNames = new ArrayList<>();
+    private final List<Path> sourceFilePaths = new ArrayList<>();
+    private final List<Path> argumentFilePaths = new ArrayList<>();
+    private Path workingDirectory;
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+
+    private JavadocCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a new {@code JavadocCLIBuilder} instance.
+     *
+     * @param jdk The JDK to use for executing the {@code javadoc} command.
+     * @return A new builder instance.
+     */
+    public static JavadocCLIBuilder create(JDK jdk) {
+        return new JavadocCLIBuilder(jdk);
+    }
+
+    @Override
+    public JavadocCLIBuilder addArgument(String arg) {
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JavadocCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JavadocCLIBuilder setEnvironmentVariable(String key, String value) {
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JavadocCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JavadocCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Adds a package name to be documented.
+     *
+     * @param packageName The name of the package.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addPackageName(String packageName) {
+        Objects.requireNonNull(packageName, "Package name cannot be null");
+        this.packageNames.add(packageName);
+        return this;
+    }
+
+    /**
+     * Adds a source file path to be documented.
+     *
+     * @param sourceFilePath The path to the source file.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addSourceFilePath(Path sourceFilePath) {
+        Objects.requireNonNull(sourceFilePath, "Source file path cannot be null");
+        this.sourceFilePaths.add(sourceFilePath);
+        return this;
+    }
+
+    /**
+     * Adds an argument file path.
+     *
+     * @param argumentFilePath The path to the argument file.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addArgumentFilePath(Path argumentFilePath) {
+        Objects.requireNonNull(argumentFilePath, "Argument file path cannot be null");
+        this.argumentFilePaths.add(argumentFilePath);
+        return this;
+    }
+
+    /**
+     * Adds modules to be documented. Corresponds to the {@code --add-modules} option.
+     *
+     * @param modules The names of the modules to add.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addModules(String... modules) {
+        Objects.requireNonNull(modules, "Modules cannot be null");
+
+        var modulesBuilder = new StringBuilder("--add-modules ");
+        for (String module : modules) {
+            modulesBuilder.append(",").append(module);
+        }
+
+        this.arguments.add(modulesBuilder.toString());
+        return this;
+    }
+
+    /**
+     * Adds all modules on the module path to be documented. Corresponds to the {@code --add-modules ALL-MODULE-PATH} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addAllModules() {
+        return addModules("ALL-MODULE-PATH");
+    }
+
+    /**
+     * Appends entries to the bootstrap class path. Corresponds to the {@code --boot-class-path} option.
+     *
+     * @param bootClassPathEntries The entries to append.
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if the JDK version is 9 or above.
+     */
+    public JavadocCLIBuilder appendBootClassPath(String... bootClassPathEntries) {
+        if (jdk.version().major() >= 9)
+            throw new UnsupportedOperationException("The --boot-class-path option is not supported in JDK 9 and above.");
+
+        Objects.requireNonNull(bootClassPathEntries, "Boot class path entries cannot be null");
+        this.arguments.add("--boot-class-path " + String.join(File.pathSeparator, bootClassPathEntries));
+        return this;
+    }
+
+    /**
+     * Specifies the classpath for finding user class files. Corresponds to the {@code -cp} or {@code -classpath} option.
+     *
+     * @param classpathEntries The entries for the classpath.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder classpath(String... classpathEntries) {
+        Objects.requireNonNull(classpathEntries, "Classpath entries cannot be null");
+        this.arguments.add("-cp " + String.join(File.pathSeparator, classpathEntries));
+        return this;
+    }
+
+    /**
+     * Enables preview language features. Corresponds to the {@code --enable-preview} option.
+     *
+     * @return This builder instance.
+     * @throws UnsupportedOperationException if the JDK version is less than 12.
+     */
+    public JavadocCLIBuilder enablePreviewFeatures() {
+        if (jdk.version().major() < 12)
+            throw new UnsupportedOperationException("Preview features are only supported in JDK 12 and above.");
+
+        this.arguments.add("--enable-preview");
+        return this;
+    }
+
+    /**
+     * Specifies the source file encoding name. Corresponds to the {@code -encoding} option.
+     *
+     * @param encoding The encoding name.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder encoding(String encoding) {
+        Objects.requireNonNull(encoding, "Encoding cannot be null");
+        this.arguments.add("-encoding " + encoding);
+        return this;
+    }
+
+    /**
+     * Specifies the source file encoding name. Corresponds to the {@code -encoding} option.
+     *
+     * @param encoding The encoding charset.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder encoding(Charset encoding) {
+        Objects.requireNonNull(encoding, "Encoding cannot be null");
+        return encoding(encoding.name());
+    }
+
+    /**
+     * Specifies the directories in which to search for installed extensions. Corresponds to the {@code -extdirs} option.
+     *
+     * @param dirs The extension directories.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder extDirs(String... dirs) {
+        Objects.requireNonNull(dirs, "Ext dirs cannot be null");
+        this.arguments.add("-extdirs " + String.join(File.pathSeparator, dirs));
+        return this;
+    }
+
+    /**
+     * Specifies the directories in which to search for installed extensions. Corresponds to the {@code -extdirs} option.
+     *
+     * @param dirs The extension directories.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder extDirs(Path... dirs) {
+        Objects.requireNonNull(dirs, "Ext dirs cannot be null");
+        String[] dirStrings = Arrays.stream(dirs).map(Path::toString).toArray(String[]::new);
+        return extDirs(dirStrings);
+    }
+
+    /**
+     * Disables the generation of line-number information in Javadoc comments. Corresponds to the {@code --disable-line-doc-comments} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder disableLineDocComments() {
+        this.arguments.add("--disable-line-doc-comments");
+        return this;
+    }
+
+    /**
+     * Limits the universe of observable modules. Corresponds to the {@code --limit-modules} option.
+     *
+     * @param modules The modules to limit to.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder limitModules(String... modules) {
+        Objects.requireNonNull(modules, "Modules cannot be null");
+        this.arguments.add("--limit-modules " + String.join(",", modules));
+        return this;
+    }
+
+    /**
+     * Adds module names to be documented. Corresponds to the {@code -module} option.
+     *
+     * @param moduleName The names of the modules to add.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addModuleNames(String... moduleName) {
+        Objects.requireNonNull(moduleName, "Module names cannot be null");
+        this.arguments.add("-module " + String.join(",", moduleName));
+        return this;
+    }
+
+    /**
+     * Specifies the module path. Corresponds to the {@code --module-path} option.
+     *
+     * @param modulePaths The entries for the module path.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder modulePath(String... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module path entries cannot be null");
+        this.arguments.add("--module-path " + String.join(File.pathSeparator, modulePaths));
+        return this;
+    }
+
+    /**
+     * Specifies the module path. Corresponds to the {@code --module-path} option.
+     *
+     * @param modulePaths The entries for the module path.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder modulePath(Path... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module path entries cannot be null");
+        String[] pathStrings = Arrays.stream(modulePaths).map(Path::toString).toArray(String[]::new);
+        return modulePath(pathStrings);
+    }
+
+    /**
+     * Specifies the module source path. Corresponds to the {@code --module-source-path} option.
+     *
+     * @param moduleSourcePaths The entries for the module source path.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder moduleSourcePath(String... moduleSourcePaths) {
+        Objects.requireNonNull(moduleSourcePaths, "Module source path entries cannot be null");
+        this.arguments.add("--module-source-path " + String.join(File.pathSeparator, moduleSourcePaths));
+        return this;
+    }
+
+    /**
+     * Specifies the module source path. Corresponds to the {@code --module-source-path} option.
+     *
+     * @param moduleSourcePaths The entries for the module source path.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder moduleSourcePath(Path... moduleSourcePaths) {
+        Objects.requireNonNull(moduleSourcePaths, "Module source path entries cannot be null");
+        String[] pathStrings = Arrays.stream(moduleSourcePaths).map(Path::toString).toArray(String[]::new);
+        return moduleSourcePath(pathStrings);
+    }
+
+    /**
+     * Specifies the release version to use. Corresponds to the {@code --release} option.
+     *
+     * @param version The release version.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder releaseVersion(String version) {
+        Objects.requireNonNull(version, "Release version cannot be null");
+        this.arguments.add("--release " + version);
+        return this;
+    }
+
+    /**
+     * Specifies the release version to use. Corresponds to the {@code --release} option.
+     *
+     * @param version The release version.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder releaseVersion(int version) {
+        return releaseVersion(Integer.toString(version));
+    }
+
+    /**
+     * Specifies the source code version. Corresponds to the {@code --source} option.
+     *
+     * @param version The source version.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder sourceVersion(String version) {
+        Objects.requireNonNull(version, "Source version cannot be null");
+        this.arguments.add("--source " + version);
+        return this;
+    }
+
+    /**
+     * Specifies the source code version. Corresponds to the {@code --source} option.
+     *
+     * @param version The source version.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder sourceVersion(int version) {
+        return sourceVersion(Integer.toString(version));
+    }
+
+    /**
+     * Specifies the source code path. Corresponds to the {@code -sourcepath} option.
+     *
+     * @param sourcePaths The entries for the source path.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder sourcepath(String... sourcePaths) {
+        Objects.requireNonNull(sourcePaths, "Source path entries cannot be null");
+        this.arguments.add("-sourcepath " + String.join(File.pathSeparator, sourcePaths));
+        return this;
+    }
+
+    /**
+     * Specifies the source code path. Corresponds to the {@code -sourcepath} option.
+     *
+     * @param sourcePaths The entries for the source path.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder sourcepath(Path... sourcePaths) {
+        Objects.requireNonNull(sourcePaths, "Source path entries cannot be null");
+        String[] pathStrings = Arrays.stream(sourcePaths).map(Path::toString).toArray(String[]::new);
+        return sourcepath(pathStrings);
+    }
+
+    /**
+     * Specifies the system JDK to use. Corresponds to the {@code --system} option.
+     *
+     * @param systemJdk The system JDK.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder systemJdk(JDK systemJdk) {
+        Objects.requireNonNull(systemJdk, "System JDK cannot be null");
+        this.arguments.add("--system " + systemJdk.path().toString());
+        return this;
+    }
+
+    /**
+     * Specifies the upgrade module path. Corresponds to the {@code --upgrade-module-path} option.
+     *
+     * @param upgradeModulePaths The entries for the upgrade module path.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder upgradeModulePath(String... upgradeModulePaths) {
+        Objects.requireNonNull(upgradeModulePaths, "Upgrade module path entries cannot be null");
+        this.arguments.add("--upgrade-module-path " + String.join(File.pathSeparator, upgradeModulePaths));
+        return this;
+    }
+
+    /**
+     * Specifies the upgrade module path. Corresponds to the {@code --upgrade-module-path} option.
+     *
+     * @param upgradeModulePaths The entries for the upgrade module path.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder upgradeModulePath(Path... upgradeModulePaths) {
+        Objects.requireNonNull(upgradeModulePaths, "Upgrade module path entries cannot be null");
+        String[] pathStrings = Arrays.stream(upgradeModulePaths).map(Path::toString).toArray(String[]::new);
+        return upgradeModulePath(pathStrings);
+    }
+
+    /**
+     * Enables the use of {@code BreakIterator} for determining sentence breaks. Corresponds to the {@code -breakiterator} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder enableBreakIterator() {
+        this.arguments.add("-breakiterator");
+        return this;
+    }
+
+    /**
+     * Specifies the class name of the doclet to use. Corresponds to the {@code -doclet} option.
+     *
+     * @param docletClassName The class name of the doclet.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder doclet(String docletClassName) {
+        Objects.requireNonNull(docletClassName, "Doclet class name cannot be null");
+        this.arguments.add("-doclet " + docletClassName);
+        return this;
+    }
+
+    /**
+     * Specifies the path where the doclet and its supporting classes are located. Corresponds to the {@code -docletpath} option.
+     *
+     * @param docletPaths The entries for the doclet path.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder docletPath(String... docletPaths) {
+        Objects.requireNonNull(docletPaths, "Doclet path entries cannot be null");
+        this.arguments.add("-docletpath " + String.join(File.pathSeparator, docletPaths));
+        return this;
+    }
+
+    /**
+     * Specifies the path where the doclet and its supporting classes are located. Corresponds to the {@code -docletpath} option.
+     *
+     * @param docletPaths The entries for the doclet path.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder docletPath(Path... docletPaths) {
+        Objects.requireNonNull(docletPaths, "Doclet path entries cannot be null");
+        String[] pathStrings = Arrays.stream(docletPaths).map(Path::toString).toArray(String[]::new);
+        return docletPath(pathStrings);
+    }
+
+    /**
+     * Excludes packages from the documentation. Corresponds to the {@code -exclude} option.
+     *
+     * @param packageNames The names of the packages to exclude.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder excludePackages(String... packageNames) {
+        Objects.requireNonNull(packageNames, "Package names cannot be null");
+        this.arguments.add("-exclude " + String.join(":", packageNames));
+        return this;
+    }
+
+    /**
+     * Expands the set of modules to be documented. Corresponds to the {@code --expand-requires} option.
+     *
+     * @param expansionType The type of expansion (TRANSITIVE or ALL).
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder expandRequires(ExpansionType expansionType) {
+        Objects.requireNonNull(expansionType, "Expansion type cannot be null");
+        this.arguments.add("--expand-requires " + expansionType.name().toLowerCase(Locale.ROOT));
+        return this;
+    }
+
+    /**
+     * Displays the help message. Corresponds to the {@code -?} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder help() {
+        this.arguments.add("-?");
+        return this;
+    }
+
+    /**
+     * Displays help on extra non-standard options. Corresponds to the {@code -X} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder extraHelp() {
+        this.arguments.add("-X");
+        return this;
+    }
+
+    /**
+     * Passes an argument directly to the Java Virtual Machine. Corresponds to the {@code -J} option.
+     *
+     * @param jflag The argument to pass to the JVM.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder jflag(String jflag) {
+        Objects.requireNonNull(jflag, "JFlag cannot be null");
+        this.arguments.add("-J" + jflag);
+        return this;
+    }
+
+    /**
+     * Specifies the locale to be used when generating documentation. Corresponds to the {@code -locale} option.
+     *
+     * @param locale The locale string.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder locale(String locale) {
+        Objects.requireNonNull(locale, "Locale cannot be null");
+        this.arguments.add("-locale " + locale);
+        return this;
+    }
+
+    /**
+     * Specifies the locale to be used when generating documentation. Corresponds to the {@code -locale} option.
+     *
+     * @param locale The locale object.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder locale(Locale locale) {
+        Objects.requireNonNull(locale, "Locale cannot be null");
+        return locale(locale.toLanguageTag());
+    }
+
+    /**
+     * Sets the minimum visibility level of members to be documented. Corresponds to options like {@code -public}, {@code -protected}, {@code -package}, {@code -private}.
+     *
+     * @param visibility The minimum visibility level.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder visibility(Visibility visibility) {
+        Objects.requireNonNull(visibility, "Visibility cannot be null");
+        this.arguments.add("-" + visibility.name().toLowerCase(Locale.ROOT));
+        return this;
+    }
+
+    /**
+     * Suppresses messages, leaving only warnings and errors. Corresponds to the {@code -quiet} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder quiet() {
+        this.arguments.add("-quiet");
+        return this;
+    }
+
+    /**
+     * Shows members with a specified visibility. Corresponds to the {@code --show-members} option.
+     *
+     * @param visibility The visibility level.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder showMembers(Visibility visibility) {
+        Objects.requireNonNull(visibility, "Visibility cannot be null");
+        this.arguments.add("--show-members " + visibility.name().toLowerCase(Locale.ROOT));
+        return this;
+    }
+
+    /**
+     * Shows module contents with a specified granularity. Corresponds to the {@code --show-module-contents} option.
+     *
+     * @param granularity The granularity level (API or ALL).
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder showModuleContents(ModuleGranularity granularity) {
+        Objects.requireNonNull(granularity, "Module granularity cannot be null");
+        this.arguments.add("--show-module-contents " + granularity.name().toLowerCase(Locale.ROOT));
+        return this;
+    }
+
+    /**
+     * Shows packages with a specified granularity. Corresponds to the {@code --show-packages} option.
+     *
+     * @param granularity The granularity level (EXPORTED or ALL).
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder showPackages(PackageGranularity granularity) {
+        Objects.requireNonNull(granularity, "Package granularity cannot be null");
+        this.arguments.add("--show-packages " + granularity.name().toLowerCase(Locale.ROOT));
+        return this;
+    }
+
+    /**
+     * Shows types with a specified visibility. Corresponds to the {@code --show-types} option.
+     *
+     * @param visibility The visibility level.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder showTypes(Visibility visibility) {
+        Objects.requireNonNull(visibility, "Visibility cannot be null");
+        this.arguments.add("--show-types " + visibility.name().toLowerCase(Locale.ROOT));
+        return this;
+    }
+
+    /**
+     * Recursively retrieves source files from the specified subpackages. Corresponds to the {@code -subpackages} option.
+     *
+     * @param packageNames The names of the subpackages.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder subpackages(String... packageNames) {
+        Objects.requireNonNull(packageNames, "Package names cannot be null");
+        this.arguments.add("-subpackages " + String.join(":", packageNames));
+        return this;
+    }
+
+    /**
+     * Enables verbose output. Corresponds to the {@code -verbose} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder verbose() {
+        this.arguments.add("-verbose");
+        return this;
+    }
+
+    /**
+     * Prints version information and exits. Corresponds to the {@code --version} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder version() {
+        this.arguments.add("--version");
+        return this;
+    }
+
+    /**
+     * Reports warnings as errors. Corresponds to the {@code -Werror} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder reportErrorOnWarnings() {
+        this.arguments.add("-Werror");
+        return this;
+    }
+
+    /**
+     * Adds a read edge from a source module to target modules. Corresponds to the {@code --add-reads} option.
+     *
+     * @param sourceModule  The source module.
+     * @param targetModules The target modules.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addReads(String sourceModule, String... targetModules) {
+        Objects.requireNonNull(sourceModule, "Source module cannot be null");
+        Objects.requireNonNull(targetModules, "Target modules cannot be null");
+
+        this.arguments.add("--add-reads " + sourceModule + "=" + String.join(",", targetModules));
+        return this;
+    }
+
+    /**
+     * Adds a read edge from a source module to all unnamed modules.
+     *
+     * @param sourceModule The source module.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addReadsAllUnnamed(String sourceModule) {
+        return addReads(sourceModule, "ALL-UNNAMED");
+    }
+
+    /**
+     * Adds an export of a package from a source module to target modules. Corresponds to the {@code --add-exports} option.
+     *
+     * @param sourceModule  The source module.
+     * @param packageName   The package to export.
+     * @param targetModules The target modules.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addExports(String sourceModule, String packageName, String... targetModules) {
+        Objects.requireNonNull(sourceModule, "Source module cannot be null");
+        Objects.requireNonNull(packageName, "Package name cannot be null");
+        Objects.requireNonNull(targetModules, "Target modules cannot be null");
+
+        this.arguments.add("--add-exports " + sourceModule + "/" + packageName + "=" + String.join(",", targetModules));
+        return this;
+    }
+
+    /**
+     * Adds an export of a package from a source module to all unnamed modules.
+     *
+     * @param sourceModule The source module.
+     * @param packageName  The package to export.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addExportsAllUnnamed(String sourceModule, String packageName) {
+        return addExports(sourceModule, packageName, "ALL-UNNAMED");
+    }
+
+    /**
+     * Patches a module with classes and resources from specified paths. Corresponds to the {@code --patch-module} option.
+     *
+     * @param moduleName The module to patch.
+     * @param patchPaths The paths to the patch content.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder patchModule(String moduleName, String... patchPaths) {
+        Objects.requireNonNull(moduleName, "Module name cannot be null");
+        Objects.requireNonNull(patchPaths, "Patch paths cannot be null");
+        this.arguments.add("--patch-module " + moduleName + "=" + String.join(File.pathSeparator, patchPaths));
+        return this;
+    }
+
+    /**
+     * Patches a module with classes and resources from specified paths. Corresponds to the {@code --patch-module} option.
+     *
+     * @param moduleName The module to patch.
+     * @param patchPaths The paths to the patch content.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder patchModule(String moduleName, Path... patchPaths) {
+        Objects.requireNonNull(moduleName, "Module name cannot be null");
+        Objects.requireNonNull(patchPaths, "Patch paths cannot be null");
+        String[] pathStrings = Arrays.stream(patchPaths).map(Path::toString).toArray(String[]::new);
+        return patchModule(moduleName, pathStrings);
+    }
+
+    /**
+     * Sets the maximum number of errors to report. Corresponds to the {@code -Xmaxerrs} option.
+     *
+     * @param maxErrors The maximum number of errors.
+     * @return This builder instance.
+     * @throws IllegalArgumentException if maxErrors is negative.
+     */
+    public JavadocCLIBuilder maxErrors(int maxErrors) {
+        if (maxErrors < 0)
+            throw new IllegalArgumentException("Max errors cannot be negative");
+
+        this.arguments.add("-Xmaxerrs " + maxErrors);
+        return this;
+    }
+
+    /**
+     * Sets the maximum number of warnings to report. Corresponds to the {@code -Xmaxwarns} option.
+     *
+     * @param maxWarnings The maximum number of warnings.
+     * @return This builder instance.
+     * @throws IllegalArgumentException if maxWarnings is negative.
+     */
+    public JavadocCLIBuilder maxWarnings(int maxWarnings) {
+        if (maxWarnings < 0)
+            throw new IllegalArgumentException("Max warnings cannot be negative");
+
+        this.arguments.add("-Xmaxwarns " + maxWarnings);
+        return this;
+    }
+
+    /**
+     * Adds a script to the generated documentation. Corresponds to the {@code --add-script} option.
+     *
+     * @param script The script to add.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addScript(String script) {
+        Objects.requireNonNull(script, "Script cannot be null");
+        this.arguments.add("--add-script " + script);
+        return this;
+    }
+
+    /**
+     * Adds a script to the generated documentation. Corresponds to the {@code --add-script} option.
+     *
+     * @param scriptFilePath The path to the script file.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addScript(Path scriptFilePath) {
+        Objects.requireNonNull(scriptFilePath, "Script file path cannot be null");
+        return addScript(scriptFilePath.toString());
+    }
+
+    /**
+     * Adds a stylesheet to the generated documentation. Corresponds to the {@code --add-stylesheet} option.
+     *
+     * @param styleSheet The stylesheet to add.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addStylesheet(String styleSheet) {
+        Objects.requireNonNull(styleSheet, "Style sheet cannot be null");
+        this.arguments.add("--add-stylesheet " + styleSheet);
+        return this;
+    }
+
+    /**
+     * Adds a stylesheet to the generated documentation. Corresponds to the {@code --add-stylesheet} option.
+     *
+     * @param styleSheetPath The path to the stylesheet file.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder addStylesheet(Path styleSheetPath) {
+        Objects.requireNonNull(styleSheetPath, "Style sheet path cannot be null");
+        return addStylesheet(styleSheetPath.toString());
+    }
+
+    /**
+     * Allows JavaScript in Javadoc comments. Corresponds to the {@code --allow-script-in-comments} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder allowScriptInComments() {
+        this.arguments.add("--allow-script-in-comments");
+        return this;
+    }
+
+    /**
+     * Includes {@code @author} tags in the generated documentation. Corresponds to the {@code -author} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder includeAuthorTags() {
+        this.arguments.add("-author");
+        return this;
+    }
+
+    /**
+     * Specifies the text to be placed at the bottom of each generated page. Corresponds to the {@code -bottom} option.
+     *
+     * @param text The text to place at the bottom.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder textAtBottom(String text) {
+        Objects.requireNonNull(text, "Text cannot be null");
+        this.arguments.add("-bottom " + text);
+        return this;
+    }
+
+    /**
+     * Specifies the charset for the generated HTML files. Corresponds to the {@code -charset} option.
+     *
+     * @param charset The charset name.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder charset(String charset) {
+        Objects.requireNonNull(charset, "Charset cannot be null");
+        this.arguments.add("-charset " + charset);
+        return this;
+    }
+
+    /**
+     * Specifies the charset for the generated HTML files. Corresponds to the {@code -charset} option.
+     *
+     * @param charset The charset object.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder charset(Charset charset) {
+        Objects.requireNonNull(charset, "Charset cannot be null");
+        return charset(charset.name());
+    }
+
+    /**
+     * Specifies the destination directory for the generated HTML files. Corresponds to the {@code -d} option.
+     *
+     * @param outputDirectory The output directory.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder destinationDirectory(Path outputDirectory) {
+        Objects.requireNonNull(outputDirectory, "Output directory cannot be null");
+        this.arguments.add("-d " + outputDirectory);
+        return this;
+    }
+
+    /**
+     * Specifies the encoding for the generated HTML files. Corresponds to the {@code -docencoding} option.
+     *
+     * @param encoding The encoding name.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder generatedEncoding(String encoding) {
+        Objects.requireNonNull(encoding, "Encoding cannot be null");
+        this.arguments.add("-docencoding " + encoding);
+        return this;
+    }
+
+    /**
+     * Specifies the encoding for the generated HTML files. Corresponds to the {@code -docencoding} option.
+     *
+     * @param encoding The encoding charset.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder generatedEncoding(Charset encoding) {
+        Objects.requireNonNull(encoding, "Encoding cannot be null");
+        return generatedEncoding(encoding.name());
+    }
+
+    /**
+     * Recursively copies doc-files subdirectories. Corresponds to the {@code -docfilessubdirs} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder deepCopySubdirectories() {
+        this.arguments.add("-docfilessubdirs");
+        return this;
+    }
+
+    /**
+     * Specifies the title to be placed in the HTML {@code <title>} tag. Corresponds to the {@code -doctitle} option.
+     *
+     * @param title The document title.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder documentTitle(String title) {
+        Objects.requireNonNull(title, "Title cannot be null");
+        this.arguments.add("-doctitle " + title);
+        return this;
+    }
+
+    /**
+     * Excludes subdirectories from the {@code doc-files} directory. Corresponds to the {@code -excludedocfilessubdir} option.
+     *
+     * @param dirNames The names of the directories to exclude.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder excludeSubdirectories(String... dirNames) {
+        Objects.requireNonNull(dirNames, "Directory names cannot be null");
+        this.arguments.add("-excludedocfilessubdir " + String.join(",", dirNames));
+        return this;
+    }
+
+    /**
+     * Specifies the footer text for each generated page. Corresponds to the {@code -footer} option.
+     *
+     * @param text The footer text.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder footerText(String text) {
+        Objects.requireNonNull(text, "Text cannot be null");
+        this.arguments.add("-footer " + text);
+        return this;
+    }
+
+    /**
+     * Specifies the header text for each generated page. Corresponds to the {@code -header} option.
+     *
+     * @param text The header text.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder headerText(String text) {
+        Objects.requireNonNull(text, "Text cannot be null");
+        this.arguments.add("-header " + text);
+        return this;
+    }
+
+    /**
+     * Separates packages into groups on the overview page. Corresponds to the {@code -group} option.
+     *
+     * @param groupDefinitions The group definitions.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder groups(String... groupDefinitions) {
+        Objects.requireNonNull(groupDefinitions, "Group definitions cannot be null");
+        this.arguments.add("-group " + String.join(",", groupDefinitions));
+        return this;
+    }
+
+    /**
+     * Specifies the path to an alternative help file. Corresponds to the {@code -helpfile} option.
+     *
+     * @param filename The name of the help file.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder helpFilename(String filename) {
+        Objects.requireNonNull(filename, "Filename cannot be null");
+        this.arguments.add("-helpfile " + filename);
+        return this;
+    }
+
+    /**
+     * Specifies the path to an alternative help file. Corresponds to the {@code -helpfile} option.
+     *
+     * @param filePath The path to the help file.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder helpFilename(Path filePath) {
+        Objects.requireNonNull(filePath, "File path cannot be null");
+        return helpFilename(filePath.toString());
+    }
+
+    /**
+     * Generates HTML5 output. Corresponds to the {@code -html5} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder enableHtml5() {
+        this.arguments.add("-html5");
+        return this;
+    }
+
+    /**
+     * Enables JavaFX-specific features. Corresponds to the {@code -javafx} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder enableJavaFX() {
+        this.arguments.add("-javafx");
+        return this;
+    }
+
+    /**
+     * Adds HTML keywords to the generated documentation. Corresponds to the {@code -keywords} option.
+     *
+     * @param keywords The keywords to add.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder keywords(String... keywords) {
+        Objects.requireNonNull(keywords, "Keywords cannot be null");
+        this.arguments.add("-keywords " + String.join(",", keywords));
+        return this;
+    }
+
+    /**
+     * Creates links to existing Javadoc documentation. Corresponds to the {@code -link} option.
+     *
+     * @param url The URL of the external Javadoc documentation.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder link(String url) {
+        Objects.requireNonNull(url, "URL cannot be null");
+        this.arguments.add("-link " + url);
+        return this;
+    }
+
+    /**
+     * Creates links to existing Javadoc documentation. Corresponds to the {@code -link} option.
+     *
+     * @param urlPath The path to the external Javadoc documentation.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder link(Path urlPath) {
+        Objects.requireNonNull(urlPath, "URL path cannot be null");
+        return link("file://" + urlPath);
+    }
+
+    /**
+     * Specifies how to handle modularity mismatches when linking. Corresponds to the {@code --link-modularity-mismatch} option.
+     *
+     * @param mismatchBehavior The behavior for modularity mismatches (WARN or INFO).
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder linkModularityMismatch(LinkModularityMismatch mismatchBehavior) {
+        Objects.requireNonNull(mismatchBehavior, "Mismatch behavior cannot be null");
+        this.arguments.add("--link-modularity-mismatch " + mismatchBehavior.name().toLowerCase(Locale.ROOT));
+        return this;
+    }
+
+    /**
+     * Creates links to existing Javadoc documentation for offline access. Corresponds to the {@code -linkoffline} option.
+     *
+     * @param url             The URL of the external Javadoc documentation.
+     * @param packageListPath The path to the {@code package-list} file.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder linkOffline(String url, Path packageListPath) {
+        Objects.requireNonNull(url, "URL cannot be null");
+        Objects.requireNonNull(packageListPath, "Package list path cannot be null");
+        this.arguments.add("-linkoffline " + url + " " + packageListPath);
+        return this;
+    }
+
+    /**
+     * Creates links to existing Javadoc documentation for offline access. Corresponds to the {@code -linkoffline} option.
+     *
+     * @param url             The URL of the external Javadoc documentation.
+     * @param packageListPath The path to the {@code package-list} file.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder linkOffline(String url, String packageListPath) {
+        Objects.requireNonNull(url, "URL cannot be null");
+        Objects.requireNonNull(packageListPath, "Package list path cannot be null");
+        this.arguments.add("-linkoffline " + url + " " + packageListPath);
+        return this;
+    }
+
+    /**
+     * Links to platform properties. Corresponds to the {@code -linkplatformproperties} option.
+     *
+     * @param url The URL of the platform properties.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder linkPlatformProperties(String url) {
+        Objects.requireNonNull(url, "URL cannot be null");
+        this.arguments.add("-linkplatformproperties " + url);
+        return this;
+    }
+
+    /**
+     * Links to platform properties. Corresponds to the {@code -linkplatformproperties} option.
+     *
+     * @param urlPath The path to the platform properties.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder linkPlatformProperties(Path urlPath) {
+        Objects.requireNonNull(urlPath, "URL path cannot be null");
+        return linkPlatformProperties("file://" + urlPath);
+    }
+
+    /**
+     * Includes HTML versions of the source files. Corresponds to the {@code -linksource} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder shouldLinkSource() {
+        this.arguments.add("-linksource");
+        return this;
+    }
+
+    /**
+     * Specifies the path to an alternative stylesheet file. Corresponds to the {@code -stylesheetfile} option.
+     *
+     * @param filePath The path to the stylesheet file.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder stylesheetFile(String filePath) {
+        Objects.requireNonNull(filePath, "File path cannot be null");
+        this.arguments.add("-stylesheetfile " + filePath);
+        return this;
+    }
+
+    /**
+     * Specifies the path to an alternative stylesheet file. Corresponds to the {@code -stylesheetfile} option.
+     *
+     * @param filePath The path to the stylesheet file.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder stylesheetFile(Path filePath) {
+        Objects.requireNonNull(filePath, "File path cannot be null");
+        return stylesheetFile(filePath.toString());
+    }
+
+    /**
+     * Suppresses the entire comment body, including the main description and all tags, from the generated documentation. Corresponds to the {@code -nocomment} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder noComments() {
+        this.arguments.add("-nocomment");
+        return this;
+    }
+
+    /**
+     * Excludes deprecated APIs from the generated documentation. Corresponds to the {@code -nodeprecated} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder noDeprecated() {
+        this.arguments.add("-nodeprecated");
+        return this;
+    }
+
+    /**
+     * Prevents the generation of the deprecated list. Corresponds to the {@code -nodeprecatedlist} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder noDeprecatedList() {
+        this.arguments.add("-nodeprecatedlist");
+        return this;
+    }
+
+    /**
+     * Suppresses the generation of font-related HTML tags. Corresponds to the {@code --nofonts} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder noFonts() {
+        this.arguments.add("--nofonts");
+        return this;
+    }
+
+    /**
+     * Suppresses the generation of the HELP link in the navigation bar. Corresponds to the {@code -nohelp} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder noHelp() {
+        this.arguments.add("-nohelp");
+        return this;
+    }
+
+    /**
+     * Suppresses the generation of the index. Corresponds to the {@code -noindex} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder noIndex() {
+        this.arguments.add("-noindex");
+        return this;
+    }
+
+    /**
+     * Suppresses the generation of the navigation bar. Corresponds to the {@code -nonavbar} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder noNavBar() {
+        this.arguments.add("-nonavbar");
+        return this;
+    }
+
+    /**
+     * Suppresses the generation of links to platform documentation. Corresponds to the {@code --no-platform-links} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder noPlatformLinks() {
+        this.arguments.add("--no-platform-links");
+        return this;
+    }
+
+    /**
+     * Excludes package name qualifiers from the generated output. Corresponds to the {@code -noqualifier} option.
+     *
+     * @param qualifiers The qualifiers to exclude.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder noQualifier(String... qualifiers) {
+        Objects.requireNonNull(qualifiers, "Qualifiers cannot be null");
+        this.arguments.add("-noqualifier " + String.join(",", qualifiers));
+        return this;
+    }
+
+    /**
+     * Suppresses the generation of {@code @since} tags. Corresponds to the {@code -nosince} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder noSinceTag() {
+        this.arguments.add("-nosince");
+        return this;
+    }
+
+    /**
+     * Suppresses the generation of a timestamp in the generated HTML. Corresponds to the {@code -notimestamp} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder noTimestamp() {
+        this.arguments.add("-notimestamp");
+        return this;
+    }
+
+    /**
+     * Suppresses the generation of the class hierarchy tree. Corresponds to the {@code -notree} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder noTree() {
+        this.arguments.add("-notree");
+        return this;
+    }
+
+    /**
+     * Specifies how to handle method override documentation. Corresponds to the {@code --override-methods} option.
+     *
+     * @param handling The handling strategy (DETAIL or SUMMARY).
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder methodOverrideHandling(MethodOverrideHandling handling) {
+        Objects.requireNonNull(handling, "Method override handling cannot be null");
+        this.arguments.add("--override-methods " + handling.name().toLowerCase(Locale.ROOT));
+        return this;
+    }
+
+    /**
+     * Specifies the path to an HTML file that contains overview documentation. Corresponds to the {@code -overview} option.
+     *
+     * @param filePath The path to the overview file.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder overviewFile(String filePath) {
+        Objects.requireNonNull(filePath, "File path cannot be null");
+        this.arguments.add("-overview " + filePath);
+        return this;
+    }
+
+    /**
+     * Specifies the path to an HTML file that contains overview documentation. Corresponds to the {@code -overview} option.
+     *
+     * @param filePath The path to the overview file.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder overviewFile(Path filePath) {
+        Objects.requireNonNull(filePath, "File path cannot be null");
+        return overviewFile(filePath.toString());
+    }
+
+    /**
+     * Reports warnings about {@code @serial} tags. Corresponds to the {@code -serialwarn} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder reportSerialWarnings() {
+        this.arguments.add("-serialwarn");
+        return this;
+    }
+
+    /**
+     * Includes documentation for APIs introduced in a specific release version. Corresponds to the {@code -since} option.
+     *
+     * @param releaseVersions The release versions.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder since(String... releaseVersions) {
+        Objects.requireNonNull(releaseVersions, "Release versions cannot be null");
+        this.arguments.add("-since " + String.join(",", releaseVersions));
+        return this;
+    }
+
+    /**
+     * Includes documentation for APIs introduced in a specific release version. Corresponds to the {@code -since} option.
+     *
+     * @param releaseVersions The release versions.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder since(int... releaseVersions) {
+        Objects.requireNonNull(releaseVersions, "Release versions cannot be null");
+        String[] versionStrings = Arrays.stream(releaseVersions).mapToObj(Integer::toString).toArray(String[]::new);
+        return since(versionStrings);
+    }
+
+    /**
+     * Specifies the label to be used for the "Since" heading. Corresponds to the {@code -sincelabel} option.
+     *
+     * @param label The label.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder sinceLabel(String label) {
+        Objects.requireNonNull(label, "Label cannot be null");
+        this.arguments.add("-sincelabel " + label);
+        return this;
+    }
+
+    /**
+     * Specifies the paths where snippet files are located. Corresponds to the {@code --snippet-path} option.
+     *
+     * @param paths The paths to the snippet files.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder snippetPaths(String... paths) {
+        Objects.requireNonNull(paths, "Paths cannot be null");
+        this.arguments.add("--snippet-path " + String.join(File.pathSeparator, paths));
+        return this;
+    }
+
+    /**
+     * Specifies the paths where snippet files are located. Corresponds to the {@code --snippet-path} option.
+     *
+     * @param paths The paths to the snippet files.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder snippetPaths(Path... paths) {
+        Objects.requireNonNull(paths, "Paths cannot be null");
+        String[] pathStrings = Arrays.stream(paths).map(Path::toString).toArray(String[]::new);
+        return snippetPaths(pathStrings);
+    }
+
+    /**
+     * Specifies the number of spaces each tab in the source file occupies. Corresponds to the {@code -sourcetab} option.
+     *
+     * @param spaces The number of spaces per tab.
+     * @return This builder instance.
+     * @throws IllegalArgumentException if spaces is not positive.
+     */
+    public JavadocCLIBuilder spacesPerTab(int spaces) {
+        if (spaces <= 0)
+            throw new IllegalArgumentException("Spaces per tab must be positive");
+
+        this.arguments.add("-sourcetab " + spaces);
+        return this;
+    }
+
+    /**
+     * Specifies the base URL for the generated specification. Corresponds to the {@code --spec-base-url} option.
+     *
+     * @param url The base URL.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder specBaseUrl(String url) {
+        Objects.requireNonNull(url, "URL cannot be null");
+        this.arguments.add("--spec-base-url " + url);
+        return this;
+    }
+
+    /**
+     * Splits the index into multiple files, one for each letter. Corresponds to the {@code -splitindex} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder shouldSplitIndex() {
+        this.arguments.add("-splitindex");
+        return this;
+    }
+
+    /**
+     * Enables syntax highlighting in the generated documentation. Corresponds to the {@code --syntaxhighlight} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder enableSyntaxHighlighting() {
+        this.arguments.add("--syntaxhighlight");
+        return this;
+    }
+
+    /**
+     * Enables the Javadoc tool to interpret a simple custom block tag. Corresponds to the {@code -tag} option.
+     *
+     * @param name      The name of the tag.
+     * @param locations The locations where the tag is valid.
+     * @param header    The header text for the tag.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder tag(String name, String locations, String header) {
+        Objects.requireNonNull(name, "Tag name cannot be null");
+        Objects.requireNonNull(locations, "Locations cannot be null");
+        Objects.requireNonNull(header, "Header cannot be null");
+        this.arguments.add("-tag " + name + ":" + locations + ":" + header);
+        return this;
+    }
+
+    /**
+     * Specifies the class name of the taglet to use. Corresponds to the {@code -taglet} option.
+     *
+     * @param tagletClassName The class name of the taglet.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder taglet(String tagletClassName) {
+        Objects.requireNonNull(tagletClassName, "Taglet class name cannot be null");
+        this.arguments.add("-taglet " + tagletClassName);
+        return this;
+    }
+
+    /**
+     * Specifies the path where the taglet and its supporting classes are located. Corresponds to the {@code -tagletpath} option.
+     *
+     * @param tagletPaths The entries for the taglet path.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder tagletPath(String... tagletPaths) {
+        Objects.requireNonNull(tagletPaths, "Taglet path entries cannot be null");
+        this.arguments.add("-tagletpath " + String.join(File.pathSeparator, tagletPaths));
+        return this;
+    }
+
+    /**
+     * Specifies the path where the taglet and its supporting classes are located. Corresponds to the {@code -tagletpath} option.
+     *
+     * @param tagletPaths The entries for the taglet path.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder tagletPath(Path... tagletPaths) {
+        Objects.requireNonNull(tagletPaths, "Taglet path entries cannot be null");
+        String[] pathStrings = Arrays.stream(tagletPaths).map(Path::toString).toArray(String[]::new);
+        return tagletPath(pathStrings);
+    }
+
+    /**
+     * Specifies the text to be placed at the top of each generated page. Corresponds to the {@code -top} option.
+     *
+     * @param text The text to place at the top.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder topText(String text) {
+        Objects.requireNonNull(text, "Text cannot be null");
+        this.arguments.add("-top " + text);
+        return this;
+    }
+
+    /**
+     * Creates a "Use" page for each class and package. Corresponds to the {@code -use} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder createUsagePages() {
+        this.arguments.add("-use");
+        return this;
+    }
+
+    /**
+     * Includes {@code @version} tags in the generated documentation. Corresponds to the {@code -version} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder includeVersionTags() {
+        this.arguments.add("-version");
+        return this;
+    }
+
+    /**
+     * Specifies the title to be placed in the HTML window title. Corresponds to the {@code -windowtitle} option.
+     *
+     * @param title The window title.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder windowTitle(String title) {
+        Objects.requireNonNull(title, "Title cannot be null");
+        this.arguments.add("-windowtitle " + title);
+        return this;
+    }
+
+    /**
+     * Specifies the date and time to be used for the generated documentation. Corresponds to the {@code -date} option.
+     *
+     * @param iso8601Date The date and time in ISO 8601 format (e.g., "2023-10-05T14:48:00Z").
+     * @return This builder instance.
+     * @throws IllegalArgumentException if the date is not in ISO 8601 format or is outside a reasonable range.
+     */
+    public JavadocCLIBuilder date(String iso8601Date) {
+        Objects.requireNonNull(iso8601Date, "Date cannot be null");
+        try {
+            OffsetDateTime dateTime = OffsetDateTime.parse(iso8601Date, ISO_OFFSET_FORMATTER);
+            return date(dateTime);
+        } catch (DateTimeParseException exception) {
+            throw new IllegalArgumentException("Date must be in ISO 8601 format (e.g., 2023-10-05T14:48:00Z)", exception);
+        }
+    }
+
+    /**
+     * Specifies the date and time to be used for the generated documentation. Corresponds to the {@code -date} option.
+     *
+     * @param date The date object.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder date(Date date) {
+        Objects.requireNonNull(date, "Date cannot be null");
+        return date(OffsetDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()));
+    }
+
+    /**
+     * Specifies the date and time to be used for the generated documentation. Corresponds to the {@code -date} option.
+     *
+     * @param epochMillis The date and time as epoch milliseconds.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder date(long epochMillis) {
+        return date(OffsetDateTime.ofInstant(Instant.ofEpochMilli(epochMillis), ZoneId.systemDefault()));
+    }
+
+    /**
+     * Specifies the date and time to be used for the generated documentation. Corresponds to the {@code -date} option.
+     *
+     * @param dateTime The {@link LocalDateTime} object.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder date(LocalDateTime dateTime) {
+        Objects.requireNonNull(dateTime, "DateTime cannot be null");
+        return date(dateTime.atZone(ZoneId.systemDefault()).toOffsetDateTime());
+    }
+
+    /**
+     * Specifies the date and time to be used for the generated documentation. Corresponds to the {@code -date} option.
+     *
+     * @param dateTime The {@link OffsetDateTime} object.
+     * @return This builder instance.
+     * @throws IllegalArgumentException if the date is outside a reasonable range (10 years before or after current date).
+     */
+    private JavadocCLIBuilder date(OffsetDateTime dateTime) {
+        Objects.requireNonNull(dateTime, "DateTime cannot be null");
+        Instant candidate = dateTime.toInstant();
+        Instant now = Instant.now();
+        Instant tenYearsAgo = now.minus(10, ChronoUnit.YEARS);
+        Instant tenYearsAhead = now.plus(10, ChronoUnit.YEARS);
+        if (candidate.isBefore(tenYearsAgo) || candidate.isAfter(tenYearsAhead))
+            throw new IllegalArgumentException("Date must be within 10 years of the current date");
+
+        this.arguments.add("-date " + ISO_OFFSET_FORMATTER.format(dateTime));
+        return this;
+    }
+
+    /**
+     * Specifies the date and time to be used for the generated documentation. Corresponds to the {@code -date} option.
+     *
+     * @param year   The year.
+     * @param month  The month.
+     * @param day    The day.
+     * @param hour   The hour.
+     * @param minute The minute.
+     * @param second The second.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder date(int year, int month, int day, int hour, int minute, int second) {
+        var dateTime = LocalDateTime.of(year, month, day, hour, minute, second);
+        return date(dateTime);
+    }
+
+    /**
+     * Specifies the date and time to be used for the generated documentation. Corresponds to the {@code -date} option.
+     *
+     * @param year  The year.
+     * @param month The month.
+     * @param day   The day.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder date(int year, int month, int day) {
+        var dateTime = LocalDateTime.of(year, month, day, 0, 0, 0);
+        return date(dateTime);
+    }
+
+    /**
+     * Includes the default legal notices. Corresponds to the {@code --legal-notices default} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder defaultLegalNotices() {
+        this.arguments.add("--legal-notices default");
+        return this;
+    }
+
+    /**
+     * Excludes legal notices. Corresponds to the {@code --legal-notices none} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder noLegalNotices() {
+        this.arguments.add("--legal-notices none");
+        return this;
+    }
+
+    /**
+     * Includes custom legal notices from a specified file. Corresponds to the {@code --legal-notices} option.
+     *
+     * @param filePath The path to the file containing custom legal notices.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder customLegalNotices(Path filePath) {
+        Objects.requireNonNull(filePath, "File path cannot be null");
+        this.arguments.add("--legal-notices " + filePath);
+        return this;
+    }
+
+    /**
+     * Suppresses the generation of frames. Corresponds to the {@code -noframes} option.
+     *
+     * @return This builder instance.
+     * @deprecated This option is deprecated and may be removed in future versions.
+     */
+    @Deprecated
+    public JavadocCLIBuilder noFrames() {
+        this.arguments.add("-noframes");
+        return this;
+    }
+
+    /**
+     * Enables recommended doclint checks. Corresponds to the {@code -Xdoclint} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder enableRecommendedChecks() {
+        this.arguments.add("-Xdoclint");
+        return this;
+    }
+
+    /**
+     * Disables all doclint checks. Corresponds to the {@code -Xdoclint:none} option.
+     *
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder disableAllChecks() {
+        this.arguments.add("-Xdoclint:none");
+        return this;
+    }
+
+    /**
+     * Enables specific doclint checks. Corresponds to the {@code -Xdoclint:checks} option.
+     *
+     * @param checks A comma-separated list of checks to enable.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder enableChecks(String checks) {
+        Objects.requireNonNull(checks, "Checks cannot be null");
+        this.arguments.add("-Xdoclint:" + checks);
+        return this;
+    }
+
+    /**
+     * Disables specific doclint checks. Corresponds to the {@code -Xdoclint:-checks} option.
+     *
+     * @param checks A comma-separated list of checks to disable.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder disableChecks(String checks) {
+        Objects.requireNonNull(checks, "Checks cannot be null");
+        this.arguments.add("-Xdoclint:-" + checks);
+        return this;
+    }
+
+    /**
+     * Enables doclint checks for specific packages. Corresponds to the {@code -Xdoclint/package:packages} option.
+     *
+     * @param packages A comma-separated list of packages to enable checks for.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder enableChecks(String... packages) {
+        Objects.requireNonNull(packages, "Packages cannot be null");
+        this.arguments.add("-Xdoclint/package:" + String.join(",", packages));
+        return this;
+    }
+
+    /**
+     * Disables doclint checks for specific packages. Corresponds to the {@code -Xdoclint/package:-packages} option.
+     *
+     * @param packages A comma-separated list of packages to disable checks for.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder disableChecks(String... packages) {
+        Objects.requireNonNull(packages, "Packages cannot be null");
+        this.arguments.add("-Xdoclint/package:-" + String.join(",", packages));
+        return this;
+    }
+
+    /**
+     * Specifies the URL of the parent directory for the generated documentation. Corresponds to the {@code -Xdocrootparent} option.
+     *
+     * @param url The URL of the parent directory.
+     * @return This builder instance.
+     */
+    public JavadocCLIBuilder docRootParentUrl(String url) {
+        Objects.requireNonNull(url, "URL cannot be null");
+        this.arguments.add("-Xdocrootparent " + url);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+        command.addAll(packageNames);
+        command.addAll(sourceFilePaths.stream().map(Path::toString).toList());
+        command.addAll(argumentFilePaths.stream().map(Path::toString).toList());
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "javadoc");
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start Javadoc process", exception);
+        }
+    }
+
+    /**
+     * Represents the type of module expansion.
+     */
+    public enum ExpansionType {
+        TRANSITIVE,
+        ALL
+    }
+
+    /**
+     * Represents the visibility levels for members.
+     */
+    public enum Visibility {
+        PUBLIC,
+        PROTECTED,
+        PACKAGE,
+        PRIVATE
+    }
+
+    /**
+     * Represents the granularity levels for module contents.
+     */
+    public enum ModuleGranularity {
+        API,
+        ALL
+    }
+
+    /**
+     * Represents the granularity levels for packages.
+     */
+    public enum PackageGranularity {
+        EXPORTED,
+        ALL
+    }
+
+    /**
+     * Represents how to handle modularity mismatches when linking.
+     */
+    public enum LinkModularityMismatch {
+        WARN,
+        INFO
+    }
+
+    /**
+     * Represents how to handle method override documentation.
+     */
+    public enum MethodOverrideHandling {
+        DETAIL,
+        SUMMARY
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JavapCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JavapCLIBuilder.java
new file mode 100644
index 00000000..cb5801e4
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JavapCLIBuilder.java
@@ -0,0 +1,423 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+import lombok.Getter;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A fluent builder for constructing and executing {@code javap} commands.
+ * <p>
+ * This builder provides methods to configure various options for disassembling class files,
+ * including verbosity, visibility filters, and classpath settings.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/javap.html">javap command documentation</a>
+ */
+public class JavapCLIBuilder implements CLIBuilder<Process, JavapCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "javap.exe" : "javap";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final List<String> classTargets = new ArrayList<>();
+    private Path workingDirectory;
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+
+    private JavapCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a new {@code JavapCLIBuilder} instance.
+     *
+     * @param jdk The JDK to use for executing the {@code javap} command.
+     * @return A new builder instance.
+     */
+    public static JavapCLIBuilder create(JDK jdk) {
+        return new JavapCLIBuilder(jdk);
+    }
+
+    @Override
+    public JavapCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JavapCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JavapCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JavapCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JavapCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Displays the help message. Corresponds to the {@code --help} option.
+     *
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder help() {
+        this.arguments.add("--help");
+        return this;
+    }
+
+    /**
+     * Displays version information. Corresponds to the {@code -version} option.
+     *
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder version() {
+        this.arguments.add("-version");
+        return this;
+    }
+
+    /**
+     * Enables verbose output, including stack size, number of locals, and args for methods. Corresponds to the {@code -verbose} option.
+     *
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder verbose() {
+        this.arguments.add("-verbose");
+        return this;
+    }
+
+    /**
+     * Prints line number and local variable tables. Corresponds to the {@code -l} option.
+     *
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder lineAndLocalVariableTables() {
+        this.arguments.add("-l");
+        return this;
+    }
+
+    /**
+     * Specifies the minimum visibility level of members to print. Corresponds to options like {@code -public}, {@code -protected}, {@code -package}, {@code -private}.
+     *
+     * @param visibility The minimum visibility level.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder visibility(Visibility visibility) {
+        Objects.requireNonNull(visibility, "Visibility cannot be null");
+        this.arguments.add(visibility.getFlag());
+        return this;
+    }
+
+    /**
+     * Disassembles the code. Corresponds to the {@code -c} option.
+     *
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder disassembleCode() {
+        this.arguments.add("-c");
+        return this;
+    }
+
+    /**
+     * Prints internal type signatures. Corresponds to the {@code -s} option.
+     *
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder printSignatures() {
+        this.arguments.add("-s");
+        return this;
+    }
+
+    /**
+     * Shows system information. Corresponds to the {@code -sysinfo} option.
+     *
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder showSystemInfo() {
+        this.arguments.add("-sysinfo");
+        return this;
+    }
+
+    /**
+     * Verifies the reachability of classes. Corresponds to the {@code -verify} option.
+     *
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder verifyClasses() {
+        this.arguments.add("-verify");
+        return this;
+    }
+
+    /**
+     * Shows final static constants. Corresponds to the {@code -constants} option.
+     *
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder showConstants() {
+        this.arguments.add("-constants");
+        return this;
+    }
+
+    /**
+     * Specifies the module to inspect. Corresponds to the {@code --module} option.
+     *
+     * @param moduleName The name of the module.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder module(String moduleName) {
+        Objects.requireNonNull(moduleName, "Module name cannot be null");
+        this.arguments.add("--module " + moduleName);
+        return this;
+    }
+
+    /**
+     * Specifies the module path. Corresponds to the {@code --module-path} option.
+     *
+     * @param modulePaths The entries for the module path.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder modulePath(String... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module paths cannot be null");
+        this.arguments.add("--module-path " + String.join(File.pathSeparator, modulePaths));
+        return this;
+    }
+
+    /**
+     * Specifies the module path. Corresponds to the {@code --module-path} option.
+     *
+     * @param modulePaths The entries for the module path.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder modulePath(Path... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module paths cannot be null");
+        String[] pathStrings = Arrays.stream(modulePaths).map(Path::toString).toArray(String[]::new);
+        return modulePath(pathStrings);
+    }
+
+    /**
+     * Specifies the path to the system modules. Corresponds to the {@code --system} option.
+     *
+     * @param systemPath The path to the system modules.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder systemModules(String systemPath) {
+        Objects.requireNonNull(systemPath, "System module path cannot be null");
+        this.arguments.add("--system " + systemPath);
+        return this;
+    }
+
+    /**
+     * Specifies the classpath for finding class files. Corresponds to the {@code -cp} or {@code -classpath} option.
+     *
+     * @param classpathEntries The entries for the classpath.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder classpath(String... classpathEntries) {
+        Objects.requireNonNull(classpathEntries, "Classpath entries cannot be null");
+        this.arguments.add("-cp " + String.join(File.pathSeparator, classpathEntries));
+        return this;
+    }
+
+    /**
+     * Specifies the classpath for finding class files. Corresponds to the {@code -cp} or {@code -classpath} option.
+     *
+     * @param classpathEntries The entries for the classpath.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder classpath(Path... classpathEntries) {
+        Objects.requireNonNull(classpathEntries, "Classpath entries cannot be null");
+        String[] entryStrings = Arrays.stream(classpathEntries).map(Path::toString).toArray(String[]::new);
+        return classpath(entryStrings);
+    }
+
+    /**
+     * Specifies the boot classpath. Corresponds to the {@code -bootclasspath} option.
+     *
+     * @param bootClassPathEntries The entries for the boot classpath.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder bootClassPath(String... bootClassPathEntries) {
+        Objects.requireNonNull(bootClassPathEntries, "Boot class path entries cannot be null");
+        this.arguments.add("-bootclasspath " + String.join(File.pathSeparator, bootClassPathEntries));
+        return this;
+    }
+
+    /**
+     * Specifies the boot classpath. Corresponds to the {@code -bootclasspath} option.
+     *
+     * @param bootClassPathEntries The entries for the boot classpath.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder bootClassPath(Path... bootClassPathEntries) {
+        Objects.requireNonNull(bootClassPathEntries, "Boot class path entries cannot be null");
+        String[] entryStrings = Arrays.stream(bootClassPathEntries).map(Path::toString).toArray(String[]::new);
+        return bootClassPath(entryStrings);
+    }
+
+    /**
+     * Specifies the multi-release JAR file version. Corresponds to the {@code --multi-release} option.
+     *
+     * @param version The multi-release version.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder multiRelease(String version) {
+        Objects.requireNonNull(version, "Multi-release version cannot be null");
+        this.arguments.add("--multi-release " + version);
+        return this;
+    }
+
+    /**
+     * Specifies the multi-release JAR file version. Corresponds to the {@code --multi-release} option.
+     *
+     * @param version The multi-release version.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder multiRelease(int version) {
+        return multiRelease(Integer.toString(version));
+    }
+
+    /**
+     * Passes options to the Java Virtual Machine. Corresponds to the {@code -J} option.
+     *
+     * @param options The JVM options.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder jvmOptions(String... options) {
+        Objects.requireNonNull(options, "JVM options cannot be null");
+        for (String option : options) {
+            Objects.requireNonNull(option, "JVM option cannot be null");
+            this.arguments.add("-J" + option);
+        }
+
+        return this;
+    }
+
+    /**
+     * Adds a class name to be disassembled.
+     *
+     * @param className The name of the class.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder addClassName(String className) {
+        Objects.requireNonNull(className, "Class name cannot be null");
+        this.classTargets.add(className);
+        return this;
+    }
+
+    /**
+     * Adds multiple class names to be disassembled.
+     *
+     * @param classNames The names of the classes.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder addClassNames(String... classNames) {
+        Objects.requireNonNull(classNames, "Class names cannot be null");
+        for (String className : classNames) {
+            addClassName(className);
+        }
+
+        return this;
+    }
+
+    /**
+     * Adds a class file to be disassembled.
+     *
+     * @param classFilePath The path to the class file.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder addClassFile(Path classFilePath) {
+        Objects.requireNonNull(classFilePath, "Class file path cannot be null");
+        this.classTargets.add(classFilePath.toString());
+        return this;
+    }
+
+    /**
+     * Adds multiple class files to be disassembled.
+     *
+     * @param classFilePaths The paths to the class files.
+     * @return This builder instance.
+     */
+    public JavapCLIBuilder addClassFiles(Path... classFilePaths) {
+        Objects.requireNonNull(classFilePaths, "Class file paths cannot be null");
+        for (Path classFilePath : classFilePaths) {
+            addClassFile(classFilePath);
+        }
+
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+        command.addAll(classTargets);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "javap");
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start javap process", exception);
+        }
+    }
+
+    /**
+     * Represents the visibility levels for members to be printed.
+     */
+    @Getter
+    public enum Visibility {
+        PUBLIC("-public"),
+        PROTECTED("-protected"),
+        PACKAGE("-package"),
+        PRIVATE("-private");
+
+        private final String flag;
+
+        Visibility(String flag) {
+            this.flag = flag;
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JcmdCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JcmdCLIBuilder.java
new file mode 100644
index 00000000..dbf930d2
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JcmdCLIBuilder.java
@@ -0,0 +1,280 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A fluent builder for constructing and executing {@code jcmd} commands.
+ * <p>
+ * This builder provides methods to interact with a running JVM, allowing for
+ * diagnostic command execution, listing JVM processes, and retrieving help information.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jcmd.html">jcmd command documentation</a>
+ */
+public class JcmdCLIBuilder implements CLIBuilder<Process, JcmdCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jcmd.exe" : "jcmd";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final List<List<String>> diagnosticCommands = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+    private Mode mode = Mode.COMMAND;
+    private Target target = Target.none();
+    private Path commandFile;
+
+    private JcmdCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a new {@code JcmdCLIBuilder} instance.
+     *
+     * @param jdk The JDK to use for executing the {@code jcmd} command.
+     * @return A new builder instance.
+     */
+    public static JcmdCLIBuilder create(JDK jdk) {
+        return new JcmdCLIBuilder(jdk);
+    }
+
+    @Override
+    public JcmdCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JcmdCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JcmdCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JcmdCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JcmdCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Configures the builder to list all running Java processes. Corresponds to the {@code -l} option.
+     *
+     * @return This builder instance.
+     */
+    public JcmdCLIBuilder listJavaProcesses() {
+        this.mode = Mode.LIST;
+        this.commandFile = null;
+        this.diagnosticCommands.clear();
+        return this;
+    }
+
+    /**
+     * Configures the builder to display help information. Corresponds to the {@code -h} option.
+     *
+     * @return This builder instance.
+     */
+    public JcmdCLIBuilder showHelp() {
+        this.mode = Mode.HELP;
+        this.commandFile = null;
+        this.diagnosticCommands.clear();
+        return this;
+    }
+
+    /**
+     * Sets the target JVM by its process ID (PID).
+     *
+     * @param pid The process ID of the target JVM.
+     * @return This builder instance.
+     * @throws IllegalArgumentException if the PID is negative.
+     */
+    public JcmdCLIBuilder targetPid(long pid) {
+        if (pid < 0)
+            throw new IllegalArgumentException("PID cannot be negative");
+
+        this.target = Target.pid(Long.toString(pid));
+        this.mode = Mode.COMMAND;
+        return this;
+    }
+
+    /**
+     * Sets the target JVM by its main class name.
+     *
+     * @param mainClass The main class name of the target JVM.
+     * @return This builder instance.
+     */
+    public JcmdCLIBuilder targetMainClass(String mainClass) {
+        Objects.requireNonNull(mainClass, "Main class cannot be null");
+        this.target = Target.mainClass(mainClass);
+        this.mode = Mode.COMMAND;
+        return this;
+    }
+
+    /**
+     * Sets the target to all running Java processes. Corresponds to using "0" as the PID.
+     *
+     * @return This builder instance.
+     */
+    public JcmdCLIBuilder targetAllJavaProcesses() {
+        this.target = Target.pid("0");
+        this.mode = Mode.COMMAND;
+        return this;
+    }
+
+    /**
+     * Executes diagnostic commands from a specified file. Corresponds to the {@code -f} option.
+     *
+     * @param file The path to the command file.
+     * @return This builder instance.
+     */
+    public JcmdCLIBuilder executeCommandsFromFile(Path file) {
+        Objects.requireNonNull(file, "Command file cannot be null");
+        this.commandFile = file;
+        this.mode = Mode.COMMAND;
+        return this;
+    }
+
+    /**
+     * Adds a diagnostic command to be executed.
+     *
+     * @param command The name of the diagnostic command (e.g., "GC.heap_info").
+     * @param args    Optional arguments for the command.
+     * @return This builder instance.
+     */
+    public JcmdCLIBuilder addDiagnosticCommand(String command, String... args) {
+        Objects.requireNonNull(command, "Command name cannot be null");
+        var commandTokens = new ArrayList<String>();
+        commandTokens.add(command);
+        if (args != null) {
+            commandTokens.addAll(Arrays.asList(args));
+        }
+
+        this.diagnosticCommands.add(commandTokens);
+        this.mode = Mode.COMMAND;
+        return this;
+    }
+
+    /**
+     * Executes the "PerfCounter.print" diagnostic command.
+     *
+     * @return This builder instance.
+     */
+    public JcmdCLIBuilder perfCounterPrint() {
+        return addDiagnosticCommand("PerfCounter.print");
+    }
+
+    @Override
+    public Process run() {
+        if (mode == Mode.COMMAND && commandFile == null && diagnosticCommands.isEmpty())
+            throw new IllegalStateException("At least one diagnostic command or command file must be specified.");
+
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+
+        switch (mode) {
+            case HELP -> command.add("-h");
+            case LIST -> command.add("-l");
+            case COMMAND -> {
+                if (target.value() != null)
+                    command.add(target.value());
+                if (commandFile != null) {
+                    command.add("-f");
+                    command.add(commandFile.toString());
+                }
+            }
+        }
+
+        command.addAll(arguments);
+        if (mode == Mode.COMMAND && commandFile == null) {
+            for (List<String> diagnosticCommand : diagnosticCommands) {
+                command.addAll(diagnosticCommand);
+            }
+        }
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jcmd");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jcmd process", exception);
+        }
+    }
+
+    /**
+     * Represents the operation mode for the {@code jcmd} command.
+     */
+    private enum Mode {
+        COMMAND,
+        LIST,
+        HELP
+    }
+
+    /**
+     * Represents the target JVM for the {@code jcmd} command.
+     */
+    private record Target(TargetType type, String value) {
+        static Target none() {
+            return new Target(TargetType.NONE, null);
+        }
+
+        static Target pid(String pid) {
+            return new Target(TargetType.PID, pid);
+        }
+
+        static Target mainClass(String mainClass) {
+            return new Target(TargetType.MAIN_CLASS, mainClass);
+        }
+    }
+
+    /**
+     * Represents the type of target for the {@code jcmd} command.
+     */
+    private enum TargetType {
+        NONE,
+        PID,
+        MAIN_CLASS
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JdbCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JdbCLIBuilder.java
new file mode 100644
index 00000000..ce3466ee
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JdbCLIBuilder.java
@@ -0,0 +1,361 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A fluent builder for constructing and executing {@code jdb} commands.
+ * <p>
+ * This builder provides methods to configure various options for debugging Java applications,
+ * including source paths, connection details, and JVM options.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jdb.html">jdb command documentation</a>
+ */
+public class JdbCLIBuilder implements CLIBuilder<Process, JdbCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jdb.exe" : "jdb";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final List<String> targetArguments = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+    private String mainClass;
+
+    private JdbCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a new {@code JdbCLIBuilder} instance.
+     *
+     * @param jdk The JDK to use for executing the {@code jdb} command.
+     * @return A new builder instance.
+     */
+    public static JdbCLIBuilder create(JDK jdk) {
+        return new JdbCLIBuilder(jdk);
+    }
+
+    @Override
+    public JdbCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JdbCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JdbCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JdbCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JdbCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Displays the help message. Corresponds to the {@code -help} option.
+     *
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder help() {
+        this.arguments.add("-help");
+        return this;
+    }
+
+    /**
+     * Specifies the source code path. Corresponds to the {@code -sourcepath} option.
+     *
+     * @param directories The directories for the source path.
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder sourcePath(String... directories) {
+        Objects.requireNonNull(directories, "Source directories cannot be null");
+        this.arguments.add("-sourcepath " + String.join(File.pathSeparator, directories));
+        return this;
+    }
+
+    /**
+     * Attaches the debugger to a running JVM. Corresponds to the {@code -attach} option.
+     *
+     * @param address The address of the target JVM.
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder attach(String address) {
+        Objects.requireNonNull(address, "Attach address cannot be null");
+        this.arguments.add("-attach " + address);
+        return this;
+    }
+
+    /**
+     * Listens for a debugger connection at the specified address. Corresponds to the {@code -listen} option.
+     *
+     * @param address The address to listen on.
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder listen(String address) {
+        Objects.requireNonNull(address, "Listen address cannot be null");
+        this.arguments.add("-listen " + address);
+        return this;
+    }
+
+    /**
+     * Listens for a debugger connection on any available address. Corresponds to the {@code -listenany} option.
+     *
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder listenAny() {
+        this.arguments.add("-listenany");
+        return this;
+    }
+
+    /**
+     * Launches the debuggee VM on startup. Corresponds to the {@code -launch} option.
+     *
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder launchOnStart() {
+        this.arguments.add("-launch");
+        return this;
+    }
+
+    /**
+     * Lists available connectors. Corresponds to the {@code -listconnectors} option.
+     *
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder listConnectors() {
+        this.arguments.add("-listconnectors");
+        return this;
+    }
+
+    /**
+     * Connects to a running JVM using the specified connector. Corresponds to the {@code -connect} option.
+     *
+     * @param connectorName The name of the connector.
+     * @param arguments     A map of arguments for the connector.
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder connect(String connectorName, Map<String, String> arguments) {
+        Objects.requireNonNull(connectorName, "Connector name cannot be null");
+        Objects.requireNonNull(arguments, "Connector arguments cannot be null");
+        var builder = new StringBuilder("-connect ").append(connectorName);
+        arguments.forEach((key, value) -> builder.append(":").append(key).append("=").append(value));
+        this.arguments.add(builder.toString());
+        return this;
+    }
+
+    /**
+     * Sets the debug trace flags. Corresponds to the {@code -dbgtrace} option.
+     *
+     * @param flags The debug trace flags.
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder debugTrace(String flags) {
+        Objects.requireNonNull(flags, "Debug trace flags cannot be null");
+        this.arguments.add("-dbgtrace " + flags);
+        return this;
+    }
+
+    /**
+     * Uses the client VM. Corresponds to the {@code -tclient} option.
+     *
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder tClient() {
+        this.arguments.add("-tclient");
+        return this;
+    }
+
+    /**
+     * Tracks all threads. Corresponds to the {@code -trackallthreads} option.
+     *
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder trackAllThreads() {
+        this.arguments.add("-trackallthreads");
+        return this;
+    }
+
+    /**
+     * Uses the server VM. Corresponds to the {@code -tserver} option.
+     *
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder tServer() {
+        this.arguments.add("-tserver");
+        return this;
+    }
+
+    /**
+     * Passes an option to the Java Virtual Machine. Corresponds to the {@code -J} option.
+     *
+     * @param option The option to pass to the JVM.
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder javaOption(String option) {
+        Objects.requireNonNull(option, "Java option cannot be null");
+        this.arguments.add("-J" + option);
+        return this;
+    }
+
+    /**
+     * Passes an option to the debuggee JVM. Corresponds to the {@code -R} option.
+     *
+     * @param option The option to pass to the debuggee JVM.
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder debuggeeOption(String option) {
+        Objects.requireNonNull(option, "Debuggee option cannot be null");
+        this.arguments.add("-R" + option);
+        return this;
+    }
+
+    /**
+     * Enables verbose output. Corresponds to the {@code -verbose} option.
+     *
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder verbose() {
+        this.arguments.add("-verbose");
+        return this;
+    }
+
+    /**
+     * Enables verbose output for a specific mode. Corresponds to the {@code -verbose:mode} option.
+     *
+     * @param mode The verbose mode.
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder verbose(String mode) {
+        Objects.requireNonNull(mode, "Verbose mode cannot be null");
+        this.arguments.add("-verbose:" + mode);
+        return this;
+    }
+
+    /**
+     * Sets a system property for the debuggee JVM. Corresponds to the {@code -Dkey=value} option.
+     *
+     * @param key   The property key.
+     * @param value The property value.
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder systemProperty(String key, String value) {
+        Objects.requireNonNull(key, "Property key cannot be null");
+        Objects.requireNonNull(value, "Property value cannot be null");
+        this.arguments.add("-D" + key + "=" + value);
+        return this;
+    }
+
+    /**
+     * Specifies the classpath for the debuggee JVM. Corresponds to the {@code -classpath} option.
+     *
+     * @param entries The classpath entries.
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder classpath(String... entries) {
+        Objects.requireNonNull(entries, "Classpath entries cannot be null");
+        this.arguments.add("-classpath " + String.join(File.pathSeparator, entries));
+        return this;
+    }
+
+    /**
+     * Passes a non-standard option to the debuggee JVM. Corresponds to the {@code -X} option.
+     *
+     * @param option The non-standard option.
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder xOption(String option) {
+        Objects.requireNonNull(option, "Nonstandard option cannot be null");
+        this.arguments.add("-X" + option);
+        return this;
+    }
+
+    /**
+     * Sets the main class to be debugged.
+     *
+     * @param mainClass The main class name.
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder mainClass(String mainClass) {
+        Objects.requireNonNull(mainClass, "Main class cannot be null");
+        this.mainClass = mainClass;
+        return this;
+    }
+
+    /**
+     * Adds arguments to be passed to the main class.
+     *
+     * @param args The arguments for the main class.
+     * @return This builder instance.
+     */
+    public JdbCLIBuilder mainClassArguments(String... args) {
+        Objects.requireNonNull(args, "Main class arguments cannot be null");
+        Collections.addAll(this.targetArguments, args);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+        if (mainClass != null) {
+            command.add(mainClass);
+        }
+        command.addAll(targetArguments);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jdb");
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jdb process", exception);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JdeprscanCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JdeprscanCLIBuilder.java
new file mode 100644
index 00000000..89c535ce
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JdeprscanCLIBuilder.java
@@ -0,0 +1,258 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A fluent builder for constructing and executing {@code jdeprscan} commands.
+ * <p>
+ * This builder provides methods to configure various options for scanning JAR files
+ * for usages of deprecated APIs, including specifying class paths, releases, and verbosity.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jdeprscan.html">jdeprscan command documentation</a>
+ */
+public class JdeprscanCLIBuilder implements CLIBuilder<Process, JdeprscanCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jdeprscan.exe" : "jdeprscan";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final List<String> targets = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+
+    private JdeprscanCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a new {@code JdeprscanCLIBuilder} instance.
+     *
+     * @param jdk The JDK to use for executing the {@code jdeprscan} command.
+     * @return A new builder instance.
+     */
+    public static JdeprscanCLIBuilder create(JDK jdk) {
+        return new JdeprscanCLIBuilder(jdk);
+    }
+
+    @Override
+    public JdeprscanCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JdeprscanCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JdeprscanCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JdeprscanCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JdeprscanCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Specifies the class path for scanning. Corresponds to the {@code --class-path} option.
+     *
+     * @param paths The class path entries.
+     * @return This builder instance.
+     */
+    public JdeprscanCLIBuilder classPath(String... paths) {
+        Objects.requireNonNull(paths, "Class path entries cannot be null");
+        this.arguments.add("--class-path " + String.join(File.pathSeparator, paths));
+        return this;
+    }
+
+    /**
+     * Specifies the class path for scanning. Corresponds to the {@code --class-path} option.
+     *
+     * @param paths The class path entries.
+     * @return This builder instance.
+     */
+    public JdeprscanCLIBuilder classPath(Path... paths) {
+        Objects.requireNonNull(paths, "Class path entries cannot be null");
+        return classPath(Arrays.stream(paths).map(Path::toString).toArray(String[]::new));
+    }
+
+    /**
+     * Scans for APIs that are deprecated for removal. Corresponds to the {@code --for-removal} option.
+     *
+     * @return This builder instance.
+     */
+    public JdeprscanCLIBuilder forRemovalOnly() {
+        this.arguments.add("--for-removal");
+        return this;
+    }
+
+    /**
+     * Displays full version information. Corresponds to the {@code --full-version} option.
+     *
+     * @return This builder instance.
+     */
+    public JdeprscanCLIBuilder fullVersion() {
+        this.arguments.add("--full-version");
+        return this;
+    }
+
+    /**
+     * Displays the help message. Corresponds to the {@code --help} option.
+     *
+     * @return This builder instance.
+     */
+    public JdeprscanCLIBuilder help() {
+        this.arguments.add("--help");
+        return this;
+    }
+
+    /**
+     * Lists all deprecated APIs. Corresponds to the {@code --list} option.
+     *
+     * @return This builder instance.
+     */
+    public JdeprscanCLIBuilder listDeprecatedApis() {
+        this.arguments.add("--list");
+        return this;
+    }
+
+    /**
+     * Specifies the Java SE release version to scan against. Corresponds to the {@code --release} option.
+     *
+     * @param release The release version.
+     * @return This builder instance.
+     */
+    public JdeprscanCLIBuilder release(int release) {
+        this.arguments.add("--release " + release);
+        return this;
+    }
+
+    /**
+     * Specifies the Java SE release version to scan against. Corresponds to the {@code --release} option.
+     *
+     * @param release The release version.
+     * @return This builder instance.
+     */
+    public JdeprscanCLIBuilder release(String release) {
+        Objects.requireNonNull(release, "Release cannot be null");
+        this.arguments.add("--release " + release);
+        return this;
+    }
+
+    /**
+     * Enables verbose output. Corresponds to the {@code --verbose} option.
+     *
+     * @return This builder instance.
+     */
+    public JdeprscanCLIBuilder verbose() {
+        this.arguments.add("--verbose");
+        return this;
+    }
+
+    /**
+     * Displays version information. Corresponds to the {@code --version} option.
+     *
+     * @return This builder instance.
+     */
+    public JdeprscanCLIBuilder version() {
+        this.arguments.add("--version");
+        return this;
+    }
+
+    /**
+     * Adds a target (JAR file, class file, or directory) to scan.
+     *
+     * @param path The path to the target.
+     * @return This builder instance.
+     */
+    public JdeprscanCLIBuilder addTarget(Path path) {
+        Objects.requireNonNull(path, "Target path cannot be null");
+        this.targets.add(path.toString());
+        return this;
+    }
+
+    /**
+     * Adds a target (JAR file, class file, or directory) to scan.
+     *
+     * @param classOrDir The class name or directory path.
+     * @return This builder instance.
+     */
+    public JdeprscanCLIBuilder addTarget(String classOrDir) {
+        Objects.requireNonNull(classOrDir, "Target cannot be null");
+        this.targets.add(classOrDir);
+        return this;
+    }
+
+    /**
+     * Adds multiple targets (JAR files, class files, or directories) to scan.
+     *
+     * @param targets The targets to add.
+     * @return This builder instance.
+     */
+    public JdeprscanCLIBuilder addTargets(String... targets) {
+        Objects.requireNonNull(targets, "Targets cannot be null");
+        Collections.addAll(this.targets, targets);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+        command.addAll(targets);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jdeprscan");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jdeprscan process", exception);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JdepsCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JdepsCLIBuilder.java
new file mode 100644
index 00000000..db8cdf80
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JdepsCLIBuilder.java
@@ -0,0 +1,595 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A fluent builder for constructing and executing {@code jdeps} commands.
+ * <p>
+ * This builder provides methods to analyze class dependencies, including options for
+ * output format, classpath and module path settings, and various filtering capabilities.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jdeps.html">jdeps command documentation</a>
+ */
+public class JdepsCLIBuilder implements CLIBuilder<Process, JdepsCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jdeps.exe" : "jdeps";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final List<String> targets = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+
+    private JdepsCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a new {@code JdepsCLIBuilder} instance.
+     *
+     * @param jdk The JDK to use for executing the {@code jdeps} command.
+     * @return A new builder instance.
+     */
+    public static JdepsCLIBuilder create(JDK jdk) {
+        return new JdepsCLIBuilder(jdk);
+    }
+
+    @Override
+    public JdepsCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JdepsCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JdepsCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JdepsCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JdepsCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Displays the help message. Corresponds to the {@code --help} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder help() {
+        this.arguments.add("--help");
+        return this;
+    }
+
+    /**
+     * Specifies the directory for DOT file output. Corresponds to the {@code --dot-output} option.
+     *
+     * @param directory The output directory.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder dotOutput(Path directory) {
+        Objects.requireNonNull(directory, "DOT output directory cannot be null");
+        this.arguments.add("--dot-output " + directory);
+        return this;
+    }
+
+    /**
+     * Prints a summary of the dependencies. Corresponds to the {@code --summary} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder summary() {
+        this.arguments.add("--summary");
+        return this;
+    }
+
+    /**
+     * Enables verbose output. Corresponds to the {@code --verbose} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder verbose() {
+        this.arguments.add("--verbose");
+        return this;
+    }
+
+    /**
+     * Enables verbose output for package-level dependencies. Corresponds to the {@code -verbose:package} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder verbosePackages() {
+        this.arguments.add("-verbose:package");
+        return this;
+    }
+
+    /**
+     * Enables verbose output for class-level dependencies. Corresponds to the {@code -verbose:class} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder verboseClasses() {
+        this.arguments.add("-verbose:class");
+        return this;
+    }
+
+    /**
+     * Shows only API dependencies. Corresponds to the {@code --api-only} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder apiOnly() {
+        this.arguments.add("--api-only");
+        return this;
+    }
+
+    /**
+     * Shows dependencies on internal JDK APIs. Corresponds to the {@code --jdk-internals} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder jdkInternals() {
+        this.arguments.add("--jdk-internals");
+        return this;
+    }
+
+    /**
+     * Specifies the class path for analyzing dependencies. Corresponds to the {@code --class-path} option.
+     *
+     * @param pathEntries The class path entries.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder classPath(String... pathEntries) {
+        Objects.requireNonNull(pathEntries, "Classpath entries cannot be null");
+        this.arguments.add("--class-path " + String.join(File.pathSeparator, pathEntries));
+        return this;
+    }
+
+    /**
+     * Specifies the class path for analyzing dependencies. Corresponds to the {@code --class-path} option.
+     *
+     * @param pathEntries The class path entries.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder classPath(Path... pathEntries) {
+        Objects.requireNonNull(pathEntries, "Classpath entries cannot be null");
+        return classPath(Arrays.stream(pathEntries).map(Path::toString).toArray(String[]::new));
+    }
+
+    /**
+     * Specifies the module path for analyzing dependencies. Corresponds to the {@code --module-path} option.
+     *
+     * @param modulePaths The module path entries.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder modulePath(String... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module path entries cannot be null");
+        this.arguments.add("--module-path " + String.join(File.pathSeparator, modulePaths));
+        return this;
+    }
+
+    /**
+     * Specifies the module path for analyzing dependencies. Corresponds to the {@code --module-path} option.
+     *
+     * @param modulePaths The module path entries.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder modulePath(Path... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module path entries cannot be null");
+        return modulePath(Arrays.stream(modulePaths).map(Path::toString).toArray(String[]::new));
+    }
+
+    /**
+     * Specifies the upgrade module path. Corresponds to the {@code --upgrade-module-path} option.
+     *
+     * @param modulePaths The upgrade module path entries.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder upgradeModulePath(String... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Upgrade module path entries cannot be null");
+        this.arguments.add("--upgrade-module-path " + String.join(File.pathSeparator, modulePaths));
+        return this;
+    }
+
+    /**
+     * Specifies the system module path. Corresponds to the {@code --system} option.
+     *
+     * @param javaHome The path to the Java home directory.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder systemModulePath(String javaHome) {
+        Objects.requireNonNull(javaHome, "Java home cannot be null");
+        this.arguments.add("--system " + javaHome);
+        return this;
+    }
+
+    /**
+     * Adds modules to the module graph. Corresponds to the {@code --add-modules} option.
+     *
+     * @param modules The names of the modules to add.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder addModules(String... modules) {
+        Objects.requireNonNull(modules, "Module names cannot be null");
+        this.arguments.add("--add-modules " + String.join(",", modules));
+        return this;
+    }
+
+    /**
+     * Specifies the multi-release JAR file version. Corresponds to the {@code --multi-release} option.
+     *
+     * @param version The multi-release version.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder multiRelease(String version) {
+        Objects.requireNonNull(version, "Multi-release version cannot be null");
+        this.arguments.add("--multi-release " + version);
+        return this;
+    }
+
+    /**
+     * Specifies the multi-release JAR file version. Corresponds to the {@code --multi-release} option.
+     *
+     * @param version The multi-release version.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder multiRelease(int version) {
+        return multiRelease(Integer.toString(version));
+    }
+
+    /**
+     * Suppresses output. Corresponds to the {@code --quiet} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder quiet() {
+        this.arguments.add("--quiet");
+        return this;
+    }
+
+    /**
+     * Prints version information and exits. Corresponds to the {@code --version} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder version() {
+        this.arguments.add("--version");
+        return this;
+    }
+
+    /**
+     * Specifies the module to analyze. Corresponds to the {@code --module} option.
+     *
+     * @param moduleName The name of the module.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder module(String moduleName) {
+        Objects.requireNonNull(moduleName, "Module name cannot be null");
+        this.arguments.add("--module " + moduleName);
+        return this;
+    }
+
+    /**
+     * Generates a {@code module-info.java} file in the specified directory. Corresponds to the {@code --generate-module-info} option.
+     *
+     * @param directory The output directory.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder generateModuleInfo(Path directory) {
+        Objects.requireNonNull(directory, "Directory cannot be null");
+        this.arguments.add("--generate-module-info " + directory);
+        return this;
+    }
+
+    /**
+     * Generates an {@code open module} declaration in the specified directory. Corresponds to the {@code --generate-open-module} option.
+     *
+     * @param directory The output directory.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder generateOpenModule(Path directory) {
+        Objects.requireNonNull(directory, "Directory cannot be null");
+        this.arguments.add("--generate-open-module " + directory);
+        return this;
+    }
+
+    /**
+     * Checks the specified modules for dependencies. Corresponds to the {@code --check} option.
+     *
+     * @param modules The modules to check.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder checkModules(String... modules) {
+        Objects.requireNonNull(modules, "Modules cannot be null");
+        this.arguments.add("--check " + String.join(",", modules));
+        return this;
+    }
+
+    /**
+     * Lists all dependencies. Corresponds to the {@code --list-deps} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder listDependences() {
+        this.arguments.add("--list-deps");
+        return this;
+    }
+
+    /**
+     * Lists reduced dependencies. Corresponds to the {@code --list-reduced-deps} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder listReducedDependences() {
+        this.arguments.add("--list-reduced-deps");
+        return this;
+    }
+
+    /**
+     * Prints module dependencies. Corresponds to the {@code --print-module-deps} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder printModuleDependences() {
+        this.arguments.add("--print-module-deps");
+        return this;
+    }
+
+    /**
+     * Ignores missing dependencies. Corresponds to the {@code --ignore-missing-deps} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder ignoreMissingDependences() {
+        this.arguments.add("--ignore-missing-deps");
+        return this;
+    }
+
+    /**
+     * Filters by package name. Corresponds to the {@code --package} option.
+     *
+     * @param packageName The package name to filter by.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder packageFilter(String packageName) {
+        Objects.requireNonNull(packageName, "Package name cannot be null");
+        this.arguments.add("--package " + packageName);
+        return this;
+    }
+
+    /**
+     * Filters by a regular expression. Corresponds to the {@code --regex} option.
+     *
+     * @param regex The regular expression to filter by.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder regexFilter(String regex) {
+        Objects.requireNonNull(regex, "Regex cannot be null");
+        this.arguments.add("--regex " + regex);
+        return this;
+    }
+
+    /**
+     * Filters by required module. Corresponds to the {@code --require} option.
+     *
+     * @param moduleName The module name to filter by.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder requireFilter(String moduleName) {
+        Objects.requireNonNull(moduleName, "Module name cannot be null");
+        this.arguments.add("--require " + moduleName);
+        return this;
+    }
+
+    /**
+     * Filters the output by a specified pattern. Corresponds to the {@code --filter} option.
+     *
+     * @param pattern The filter pattern.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder filter(String pattern) {
+        Objects.requireNonNull(pattern, "Filter pattern cannot be null");
+        this.arguments.add("--filter " + pattern);
+        return this;
+    }
+
+    /**
+     * Filters output to show only package-level dependencies. Corresponds to the {@code -filter:package} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder filterPackage() {
+        this.arguments.add("-filter:package");
+        return this;
+    }
+
+    /**
+     * Filters output to show only archive-level dependencies. Corresponds to the {@code -filter:archive} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder filterArchive() {
+        this.arguments.add("-filter:archive");
+        return this;
+    }
+
+    /**
+     * Filters output to show only module-level dependencies. Corresponds to the {@code -filter:module} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder filterModule() {
+        this.arguments.add("-filter:module");
+        return this;
+    }
+
+    /**
+     * Disables all filtering. Corresponds to the {@code -filter:none} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder filterNone() {
+        this.arguments.add("-filter:none");
+        return this;
+    }
+
+    /**
+     * Shows missing dependencies. Corresponds to the {@code --missing-deps} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder missingDependences() {
+        this.arguments.add("--missing-deps");
+        return this;
+    }
+
+    /**
+     * Includes dependencies matching the specified regular expression. Corresponds to the {@code -include} option.
+     *
+     * @param regex The regular expression to include.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder includePattern(String regex) {
+        Objects.requireNonNull(regex, "Include pattern cannot be null");
+        this.arguments.add("-include " + regex);
+        return this;
+    }
+
+    /**
+     * Recursively traverses dependencies. Corresponds to the {@code --recursive} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder recursive() {
+        this.arguments.add("--recursive");
+        return this;
+    }
+
+    /**
+     * Disables recursive traversal of dependencies. Corresponds to the {@code --no-recursive} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder nonRecursive() {
+        this.arguments.add("--no-recursive");
+        return this;
+    }
+
+    /**
+     * Shows the inverse of the dependencies. Corresponds to the {@code --inverse} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder inverse() {
+        this.arguments.add("--inverse");
+        return this;
+    }
+
+    /**
+     * Shows the compile-time view of dependencies. Corresponds to the {@code --compile-time} option.
+     *
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder compileTimeView() {
+        this.arguments.add("--compile-time");
+        return this;
+    }
+
+    /**
+     * Adds a target (JAR file, class file, or directory) to analyze.
+     *
+     * @param target The path to the target.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder addTarget(Path target) {
+        Objects.requireNonNull(target, "Target cannot be null");
+        this.targets.add(target.toString());
+        return this;
+    }
+
+    /**
+     * Adds a target (JAR file, class file, or directory) to analyze.
+     *
+     * @param target The target to add.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder addTarget(String target) {
+        Objects.requireNonNull(target, "Target cannot be null");
+        this.targets.add(target);
+        return this;
+    }
+
+    /**
+     * Adds multiple targets (JAR files, class files, or directories) to analyze.
+     *
+     * @param targetEntries The targets to add.
+     * @return This builder instance.
+     */
+    public JdepsCLIBuilder addTargets(String... targetEntries) {
+        Objects.requireNonNull(targetEntries, "Targets cannot be null");
+        Collections.addAll(this.targets, targetEntries);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+        command.addAll(targets);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jdeps");
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jdeps process", exception);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JfrCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JfrCLIBuilder.java
new file mode 100644
index 00000000..ac8f2242
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JfrCLIBuilder.java
@@ -0,0 +1,652 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A fluent builder for constructing and executing {@code jfr} commands.
+ * <p>
+ * This builder provides methods to interact with Java Flight Recorder (JFR) recordings,
+ * allowing for printing, viewing, configuring, and analyzing JFR data.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jfr.html">jfr command documentation</a>
+ */
+public class JfrCLIBuilder implements CLIBuilder<Process, JfrCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jfr.exe" : "jfr";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+    private Subcommand subcommand;
+
+    private JfrCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a new {@code JfrCLIBuilder} instance.
+     *
+     * @param jdk The JDK to use for executing the {@code jfr} command.
+     * @return A new builder instance.
+     */
+    public static JfrCLIBuilder create(JDK jdk) {
+        return new JfrCLIBuilder(jdk);
+    }
+
+    @Override
+    public JfrCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JfrCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JfrCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JfrCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JfrCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Adds a "print" subcommand to the JFR CLI with the specified recording file.
+     *
+     * @param file the recording file to print; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the file is null
+     */
+    public JfrCLIBuilder print(Path file) {
+        Objects.requireNonNull(file, "Recording file cannot be null");
+        this.subcommand = Subcommand.PRINT;
+        this.arguments.add(file.toString());
+        return this;
+    }
+
+    /**
+     * Adds a "view" subcommand to the JFR CLI with the specified view name and recording file.
+     *
+     * @param viewName the name of the view; must not be null
+     * @param file     the recording file to view; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the view name or file is null
+     */
+    public JfrCLIBuilder view(String viewName, Path file) {
+        Objects.requireNonNull(viewName, "View name cannot be null");
+        Objects.requireNonNull(file, "Recording file cannot be null");
+        this.subcommand = Subcommand.VIEW;
+        this.arguments.add(viewName);
+        this.arguments.add(file.toString());
+        return this;
+    }
+
+    /**
+     * Adds a "configure" subcommand to the JFR CLI.
+     *
+     * @return the current `JfrCLIBuilder` instance
+     */
+    public JfrCLIBuilder configure() {
+        this.subcommand = Subcommand.CONFIGURE;
+        return this;
+    }
+
+    /**
+     * Adds a "metadata" subcommand to the JFR CLI with the specified recording file.
+     *
+     * @param file the recording file for metadata; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the file is null
+     */
+    public JfrCLIBuilder metadata(Path file) {
+        Objects.requireNonNull(file, "Recording file cannot be null");
+        this.subcommand = Subcommand.METADATA;
+        this.arguments.add(file.toString());
+        return this;
+    }
+
+    /**
+     * Adds a "metadata" subcommand to the JFR CLI without specifying a file.
+     *
+     * @return the current `JfrCLIBuilder` instance
+     */
+    public JfrCLIBuilder metadata() {
+        this.subcommand = Subcommand.METADATA;
+        return this;
+    }
+
+    /**
+     * Adds a "summary" subcommand to the JFR CLI with the specified recording file.
+     *
+     * @param file the recording file for the summary; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the file is null
+     */
+    public JfrCLIBuilder summary(Path file) {
+        Objects.requireNonNull(file, "Recording file cannot be null");
+        this.subcommand = Subcommand.SUMMARY;
+        this.arguments.add(file.toString());
+        return this;
+    }
+
+    /**
+     * Adds a "scrub" subcommand to the JFR CLI with the specified input and output files.
+     *
+     * @param inputFile  the input file to scrub; must not be null
+     * @param outputFile the output file to save the scrubbed data; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the input or output file is null
+     */
+    public JfrCLIBuilder scrub(Path inputFile, Path outputFile) {
+        Objects.requireNonNull(inputFile, "Input file cannot be null");
+        Objects.requireNonNull(outputFile, "Output file cannot be null");
+        this.subcommand = Subcommand.SCRUB;
+        this.arguments.add(inputFile.toString());
+        this.arguments.add(outputFile.toString());
+        return this;
+    }
+
+    /**
+     * Adds a "scrub" subcommand to the JFR CLI with the specified input file.
+     *
+     * @param inputFile the input file to scrub; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the input file is null
+     */
+    public JfrCLIBuilder scrub(Path inputFile) {
+        Objects.requireNonNull(inputFile, "Input file cannot be null");
+        this.subcommand = Subcommand.SCRUB;
+        this.arguments.add(inputFile.toString());
+        return this;
+    }
+
+    /**
+     * Adds an "assemble" subcommand to the JFR CLI with the specified repository and output file.
+     *
+     * @param repository the repository path; must not be null
+     * @param file       the output file to save the assembled data; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the repository or output file is null
+     */
+    public JfrCLIBuilder assemble(Path repository, Path file) {
+        Objects.requireNonNull(repository, "Repository cannot be null");
+        Objects.requireNonNull(file, "Output file cannot be null");
+        this.subcommand = Subcommand.ASSEMBLE;
+        this.arguments.add(repository.toString());
+        this.arguments.add(file.toString());
+        return this;
+    }
+
+    /**
+     * Adds a "disassemble" subcommand to the JFR CLI with the specified recording file.
+     *
+     * @param file the recording file to disassemble; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the file is null
+     */
+    public JfrCLIBuilder disassemble(Path file) {
+        Objects.requireNonNull(file, "Recording file cannot be null");
+        this.subcommand = Subcommand.DISASSEMBLE;
+        this.arguments.add(file.toString());
+        return this;
+    }
+
+    /**
+     * Adds the "--xml" option to the current subcommand.
+     *
+     * @return the current `JfrCLIBuilder` instance
+     */
+    public JfrCLIBuilder printXml() {
+        this.arguments.add("--xml");
+        return this;
+    }
+
+    /**
+     * Adds the "--json" option to the current subcommand.
+     *
+     * @return the current `JfrCLIBuilder` instance
+     */
+    public JfrCLIBuilder printJson() {
+        this.arguments.add("--json");
+        return this;
+    }
+
+    /**
+     * Adds the "--exact" option to the current subcommand.
+     *
+     * @return the current `JfrCLIBuilder` instance
+     */
+    public JfrCLIBuilder printExact() {
+        this.arguments.add("--exact");
+        return this;
+    }
+
+    /**
+     * Adds a category filter to the current subcommand.
+     *
+     * @param filter the category filter; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the filter is null
+     */
+    public JfrCLIBuilder categoriesFilter(String filter) {
+        Objects.requireNonNull(filter, "Category filter cannot be null");
+        this.arguments.add("--categories " + filter);
+        return this;
+    }
+
+    /**
+     * Adds an event filter to the current subcommand.
+     *
+     * @param filter the event filter; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the filter is null
+     */
+    public JfrCLIBuilder eventFilter(String filter) {
+        Objects.requireNonNull(filter, "Event filter cannot be null");
+        this.arguments.add("--events " + filter);
+        return this;
+    }
+
+    /**
+     * Sets the stack depth for the current subcommand.
+     *
+     * @param depth the stack depth; must be non-negative
+     * @return the current `JfrCLIBuilder` instance
+     * @throws IllegalArgumentException if the depth is negative
+     */
+    public JfrCLIBuilder stackDepth(int depth) {
+        if (depth < 0)
+            throw new IllegalArgumentException("Stack depth cannot be negative");
+
+        this.arguments.add("--stack-depth " + depth);
+        return this;
+    }
+
+    /**
+     * Adds the "--verbose" option to the "view" subcommand.
+     *
+     * @return the current `JfrCLIBuilder` instance
+     */
+    public JfrCLIBuilder viewVerbose() {
+        this.arguments.add("--verbose");
+        return this;
+    }
+
+    /**
+     * Sets the width for the "view" subcommand.
+     *
+     * @param width the width value
+     * @return the current `JfrCLIBuilder` instance
+     */
+    public JfrCLIBuilder viewWidth(int width) {
+        this.arguments.add("--width " + width);
+        return this;
+    }
+
+    /**
+     * Sets the truncate mode for the "view" subcommand.
+     *
+     * @param mode the truncate mode; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the mode is null
+     */
+    public JfrCLIBuilder viewTruncateMode(String mode) {
+        Objects.requireNonNull(mode, "Truncate mode cannot be null");
+        this.arguments.add("--truncate " + mode);
+        return this;
+    }
+
+    /**
+     * Sets the cell height for the "view" subcommand.
+     *
+     * @param height the cell height value
+     * @return the current `JfrCLIBuilder` instance
+     */
+    public JfrCLIBuilder viewCellHeight(int height) {
+        this.arguments.add("--cell-height " + height);
+        return this;
+    }
+
+    /**
+     * Adds the "--interactive" option to the "configure" subcommand.
+     *
+     * @return the current `JfrCLIBuilder` instance
+     */
+    public JfrCLIBuilder configureInteractive() {
+        this.arguments.add("--interactive");
+        return this;
+    }
+
+    /**
+     * Adds the "--verbose" option to the "configure" subcommand.
+     *
+     * @return the current `JfrCLIBuilder` instance
+     */
+    public JfrCLIBuilder configureVerbose() {
+        this.arguments.add("--verbose");
+        return this;
+    }
+
+    /**
+     * Sets the input files for the "configure" subcommand.
+     *
+     * @param files the input files; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the files are null
+     */
+    public JfrCLIBuilder configureInput(String files) {
+        Objects.requireNonNull(files, "Input files cannot be null");
+        this.arguments.add("--input " + files);
+        return this;
+    }
+
+    /**
+     * Sets the output file for the "configure" subcommand.
+     *
+     * @param file the output file; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the file is null
+     */
+    public JfrCLIBuilder configureOutput(Path file) {
+        Objects.requireNonNull(file, "Output file cannot be null");
+        this.arguments.add("--output " + file);
+        return this;
+    }
+
+    /**
+     * Adds an option and its value to the "configure" subcommand.
+     *
+     * @param option the option name; must not be null
+     * @param value  the option value; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the option or value is null
+     */
+    public JfrCLIBuilder configureOption(String option, String value) {
+        Objects.requireNonNull(option, "Option cannot be null");
+        Objects.requireNonNull(value, "Value cannot be null");
+        this.arguments.add(option + "=" + value);
+        return this;
+    }
+
+    /**
+     * Adds an event setting and its value to the "configure" subcommand.
+     *
+     * @param setting the event setting name; must not be null
+     * @param value   the event setting value; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the setting or value is null
+     */
+    public JfrCLIBuilder configureEventSetting(String setting, String value) {
+        Objects.requireNonNull(setting, "Setting cannot be null");
+        Objects.requireNonNull(value, "Value cannot be null");
+        this.arguments.add(setting + "=" + value);
+        return this;
+    }
+
+    /**
+     * Adds a category filter to the "metadata" subcommand.
+     *
+     * @param filter the category filter; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the filter is null
+     */
+    public JfrCLIBuilder metadataCategoryFilter(String filter) {
+        Objects.requireNonNull(filter, "Category filter cannot be null");
+        this.arguments.add("--categories " + filter);
+        return this;
+    }
+
+    /**
+     * Adds an event filter to the "metadata" subcommand.
+     *
+     * @param filter the event filter; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the filter is null
+     */
+    public JfrCLIBuilder metadataEventFilter(String filter) {
+        Objects.requireNonNull(filter, "Event filter cannot be null");
+        this.arguments.add("--events " + filter);
+        return this;
+    }
+
+    /**
+     * Adds an include events filter to the "scrub" subcommand.
+     *
+     * @param filter the include events filter; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the filter is null
+     */
+    public JfrCLIBuilder scrubIncludeEvents(String filter) {
+        Objects.requireNonNull(filter, "Include events filter cannot be null");
+        this.arguments.add("--include-events " + filter);
+        return this;
+    }
+
+    /**
+     * Adds an exclude events filter to the "scrub" subcommand.
+     *
+     * @param filter the exclude events filter; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the filter is null
+     */
+    public JfrCLIBuilder scrubExcludeEvents(String filter) {
+        Objects.requireNonNull(filter, "Exclude events filter cannot be null");
+        this.arguments.add("--exclude-events " + filter);
+        return this;
+    }
+
+    /**
+     * Adds an include categories filter to the "scrub" subcommand.
+     *
+     * @param filter the include categories filter; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the filter is null
+     */
+    public JfrCLIBuilder scrubIncludeCategories(String filter) {
+        Objects.requireNonNull(filter, "Include categories filter cannot be null");
+        this.arguments.add("--include-categories " + filter);
+        return this;
+    }
+
+    /**
+     * Adds an exclude categories filter to the "scrub" subcommand.
+     *
+     * @param filter the exclude categories filter; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the filter is null
+     */
+    public JfrCLIBuilder scrubExcludeCategories(String filter) {
+        Objects.requireNonNull(filter, "Exclude categories filter cannot be null");
+        this.arguments.add("--exclude-categories " + filter);
+        return this;
+    }
+
+    /**
+     * Adds an include threads filter to the "scrub" subcommand.
+     *
+     * @param filter the include threads filter; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the filter is null
+     */
+    public JfrCLIBuilder scrubIncludeThreads(String filter) {
+        Objects.requireNonNull(filter, "Include threads filter cannot be null");
+        this.arguments.add("--include-threads " + filter);
+        return this;
+    }
+
+    /**
+     * Adds an exclude threads filter to the "scrub" subcommand.
+     *
+     * @param filter the exclude threads filter; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the filter is null
+     */
+    public JfrCLIBuilder scrubExcludeThreads(String filter) {
+        Objects.requireNonNull(filter, "Exclude threads filter cannot be null");
+        this.arguments.add("--exclude-threads " + filter);
+        return this;
+    }
+
+    /**
+     * Sets the output directory for the "disassemble" subcommand.
+     *
+     * @param directory the output directory; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the directory is null
+     */
+    public JfrCLIBuilder disassembleOutput(Path directory) {
+        Objects.requireNonNull(directory, "Output directory cannot be null");
+        this.arguments.add("--output " + directory);
+        return this;
+    }
+
+    /**
+     * Sets the maximum number of chunks for the "disassemble" subcommand.
+     *
+     * @param chunks the maximum number of chunks; must be positive
+     * @return the current `JfrCLIBuilder` instance
+     * @throws IllegalArgumentException if the chunks value is not positive
+     */
+    public JfrCLIBuilder disassembleMaxChunks(int chunks) {
+        if (chunks <= 0)
+            throw new IllegalArgumentException("Max chunks must be positive");
+
+        this.arguments.add("--max-chunks " + chunks);
+        return this;
+    }
+
+    /**
+     * Sets the maximum size for the "disassemble" subcommand.
+     *
+     * @param size the maximum size; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the size is null
+     */
+    public JfrCLIBuilder disassembleMaxSize(String size) {
+        Objects.requireNonNull(size, "Max size cannot be null");
+        this.arguments.add("--max-size " + size);
+        return this;
+    }
+
+    /**
+     * Adds a "version" subcommand to the JFR CLI.
+     *
+     * @return the current `JfrCLIBuilder` instance
+     */
+    public JfrCLIBuilder version() {
+        this.subcommand = Subcommand.VERSION;
+        return this;
+    }
+
+    /**
+     * Adds a "help" subcommand to the JFR CLI.
+     *
+     * @return the current `JfrCLIBuilder` instance
+     */
+    public JfrCLIBuilder help() {
+        this.subcommand = Subcommand.HELP;
+        return this;
+    }
+
+    /**
+     * Adds a "help" subcommand to the JFR CLI with the specified subcommand.
+     *
+     * @param subcommand the subcommand to display help for; must not be null
+     * @return the current `JfrCLIBuilder` instance
+     * @throws NullPointerException if the subcommand is null
+     */
+    public JfrCLIBuilder help(String subcommand) {
+        Objects.requireNonNull(subcommand, "Subcommand cannot be null");
+        this.subcommand = Subcommand.HELP;
+        this.arguments.add(subcommand);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        if (subcommand == null)
+            throw new IllegalStateException("A jfr subcommand must be selected.");
+
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.add(subcommand.command());
+        command.addAll(arguments);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jfr");
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jfr process", exception);
+        }
+    }
+
+    private enum Subcommand {
+        PRINT("print"),
+        VIEW("view"),
+        CONFIGURE("configure"),
+        METADATA("metadata"),
+        SUMMARY("summary"),
+        SCRUB("scrub"),
+        ASSEMBLE("assemble"),
+        DISASSEMBLE("disassemble"),
+        VERSION("version"),
+        HELP("--help");
+
+        private final String command;
+
+        Subcommand(String command) {
+            this.command = command;
+        }
+
+        public String command() {
+            return command;
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JinfoCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JinfoCLIBuilder.java
new file mode 100644
index 00000000..8449b63f
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JinfoCLIBuilder.java
@@ -0,0 +1,224 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Builder for configuring {@code jinfo} invocations against a specific {@link JDK}.
+ * <p>
+ * Supports toggling JVM flags, printing system properties, and targeting particular JVM processes.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jinfo.html">jinfo command documentation</a>
+ */
+public class JinfoCLIBuilder implements CLIBuilder<Process, JinfoCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jinfo.exe" : "jinfo";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+    private String processId;
+
+    private JinfoCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    public static JinfoCLIBuilder create(JDK jdk) {
+        return new JinfoCLIBuilder(jdk);
+    }
+
+    @Override
+    public JinfoCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JinfoCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JinfoCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JinfoCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JinfoCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Sets the process ID for the `jinfo` command using a long value.
+     *
+     * @param pid the process ID; must be positive
+     * @return the current `JinfoCLIBuilder` instance
+     * @throws IllegalArgumentException if the PID is not positive
+     */
+    public JinfoCLIBuilder processId(long pid) {
+        if (pid <= 0)
+            throw new IllegalArgumentException("PID must be positive");
+
+        this.processId = Long.toString(pid);
+        return this;
+    }
+
+    /**
+     * Sets the process ID for the `jinfo` command using a string value.
+     *
+     * @param pid the process ID as a string; must not be null
+     * @return the current `JinfoCLIBuilder` instance
+     * @throws NullPointerException if the PID is null
+     */
+    public JinfoCLIBuilder processId(String pid) {
+        Objects.requireNonNull(pid, "PID cannot be null");
+        this.processId = pid;
+        return this;
+    }
+
+    /**
+     * Adds a flag to the `jinfo` command.
+     *
+     * @param name the name of the flag; must not be null
+     * @return the current `JinfoCLIBuilder` instance
+     * @throws NullPointerException if the flag name is null
+     */
+    public JinfoCLIBuilder flag(String name) {
+        Objects.requireNonNull(name, "Flag name cannot be null");
+        this.arguments.add("-flag " + name);
+        return this;
+    }
+
+    /**
+     * Adds a flag to the `jinfo` command with an enabled or disabled state.
+     *
+     * @param name    the name of the flag; must not be null
+     * @param enabled whether the flag is enabled (true) or disabled (false)
+     * @return the current `JinfoCLIBuilder` instance
+     * @throws NullPointerException if the flag name is null
+     */
+    public JinfoCLIBuilder flag(String name, boolean enabled) {
+        Objects.requireNonNull(name, "Flag name cannot be null");
+        this.arguments.add("-flag " + (enabled ? "+" : "-") + name);
+        return this;
+    }
+
+    /**
+     * Adds a flag to the `jinfo` command with a specific value.
+     *
+     * @param name  the name of the flag; must not be null
+     * @param value the value of the flag; must not be null
+     * @return the current `JinfoCLIBuilder` instance
+     * @throws NullPointerException if the flag name or value is null
+     */
+    public JinfoCLIBuilder flag(String name, String value) {
+        Objects.requireNonNull(name, "Flag name cannot be null");
+        Objects.requireNonNull(value, "Flag value cannot be null");
+        this.arguments.add("-flag " + name + "=" + value);
+        return this;
+    }
+
+    /**
+     * Adds the `-flags` option to the `jinfo` command to print all flags.
+     *
+     * @return the current `JinfoCLIBuilder` instance
+     */
+    public JinfoCLIBuilder printFlags() {
+        this.arguments.add("-flags");
+        return this;
+    }
+
+    /**
+     * Adds the `-sysprops` option to the `jinfo` command to print all system properties.
+     *
+     * @return the current `JinfoCLIBuilder` instance
+     */
+    public JinfoCLIBuilder printSystemProperties() {
+        this.arguments.add("-sysprops");
+        return this;
+    }
+
+    /**
+     * Adds the `-help` option to the `jinfo` command to display help information.
+     *
+     * @return the current `JinfoCLIBuilder` instance
+     */
+    public JinfoCLIBuilder help() {
+        this.arguments.add("-help");
+        return this;
+    }
+
+    /**
+     * Adds a Java option to the `jinfo` command.
+     *
+     * @param option the Java option; must not be null
+     * @return the current `JinfoCLIBuilder` instance
+     * @throws NullPointerException if the Java option is null
+     */
+    public JinfoCLIBuilder javaOption(String option) {
+        Objects.requireNonNull(option, "Java option cannot be null");
+        this.arguments.add("-J" + option);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        if (processId == null)
+            throw new IllegalStateException("A process ID must be specified for jinfo.");
+
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+        command.add(processId);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jinfo");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jinfo process", exception);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JlinkCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JlinkCLIBuilder.java
new file mode 100644
index 00000000..30bac3af
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JlinkCLIBuilder.java
@@ -0,0 +1,403 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Builder to construct {@code jlink} commands for creating custom runtime images.
+ * <p>
+ * Allows configuration of modules, compression, plugins, launchers, and other packaging flags.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jlink.html">jlink command documentation</a>
+ */
+public class JlinkCLIBuilder implements CLIBuilder<Process, JlinkCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jlink.exe" : "jlink";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+
+    private JlinkCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    public static JlinkCLIBuilder create(JDK jdk) {
+        return new JlinkCLIBuilder(jdk);
+    }
+
+    @Override
+    public JlinkCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JlinkCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JlinkCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JlinkCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JlinkCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Adds the specified modules to the `jlink` command.
+     *
+     * @param modules the modules to add; must not be null
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws NullPointerException if the modules are null
+     */
+    public JlinkCLIBuilder addModules(String... modules) {
+        Objects.requireNonNull(modules, "Modules cannot be null");
+        this.arguments.add("--add-modules " + String.join(",", modules));
+        return this;
+    }
+
+    /**
+     * Adds the `--bind-services` option to the `jlink` command.
+     *
+     * @return the current `JlinkCLIBuilder` instance
+     */
+    public JlinkCLIBuilder bindServices() {
+        this.arguments.add("--bind-services");
+        return this;
+    }
+
+    /**
+     * Sets the compression level for the `jlink` command.
+     *
+     * @param level the compression level (0, 1, or 2)
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws IllegalArgumentException if the level is not 0, 1, or 2
+     */
+    public JlinkCLIBuilder compressionLevel(int level) {
+        if (level < 0 || level > 2)
+            throw new IllegalArgumentException("Compression level must be 0, 1, or 2");
+
+        this.arguments.add("--compress=" + level);
+        return this;
+    }
+
+    /**
+     * Sets the compression level and filter pattern for the `jlink` command.
+     *
+     * @param level         the compression level (0, 1, or 2)
+     * @param filterPattern the filter pattern; must not be null
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws IllegalArgumentException if the level is not 0, 1, or 2
+     * @throws NullPointerException     if the filter pattern is null
+     */
+    public JlinkCLIBuilder compressionLevel(int level, String filterPattern) {
+        if (level < 0 || level > 2)
+            throw new IllegalArgumentException("Compression level must be 0, 1, or 2");
+
+        Objects.requireNonNull(filterPattern, "Filter pattern cannot be null");
+        this.arguments.add("--compress=" + level + ":filter=" + filterPattern);
+        return this;
+    }
+
+    /**
+     * Disables the specified plugin in the `jlink` command.
+     *
+     * @param pluginName the name of the plugin to disable; must not be null
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws NullPointerException if the plugin name is null
+     */
+    public JlinkCLIBuilder disablePlugin(String pluginName) {
+        Objects.requireNonNull(pluginName, "Plugin name cannot be null");
+        this.arguments.add("--disable-plugin " + pluginName);
+        return this;
+    }
+
+    /**
+     * Sets the endian option for the `jlink` command.
+     *
+     * @param endian the endian value; must not be null
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws NullPointerException if the endian value is null
+     */
+    public JlinkCLIBuilder endian(String endian) {
+        Objects.requireNonNull(endian, "Endian cannot be null");
+        this.arguments.add("--endian " + endian);
+        return this;
+    }
+
+    /**
+     * Adds the `--help` option to the `jlink` command.
+     *
+     * @return the current `JlinkCLIBuilder` instance
+     */
+    public JlinkCLIBuilder help() {
+        this.arguments.add("--help");
+        return this;
+    }
+
+    /**
+     * Adds the `--ignore-signing-information` option to the `jlink` command.
+     *
+     * @return the current `JlinkCLIBuilder` instance
+     */
+    public JlinkCLIBuilder ignoreSigningInformation() {
+        this.arguments.add("--ignore-signing-information");
+        return this;
+    }
+
+    /**
+     * Adds a launcher definition to the `jlink` command.
+     *
+     * @param commandName  the name of the launcher command; must not be null
+     * @param moduleOrMain the module or main class definition; must not be null
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws NullPointerException if the command name or module definition is null
+     */
+    public JlinkCLIBuilder launcher(String commandName, String moduleOrMain) {
+        Objects.requireNonNull(commandName, "Command name cannot be null");
+        Objects.requireNonNull(moduleOrMain, "Module definition cannot be null");
+        this.arguments.add("--launcher " + commandName + "=" + moduleOrMain);
+        return this;
+    }
+
+    /**
+     * Limits the modules included in the `jlink` command.
+     *
+     * @param modules the modules to include; must not be null
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws NullPointerException if the modules are null
+     */
+    public JlinkCLIBuilder limitModules(String... modules) {
+        Objects.requireNonNull(modules, "Module names cannot be null");
+        this.arguments.add("--limit-modules " + String.join(",", modules));
+        return this;
+    }
+
+    /**
+     * Adds the `--list-plugins` option to the `jlink` command.
+     *
+     * @return the current `JlinkCLIBuilder` instance
+     */
+    public JlinkCLIBuilder listPlugins() {
+        this.arguments.add("--list-plugins");
+        return this;
+    }
+
+    /**
+     * Sets the module path for the `jlink` command.
+     *
+     * @param modulePaths the module path entries; must not be null
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws NullPointerException if the module path entries are null
+     */
+    public JlinkCLIBuilder modulePath(String... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module path entries cannot be null");
+        this.arguments.add("--module-path " + String.join(File.pathSeparator, modulePaths));
+        return this;
+    }
+
+    /**
+     * Sets the module path for the `jlink` command using `Path` objects.
+     *
+     * @param modulePaths the module path entries as `Path` objects; must not be null
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws NullPointerException if the module path entries are null
+     */
+    public JlinkCLIBuilder modulePath(Path... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module path entries cannot be null");
+        return modulePath(Arrays.stream(modulePaths).map(Path::toString).toArray(String[]::new));
+    }
+
+    /**
+     * Adds the `--no-header-files` option to the `jlink` command.
+     *
+     * @return the current `JlinkCLIBuilder` instance
+     */
+    public JlinkCLIBuilder noHeaderFiles() {
+        this.arguments.add("--no-header-files");
+        return this;
+    }
+
+    /**
+     * Adds the `--no-man-pages` option to the `jlink` command.
+     *
+     * @return the current `JlinkCLIBuilder` instance
+     */
+    public JlinkCLIBuilder noManPages() {
+        this.arguments.add("--no-man-pages");
+        return this;
+    }
+
+    /**
+     * Sets the output directory for the `jlink` command.
+     *
+     * @param path the output directory; must not be null
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws NullPointerException if the output path is null
+     */
+    public JlinkCLIBuilder output(Path path) {
+        Objects.requireNonNull(path, "Output path cannot be null");
+        this.arguments.add("--output " + path);
+        return this;
+    }
+
+    /**
+     * Saves the options used in the `jlink` command to a file.
+     *
+     * @param file the file to save the options to; must not be null
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws NullPointerException if the file is null
+     */
+    public JlinkCLIBuilder saveOptions(Path file) {
+        Objects.requireNonNull(file, "Options file cannot be null");
+        this.arguments.add("--save-opts " + file);
+        return this;
+    }
+
+    /**
+     * Suggests providers for the `jlink` command.
+     *
+     * @param serviceTypes the service types to suggest providers for; can be empty
+     * @return the current `JlinkCLIBuilder` instance
+     */
+    public JlinkCLIBuilder suggestProviders(String... serviceTypes) {
+        if (serviceTypes == null || serviceTypes.length == 0) {
+            this.arguments.add("--suggest-providers");
+            return this;
+        }
+
+        this.arguments.add("--suggest-providers " + String.join(",", serviceTypes));
+        return this;
+    }
+
+    /**
+     * Adds the `--version` option to the `jlink` command.
+     *
+     * @return the current `JlinkCLIBuilder` instance
+     */
+    public JlinkCLIBuilder version() {
+        this.arguments.add("--version");
+        return this;
+    }
+
+    /**
+     * Includes the specified locales in the `jlink` command.
+     *
+     * @param locales the locales to include; must not be null
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws NullPointerException if the locales are null
+     */
+    public JlinkCLIBuilder includeLocales(String... locales) {
+        Objects.requireNonNull(locales, "Locales cannot be null");
+        this.arguments.add("--include-locales=" + String.join(",", locales));
+        return this;
+    }
+
+    /**
+     * Sets the resource ordering pattern for the `jlink` command.
+     *
+     * @param patternList the pattern list; must not be null
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws NullPointerException if the pattern list is null
+     */
+    public JlinkCLIBuilder orderResources(String patternList) {
+        Objects.requireNonNull(patternList, "Pattern list cannot be null");
+        this.arguments.add("--order-resources=" + patternList);
+        return this;
+    }
+
+    /**
+     * Adds the `--strip-debug` option to the `jlink` command.
+     *
+     * @return the current `JlinkCLIBuilder` instance
+     */
+    public JlinkCLIBuilder stripDebug() {
+        this.arguments.add("--strip-debug");
+        return this;
+    }
+
+    /**
+     * Adds the `--generate-cds-archive` option to the `jlink` command.
+     *
+     * @return the current `JlinkCLIBuilder` instance
+     */
+    public JlinkCLIBuilder generateCdsArchive() {
+        this.arguments.add("--generate-cds-archive");
+        return this;
+    }
+
+    /**
+     * Adds an argument file to the `jlink` command.
+     *
+     * @param file the argument file; must not be null
+     * @return the current `JlinkCLIBuilder` instance
+     * @throws NullPointerException if the argument file is null
+     */
+    public JlinkCLIBuilder addArgumentFile(Path file) {
+        Objects.requireNonNull(file, "Argument file cannot be null");
+        this.arguments.add("@" + file);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jlink");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jlink process", exception);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JmapCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JmapCLIBuilder.java
new file mode 100644
index 00000000..fe7d0407
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JmapCLIBuilder.java
@@ -0,0 +1,223 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Builder for composing {@code jmap} commands to inspect heap and class metadata.
+ * <p>
+ * Enables selecting targets, histogram options, and dumping heap/configurations.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jmap.html">jmap command documentation</a>
+ */
+public class JmapCLIBuilder implements CLIBuilder<Process, JmapCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jmap.exe" : "jmap";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+    private String processId;
+
+    private JmapCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    public static JmapCLIBuilder create(JDK jdk) {
+        return new JmapCLIBuilder(jdk);
+    }
+
+    @Override
+    public JmapCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JmapCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JmapCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JmapCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JmapCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    public JmapCLIBuilder processId(long pid) {
+        if (pid <= 0)
+            throw new IllegalArgumentException("PID must be positive");
+
+        this.processId = Long.toString(pid);
+        return this;
+    }
+
+    /**
+     * Sets the process ID for the `jmap` command using a string value.
+     *
+     * @param pid the process ID as a string; must not be null
+     * @return the current `JmapCLIBuilder` instance
+     * @throws NullPointerException if the PID is null
+     */
+    public JmapCLIBuilder processId(String pid) {
+        Objects.requireNonNull(pid, "PID cannot be null");
+        this.processId = pid;
+        return this;
+    }
+
+    /**
+     * Adds the `-clstats` option to the `jmap` command to display class loader statistics.
+     *
+     * @return the current `JmapCLIBuilder` instance
+     */
+    public JmapCLIBuilder classLoaderStats() {
+        this.arguments.add("-clstats");
+        return this;
+    }
+
+    /**
+     * Adds the `-finalizerinfo` option to the `jmap` command to display information about objects
+     * pending finalization.
+     *
+     * @return the current `JmapCLIBuilder` instance
+     */
+    public JmapCLIBuilder finalizerInfo() {
+        this.arguments.add("-finalizerinfo");
+        return this;
+    }
+
+    /**
+     * Adds the `-histo` or `-histo:live` option to the `jmap` command to display a histogram of
+     * the heap.
+     *
+     * @param liveOnly whether to include only live objects in the histogram
+     * @return the current `JmapCLIBuilder` instance
+     */
+    public JmapCLIBuilder histogram(boolean liveOnly) {
+        this.arguments.add(liveOnly ? "-histo:live" : "-histo");
+        return this;
+    }
+
+    /**
+     * Adds the `-dump` option to the `jmap` command to dump the heap with the specified options.
+     *
+     * @param liveOnly whether to include only live objects in the dump
+     * @param format   the format of the dump; must not be null
+     * @param file     the file to save the dump to; must not be null
+     * @return the current `JmapCLIBuilder` instance
+     * @throws NullPointerException if the format or file is null
+     */
+    public JmapCLIBuilder dumpHeap(boolean liveOnly, String format, Path file) {
+        Objects.requireNonNull(format, "Dump format cannot be null");
+        Objects.requireNonNull(file, "Dump file cannot be null");
+
+        var options = new StringJoiner(",");
+        if (liveOnly)
+            options.add("live");
+        options.add("format=" + format);
+        options.add("file=" + file);
+        this.arguments.add("-dump:" + options);
+        return this;
+    }
+
+    /**
+     * Adds the `-dump` option to the `jmap` command with the specified options.
+     *
+     * @param options the dump options as a string; must not be null
+     * @return the current `JmapCLIBuilder` instance
+     * @throws NullPointerException if the options are null
+     */
+    public JmapCLIBuilder dumpHeap(String options) {
+        Objects.requireNonNull(options, "Dump options cannot be null");
+        this.arguments.add("-dump:" + options);
+        return this;
+    }
+
+    /**
+     * Adds the `-help` option to the `jmap` command to display help information.
+     *
+     * @return the current `JmapCLIBuilder` instance
+     */
+    public JmapCLIBuilder help() {
+        this.arguments.add("-help");
+        return this;
+    }
+
+    /**
+     * Adds a Java option to the `jmap` command.
+     *
+     * @param option the Java option; must not be null
+     * @return the current `JmapCLIBuilder` instance
+     * @throws NullPointerException if the option is null
+     */
+    public JmapCLIBuilder javaOption(String option) {
+        Objects.requireNonNull(option, "Java option cannot be null");
+        this.arguments.add("-J" + option);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        if (processId == null)
+            throw new IllegalStateException("A process ID must be specified for jmap.");
+
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+        command.add(processId);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jmap");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jmap process", exception);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JmodCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JmodCLIBuilder.java
new file mode 100644
index 00000000..6ad5d105
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JmodCLIBuilder.java
@@ -0,0 +1,487 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Builder that wraps the {@code jmod} tool to create, inspect, and manipulate JMOD files.
+ * <p>
+ * Offers helpers for different operation modes, routing of paths, and advanced options exposed by {@code jmod}.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jmod.html">jmod command documentation</a>
+ */
+public class JmodCLIBuilder implements CLIBuilder<Process, JmodCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jmod.exe" : "jmod";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+    private OperationMode operationMode;
+    private String jmodFile;
+
+    private JmodCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    public static JmodCLIBuilder create(JDK jdk) {
+        return new JmodCLIBuilder(jdk);
+    }
+
+    @Override
+    public JmodCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JmodCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JmodCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JmodCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JmodCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Sets the operation mode to "create" and specifies the JMOD file to create.
+     *
+     * @param jmodFile the JMOD file to create; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the JMOD file is null
+     */
+    public JmodCLIBuilder create(Path jmodFile) {
+        Objects.requireNonNull(jmodFile, "JMOD file cannot be null");
+        this.operationMode = OperationMode.CREATE;
+        this.jmodFile = jmodFile.toString();
+        return this;
+    }
+
+    /**
+     * Sets the operation mode to "extract" and specifies the JMOD file to extract.
+     *
+     * @param jmodFile the JMOD file to extract; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the JMOD file is null
+     */
+    public JmodCLIBuilder extract(Path jmodFile) {
+        Objects.requireNonNull(jmodFile, "JMOD file cannot be null");
+        this.operationMode = OperationMode.EXTRACT;
+        this.jmodFile = jmodFile.toString();
+        return this;
+    }
+
+    /**
+     * Sets the operation mode to "list" and specifies the JMOD file to list.
+     *
+     * @param jmodFile the JMOD file to list; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the JMOD file is null
+     */
+    public JmodCLIBuilder list(Path jmodFile) {
+        Objects.requireNonNull(jmodFile, "JMOD file cannot be null");
+        this.operationMode = OperationMode.LIST;
+        this.jmodFile = jmodFile.toString();
+        return this;
+    }
+
+    /**
+     * Sets the operation mode to "describe" and specifies the JMOD file to describe.
+     *
+     * @param jmodFile the JMOD file to describe; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the JMOD file is null
+     */
+    public JmodCLIBuilder describe(Path jmodFile) {
+        Objects.requireNonNull(jmodFile, "JMOD file cannot be null");
+        this.operationMode = OperationMode.DESCRIBE;
+        this.jmodFile = jmodFile.toString();
+        return this;
+    }
+
+    /**
+     * Sets the operation mode to "hash" and specifies the JMOD file to hash.
+     *
+     * @param jmodFile the JMOD file to hash; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the JMOD file is null
+     */
+    public JmodCLIBuilder hash(Path jmodFile) {
+        Objects.requireNonNull(jmodFile, "JMOD file cannot be null");
+        this.operationMode = OperationMode.HASH;
+        this.jmodFile = jmodFile.toString();
+        return this;
+    }
+
+    /**
+     * Adds the `--class-path` option to the JMOD command with the specified class path.
+     *
+     * @param path the class path to add; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the class path is null
+     */
+    public JmodCLIBuilder classPath(String path) {
+        Objects.requireNonNull(path, "Class path cannot be null");
+        this.arguments.add("--class-path " + path);
+        return this;
+    }
+
+    /**
+     * Adds the `--cmds` option to the JMOD command with the specified command path.
+     *
+     * @param path the command path to add; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the command path is null
+     */
+    public JmodCLIBuilder cmds(Path path) {
+        Objects.requireNonNull(path, "Command path cannot be null");
+        this.arguments.add("--cmds " + path);
+        return this;
+    }
+
+    /**
+     * Adds the `--compress` option to the JMOD command with the specified compression level.
+     *
+     * @param compression the compression level to set; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the compression level is null
+     */
+    public JmodCLIBuilder compression(String compression) {
+        Objects.requireNonNull(compression, "Compression cannot be null");
+        this.arguments.add("--compress " + compression);
+        return this;
+    }
+
+    /**
+     * Adds the `--config` option to the JMOD command with the specified configuration path.
+     *
+     * @param path the configuration path to add; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the configuration path is null
+     */
+    public JmodCLIBuilder config(Path path) {
+        Objects.requireNonNull(path, "Config path cannot be null");
+        this.arguments.add("--config " + path);
+        return this;
+    }
+
+    /**
+     * Adds the `--date` option to the JMOD command with the specified entry timestamp.
+     *
+     * @param timestamp the entry timestamp to set; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the timestamp is null
+     */
+    public JmodCLIBuilder entryTimestamp(String timestamp) {
+        Objects.requireNonNull(timestamp, "Timestamp cannot be null");
+        this.arguments.add("--date " + timestamp);
+        return this;
+    }
+
+    /**
+     * Adds the `--dir` option to the JMOD command with the specified extraction directory.
+     *
+     * @param path the extraction directory to set; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the extraction directory is null
+     */
+    public JmodCLIBuilder extractionDirectory(Path path) {
+        Objects.requireNonNull(path, "Extraction directory cannot be null");
+        this.arguments.add("--dir " + path);
+        return this;
+    }
+
+    /**
+     * Adds the `--dry-run` option to the JMOD command.
+     *
+     * @return the current `JmodCLIBuilder` instance
+     */
+    public JmodCLIBuilder dryRun() {
+        this.arguments.add("--dry-run");
+        return this;
+    }
+
+    /**
+     * Adds the `--exclude` option to the JMOD command with the specified pattern list.
+     *
+     * @param patternList the pattern list to exclude; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the pattern list is null
+     */
+    public JmodCLIBuilder exclude(String patternList) {
+        Objects.requireNonNull(patternList, "Pattern list cannot be null");
+        this.arguments.add("--exclude " + patternList);
+        return this;
+    }
+
+    /**
+     * Adds the `--hash-modules` option to the JMOD command with the specified regex pattern.
+     *
+     * @param regexPattern the regex pattern to hash modules; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the regex pattern is null
+     */
+    public JmodCLIBuilder hashModules(String regexPattern) {
+        Objects.requireNonNull(regexPattern, "Regex pattern cannot be null");
+        this.arguments.add("--hash-modules " + regexPattern);
+        return this;
+    }
+
+    /**
+     * Adds the `--header-files` option to the JMOD command with the specified header files path.
+     *
+     * @param path the header files path to add; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the header files path is null
+     */
+    public JmodCLIBuilder headerFiles(Path path) {
+        Objects.requireNonNull(path, "Header files path cannot be null");
+        this.arguments.add("--header-files " + path);
+        return this;
+    }
+
+    /**
+     * Adds the `--help` option to the JMOD command.
+     *
+     * @return the current `JmodCLIBuilder` instance
+     */
+    public JmodCLIBuilder help() {
+        this.arguments.add("--help");
+        return this;
+    }
+
+    /**
+     * Adds the `--help-extra` option to the JMOD command.
+     *
+     * @return the current `JmodCLIBuilder` instance
+     */
+    public JmodCLIBuilder helpExtra() {
+        this.arguments.add("--help-extra");
+        return this;
+    }
+
+    /**
+     * Adds the `--legal-notices` option to the JMOD command with the specified legal notices path.
+     *
+     * @param path the legal notices path to add; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the legal notices path is null
+     */
+    public JmodCLIBuilder legalNotices(Path path) {
+        Objects.requireNonNull(path, "Legal notices path cannot be null");
+        this.arguments.add("--legal-notices " + path);
+        return this;
+    }
+
+    /**
+     * Adds the `--libs` option to the JMOD command with the specified libraries path.
+     *
+     * @param path the libraries path to add; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the libraries path is null
+     */
+    public JmodCLIBuilder libs(Path path) {
+        Objects.requireNonNull(path, "Libraries path cannot be null");
+        this.arguments.add("--libs " + path);
+        return this;
+    }
+
+    /**
+     * Adds the `--main-class` option to the JMOD command with the specified main class.
+     *
+     * @param className the main class to set; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the main class is null
+     */
+    public JmodCLIBuilder mainClass(String className) {
+        Objects.requireNonNull(className, "Main class cannot be null");
+        this.arguments.add("--main-class " + className);
+        return this;
+    }
+
+    /**
+     * Adds the `--man-pages` option to the JMOD command with the specified man pages path.
+     *
+     * @param path the man pages path to add; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the man pages path is null
+     */
+    public JmodCLIBuilder manPages(Path path) {
+        Objects.requireNonNull(path, "Man pages path cannot be null");
+        this.arguments.add("--man-pages " + path);
+        return this;
+    }
+
+    /**
+     * Adds the `--module-version` option to the JMOD command with the specified module version.
+     *
+     * @param version the module version to set; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the module version is null
+     */
+    public JmodCLIBuilder moduleVersion(String version) {
+        Objects.requireNonNull(version, "Module version cannot be null");
+        this.arguments.add("--module-version " + version);
+        return this;
+    }
+
+    /**
+     * Adds the `--module-path` option to the JMOD command with the specified module path.
+     *
+     * @param path the module path to add; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the module path is null
+     */
+    public JmodCLIBuilder modulePath(String path) {
+        Objects.requireNonNull(path, "Module path cannot be null");
+        this.arguments.add("--module-path " + path);
+        return this;
+    }
+
+    /**
+     * Adds the `--target-platform` option to the JMOD command with the specified platform.
+     *
+     * @param platform the target platform to set; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the platform is null
+     */
+    public JmodCLIBuilder targetPlatform(String platform) {
+        Objects.requireNonNull(platform, "Platform cannot be null");
+        this.arguments.add("--target-platform " + platform);
+        return this;
+    }
+
+    /**
+     * Adds the `--version` option to the JMOD command.
+     *
+     * @return the current `JmodCLIBuilder` instance
+     */
+    public JmodCLIBuilder version() {
+        this.arguments.add("--version");
+        return this;
+    }
+
+    /**
+     * Adds an argument file to the JMOD command.
+     *
+     * @param file the argument file to add; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the argument file is null
+     */
+    public JmodCLIBuilder argumentFile(Path file) {
+        Objects.requireNonNull(file, "Argument file cannot be null");
+        this.arguments.add("@" + file);
+        return this;
+    }
+
+    /**
+     * Adds the `--do-not-resolve-by-default` option to the JMOD command.
+     *
+     * @return the current `JmodCLIBuilder` instance
+     */
+    public JmodCLIBuilder doNotResolveByDefault() {
+        this.arguments.add("--do-not-resolve-by-default");
+        return this;
+    }
+
+    /**
+     * Adds the `--warn-if-resolved` option to the JMOD command with the specified hint.
+     *
+     * @param hint the hint to warn if resolved; must not be null
+     * @return the current `JmodCLIBuilder` instance
+     * @throws NullPointerException if the hint is null
+     */
+    public JmodCLIBuilder warnIfResolved(String hint) {
+        Objects.requireNonNull(hint, "Warning hint cannot be null");
+        this.arguments.add("--warn-if-resolved=" + hint);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        if (operationMode == null)
+            throw new IllegalStateException("An operation mode must be specified.");
+        if (jmodFile == null)
+            throw new IllegalStateException("A JMOD file must be provided.");
+
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.add(operationMode.command());
+        command.addAll(arguments);
+        command.add(jmodFile);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jmod");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jmod process", exception);
+        }
+    }
+
+    private enum OperationMode {
+        CREATE("create"),
+        EXTRACT("extract"),
+        LIST("list"),
+        DESCRIBE("describe"),
+        HASH("hash");
+
+        private final String command;
+
+        OperationMode(String command) {
+            this.command = command;
+        }
+
+        public String command() {
+            return command;
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JpackageCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JpackageCLIBuilder.java
new file mode 100644
index 00000000..61ab4eeb
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JpackageCLIBuilder.java
@@ -0,0 +1,504 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+public class JpackageCLIBuilder implements CLIBuilder<Process, JpackageCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jpackage.exe" : "jpackage";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+
+    private JpackageCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a fresh builder tied to the provided {@link JDK}.
+     *
+     * @param jdk the JDK whose tools should be used
+     * @return a new builder instance
+     */
+    public static JpackageCLIBuilder create(JDK jdk) {
+        return new JpackageCLIBuilder(jdk);
+    }
+
+    @Override
+    public JpackageCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JpackageCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JpackageCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JpackageCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JpackageCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Instructs {@code jpackage} to read arguments from the given option file.
+     *
+     * @param optionFile path to the option file
+     * @return this builder
+     */
+    public JpackageCLIBuilder optionFile(Path optionFile) {
+        Objects.requireNonNull(optionFile, "Option file cannot be null");
+        this.arguments.add("@" + optionFile);
+        return this;
+    }
+
+    /**
+     * Sets the target package type.
+     *
+     * @param type package type (e.g., {@code pkg}, {@code exe})
+     * @return this builder
+     */
+    public JpackageCLIBuilder packageType(String type) {
+        Objects.requireNonNull(type, "Package type cannot be null");
+        this.arguments.add("--type " + type);
+        return this;
+    }
+
+    /**
+     * Declares the application version passed to {@code jpackage}.
+     *
+     * @param version version string
+     * @return this builder
+     */
+    public JpackageCLIBuilder appVersion(String version) {
+        Objects.requireNonNull(version, "Version cannot be null");
+        this.arguments.add("--app-version " + version);
+        return this;
+    }
+
+    /**
+     * Sets the copyright notice inside the generated package.
+     *
+     * @param copyright copyright text
+     * @return this builder
+     */
+    public JpackageCLIBuilder copyright(String copyright) {
+        Objects.requireNonNull(copyright, "Copyright cannot be null");
+        this.arguments.add("--copyright " + copyright);
+        return this;
+    }
+
+    /**
+     * Provides a description for the packaged application.
+     *
+     * @param description description text
+     * @return this builder
+     */
+    public JpackageCLIBuilder description(String description) {
+        Objects.requireNonNull(description, "Description cannot be null");
+        this.arguments.add("--description " + description);
+        return this;
+    }
+
+    /**
+     * Requests {@code --help} output from {@code jpackage}.
+     *
+     * @return this builder
+     */
+    public JpackageCLIBuilder help() {
+        this.arguments.add("--help");
+        return this;
+    }
+
+    /**
+     * Includes an icon for the application bundle.
+     *
+     * @param iconPath path to the icon file
+     * @return this builder
+     */
+    public JpackageCLIBuilder icon(Path iconPath) {
+        Objects.requireNonNull(iconPath, "Icon path cannot be null");
+        this.arguments.add("--icon " + iconPath);
+        return this;
+    }
+
+    /**
+     * Names the generated application.
+     *
+     * @param name application name
+     * @return this builder
+     */
+    public JpackageCLIBuilder applicationName(String name) {
+        Objects.requireNonNull(name, "Application name cannot be null");
+        this.arguments.add("--name " + name);
+        return this;
+    }
+
+    /**
+     * Configures the output directory for the package.
+     *
+     * @param destination destination directory
+     * @return this builder
+     */
+    public JpackageCLIBuilder destination(Path destination) {
+        Objects.requireNonNull(destination, "Destination cannot be null");
+        this.arguments.add("--dest " + destination);
+        return this;
+    }
+
+    /**
+     * Points {@code jpackage} at extra resource files.
+     *
+     * @param resourceDir path to the resource directory
+     * @return this builder
+     */
+    public JpackageCLIBuilder resourceDirectory(Path resourceDir) {
+        Objects.requireNonNull(resourceDir, "Resource directory cannot be null");
+        this.arguments.add("--resource-dir " + resourceDir);
+        return this;
+    }
+
+    /**
+     * Defines a temporary directory to use during packaging.
+     *
+     * @param tempDir temp directory
+     * @return this builder
+     */
+    public JpackageCLIBuilder tempDirectory(Path tempDir) {
+        Objects.requireNonNull(tempDir, "Temp directory cannot be null");
+        this.arguments.add("--temp " + tempDir);
+        return this;
+    }
+
+    /**
+     * Adds vendor metadata to the package.
+     *
+     * @param vendor vendor name
+     * @return this builder
+     */
+    public JpackageCLIBuilder vendor(String vendor) {
+        Objects.requireNonNull(vendor, "Vendor cannot be null");
+        this.arguments.add("--vendor " + vendor);
+        return this;
+    }
+
+    /**
+     * Enables verbose logging for {@code jpackage}.
+     *
+     * @return this builder
+     */
+    public JpackageCLIBuilder verbose() {
+        this.arguments.add("--verbose");
+        return this;
+    }
+
+    /**
+     * Adds {@code --version} to the CLI arguments.
+     *
+     * @return this builder
+     */
+    public JpackageCLIBuilder versionInfo() {
+        this.arguments.add("--version");
+        return this;
+    }
+
+    /**
+     * Passes module names to the launcher.
+     *
+     * @param modules module names
+     * @return this builder
+     */
+    public JpackageCLIBuilder addModules(String... modules) {
+        Objects.requireNonNull(modules, "Modules cannot be null");
+        this.arguments.add("--add-modules " + String.join(",", modules));
+        return this;
+    }
+
+    /**
+     * Sets module path entries via string representations.
+     *
+     * @param modulePaths module path elements
+     * @return this builder
+     */
+    public JpackageCLIBuilder modulePath(String... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module path entries cannot be null");
+        this.arguments.add("--module-path " + String.join(File.pathSeparator, modulePaths));
+        return this;
+    }
+
+    /**
+     * Sets module path entries via {@link Path} instances.
+     *
+     * @param modulePaths module path elements
+     * @return this builder
+     */
+    public JpackageCLIBuilder modulePath(Path... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module path entries cannot be null");
+        return modulePath(Arrays.stream(modulePaths).map(Path::toString).toArray(String[]::new));
+    }
+
+    /**
+     * Forwards arguments to the bundled {@code jlink} step.
+     *
+     * @param options jlink options
+     * @return this builder
+     */
+    public JpackageCLIBuilder jlinkOptions(String... options) {
+        Objects.requireNonNull(options, "jlink options cannot be null");
+        this.arguments.add("--jlink-options " + String.join(" ", options));
+        return this;
+    }
+
+    /**
+     * Points {@code jpackage} at a custom runtime image.
+     *
+     * @param runtimeImage runtime image path
+     * @return this builder
+     */
+    public JpackageCLIBuilder runtimeImage(Path runtimeImage) {
+        Objects.requireNonNull(runtimeImage, "Runtime image path cannot be null");
+        this.arguments.add("--runtime-image " + runtimeImage);
+        return this;
+    }
+
+    /**
+     * Sets the input directory containing application files.
+     *
+     * @param inputDirectory input folder
+     * @return this builder
+     */
+    public JpackageCLIBuilder input(Path inputDirectory) {
+        Objects.requireNonNull(inputDirectory, "Input directory cannot be null");
+        this.arguments.add("--input " + inputDirectory);
+        return this;
+    }
+
+    /**
+     * Adds additional application content directories.
+     *
+     * @param contentPaths content paths
+     * @return this builder
+     */
+    public JpackageCLIBuilder appContent(String... contentPaths) {
+        Objects.requireNonNull(contentPaths, "App content paths cannot be null");
+        this.arguments.add("--app-content " + String.join(",", contentPaths));
+        return this;
+    }
+
+    /**
+     * Declares an extra launcher with its properties file.
+     *
+     * @param name           launcher name
+     * @param propertiesFile launcher properties path
+     * @return this builder
+     */
+    public JpackageCLIBuilder addLauncher(String name, Path propertiesFile) {
+        Objects.requireNonNull(name, "Launcher name cannot be null");
+        Objects.requireNonNull(propertiesFile, "Launcher properties files cannot be null");
+        this.arguments.add("--add-launcher " + name + "=" + propertiesFile);
+        return this;
+    }
+
+    /**
+     * Provides launcher-specific arguments to include in the bundle metadata.
+     *
+     * @param arguments launcher arguments
+     * @return this builder
+     */
+    public JpackageCLIBuilder launcherArguments(String arguments) {
+        Objects.requireNonNull(arguments, "Launcher arguments cannot be null");
+        this.arguments.add("--arguments " + arguments);
+        return this;
+    }
+
+    /**
+     * Supplies JVM options for the launcher.
+     *
+     * @param options JVM options string
+     * @return this builder
+     */
+    public JpackageCLIBuilder launcherJavaOptions(String options) {
+        Objects.requireNonNull(options, "Java options cannot be null");
+        this.arguments.add("--java-options " + options);
+        return this;
+    }
+
+    /**
+     * Provides the fully qualified main class name.
+     *
+     * @param mainClass main class
+     * @return this builder
+     */
+    public JpackageCLIBuilder mainClass(String mainClass) {
+        Objects.requireNonNull(mainClass, "Main class cannot be null");
+        this.arguments.add("--main-class " + mainClass);
+        return this;
+    }
+
+    /**
+     * Sets the main JAR file to launch.
+     *
+     * @param jarPath path to the main JAR
+     * @return this builder
+     */
+    public JpackageCLIBuilder mainJar(String jarPath) {
+        Objects.requireNonNull(jarPath, "Main JAR path cannot be null");
+        this.arguments.add("--main-jar " + jarPath);
+        return this;
+    }
+
+    /**
+     * Declares the primary module to launch.
+     *
+     * @param module module name
+     * @return this builder
+     */
+    public JpackageCLIBuilder module(String module) {
+        Objects.requireNonNull(module, "Module cannot be null");
+        this.arguments.add("--module " + module);
+        return this;
+    }
+
+    /**
+     * Requests a Windows console application.
+     *
+     * @return this builder
+     */
+    public JpackageCLIBuilder windowsConsole() {
+        this.arguments.add("--win-console");
+        return this;
+    }
+
+    /**
+     * Sets the macOS bundle identifier.
+     *
+     * @param identifier bundle identifier
+     * @return this builder
+     */
+    public JpackageCLIBuilder macPackageIdentifier(String identifier) {
+        Objects.requireNonNull(identifier, "Identifier cannot be null");
+        this.arguments.add("--mac-package-identifier " + identifier);
+        return this;
+    }
+
+    /**
+     * Sets the macOS package name.
+     *
+     * @param name mac package name
+     * @return this builder
+     */
+    public JpackageCLIBuilder macPackageName(String name) {
+        Objects.requireNonNull(name, "Mac package name cannot be null");
+        this.arguments.add("--mac-package-name " + name);
+        return this;
+    }
+
+    /**
+     * Adds the signing prefix for macOS packages.
+     *
+     * @param prefix signing prefix
+     * @return this builder
+     */
+    public JpackageCLIBuilder macPackageSigningPrefix(String prefix) {
+        Objects.requireNonNull(prefix, "Signing prefix cannot be null");
+        this.arguments.add("--mac-package-signing-prefix " + prefix);
+        return this;
+    }
+
+    /**
+     * Enables macOS signing for the package.
+     *
+     * @return this builder
+     */
+    public JpackageCLIBuilder macSign() {
+        this.arguments.add("--mac-sign");
+        return this;
+    }
+
+    /**
+     * Provides the macOS keychain used for signing.
+     *
+     * @param keychain keychain name
+     * @return this builder
+     */
+    public JpackageCLIBuilder macSigningKeychain(String keychain) {
+        Objects.requireNonNull(keychain, "Keychain cannot be null");
+        this.arguments.add("--mac-signing-keychain " + keychain);
+        return this;
+    }
+
+    /**
+     * Sets the username for the macOS signing key.
+     *
+     * @param userName mac signing user name
+     * @return this builder
+     */
+    public JpackageCLIBuilder macSigningKeyUser(String userName) {
+        Objects.requireNonNull(userName, "User name cannot be null");
+        this.arguments.add("--mac-signing-key-user-name " + userName);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jpackage");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jpackage process", exception);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JpsCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JpsCLIBuilder.java
new file mode 100644
index 00000000..288a2c16
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JpsCLIBuilder.java
@@ -0,0 +1,216 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+public class JpsCLIBuilder implements CLIBuilder<Process, JpsCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jps.exe" : "jps";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+    private String hostIdentifier;
+
+    private JpsCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a new builder instance tied to the provided {@link JDK}.
+     *
+     * @param jdk the JDK to use
+     * @return builder ready for configuration
+     */
+    public static JpsCLIBuilder create(JDK jdk) {
+        return new JpsCLIBuilder(jdk);
+    }
+
+    /**
+     * Adds a raw CLI argument to {@code jps}.
+     *
+     * @param arg argument value
+     * @return this builder
+     */
+    @Override
+    public JpsCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    /**
+     * Sets the working directory for the {@code jps} process.
+     *
+     * @param path working directory
+     * @return this builder
+     */
+    @Override
+    public JpsCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    /**
+     * Adds or overrides an environment variable for the spawned process.
+     *
+     * @param key   variable name
+     * @param value variable value
+     * @return this builder
+     */
+    @Override
+    public JpsCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    /**
+     * Controls whether the new process inherits the system environment variables.
+     *
+     * @param useSystemVars whether to inherit system variables
+     * @return this builder
+     */
+    @Override
+    public JpsCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    /**
+     * Sets a timeout applied when enforcing process termination.
+     *
+     * @param duration timeout duration
+     * @param unit     time unit
+     * @return this builder
+     */
+    @Override
+    public JpsCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Adds the {@code -q} flag to suppress headers.
+     *
+     * @return this builder
+     */
+    public JpsCLIBuilder quiet() {
+        this.arguments.add("-q");
+        return this;
+    }
+
+    /**
+     * Adds {@code -m} to show main arguments for each JVM.
+     *
+     * @return this builder
+     */
+    public JpsCLIBuilder showMainArguments() {
+        this.arguments.add("-m");
+        return this;
+    }
+
+    /**
+     * Adds {@code -l} to show the main class or JAR for each JVM.
+     *
+     * @return this builder
+     */
+    public JpsCLIBuilder showMainClassOrJar() {
+        this.arguments.add("-l");
+        return this;
+    }
+
+    /**
+     * Adds {@code -v} to include JVM arguments in the output.
+     *
+     * @return this builder
+     */
+    public JpsCLIBuilder showJvmArguments() {
+        this.arguments.add("-v");
+        return this;
+    }
+
+    /**
+     * Adds {@code -V} to show only JVM identifiers.
+     *
+     * @return this builder
+     */
+    public JpsCLIBuilder showOnlyIdentifiers() {
+        this.arguments.add("-V");
+        return this;
+    }
+
+    /**
+     * Targets a remote host identifier.
+     *
+     * @param hostIdentifier host address or name
+     * @return this builder
+     */
+    public JpsCLIBuilder host(String hostIdentifier) {
+        Objects.requireNonNull(hostIdentifier, "Host identifier cannot be null");
+        this.hostIdentifier = hostIdentifier;
+        return this;
+    }
+
+    /**
+     * Adds {@code -help} to the argument list.
+     *
+     * @return this builder
+     */
+    public JpsCLIBuilder help() {
+        this.arguments.add("-help");
+        return this;
+    }
+
+    /**
+     * Starts the configured {@code jps} process enforcing the timeout policy.
+     *
+     * @return started process
+     */
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+        if (hostIdentifier != null)
+            command.add(hostIdentifier);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jps");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jps process", exception);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JshellCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JshellCLIBuilder.java
new file mode 100644
index 00000000..8a00d2a0
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JshellCLIBuilder.java
@@ -0,0 +1,462 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+import lombok.Getter;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Builder that exposes the {@code jshell} launcher backed by a specific {@link JDK}.
+ * <p>
+ * Fluent helpers configure exports, modules, classpath settings, and various feedback toggles
+ * before the interactive shell process is executed.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jshell.html">jshell command documentation</a>
+ */
+public class JshellCLIBuilder implements CLIBuilder<Process, JshellCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jshell.exe" : "jshell";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final List<String> loadFiles = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+
+    private JshellCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Starts a builder tied to the provided {@link JDK}.
+     *
+     * @param jdk JDK supplying {@code jshell}
+     * @return a new builder instance
+     */
+    public static JshellCLIBuilder create(JDK jdk) {
+        return new JshellCLIBuilder(jdk);
+    }
+
+    @Override
+    public JshellCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JshellCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JshellCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JshellCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JshellCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Adds an {@code --add-exports} directive.
+     *
+     * @param moduleAndPackage the module/package pair (e.g. {@code java.base/java.lang})
+     * @return this builder
+     */
+    public JshellCLIBuilder addExports(String moduleAndPackage) {
+        Objects.requireNonNull(moduleAndPackage, "Module/package cannot be null");
+        this.arguments.add("--add-exports " + moduleAndPackage);
+        return this;
+    }
+
+    /**
+     * Adds an {@code --add-exports} directive by splitting module and package arguments.
+     *
+     * @param moduleName  module name
+     * @param packageName package name
+     * @return this builder
+     */
+    public JshellCLIBuilder addExports(String moduleName, String packageName) {
+        Objects.requireNonNull(moduleName, "Module name cannot be null");
+        Objects.requireNonNull(packageName, "Package name cannot be null");
+        return addExports(moduleName + "/" + packageName);
+    }
+
+    /**
+     * Adds {@code --add-modules} with the provided module list.
+     *
+     * @param modules module names
+     * @return this builder
+     */
+    public JshellCLIBuilder addModules(String... modules) {
+        Objects.requireNonNull(modules, "Modules cannot be null");
+        if (modules.length == 0)
+            throw new IllegalArgumentException("At least one module must be provided");
+
+        for (String module : modules) {
+            Objects.requireNonNull(module, "Module name cannot be null");
+        }
+
+        this.arguments.add("--add-modules " + String.join(",", modules));
+        return this;
+    }
+
+    /**
+     * Attaches compiler-specific options via {@code -C}.
+     *
+     * @param options compiler options
+     * @return this builder
+     */
+    public JshellCLIBuilder compilerOptions(String... options) {
+        Objects.requireNonNull(options, "Compiler options cannot be null");
+        for (String option : options) {
+            Objects.requireNonNull(option, "Compiler option cannot be null");
+            this.arguments.add("-C" + option);
+        }
+
+        return this;
+    }
+
+    /**
+     * Sets the compilation classpath for {@code jshell}.
+     *
+     * @param entries classpath entries
+     * @return this builder
+     */
+    public JshellCLIBuilder classPath(String... entries) {
+        Objects.requireNonNull(entries, "Classpath entries cannot be null");
+        if (entries.length == 0)
+            throw new IllegalArgumentException("At least one classpath entry must be provided");
+
+        this.arguments.add("--class-path " + String.join(File.pathSeparator, entries));
+        return this;
+    }
+
+    /**
+     * Sets classpath entries using {@link Path} values.
+     *
+     * @param entries classpath entries
+     * @return this builder
+     */
+    public JshellCLIBuilder classPath(Path... entries) {
+        Objects.requireNonNull(entries, "Classpath entries cannot be null");
+        String[] entryStrings = Arrays.stream(entries).map(path -> Objects.requireNonNull(path, "Classpath path cannot be null").toString()).toArray(String[]::new);
+        return classPath(entryStrings);
+    }
+
+    /**
+     * Enables preview language features via {@code --enable-preview}.
+     *
+     * @return this builder
+     */
+    public JshellCLIBuilder enablePreview() {
+        this.arguments.add("--enable-preview");
+        return this;
+    }
+
+    /**
+     * Sets the execution engine (like {@code java} or {@code jshell} implementations).
+     *
+     * @param specification engine name or specification
+     * @return this builder
+     */
+    public JshellCLIBuilder executionEngine(String specification) {
+        Objects.requireNonNull(specification, "Execution specification cannot be null");
+        this.arguments.add("--execution " + specification);
+        return this;
+    }
+
+    /**
+     * Chooses the feedback mode by keyword.
+     *
+     * @param mode feedback keyword
+     * @return this builder
+     */
+    public JshellCLIBuilder feedbackMode(String mode) {
+        Objects.requireNonNull(mode, "Feedback mode cannot be null");
+        this.arguments.add("--feedback " + mode);
+        return this;
+    }
+
+    /**
+     * Chooses the feedback mode via {@link FeedbackMode}.
+     *
+     * @param mode feedback mode
+     * @return this builder
+     */
+    public JshellCLIBuilder feedbackMode(FeedbackMode mode) {
+        Objects.requireNonNull(mode, "Feedback mode cannot be null");
+        return feedbackMode(mode.getMode());
+    }
+
+    /**
+     * Requests {@code --help} output.
+     *
+     * @return this builder
+     */
+    public JshellCLIBuilder help() {
+        this.arguments.add("--help");
+        return this;
+    }
+
+    /**
+     * Enables {@code --help-extra} to include additional guidance.
+     *
+     * @return this builder
+     */
+    public JshellCLIBuilder helpExtra() {
+        this.arguments.add("--help-extra");
+        return this;
+    }
+
+    /**
+     * Supplies JVM options prefixed with {@code -J}.
+     *
+     * @param options JVM options
+     * @return this builder
+     */
+    public JshellCLIBuilder jvmOptions(String... options) {
+        Objects.requireNonNull(options, "JVM options cannot be null");
+        for (String option : options) {
+            Objects.requireNonNull(option, "JVM option cannot be null");
+            this.arguments.add("-J" + option);
+        }
+
+        return this;
+    }
+
+    /**
+     * Configures the module path for this {@code jshell} session.
+     *
+     * @param modulePaths module path entries
+     * @return this builder
+     */
+    public JshellCLIBuilder modulePath(String... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module paths cannot be null");
+        if (modulePaths.length == 0)
+            throw new IllegalArgumentException("At least one module path must be provided");
+
+        this.arguments.add("--module-path " + String.join(File.pathSeparator, modulePaths));
+        return this;
+    }
+
+    /**
+     * Configures the module path via {@link Path} instances.
+     *
+     * @param modulePaths module path entries
+     * @return this builder
+     */
+    public JshellCLIBuilder modulePath(Path... modulePaths) {
+        Objects.requireNonNull(modulePaths, "Module paths cannot be null");
+        String[] pathStrings = Arrays.stream(modulePaths).map(path -> Objects.requireNonNull(path, "Module path cannot be null").toString()).toArray(String[]::new);
+        return modulePath(pathStrings);
+    }
+
+    /**
+     * Disables loading of startup scripts.
+     *
+     * @return this builder
+     */
+    public JshellCLIBuilder noStartupScripts() {
+        this.arguments.add("--no-startup");
+        return this;
+    }
+
+    /**
+     * Requests concise feedback with {@code -q}.
+     *
+     * @return this builder
+     */
+    public JshellCLIBuilder conciseFeedback() {
+        this.arguments.add("-q");
+        return this;
+    }
+
+    /**
+     * Adds runtime options prefixed with {@code -R}.
+     *
+     * @param options runtime options
+     * @return this builder
+     */
+    public JshellCLIBuilder runtimeOptions(String... options) {
+        Objects.requireNonNull(options, "Runtime options cannot be null");
+        for (String option : options) {
+            Objects.requireNonNull(option, "Runtime option cannot be null");
+            this.arguments.add("-R" + option);
+        }
+
+        return this;
+    }
+
+    /**
+     * Requests silent mode via {@code -s}.
+     *
+     * @return this builder
+     */
+    public JshellCLIBuilder silentFeedback() {
+        this.arguments.add("-s");
+        return this;
+    }
+
+    /**
+     * Prints version information and enters the shell.
+     *
+     * @return this builder
+     */
+    public JshellCLIBuilder showVersionAndEnter() {
+        this.arguments.add("--show-version");
+        return this;
+    }
+
+    /**
+     * Loads a startup script by name.
+     *
+     * @param scriptName script file name
+     * @return this builder
+     */
+    public JshellCLIBuilder startupScript(String scriptName) {
+        Objects.requireNonNull(scriptName, "Startup script cannot be null");
+        this.arguments.add("--startup " + scriptName);
+        return this;
+    }
+
+    /**
+     * Loads a startup script from a {@link Path}.
+     *
+     * @param scriptPath path to the startup script
+     * @return this builder
+     */
+    public JshellCLIBuilder startupScript(Path scriptPath) {
+        Objects.requireNonNull(scriptPath, "Startup script path cannot be null");
+        return startupScript(scriptPath.toString());
+    }
+
+    /**
+     * Enables verbose feedback via {@code -v}.
+     *
+     * @return this builder
+     */
+    public JshellCLIBuilder verboseFeedback() {
+        this.arguments.add("-v");
+        return this;
+    }
+
+    /**
+     * Prints the JShell version.
+     *
+     * @return this builder
+     */
+    public JshellCLIBuilder version() {
+        this.arguments.add("--version");
+        return this;
+    }
+
+    /**
+     * Queues a file to load after {@code jshell} starts.
+     *
+     * @param loadFile load file path or {@code -} to read from stdin
+     * @return this builder
+     */
+    public JshellCLIBuilder addLoadFile(String loadFile) {
+        Objects.requireNonNull(loadFile, "Load file cannot be null");
+        this.loadFiles.add(loadFile);
+        return this;
+    }
+
+    /**
+     * Queues a {@link Path}-based file to load.
+     *
+     * @param path load file path
+     * @return this builder
+     */
+    public JshellCLIBuilder addLoadFile(Path path) {
+        Objects.requireNonNull(path, "Load file path cannot be null");
+        return addLoadFile(path.toString());
+    }
+
+    /**
+     * Allows {@code jshell} to accept input from {@code stdin}.
+     *
+     * @return this builder
+     */
+    public JshellCLIBuilder acceptInputFromStdin() {
+        this.loadFiles.add("-");
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+        command.addAll(loadFiles);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jshell");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jshell process", exception);
+        }
+    }
+
+    /**
+     * Encapsulates the supported feedback modes for JShell.
+     */
+    @Getter
+    public enum FeedbackMode {
+        VERBOSE("verbose"),
+        NORMAL("normal"),
+        CONCISE("concise"),
+        SILENT("silent"),
+        CUSTOM("custom");
+
+        private final String mode;
+
+        FeedbackMode(String mode) {
+            this.mode = mode;
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JstackCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JstackCLIBuilder.java
new file mode 100644
index 00000000..9bf341f5
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JstackCLIBuilder.java
@@ -0,0 +1,186 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Builder for configuring and executing {@code jstack} backed by a {@link JDK}.
+ * <p>
+ * Provides helpers to point {@code jstack} at a target process, toggle verbosity,
+ * and pass through Java launcher options before running the tool.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jstack.html">jstack command documentation</a>
+ */
+public class JstackCLIBuilder implements CLIBuilder<Process, JstackCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jstack.exe" : "jstack";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+    private String processId;
+
+    private JstackCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Constructs a new builder that uses the supplied {@link JDK}.
+     *
+     * @param jdk the JDK to invoke {@code jstack} from
+     * @return a builder ready for configuration
+     */
+    public static JstackCLIBuilder create(JDK jdk) {
+        return new JstackCLIBuilder(jdk);
+    }
+
+    @Override
+    public JstackCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JstackCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JstackCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JstackCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JstackCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Targets {@code jstack} at a numeric process ID.
+     *
+     * @param pid positive process identifier
+     * @return this builder
+     */
+    public JstackCLIBuilder processId(long pid) {
+        if (pid <= 0)
+            throw new IllegalArgumentException("PID must be positive");
+
+        this.processId = Long.toString(pid);
+        return this;
+    }
+
+    /**
+     * Targets {@code jstack} at a string-based process identifier (host:pid style).
+     *
+     * @param pid process identifier
+     * @return this builder
+     */
+    public JstackCLIBuilder processId(String pid) {
+        Objects.requireNonNull(pid, "PID cannot be null");
+        this.processId = pid;
+        return this;
+    }
+
+    /**
+     * Adds {@code -l} for a long thread listing.
+     *
+     * @return this builder
+     */
+    public JstackCLIBuilder longListing() {
+        this.arguments.add("-l");
+        return this;
+    }
+
+    /**
+     * Requests the {@code -help} summary.
+     *
+     * @return this builder
+     */
+    public JstackCLIBuilder help() {
+        this.arguments.add("-help");
+        return this;
+    }
+
+    /**
+     * Requests the short {@code -h} help output.
+     *
+     * @return this builder
+     */
+    public JstackCLIBuilder shortHelp() {
+        this.arguments.add("-h");
+        return this;
+    }
+
+    /**
+     * Passes a JVM option through {@code -J}.
+     *
+     * @param option JVM argument
+     * @return this builder
+     */
+    public JstackCLIBuilder javaOption(String option) {
+        Objects.requireNonNull(option, "Java option cannot be null");
+        this.arguments.add("-J" + option);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        if (processId == null)
+            throw new IllegalStateException("A process ID must be specified for jstack.");
+
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+        command.add(processId);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jstack");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jstack process", exception);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JstatCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JstatCLIBuilder.java
new file mode 100644
index 00000000..ddd2d8fc
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JstatCLIBuilder.java
@@ -0,0 +1,356 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Fluent builder for configuring and running the {@code jstat} diagnostic utility shipped with a {@link JDK}.
+ * <p>
+ * Provides helpers for selecting general options, stat counters, VM identifiers, and sampling intervals
+ * before executing {@code jstat} via {@link ProcessExecution}.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jstat.html">jstat command documentation</a>
+ */
+public class JstatCLIBuilder implements CLIBuilder<Process, JstatCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jstat.exe" : "jstat";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+
+    private String generalOption;
+    private String statOption;
+    private String vmId;
+    private String intervalExpression;
+    private Integer sampleCount;
+
+    private JstatCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Instantiates a builder bound to the given {@link JDK}.
+     *
+     * @param jdk the JDK that provides {@code jstat}
+     * @return a new builder instance
+     */
+    public static JstatCLIBuilder create(JDK jdk) {
+        return new JstatCLIBuilder(jdk);
+    }
+
+    @Override
+    public JstatCLIBuilder addArgument(String arg) {
+        ensureGeneralOptionNotSet();
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JstatCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JstatCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JstatCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JstatCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Requests {@code -help} output from {@code jstat}.
+     *
+     * @return this builder
+     */
+    public JstatCLIBuilder help() {
+        selectGeneralOption("-help");
+        return this;
+    }
+
+    /**
+     * Adds {@code -options} to list available statistics.
+     *
+     * @return this builder
+     */
+    public JstatCLIBuilder listStatOptions() {
+        selectGeneralOption("-options");
+        return this;
+    }
+
+    /**
+     * Specifies a pre-defined stat option.
+     *
+     * @param option stat option
+     * @return this builder
+     */
+    public JstatCLIBuilder statOption(StatOption option) {
+        Objects.requireNonNull(option, "Stat option cannot be null");
+        return statOption(option.getFlag());
+    }
+
+    /**
+     * Specifies a custom stat option flag.
+     *
+     * @param option stat option flag
+     * @return this builder
+     */
+    public JstatCLIBuilder statOption(String option) {
+        ensureGeneralOptionNotSet();
+        Objects.requireNonNull(option, "Stat option cannot be null");
+        if (option.isBlank())
+            throw new IllegalArgumentException("Stat option cannot be blank");
+
+        this.statOption = option.startsWith("-") ? option : "-" + option;
+        return this;
+    }
+
+    /**
+     * Requests timestamps via {@code -t}.
+     *
+     * @return this builder
+     */
+    public JstatCLIBuilder showTimestamp() {
+        ensureGeneralOptionNotSet();
+        this.arguments.add("-t");
+        return this;
+    }
+
+    /**
+     * Inserts {@code -h <lines>} to repeat headers.
+     *
+     * @param lines header frequency
+     * @return this builder
+     */
+    public JstatCLIBuilder headerEvery(int lines) {
+        ensureGeneralOptionNotSet();
+        if (lines < 0)
+            throw new IllegalArgumentException("Header frequency must be zero or greater");
+
+        this.arguments.add("-h");
+        this.arguments.add(Integer.toString(lines));
+        return this;
+    }
+
+    /**
+     * Adds a JVM argument with {@code -J}.
+     *
+     * @param option JVM option
+     * @return this builder
+     */
+    public JstatCLIBuilder javaOption(String option) {
+        ensureGeneralOptionNotSet();
+        Objects.requireNonNull(option, "Java option cannot be null");
+        if (option.isBlank())
+            throw new IllegalArgumentException("Java option cannot be blank");
+
+        this.arguments.add("-J" + option);
+        return this;
+    }
+
+    /**
+     * Adds multiple JVM options.
+     *
+     * @param options JVM options
+     * @return this builder
+     */
+    public JstatCLIBuilder javaOptions(String... options) {
+        Objects.requireNonNull(options, "Java options cannot be null");
+        for (String option : options) {
+            javaOption(option);
+        }
+
+        return this;
+    }
+
+    /**
+     * Targets a VM using its numeric PID.
+     *
+     * @param pid process identifier
+     * @return this builder
+     */
+    public JstatCLIBuilder vmId(long pid) {
+        ensureGeneralOptionNotSet();
+        if (pid <= 0)
+            throw new IllegalArgumentException("PID must be positive");
+
+        this.vmId = Long.toString(pid);
+        return this;
+    }
+
+    /**
+     * Targets a VM using a string identifier.
+     *
+     * @param vmIdentifier VM identifier
+     * @return this builder
+     */
+    public JstatCLIBuilder vmId(String vmIdentifier) {
+        ensureGeneralOptionNotSet();
+        Objects.requireNonNull(vmIdentifier, "VM identifier cannot be null");
+        if (vmIdentifier.isBlank())
+            throw new IllegalArgumentException("VM identifier cannot be blank");
+
+        this.vmId = vmIdentifier;
+        return this;
+    }
+
+    /**
+     * Sets the sampling interval via {@code <value><unit>}.
+     *
+     * @param interval interval value
+     * @param unit     time unit
+     * @return this builder
+     */
+    public JstatCLIBuilder samplingInterval(long interval, TimeUnit unit) {
+        ensureGeneralOptionNotSet();
+        if (interval <= 0)
+            throw new IllegalArgumentException("Interval must be positive");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.intervalExpression = formatInterval(interval, unit);
+        return this;
+    }
+
+    /**
+     * Configures the number of samples to collect.
+     *
+     * @param count sample count
+     * @return this builder
+     */
+    public JstatCLIBuilder sampleCount(int count) {
+        ensureGeneralOptionNotSet();
+        if (count <= 0)
+            throw new IllegalArgumentException("Sample count must be positive");
+
+        this.sampleCount = count;
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+
+        if (generalOption != null) {
+            command.add(generalOption);
+        } else {
+            if (statOption == null)
+                throw new IllegalStateException("A stat option must be specified when not using a general option.");
+            if (vmId == null)
+                throw new IllegalStateException("A VM identifier must be specified when using jstat output options.");
+            if (sampleCount != null && intervalExpression == null)
+                throw new IllegalStateException("A sampling interval must be specified before setting a sample count.");
+
+            command.add(statOption);
+            command.addAll(arguments);
+            command.add(vmId);
+
+            if (intervalExpression != null) {
+                command.add(intervalExpression);
+                if (sampleCount != null)
+                    command.add(Integer.toString(sampleCount));
+            }
+        }
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jstat");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jstat process", exception);
+        }
+    }
+
+    private void selectGeneralOption(String optionFlag) {
+        if (this.generalOption != null)
+            throw new IllegalStateException("Only one jstat general option can be specified.");
+
+        if (statOption != null || vmId != null || intervalExpression != null || sampleCount != null || !arguments.isEmpty())
+            throw new IllegalStateException("General options cannot be combined with other jstat configuration.");
+
+        this.generalOption = optionFlag;
+    }
+
+    private void ensureGeneralOptionNotSet() {
+        if (generalOption != null)
+            throw new IllegalStateException("Cannot combine general jstat options with other configuration.");
+    }
+
+    private static String formatInterval(long interval, TimeUnit unit) {
+        return switch (unit) {
+            case MILLISECONDS -> interval + "ms";
+            case SECONDS -> interval + "s";
+            default -> throw new IllegalArgumentException("jstat intervals support only seconds or milliseconds");
+        };
+    }
+
+    public enum StatOption {
+        CLASS("class"),
+        COMPILER("compiler"),
+        GC("gc"),
+        GC_CAPACITY("gccapacity"),
+        GC_CAUSE("gccause"),
+        GC_NEW("gcnew"),
+        GC_NEW_CAPACITY("gcnewcapacity"),
+        GC_OLD("gcold"),
+        GC_OLD_CAPACITY("gcoldcapacity"),
+        GC_META_CAPACITY("gcmetacapacity"),
+        GC_UTIL("gcutil"),
+        PRINT_COMPILATION("printcompilation");
+
+        private final String flag;
+
+        StatOption(String flag) {
+            this.flag = flag;
+        }
+
+        public String getFlag() {
+            return "-" + flag;
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/JstatdCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/JstatdCLIBuilder.java
new file mode 100644
index 00000000..ce721e5a
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/JstatdCLIBuilder.java
@@ -0,0 +1,181 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Builder to configure {@code jstatd} daemon processes using a specific {@link JDK}.
+ * <p>
+ * Enables toggles for registry/connector ports, RMI object names, and runtime options.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/jstatd.html">jstatd command documentation</a>
+ */
+public class JstatdCLIBuilder implements CLIBuilder<Process, JstatdCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "jstatd.exe" : "jstatd";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+
+    private JstatdCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a builder tied to the provided {@link JDK}.
+     *
+     * @param jdk the JDK providing {@code jstatd}
+     * @return a new builder instance
+     */
+    public static JstatdCLIBuilder create(JDK jdk) {
+        return new JstatdCLIBuilder(jdk);
+    }
+
+    @Override
+    public JstatdCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public JstatdCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public JstatdCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public JstatdCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public JstatdCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Adds {@code -nr} to disable the internal registry.
+     *
+     * @return this builder
+     */
+    public JstatdCLIBuilder noInternalRegistry() {
+        this.arguments.add("-nr");
+        return this;
+    }
+
+    /**
+     * Sets a specific registry port with {@code -p}.
+     *
+     * @param port registry port
+     * @return this builder
+     */
+    public JstatdCLIBuilder registryPort(int port) {
+        validatePort(port, "Registry port must be between 1 and 65535");
+        this.arguments.add("-p");
+        this.arguments.add(Integer.toString(port));
+        return this;
+    }
+
+    /**
+     * Sets a connector port via {@code -r}.
+     *
+     * @param port connector port
+     * @return this builder
+     */
+    public JstatdCLIBuilder connectorPort(int port) {
+        validatePort(port, "Connector port must be between 1 and 65535");
+        this.arguments.add("-r");
+        this.arguments.add(Integer.toString(port));
+        return this;
+    }
+
+    /**
+     * Provides an RMI object name using {@code -n}.
+     *
+     * @param name object name
+     * @return this builder
+     */
+    public JstatdCLIBuilder rmiObjectName(String name) {
+        Objects.requireNonNull(name, "RMI object name cannot be null");
+        if (name.isBlank())
+            throw new IllegalArgumentException("RMI object name cannot be blank");
+
+        this.arguments.add("-n");
+        this.arguments.add(name);
+        return this;
+    }
+
+    /**
+     * Supplies a JVM option via {@code -J}.
+     *
+     * @param option JVM option
+     * @return this builder
+     */
+    public JstatdCLIBuilder javaOption(String option) {
+        Objects.requireNonNull(option, "Java option cannot be null");
+        this.arguments.add("-J" + option);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "jstatd");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start jstatd process", exception);
+        }
+    }
+
+    private static void validatePort(int port, String message) {
+        if (port <= 0 || port > 65535)
+            throw new IllegalArgumentException(message);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/KeytoolCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/KeytoolCLIBuilder.java
new file mode 100644
index 00000000..129dc1f3
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/KeytoolCLIBuilder.java
@@ -0,0 +1,1040 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+import lombok.Getter;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Builder that constructs {@code keytool} invocations used to create and manage keystores,
+ * certificates, and related trust material.
+ *
+ * <p>Each helper method adds the appropriate flag to the argument list and validates
+ * required data before execution.</p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/keytool.html">keytool command documentation</a>
+ */
+public class KeytoolCLIBuilder implements CLIBuilder<Process, KeytoolCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "keytool.exe" : "keytool";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private Path workingDirectory;
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+    private KeytoolCommand selectedCommand;
+
+    private KeytoolCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a builder that executes {@code keytool} from the provided {@link JDK}.
+     *
+     * @param jdk the JDK to use when locating the executable; must not be null
+     * @return a new {@code KeytoolCLIBuilder} configured for the given JDK
+     */
+    public static KeytoolCLIBuilder create(JDK jdk) {
+        return new KeytoolCLIBuilder(jdk);
+    }
+
+    @Override
+    public KeytoolCLIBuilder addArgument(String arg) {
+        this.arguments.add(Objects.requireNonNull(arg, "Argument cannot be null"));
+        return this;
+    }
+
+    @Override
+    public KeytoolCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = Objects.requireNonNull(path, "Working directory cannot be null");
+        return this;
+    }
+
+    @Override
+    public KeytoolCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment key cannot be null");
+        Objects.requireNonNull(value, "Environment value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public KeytoolCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public KeytoolCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        this.timeoutDuration = duration;
+        this.timeoutUnit = Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        return this;
+    }
+
+    /**
+     * Sets the keytool command to run. Only a single command may be selected.
+     *
+     * @param command the command to run; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder command(KeytoolCommand command) {
+        Objects.requireNonNull(command, "Command cannot be null");
+        if (this.selectedCommand != null)
+            throw new IllegalStateException("Only one keytool command can be specified per invocation.");
+
+        this.arguments.add(command.getFlag());
+        this.selectedCommand = command;
+        return this;
+    }
+
+    /**
+     * Selects {@code -certreq} to generate a certificate signing request.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder certreq() {
+        return command(KeytoolCommand.CERTREQ);
+    }
+
+    /**
+     * Selects {@code -changealias} to change a certificate alias in a keystore.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder changeAlias() {
+        return command(KeytoolCommand.CHANGE_ALIAS);
+    }
+
+    /**
+     * Selects {@code -delete} to remove an entry from a keystore.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder deleteEntry() {
+        return command(KeytoolCommand.DELETE);
+    }
+
+    /**
+     * Selects {@code -exportcert} to export a certificate from the keystore.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder exportCertificate() {
+        return command(KeytoolCommand.EXPORT_CERT);
+    }
+
+    /**
+     * Selects {@code -gencert} to generate a certificate using an existing certificate authority.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder generateCertificate() {
+        return command(KeytoolCommand.GEN_CERT);
+    }
+
+    /**
+     * Selects {@code -genkeypair} to generate a new key pair and self-signed certificate.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder generateKeyPair() {
+        return command(KeytoolCommand.GEN_KEYPAIR);
+    }
+
+    /**
+     * Selects {@code -genseckey} to generate a secret key entry in the keystore.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder generateSecretKey() {
+        return command(KeytoolCommand.GEN_SECKEY);
+    }
+
+    /**
+     * Selects {@code -importcert} to import a certificate into the keystore.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder importCertificate() {
+        return command(KeytoolCommand.IMPORT_CERT);
+    }
+
+    /**
+     * Selects {@code -importpass} to import a password entry from another keystore.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder importPassword() {
+        return command(KeytoolCommand.IMPORT_PASS);
+    }
+
+    /**
+     * Selects {@code -importkeystore} to import entries from a different keystore.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder importKeystore() {
+        return command(KeytoolCommand.IMPORT_KEYSTORE);
+    }
+
+    /**
+     * Selects {@code -keypasswd} to change the password of a key pair.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder keyPasswordCommand() {
+        return command(KeytoolCommand.KEY_PASSWD);
+    }
+
+    /**
+     * Selects {@code -list} to list the entries contained in the keystore.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder listEntries() {
+        return command(KeytoolCommand.LIST);
+    }
+
+    /**
+     * Selects {@code -printcert} to display the contents of a certificate.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder printCertificate() {
+        return command(KeytoolCommand.PRINT_CERT);
+    }
+
+    /**
+     * Selects {@code -printcertreq} to display a certificate request.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder printCertificateRequest() {
+        return command(KeytoolCommand.PRINT_CERT_REQ);
+    }
+
+    /**
+     * Selects {@code -printcrl} to display a certificate revocation list.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder printCRL() {
+        return command(KeytoolCommand.PRINT_CRL);
+    }
+
+    /**
+     * Selects {@code -storepasswd} to change a keystore password.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder storePasswordCommand() {
+        return command(KeytoolCommand.STORE_PASSWD);
+    }
+
+    /**
+     * Selects {@code -showinfo} to display keystore metadata and provider information.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder showInfo() {
+        return command(KeytoolCommand.SHOW_INFO);
+    }
+
+    /**
+     * Selects {@code -version} to print the tool's version.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder version() {
+        return command(KeytoolCommand.VERSION);
+    }
+
+    /**
+     * Adds {@code -help} to print usage for the selected command.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder help() {
+        this.arguments.add("-help");
+        return this;
+    }
+
+    /**
+     * Adds {@code -rfc} to format certificate output in RFC style.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder rfcOutput() {
+        this.arguments.add("-rfc");
+        return this;
+    }
+
+    /**
+     * Adds {@code -v} to enable verbose logging.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder verbose() {
+        this.arguments.add("-v");
+        return this;
+    }
+
+    /**
+     * Adds {@code -protected} to run operations in protected mode.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder protectedMode() {
+        this.arguments.add("-protected");
+        return this;
+    }
+
+    /**
+     * Adds {@code -trustcacerts} to trust certificates from the default trust store.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder trustCaCerts() {
+        this.arguments.add("-trustcacerts");
+        return this;
+    }
+
+    /**
+     * Adds {@code -cacerts} to operate on the default cacerts keystore.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder useDefaultCacerts() {
+        this.arguments.add("-cacerts");
+        return this;
+    }
+
+    /**
+     * Adds {@code -certs} to include the certificate chain in exports.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder includeCertChain() {
+        this.arguments.add("-certs");
+        return this;
+    }
+
+    /**
+     * Adds {@code -noprompt} to skip confirmation prompts.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder noPrompt() {
+        this.arguments.add("-noprompt");
+        return this;
+    }
+
+    /**
+     * Adds {@code -stdout} to route certificate output to {@code stdout}.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder outputToStdout() {
+        this.arguments.add("-stdout");
+        return this;
+    }
+
+    /**
+     * Adds {@code -tls} with the provided protocols to request TLS information.
+     *
+     * @param protocols the TLS protocols to enable; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder tlsInfo(String protocols) {
+        Objects.requireNonNull(protocols, "Protocols cannot be null");
+        this.arguments.add("-tls " + protocols);
+        return this;
+    }
+
+    /**
+     * Adds {@code -sslserver} to contact a specific SSL server.
+     *
+     * @param server the SSL server; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder sslServer(String server) {
+        Objects.requireNonNull(server, "Server cannot be null");
+        this.arguments.add("-sslserver " + server);
+        return this;
+    }
+
+    /**
+     * Adds {@code -alias} to specify the alias of the entry to work with.
+     *
+     * @param alias the alias; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder alias(String alias) {
+        Objects.requireNonNull(alias, "Alias cannot be null");
+        this.arguments.add("-alias " + alias);
+        return this;
+    }
+
+    /**
+     * Adds {@code -destalias} for the destination alias when copying or moving entries.
+     *
+     * @param alias the destination alias; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder destAlias(String alias) {
+        Objects.requireNonNull(alias, "Destination alias cannot be null");
+        this.arguments.add("-destalias " + alias);
+        return this;
+    }
+
+    /**
+     * Adds {@code -srcalias} for the source alias when copying or converting entries.
+     *
+     * @param alias the source alias; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder srcAlias(String alias) {
+        Objects.requireNonNull(alias, "Source alias cannot be null");
+        this.arguments.add("-srcalias " + alias);
+        return this;
+    }
+
+    /**
+     * Adds {@code -dname} to define the distinguished name for certificate creation.
+     *
+     * @param distinguishedName the distinguished name; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder dname(String distinguishedName) {
+        Objects.requireNonNull(distinguishedName, "Distinguished name cannot be null");
+        this.arguments.add("-dname " + distinguishedName);
+        return this;
+    }
+
+    /**
+     * Adds {@code -keyalg} to specify the key algorithm.
+     *
+     * @param algorithm the key algorithm; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder keyAlgorithm(String algorithm) {
+        Objects.requireNonNull(algorithm, "Key algorithm cannot be null");
+        this.arguments.add("-keyalg " + algorithm);
+        return this;
+    }
+
+    /**
+     * Adds {@code -keysize} to request a specific key size.
+     *
+     * @param size the key size; must be positive
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder keySize(int size) {
+        if (size <= 0)
+            throw new IllegalArgumentException("Key size must be positive");
+        this.arguments.add("-keysize " + size);
+        return this;
+    }
+
+    /**
+     * Adds {@code -sigalg} to specify the signature algorithm.
+     *
+     * @param algorithm the signature algorithm; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder signatureAlgorithm(String algorithm) {
+        Objects.requireNonNull(algorithm, "Signature algorithm cannot be null");
+        this.arguments.add("-sigalg " + algorithm);
+        return this;
+    }
+
+    /**
+     * Adds {@code -validity} to define the validity duration of a certificate.
+     *
+     * @param days the number of days; must be positive
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder validityDays(int days) {
+        if (days <= 0)
+            throw new IllegalArgumentException("Validity days must be positive");
+        this.arguments.add("-validity " + days);
+        return this;
+    }
+
+    /**
+     * Adds {@code -startdate} to specify when the certificate becomes valid.
+     *
+     * @param date the start date; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder startDate(String date) {
+        Objects.requireNonNull(date, "Start date cannot be null");
+        this.arguments.add("-startdate " + date);
+        return this;
+    }
+
+    /**
+     * Adds {@code -groupname} to specify a provider group name.
+     *
+     * @param group the group name; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder groupName(String group) {
+        Objects.requireNonNull(group, "Group name cannot be null");
+        this.arguments.add("-groupname " + group);
+        return this;
+    }
+
+    /**
+     * Adds {@code -keypass} to supply the password for a key entry.
+     *
+     * @param password the key password; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder keyPass(String password) {
+        Objects.requireNonNull(password, "Key password cannot be null");
+        this.arguments.add("-keypass " + password);
+        return this;
+    }
+
+    /**
+     * Adds {@code -new} to specify a new password.
+     *
+     * @param password the new password; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder newPassword(String password) {
+        Objects.requireNonNull(password, "New password cannot be null");
+        this.arguments.add("-new " + password);
+        return this;
+    }
+
+    /**
+     * Adds {@code -signer} to specify the alias of the signing certificate.
+     *
+     * @param signerAlias the signer alias; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder signer(String signerAlias) {
+        Objects.requireNonNull(signerAlias, "Signer alias cannot be null");
+        this.arguments.add("-signer " + signerAlias);
+        return this;
+    }
+
+    /**
+     * Adds {@code -signerkeypass} to supply the password for the signer.
+     *
+     * @param password the signer's key password; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder signerKeyPass(String password) {
+        Objects.requireNonNull(password, "Signer key password cannot be null");
+        this.arguments.add("-signerkeypass " + password);
+        return this;
+    }
+
+    /**
+     * Adds {@code -keystore} to specify the keystore path.
+     *
+     * @param keystore the keystore path; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder keystore(String keystore) {
+        Objects.requireNonNull(keystore, "Keystore cannot be null");
+        this.arguments.add("-keystore " + keystore);
+        return this;
+    }
+
+    /**
+     * Adds {@code -keystore} using a {@link Path}.
+     *
+     * @param keystorePath the keystore path; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder keystore(Path keystorePath) {
+        Objects.requireNonNull(keystorePath, "Keystore path cannot be null");
+        return keystore(keystorePath.toString());
+    }
+
+    /**
+     * Adds {@code -storepass} to set the keystore password.
+     *
+     * @param password the keystore password; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder storePass(String password) {
+        Objects.requireNonNull(password, "Store password cannot be null");
+        this.arguments.add("-storepass " + password);
+        return this;
+    }
+
+    /**
+     * Adds {@code -storetype} to define the keystore type.
+     *
+     * @param type the keystore type; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder storeType(String type) {
+        Objects.requireNonNull(type, "Store type cannot be null");
+        this.arguments.add("-storetype " + type);
+        return this;
+    }
+
+    /**
+     * Adds {@code -destkeystore} to specify the destination keystore path.
+     *
+     * @param path the destination keystore; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder destKeystore(String path) {
+        Objects.requireNonNull(path, "Destination keystore cannot be null");
+        this.arguments.add("-destkeystore " + path);
+        return this;
+    }
+
+    /**
+     * Adds {@code -destkeystore} using a {@link Path}.
+     *
+     * @param path the destination keystore path; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder destKeystore(Path path) {
+        Objects.requireNonNull(path, "Destination keystore path cannot be null");
+        return destKeystore(path.toString());
+    }
+
+    /**
+     * Adds {@code -deststorepass} for the destination keystore password.
+     *
+     * @param password the destination store password; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder destStorePass(String password) {
+        Objects.requireNonNull(password, "Destination store password cannot be null");
+        this.arguments.add("-deststorepass " + password);
+        return this;
+    }
+
+    /**
+     * Adds {@code -deststoretype} to override the destination keystore type.
+     *
+     * @param type the destination store type; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder destStoreType(String type) {
+        Objects.requireNonNull(type, "Destination store type cannot be null");
+        this.arguments.add("-deststoretype " + type);
+        return this;
+    }
+
+    /**
+     * Adds {@code -destkeypass} to supply the password for the destination key entry.
+     *
+     * @param password the destination key password; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder destKeyPass(String password) {
+        Objects.requireNonNull(password, "Destination key password cannot be null");
+        this.arguments.add("-destkeypass " + password);
+        return this;
+    }
+
+    /**
+     * Adds {@code -destprovidername} for third-party providers when writing to the destination.
+     *
+     * @param providerName the provider name; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder destProviderName(String providerName) {
+        Objects.requireNonNull(providerName, "Destination provider name cannot be null");
+        this.arguments.add("-destprovidername " + providerName);
+        return this;
+    }
+
+    /**
+     * Adds {@code -destprotected} to request protected mode on the destination keystore.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder destProtected() {
+        this.arguments.add("-destprotected");
+        return this;
+    }
+
+    /**
+     * Adds {@code -srckeystore} for the source keystore path.
+     *
+     * @param path the source keystore; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder srcKeystore(String path) {
+        Objects.requireNonNull(path, "Source keystore cannot be null");
+        this.arguments.add("-srckeystore " + path);
+        return this;
+    }
+
+    /**
+     * Adds {@code -srckeystore} using a {@link Path}.
+     *
+     * @param path the source keystore path; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder srcKeystore(Path path) {
+        Objects.requireNonNull(path, "Source keystore path cannot be null");
+        return srcKeystore(path.toString());
+    }
+
+    /**
+     * Adds {@code -srcstorepass} to supply the source keystore password.
+     *
+     * @param password the source store password; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder srcStorePass(String password) {
+        Objects.requireNonNull(password, "Source store password cannot be null");
+        this.arguments.add("-srcstorepass " + password);
+        return this;
+    }
+
+    /**
+     * Adds {@code -srcstoretype} to override the source keystore type.
+     *
+     * @param type the source store type; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder srcStoreType(String type) {
+        Objects.requireNonNull(type, "Source store type cannot be null");
+        this.arguments.add("-srcstoretype " + type);
+        return this;
+    }
+
+    /**
+     * Adds {@code -srcprovidername} for custom source providers.
+     *
+     * @param providerName the source provider name; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder srcProviderName(String providerName) {
+        Objects.requireNonNull(providerName, "Source provider name cannot be null");
+        this.arguments.add("-srcprovidername " + providerName);
+        return this;
+    }
+
+    /**
+     * Adds {@code -srckeypass} to provide the source key password.
+     *
+     * @param password the source key password; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder srcKeyPass(String password) {
+        Objects.requireNonNull(password, "Source key password cannot be null");
+        this.arguments.add("-srckeypass " + password);
+        return this;
+    }
+
+    /**
+     * Adds {@code -srcprotected} to request protected mode on the source keystore.
+     *
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder srcProtected() {
+        this.arguments.add("-srcprotected");
+        return this;
+    }
+
+    /**
+     * Adds {@code -providername} to specify the provider to load.
+     *
+     * @param name the provider name; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder providerName(String name) {
+        Objects.requireNonNull(name, "Provider name cannot be null");
+        this.arguments.add("-providername " + name);
+        return this;
+    }
+
+    /**
+     * Adds {@code -providerclass} to specify a provider implementation class.
+     *
+     * @param className the provider class name; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder providerClass(String className) {
+        Objects.requireNonNull(className, "Provider class cannot be null");
+        this.arguments.add("-providerclass " + className);
+        return this;
+    }
+
+    /**
+     * Adds {@code -providerarg} to pass an argument to the provider.
+     *
+     * @param arg the provider argument; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder providerArg(String arg) {
+        Objects.requireNonNull(arg, "Provider argument cannot be null");
+        this.arguments.add("-providerarg " + arg);
+        return this;
+    }
+
+    /**
+     * Adds {@code -providerpath} with one or more paths where providers are located.
+     *
+     * @param paths the provider paths; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder providerPath(String... paths) {
+        Objects.requireNonNull(paths, "Provider paths cannot be null");
+        String joined = String.join(File.pathSeparator, Arrays.asList(paths));
+        this.arguments.add("-providerpath " + joined);
+        return this;
+    }
+
+    /**
+     * Adds {@code -addprovider} to install a provider into the keystore.
+     *
+     * @param providerName the provider name; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder addProvider(String providerName) {
+        Objects.requireNonNull(providerName, "Provider name cannot be null");
+        this.arguments.add("-addprovider " + providerName);
+        return this;
+    }
+
+    /**
+     * Adds {@code -infile} to specify the input file.
+     *
+     * @param file the input file; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder inFile(String file) {
+        Objects.requireNonNull(file, "Input file cannot be null");
+        this.arguments.add("-infile " + file);
+        return this;
+    }
+
+    /**
+     * Adds {@code -infile} using a {@link Path}.
+     *
+     * @param file the input file path; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder inFile(Path file) {
+        Objects.requireNonNull(file, "Input file path cannot be null");
+        return inFile(file.toString());
+    }
+
+    /**
+     * Adds {@code -outfile} to specify the output file.
+     *
+     * @param file the output file; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder outFile(String file) {
+        Objects.requireNonNull(file, "Output file cannot be null");
+        this.arguments.add("-outfile " + file);
+        return this;
+    }
+
+    /**
+     * Adds {@code -outfile} using a {@link Path}.
+     *
+     * @param file the output file path; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder outFile(Path file) {
+        Objects.requireNonNull(file, "Output file path cannot be null");
+        return outFile(file.toString());
+    }
+
+    /**
+     * Adds {@code -file} to supply a general file argument.
+     *
+     * @param file the file path; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder file(String file) {
+        Objects.requireNonNull(file, "File cannot be null");
+        this.arguments.add("-file " + file);
+        return this;
+    }
+
+    /**
+     * Adds {@code -file} using a {@link Path}.
+     *
+     * @param file the file path; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder file(Path file) {
+        Objects.requireNonNull(file, "File path cannot be null");
+        return file(file.toString());
+    }
+
+    /**
+     * Adds {@code -jarfile} to provide the signing JAR file.
+     *
+     * @param file the jar file path; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder jarFile(String file) {
+        Objects.requireNonNull(file, "JAR file cannot be null");
+        this.arguments.add("-jarfile " + file);
+        return this;
+    }
+
+    /**
+     * Adds {@code -jarfile} using a {@link Path}.
+     *
+     * @param file the jar file path; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder jarFile(Path file) {
+        Objects.requireNonNull(file, "JAR file path cannot be null");
+        return jarFile(file.toString());
+    }
+
+    /**
+     * Adds {@code -conf} to specify the configuration file.
+     *
+     * @param conf the configuration file; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder confFile(String conf) {
+        Objects.requireNonNull(conf, "Configuration file cannot be null");
+        this.arguments.add("-conf " + conf);
+        return this;
+    }
+
+    /**
+     * Adds {@code -conf} using a {@link Path}.
+     *
+     * @param conf the configuration path; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder confFile(Path conf) {
+        Objects.requireNonNull(conf, "Configuration path cannot be null");
+        return confFile(conf.toString());
+    }
+
+    /**
+     * Adds {@code -ext} to provide an extension definition.
+     *
+     * @param extension the extension definition; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder extension(String extension) {
+        Objects.requireNonNull(extension, "Extension cannot be null");
+        this.arguments.add("-ext " + extension);
+        return this;
+    }
+
+    /**
+     * Adds multiple {@code -ext} definitions.
+     *
+     * @param extensions the extensions to add; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder extensions(String... extensions) {
+        Objects.requireNonNull(extensions, "Extensions cannot be null");
+        for (String extension : extensions) {
+            extension(extension);
+        }
+        return this;
+    }
+
+    /**
+     * Adds an argument file reference via {@code @file}.
+     *
+     * @param argFile the argument file path; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder includeArgumentFile(Path argFile) {
+        Objects.requireNonNull(argFile, "Argument file cannot be null");
+        this.arguments.add("@" + argFile);
+        return this;
+    }
+
+    /**
+     * Adds a JVM option prefixed with {@code -J}.
+     *
+     * @param option the JVM option; must not be null
+     * @return the current {@code KeytoolCLIBuilder}
+     */
+    public KeytoolCLIBuilder jvmOption(String option) {
+        Objects.requireNonNull(option, "JVM option cannot be null");
+        this.arguments.add("-J" + option);
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+
+        ProcessBuilder processBuilder = new ProcessBuilder().command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            processBuilder.environment().putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "keytool");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start keytool process", exception);
+        }
+    }
+
+    /**
+     * Represents the primary {@code keytool} commands that can be executed.
+     */
+    @Getter
+    public enum KeytoolCommand {
+        CERTREQ("-certreq"),
+        CHANGE_ALIAS("-changealias"),
+        DELETE("-delete"),
+        EXPORT_CERT("-exportcert"),
+        GEN_CERT("-gencert"),
+        GEN_KEYPAIR("-genkeypair"),
+        GEN_SECKEY("-genseckey"),
+        IMPORT_CERT("-importcert"),
+        IMPORT_PASS("-importpass"),
+        IMPORT_KEYSTORE("-importkeystore"),
+        KEY_PASSWD("-keypasswd"),
+        LIST("-list"),
+        PRINT_CERT("-printcert"),
+        PRINT_CERT_REQ("-printcertreq"),
+        PRINT_CRL("-printcrl"),
+        STORE_PASSWD("-storepasswd"),
+        SHOW_INFO("-showinfo"),
+        VERSION("-version");
+
+        private final String flag;
+
+        KeytoolCommand(String flag) {
+            this.flag = flag;
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/RmicCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/RmicCLIBuilder.java
new file mode 100644
index 00000000..eaa684bc
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/RmicCLIBuilder.java
@@ -0,0 +1,331 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Builder that drives the {@code rmic} tool for generating RMI stubs and skeletons.
+ * <p>
+ * Wraps options for classpaths, destinations, protocols, and verbosity flags.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/rmic.html">rmic command documentation</a>
+ */
+public class RmicCLIBuilder implements CLIBuilder<Process, RmicCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "rmic.exe" : "rmic";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final List<String> classNames = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+
+    private RmicCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a new builder instance for the supplied {@link JDK}.
+     *
+     * @param jdk the JDK installation that will run {@code rmic}; must not be null
+     * @return a fresh {@link RmicCLIBuilder}
+     * @throws NullPointerException if the JDK is null
+     */
+    public static RmicCLIBuilder create(JDK jdk) {
+        return new RmicCLIBuilder(jdk);
+    }
+
+    @Override
+    public RmicCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public RmicCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public RmicCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public RmicCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public RmicCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Defines the bootstrap class path entries for the {@code rmic} command.
+     *
+     * @param paths the bootstrap entries; must not be null or contain null elements
+     * @return the current {@link RmicCLIBuilder} instance
+     * @throws NullPointerException if the entries array or any entry is null
+     */
+    public RmicCLIBuilder bootClassPath(String... paths) {
+        Objects.requireNonNull(paths, "Boot class path entries cannot be null");
+        for (String path : paths) {
+            Objects.requireNonNull(path, "Boot class path entry cannot be null");
+        }
+        this.arguments.add("-bootclasspath");
+        this.arguments.add(String.join(File.pathSeparator, paths));
+        return this;
+    }
+
+    /**
+     * Defines the bootstrap class path entries for the {@code rmic} command using {@link Path} objects.
+     *
+     * @param paths the bootstrap entries as {@code Path} objects; must not be null or contain nulls
+     * @return the current {@link RmicCLIBuilder} instance
+     * @throws NullPointerException if the entries array or any entry is null
+     */
+    public RmicCLIBuilder bootClassPath(Path... paths) {
+        Objects.requireNonNull(paths, "Boot class path entries cannot be null");
+        String[] entries = Arrays.stream(paths).map(Path::toString).toArray(String[]::new);
+        return bootClassPath(entries);
+    }
+
+    /**
+     * Sets the classpath entries for the {@code rmic} command.
+     *
+     * @param entries the classpath entries; must not be null or contain null values
+     * @return the current {@link RmicCLIBuilder} instance
+     * @throws NullPointerException if the array or included values are null
+     */
+    public RmicCLIBuilder classpath(String... entries) {
+        Objects.requireNonNull(entries, "Classpath entries cannot be null");
+        for (String entry : entries) {
+            Objects.requireNonNull(entry, "Classpath entry cannot be null");
+        }
+        this.arguments.add("-classpath");
+        this.arguments.add(String.join(File.pathSeparator, entries));
+        return this;
+    }
+
+    /**
+     * Sets the classpath entries for the {@code rmic} command using {@link Path} objects.
+     *
+     * @param entries the classpath entries as {@code Path} values; must not be null
+     * @return the current {@link RmicCLIBuilder} instance
+     * @throws NullPointerException if the array or any element is null
+     */
+    public RmicCLIBuilder classpath(Path... entries) {
+        Objects.requireNonNull(entries, "Classpath entries cannot be null");
+        String[] paths = Arrays.stream(entries).map(Path::toString).toArray(String[]::new);
+        return classpath(paths);
+    }
+
+    /**
+     * Sets the target directory where {@code rmic} will place generated files.
+     *
+     * @param directory the output directory; must not be null
+     * @return the current {@link RmicCLIBuilder} instance
+     * @throws NullPointerException if the directory is null
+     */
+    public RmicCLIBuilder destinationDirectory(String directory) {
+        Objects.requireNonNull(directory, "Destination directory cannot be null");
+        this.arguments.add("-d");
+        this.arguments.add(directory);
+        return this;
+    }
+
+    /**
+     * Sets the target directory for generated sources using a {@link Path}.
+     *
+     * @param directory the output directory; must not be null
+     * @return the current {@link RmicCLIBuilder} instance
+     * @throws NullPointerException if the directory is null
+     */
+    public RmicCLIBuilder destinationDirectory(Path directory) {
+        Objects.requireNonNull(directory, "Destination directory cannot be null");
+        return destinationDirectory(directory.toString());
+    }
+
+    /**
+     * Enables debug information generation via the {@code -g} flag.
+     *
+     * @return the current {@link RmicCLIBuilder} instance
+     */
+    public RmicCLIBuilder generateDebugInfo() {
+        this.arguments.add("-g");
+        return this;
+    }
+
+    /**
+     * Adds a JVM option passed through to the underlying Java launcher.
+     *
+     * @param option the option to pass; must not be null
+     * @return the current {@link RmicCLIBuilder} instance
+     * @throws NullPointerException if the option is null
+     */
+    public RmicCLIBuilder javaOption(String option) {
+        Objects.requireNonNull(option, "Java option cannot be null");
+        this.arguments.add("-J" + option);
+        return this;
+    }
+
+    /**
+     * Instructs {@code rmic} to keep the generated source files.
+     *
+     * @return the current {@link RmicCLIBuilder} instance
+     */
+    public RmicCLIBuilder keepGeneratedSources() {
+        this.arguments.add("-keepgenerated");
+        return this;
+    }
+
+    /**
+     * Suppresses warning output from {@code rmic}.
+     *
+     * @return the current {@link RmicCLIBuilder} instance
+     */
+    public RmicCLIBuilder noWarnings() {
+        this.arguments.add("-nowarn");
+        return this;
+    }
+
+    /**
+     * Prevents {@code rmic} from writing files to disk.
+     *
+     * @return the current {@link RmicCLIBuilder} instance
+     */
+    public RmicCLIBuilder noWrite() {
+        this.arguments.add("-nowrite");
+        return this;
+    }
+
+    /**
+     * Enables protocol compatibility mode with legacy RMI wire formats.
+     *
+     * @return the current {@link RmicCLIBuilder} instance
+     */
+    public RmicCLIBuilder protocolCompat() {
+        this.arguments.add("-vcompat");
+        return this;
+    }
+
+    /**
+     * Forces the use of the RMI protocol version 1.1.
+     *
+     * @return the current {@link RmicCLIBuilder} instance
+     */
+    public RmicCLIBuilder protocolV11() {
+        this.arguments.add("-v1.1");
+        return this;
+    }
+
+    /**
+     * Forces the use of the RMI protocol version 1.2.
+     *
+     * @return the current {@link RmicCLIBuilder} instance
+     */
+    public RmicCLIBuilder protocolV12() {
+        this.arguments.add("-v1.2");
+        return this;
+    }
+
+    /**
+     * Enables verbose output from {@code rmic}.
+     *
+     * @return the current {@link RmicCLIBuilder} instance
+     */
+    public RmicCLIBuilder verbose() {
+        this.arguments.add("-verbose");
+        return this;
+    }
+
+    /**
+     * Adds a fully qualified class name to process with {@code rmic}.
+     *
+     * @param className the class to process; must not be null or blank
+     * @return the current {@link RmicCLIBuilder} instance
+     * @throws NullPointerException     if the class name is null
+     * @throws IllegalArgumentException if the class name is blank
+     */
+    public RmicCLIBuilder addClassName(String className) {
+        Objects.requireNonNull(className, "Class name cannot be null");
+        if (className.isBlank())
+            throw new IllegalArgumentException("Class name cannot be blank");
+
+        this.classNames.add(className);
+        return this;
+    }
+
+    /**
+     * Adds multiple class names for {@code rmic} to process.
+     *
+     * @param classNames the classes to process; must not be null or contain nulls
+     * @return the current {@link RmicCLIBuilder} instance
+     * @throws NullPointerException if the class names array or an entry is null
+     */
+    public RmicCLIBuilder addClassNames(String... classNames) {
+        Objects.requireNonNull(classNames, "Class names cannot be null");
+        for (String className : classNames) {
+            addClassName(className);
+        }
+
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        if (classNames.isEmpty())
+            throw new IllegalStateException("At least one class name must be specified for rmic.");
+
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+        command.addAll(classNames);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "rmic");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start rmic process", exception);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/RmidCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/RmidCLIBuilder.java
new file mode 100644
index 00000000..5fb3172f
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/RmidCLIBuilder.java
@@ -0,0 +1,207 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Builder for launching {@code rmid} daemons via a specified {@link JDK} installation.
+ * <p>
+ * Offers helpers for JVM options, policy files, logging, ports, and lifecycle controls.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/rmid.html">rmid command documentation</a>
+ */
+public class RmidCLIBuilder implements CLIBuilder<Process, RmidCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "rmid.exe" : "rmid";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+
+    private RmidCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a new {@link RmidCLIBuilder} for the provided {@link JDK}.
+     *
+     * @param jdk the JDK to use when launching {@code rmid}; must not be null
+     * @return a fresh {@link RmidCLIBuilder} instance
+     * @throws NullPointerException if the JDK is null
+     */
+    public static RmidCLIBuilder create(JDK jdk) {
+        return new RmidCLIBuilder(jdk);
+    }
+
+    @Override
+    public RmidCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public RmidCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public RmidCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public RmidCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public RmidCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Adds a child process option flag (-C) to the {@code rmid} command.
+     *
+     * @param option the option to pass; must not be null
+     * @return the current {@link RmidCLIBuilder} instance
+     * @throws NullPointerException if the option is null
+     */
+    public RmidCLIBuilder childProcessOption(String option) {
+        Objects.requireNonNull(option, "Child process option cannot be null");
+        this.arguments.add("-C" + option);
+        return this;
+    }
+
+    /**
+     * Passes a JVM argument through to the {@code java} launcher.
+     *
+     * @param option the JVM argument; must not be null
+     * @return the current {@link RmidCLIBuilder} instance
+     * @throws NullPointerException if the option is null
+     */
+    public RmidCLIBuilder javaOption(String option) {
+        Objects.requireNonNull(option, "Java option cannot be null");
+        this.arguments.add("-J" + option);
+        return this;
+    }
+
+    /**
+     * Sets the activation execution policy for the {@code rmid} daemon.
+     *
+     * @param policy the execution policy; must not be null or blank
+     * @return the current {@link RmidCLIBuilder} instance
+     * @throws NullPointerException     if the policy is null
+     * @throws IllegalArgumentException if the policy is blank
+     */
+    public RmidCLIBuilder execPolicy(String policy) {
+        Objects.requireNonNull(policy, "Execution policy cannot be null");
+        if (policy.isBlank())
+            throw new IllegalArgumentException("Execution policy cannot be blank");
+
+        this.arguments.add("-J-Dsun.rmi.activation.execPolicy=" + policy);
+        return this;
+    }
+
+    /**
+     * Logs output from {@code rmid} to the specified directory.
+     *
+     * @param directory the directory for log files; must not be null
+     * @return the current {@link RmidCLIBuilder} instance
+     * @throws NullPointerException if the directory is null
+     */
+    public RmidCLIBuilder logDirectory(String directory) {
+        Objects.requireNonNull(directory, "Log directory cannot be null");
+        this.arguments.add("-log");
+        this.arguments.add(directory);
+        return this;
+    }
+
+    /**
+     * Logs output from {@code rmid} to the specified directory.
+     *
+     * @param directory the directory for log files; must not be null
+     * @return the current {@link RmidCLIBuilder} instance
+     * @throws NullPointerException if the directory is null
+     */
+    public RmidCLIBuilder logDirectory(Path directory) {
+        Objects.requireNonNull(directory, "Log directory cannot be null");
+        return logDirectory(directory.toString());
+    }
+
+    /**
+     * Sets the port number for the {@code rmid} daemon.
+     *
+     * @param port the port to listen on (1-65535)
+     * @return the current {@link RmidCLIBuilder} instance
+     * @throws IllegalArgumentException if the port is outside the valid range
+     */
+    public RmidCLIBuilder port(int port) {
+        if (port <= 0 || port > 65535)
+            throw new IllegalArgumentException("Port must be between 1 and 65535");
+        this.arguments.add("-port");
+        this.arguments.add(Integer.toString(port));
+        return this;
+    }
+
+    /**
+     * Adds the {@code -stop} flag to shut down a running {@code rmid} daemon.
+     *
+     * @return the current {@link RmidCLIBuilder} instance
+     */
+    public RmidCLIBuilder stop() {
+        this.arguments.add("-stop");
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "rmid");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start rmid process", exception);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/RmiregistryCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/RmiregistryCLIBuilder.java
new file mode 100644
index 00000000..557b5115
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/RmiregistryCLIBuilder.java
@@ -0,0 +1,143 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Fluent builder for starting {@code rmiregistry} processes via a given {@link JDK}.
+ * <p>
+ * Supports setting ports and JVM options before launching the registry.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/rmiregistry.html">rmiregistry command documentation</a>
+ */
+public class RmiregistryCLIBuilder implements CLIBuilder<Process, RmiregistryCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "rmiregistry.exe" : "rmiregistry";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+    private Integer port;
+
+    private RmiregistryCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a new {@link RmiregistryCLIBuilder} that will launch {@code rmiregistry} using the supplied {@link JDK}.
+     *
+     * @param jdk the JDK installation to use; must not be null
+     * @return a fresh {@link RmiregistryCLIBuilder}
+     * @throws NullPointerException if the JDK is null
+     */
+    public static RmiregistryCLIBuilder create(JDK jdk) {
+        return new RmiregistryCLIBuilder(jdk);
+    }
+
+    @Override
+    public RmiregistryCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public RmiregistryCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public RmiregistryCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public RmiregistryCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public RmiregistryCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Passes a JVM argument through the {@link JDK} launcher invoked by {@code rmiregistry}.
+     *
+     * @param option the JVM option to pass; must not be null
+     * @return the current {@link RmiregistryCLIBuilder} instance
+     * @throws NullPointerException if the option is null
+     */
+    public RmiregistryCLIBuilder javaOption(String option) {
+        Objects.requireNonNull(option, "Java option cannot be null");
+        this.arguments.add("-J" + option);
+        return this;
+    }
+
+    /**
+     * Sets the port number {@code rmiregistry} should bind to.
+     *
+     * @param port the port value between 1 and 65535
+     * @return the current {@link RmiregistryCLIBuilder} instance
+     * @throws IllegalArgumentException if the port is outside the valid range
+     */
+    public RmiregistryCLIBuilder port(int port) {
+        if (port <= 0 || port > 65535)
+            throw new IllegalArgumentException("Port must be between 1 and 65535");
+        this.port = port;
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+        if (port != null)
+            command.add(Integer.toString(port));
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "rmiregistry");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start rmiregistry process", exception);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/java/cli/impl/SerialverCLIBuilder.java b/src/main/java/dev/railroadide/railroad/java/cli/impl/SerialverCLIBuilder.java
new file mode 100644
index 00000000..96f8e3ea
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/java/cli/impl/SerialverCLIBuilder.java
@@ -0,0 +1,196 @@
+package dev.railroadide.railroad.java.cli.impl;
+
+import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.cli.CLIBuilder;
+import dev.railroadide.railroad.java.cli.ProcessExecution;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Builder for running {@code serialver} to print serialVersionUID values.
+ * <p>
+ * Allows configuring classpaths, JVM options, and the list of classes to analyze.
+ * </p>
+ *
+ * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/man/serialver.html">serialver command documentation</a>
+ */
+public class SerialverCLIBuilder implements CLIBuilder<Process, SerialverCLIBuilder> {
+    private static final String EXECUTABLE_NAME = OperatingSystem.isWindows() ? "serialver.exe" : "serialver";
+
+    private final JDK jdk;
+    private final List<String> arguments = new ArrayList<>();
+    private final List<String> classNames = new ArrayList<>();
+    private final Map<String, String> environmentVariables = new HashMap<>();
+    private Path workingDirectory;
+    private boolean useSystemEnvVars = true;
+    private long timeoutDuration = 0;
+    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
+
+    private SerialverCLIBuilder(JDK jdk) {
+        this.jdk = Objects.requireNonNull(jdk, "JDK cannot be null");
+    }
+
+    /**
+     * Creates a {@link SerialverCLIBuilder} that will run {@code serialver} using the provided {@link JDK}.
+     *
+     * @param jdk the JDK installation to use; must not be null
+     * @return a fresh {@link SerialverCLIBuilder}
+     * @throws NullPointerException if the JDK is null
+     */
+    public static SerialverCLIBuilder create(JDK jdk) {
+        return new SerialverCLIBuilder(jdk);
+    }
+
+    @Override
+    public SerialverCLIBuilder addArgument(String arg) {
+        Objects.requireNonNull(arg, "Argument cannot be null");
+        this.arguments.add(arg);
+        return this;
+    }
+
+    @Override
+    public SerialverCLIBuilder setWorkingDirectory(Path path) {
+        this.workingDirectory = path;
+        return this;
+    }
+
+    @Override
+    public SerialverCLIBuilder setEnvironmentVariable(String key, String value) {
+        Objects.requireNonNull(key, "Environment variable key cannot be null");
+        Objects.requireNonNull(value, "Environment variable value cannot be null");
+        this.environmentVariables.put(key, value);
+        return this;
+    }
+
+    @Override
+    public SerialverCLIBuilder useSystemEnvironmentVariables(boolean useSystemVars) {
+        this.useSystemEnvVars = useSystemVars;
+        return this;
+    }
+
+    @Override
+    public SerialverCLIBuilder setTimeout(long duration, TimeUnit unit) {
+        if (duration < 0)
+            throw new IllegalArgumentException("Timeout duration cannot be negative");
+
+        Objects.requireNonNull(unit, "TimeUnit cannot be null");
+        this.timeoutDuration = duration;
+        this.timeoutUnit = unit;
+        return this;
+    }
+
+    /**
+     * Sets the {@code -classpath} entries for {@code serialver}.
+     *
+     * @param entries the classpath entries; must not be null or contain null elements
+     * @return the current {@link SerialverCLIBuilder} instance
+     * @throws NullPointerException if the entries array or any entry is null
+     */
+    public SerialverCLIBuilder classpath(String... entries) {
+        Objects.requireNonNull(entries, "Classpath entries cannot be null");
+        for (String entry : entries) {
+            Objects.requireNonNull(entry, "Classpath entry cannot be null");
+        }
+
+        this.arguments.add("-classpath");
+        this.arguments.add(String.join(File.pathSeparator, entries));
+        return this;
+    }
+
+    /**
+     * Sets the {@code -classpath} for {@code serialver} using {@link Path} values.
+     *
+     * @param entries the classpath entries as {@code Path}; must not be null
+     * @return the current {@link SerialverCLIBuilder} instance
+     * @throws NullPointerException if the array or any entry is null
+     */
+    public SerialverCLIBuilder classpath(Path... entries) {
+        Objects.requireNonNull(entries, "Classpath entries cannot be null");
+        String[] paths = Arrays.stream(entries).map(Path::toString).toArray(String[]::new);
+        return classpath(paths);
+    }
+
+    /**
+     * Passes a JVM argument through the {@link JDK} launcher.
+     *
+     * @param option the JVM option to pass; must not be null
+     * @return the current {@link SerialverCLIBuilder} instance
+     * @throws NullPointerException if the option is null
+     */
+    public SerialverCLIBuilder javaOption(String option) {
+        Objects.requireNonNull(option, "Java option cannot be null");
+        this.arguments.add("-J" + option);
+        return this;
+    }
+
+    /**
+     * Adds a fully qualified class name for {@code serialver} to analyze.
+     *
+     * @param className the class to inspect; must not be null or blank
+     * @return the current {@link SerialverCLIBuilder} instance
+     * @throws NullPointerException     if the class name is null
+     * @throws IllegalArgumentException if the class name is blank
+     */
+    public SerialverCLIBuilder addClassName(String className) {
+        Objects.requireNonNull(className, "Class name cannot be null");
+        if (className.isBlank())
+            throw new IllegalArgumentException("Class name cannot be blank");
+
+        this.classNames.add(className);
+        return this;
+    }
+
+    /**
+     * Adds multiple class names to analyze in {@code serialver}.
+     *
+     * @param classNames the classes to inspect; must not be null or contain null elements
+     * @return the current {@link SerialverCLIBuilder} instance
+     * @throws NullPointerException if the class names array or an entry is null
+     */
+    public SerialverCLIBuilder addClassNames(String... classNames) {
+        Objects.requireNonNull(classNames, "Class names cannot be null");
+        for (String className : classNames) {
+            addClassName(className);
+        }
+
+        return this;
+    }
+
+    @Override
+    public Process run() {
+        if (classNames.isEmpty())
+            throw new IllegalStateException("At least one class name must be specified for serialver.");
+
+        List<String> command = new ArrayList<>();
+        command.add(jdk.executablePath(EXECUTABLE_NAME).toString());
+        command.addAll(arguments);
+        command.addAll(classNames);
+
+        var processBuilder = new ProcessBuilder();
+        processBuilder.command(command);
+        if (workingDirectory != null) {
+            processBuilder.directory(workingDirectory.toFile());
+        }
+
+        if (useSystemEnvVars) {
+            Map<String, String> env = processBuilder.environment();
+            env.putAll(environmentVariables);
+        } else {
+            processBuilder.environment().clear();
+            processBuilder.environment().putAll(environmentVariables);
+        }
+
+        try {
+            Process process = processBuilder.start();
+            ProcessExecution.enforceTimeout(process, timeoutDuration, timeoutUnit, "serialver");
+
+            return process;
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to start serialver process", exception);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/localization/L18n.java b/src/main/java/dev/railroadide/railroad/localization/L18n.java
index dbb1830d..7d19d482 100644
--- a/src/main/java/dev/railroadide/railroad/localization/L18n.java
+++ b/src/main/java/dev/railroadide/railroad/localization/L18n.java
@@ -11,6 +11,10 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
@@ -57,7 +61,9 @@ public static void onPluginEnabled(PluginDescriptor descriptor) {
         try {
             InputStream langFileStream = PluginManager.loadResource(descriptor, langFileName);
             if (langFileStream != null) {
-                LANG_CACHE.load(langFileStream);
+                try (var reader = new InputStreamReader(langFileStream, StandardCharsets.UTF_8)) {
+                    LANG_CACHE.load(reader);
+                }
                 LOGGER.debug("Language file {} loaded for plugin {}", langFileName, descriptor.getId());
 
                 CURRENT_LANG.setValue(language);
@@ -100,24 +106,26 @@ public static void loadLanguage(Language language) {
      * @throws IOException if an error occurs while reading the language file
      */
     private static Properties getLanguageProperties(String name, List<InputStream> pluginResources) throws IOException {
-        var languageFiles = new InputStream[pluginResources.size() + 1];
-        languageFiles[0] = AppResources.getResourceAsStream(name);
-        for (int i = 0; i < pluginResources.size(); i++) {
-            languageFiles[i + 1] = pluginResources.get(i);
+        String base = "lang/en_us.lang";
+
+        List<InputStream> streams = new ArrayList<>();
+
+        // setting base language
+        InputStream appBase = AppResources.getResourceAsStream(base);
+        if (appBase != null) {
+            streams.add(appBase);
         }
+        List<InputStream> pluginBaseResources = PluginManager.loadResourcesFromAllPlugins(base);
+        streams.addAll(pluginBaseResources);
 
-        Properties props = mergeLanguageFiles(languageFiles);
-        for (InputStream stream : languageFiles) {
-            if (stream != null) {
-                try {
-                    stream.close();
-                } catch (IOException exception) {
-                    LOGGER.error("Error closing language file stream", exception);
-                }
-            }
+        // setting name language
+        InputStream appCurrent = AppResources.getResourceAsStream(name);
+        if (appCurrent != null) {
+            streams.add(appCurrent);
         }
+        streams.addAll(pluginResources);
 
-        return props;
+        return mergeLanguageFiles(streams.toArray(InputStream[]::new));
     }
 
     private static void setProps(Properties properties) {
@@ -132,7 +140,11 @@ private static Properties mergeLanguageFiles(InputStream... streams) throws IOEx
             if (stream == null)
                 continue;
 
-            mergedProperties.load(stream);
+            try (Reader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
+                var tempProperties = new Properties();
+                tempProperties.load(reader);
+                mergedProperties.putAll(tempProperties);
+            }
         }
 
         return mergedProperties;
@@ -145,22 +157,21 @@ private static Properties mergeLanguageFiles(InputStream... streams) throws IOEx
      * @return the localized string
      */
     public static String localize(String key) {
-        if (key != null && key.isBlank())
-            return "";
-
-        LOGGER.debug("Getting localized string for key {}", key);
-
         if (key == null) {
             LOGGER.error("Localize called with null key");
             return "null";
         }
 
-        if (LANG_CACHE.get(key) == null) {
+        if (key.isBlank())
+            return "";
+
+        Object value = LANG_CACHE.get(key);
+        if (value == null) {
             LOGGER.error("Error finding translations for key '{}' in language {}", key, CURRENT_LANG.getValue());
             return key;
         }
 
-        return LANG_CACHE.get(key).toString();
+        return value.toString();
     }
 
     /**
@@ -184,6 +195,7 @@ public static String localize(String key, Object... args) {
      * @return true if the key is valid, false otherwise
      */
     public static boolean isKeyValid(String key) {
-        return LANG_CACHE.get(key) != null && LANG_CACHE.get(key) != "";
+        Object value = LANG_CACHE.get(key);
+        return value != null && !value.toString().isEmpty();
     }
 }
diff --git a/src/main/java/dev/railroadide/railroad/localization/LanguageRegistryLoader.java b/src/main/java/dev/railroadide/railroad/localization/LanguageRegistryLoader.java
new file mode 100644
index 00000000..4c6ec363
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/localization/LanguageRegistryLoader.java
@@ -0,0 +1,86 @@
+package dev.railroadide.railroad.localization;
+
+import dev.railroadide.core.localization.Language;
+import dev.railroadide.railroad.Railroad;
+
+import java.net.URI;
+import java.net.URL;
+import java.nio.file.*;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public final class LanguageRegistryLoader {
+    private static final String FOLDER = "assets/railroad/lang";
+    private static final Pattern FILE_PATTERN = Pattern.compile("^([a-z]{2})_([a-z]{2})\\.lang$");
+
+    private LanguageRegistryLoader() {
+    }
+
+    public static void load() {
+        try {
+            ClassLoader cl = Thread.currentThread().getContextClassLoader();
+            Enumeration<URL> resources = cl.getResources(FOLDER);
+
+            while (resources.hasMoreElements()) {
+                URL url = resources.nextElement();
+                discoverFromFileSystem(url);
+            }
+        } catch (Exception e) {
+            Railroad.LOGGER.debug("Language load failed", e);
+        }
+    }
+
+
+    private static void discoverFromFileSystem(URL url) throws Exception {
+        String protocol = url.getProtocol();
+        if ("file".equals(protocol)) {
+            try (DirectoryStream<Path> stream = Files.newDirectoryStream(Paths.get(url.toURI()), "*.lang")) {
+                for (Path path : stream)
+                    tryRegisterFromFileName(path.getFileName().toString());
+            }
+        } else if ("jar".equals(protocol)) {
+            String spec = url.toString();
+            int bang = spec.indexOf("!/");
+            URI jarUri = URI.create(spec.substring(0, bang));
+            String inJarPath = spec.substring(bang + 2);
+
+            try (FileSystem fileSystem = FileSystems.newFileSystem(jarUri, Map.of())) {
+                Path dir = fileSystem.getPath(inJarPath);
+                try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir, "*.lang")) {
+                    for (Path path : stream)
+                        tryRegisterFromFileName(path.getFileName().toString());
+                }
+            }
+        } else {
+            Railroad.LOGGER.warn("Unsupported URL scheme for languages: {}", url);
+        }
+    }
+
+    private static void tryRegisterFromFileName(String fileName) {
+        Matcher matcher = FILE_PATTERN.matcher(fileName);
+        if (!matcher.matches()) {
+            return;
+        }
+
+        String lang = matcher.group(1);
+        String country = matcher.group(2);
+
+        String fullCode = (lang + "_" + country).toUpperCase(Locale.ROOT);
+        if (Language.REGISTRY.contains(fullCode)) {
+            return;
+        }
+
+        Locale locale = Locale.forLanguageTag(lang + "-" + country.toUpperCase(Locale.ROOT));
+        String displayName = locale.getDisplayName(locale);
+
+        Language.builder(displayName)
+            .languageCode(lang)
+            .countryCode(country.toUpperCase(Locale.ROOT))
+            .build();
+
+        Railroad.LOGGER.debug("Registered language: {} ({})", displayName, fullCode);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/localization/Languages.java b/src/main/java/dev/railroadide/railroad/localization/Languages.java
index 493db44d..a7b2eb29 100644
--- a/src/main/java/dev/railroadide/railroad/localization/Languages.java
+++ b/src/main/java/dev/railroadide/railroad/localization/Languages.java
@@ -8,18 +8,7 @@ public final class Languages {
         .countryCode("US")
         .build();
 
-    public static final Language ES_ES = Language.builder("Español")
-        .languageCode("es")
-        .countryCode("ES")
-        .build();
-
-    public static final Language FR_FR = Language.builder("Français")
-        .languageCode("fr")
-        .countryCode("FR")
-        .build();
-
-    public static final Language DE_DE = Language.builder("Deutsch")
-        .languageCode("de")
-        .countryCode("DE")
-        .build();
+    public static void initialize() {
+        LanguageRegistryLoader.load();
+    }
 }
diff --git a/src/main/java/dev/railroadide/railroad/plugin/ui/PluginsPane.java b/src/main/java/dev/railroadide/railroad/plugin/ui/PluginsPane.java
index 413425e2..c106ca39 100644
--- a/src/main/java/dev/railroadide/railroad/plugin/ui/PluginsPane.java
+++ b/src/main/java/dev/railroadide/railroad/plugin/ui/PluginsPane.java
@@ -1,302 +1,476 @@
 package dev.railroadide.railroad.plugin.ui;
 
-import dev.railroadide.core.localization.LocalizationService;
-import dev.railroadide.core.ui.RRCard;
-import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.ui.RRListView;
 import dev.railroadide.core.ui.RRTextField;
 import dev.railroadide.core.ui.RRVBox;
 import dev.railroadide.core.ui.localized.LocalizedLabel;
-import dev.railroadide.core.utility.ServiceLocator;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.Services;
+import dev.railroadide.railroad.localization.L18n;
+import dev.railroadide.railroad.plugin.PluginLoadResult;
 import dev.railroadide.railroad.plugin.PluginManager;
 import dev.railroadide.railroadpluginapi.PluginDescriptor;
-import dev.railroadide.railroadpluginapi.deps.MavenDep;
+import dev.railroadide.railroadpluginapi.deps.MavenDeps;
+import javafx.application.HostServices;
 import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
-import javafx.collections.transformation.SortedList;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.*;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.VBox;
-import lombok.Getter;
+import javafx.scene.layout.*;
 import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
 import org.kordamp.ikonli.javafx.FontIcon;
 
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 public class PluginsPane extends SplitPane {
-    @Getter
-    private final Map<PluginDescriptor, Boolean> enabledPlugins = new HashMap<>();
-
-    private final ObservableList<PluginModel> items = FXCollections.observableArrayList();
-    private final FilteredList<PluginModel> filtered = new FilteredList<>(items);
-
-    private final ListView<PluginModel> listView = new ListView<>();
-    private final VBox detailsBox = new RRVBox(24);
+    private static final double DEFAULT_DIVIDER_POSITION = 0.35;
+
+    private final Map<PluginDescriptor, Boolean> enabledPlugins = new LinkedHashMap<>();
+    private final ObservableList<PluginDescriptor> pluginItems = FXCollections.observableArrayList();
+    private final FilteredList<PluginDescriptor> filteredPlugins = new FilteredList<>(pluginItems, Objects::nonNull);
+
+    private final RRListView<PluginDescriptor> pluginListView = new RRListView<>();
+    private final LocalizedLabel listPlaceholderLabel = new LocalizedLabel("railroad.plugins.list.empty");
+    private final LocalizedLabel headerLabel = new LocalizedLabel("railroad.settings.plugins.title");
+    private final LocalizedLabel placeholderTitle = new LocalizedLabel("railroad.plugins.placeholder.title");
+    private final LocalizedLabel placeholderSubtitle = new LocalizedLabel("railroad.plugins.placeholder.subtitle");
+    private final VBox placeholderBox = new VBox(6, placeholderTitle, placeholderSubtitle);
+    private final VBox detailContainer = new VBox(16);
+
+    private final Label nameLabel = new Label();
+    private final Label metaLabel = new Label();
+    private final CheckBox detailToggle = new CheckBox();
+    private final Label descriptionValue = new Label();
+    private final Hyperlink websiteLink = new Hyperlink();
+
+    private final Label idValue = new Label();
+    private final Label versionValue = new Label();
+    private final Label authorValue = new Label();
+    private final Label licenseValue = new Label();
+    private final Label mainClassValue = new Label();
+    private final Label dependenciesValue = new Label();
+
+    private final HostServices hostServices;
+    private PluginDescriptor activeDescriptor;
+    private boolean updatingDetailToggle;
 
     public PluginsPane() {
         this(PluginManager.getEnabledPlugins());
     }
 
     public PluginsPane(Map<PluginDescriptor, Boolean> defaultEnabledPlugins) {
-        getStyleClass().add("plugins-pane");
-
-        var left = new RRVBox(12);
-        left.getStyleClass().add("plugins-left-pane");
-        left.setPadding(new Insets(16, 16, 16, 16));
-
-        var search = new RRTextField("railroad.plugins.search.placeholder");
-        search.setPrefHeight(38);
-
-        SortedList<PluginModel> sorted = new SortedList<>(filtered, Comparator.comparing(vm -> vm.descriptor().getName().toLowerCase()));
-        listView.setItems(sorted);
-        listView.setFocusTraversable(true);
-        listView.getStyleClass().add("plugins-list");
-        listView.setFixedCellSize(-1);
-        VBox.setVgrow(listView, Priority.ALWAYS);
-
-        search.textProperty().addListener((observable, oldValue, newValue) -> {
-            final String query = newValue == null ? "" : newValue.toLowerCase();
-            filtered.setPredicate(vm ->
-                query.isBlank()
-                    || vm.nameLower().contains(query)
-                    || vm.authorLower().contains(query)
-                    || vm.descriptionLower().contains(query));
-        });
-
-        listView.setCellFactory($ -> new PluginCell());
-        left.getChildren().addAll(search, listView);
+        HostServices services;
+        try {
+            services = Services.getService(HostServices.class);
+        } catch (Exception exception) {
+            services = null;
+        }
 
-        detailsBox.setPadding(new Insets(24, 28, 24, 28));
-        detailsBox.setFillWidth(true);
+        this.hostServices = services;
 
-        var detailsScroll = new ScrollPane();
-        detailsScroll.setFitToWidth(true);
-        detailsScroll.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-        detailsScroll.setContent(detailsBox);
+        placeholderTitle.getStyleClass().add("plugins-pane-placeholder-title");
+        placeholderSubtitle.getStyleClass().add("plugins-pane-placeholder-subtitle");
+        placeholderTitle.setWrapText(true);
+        placeholderSubtitle.setWrapText(true);
+        placeholderTitle.setMaxWidth(360);
+        placeholderSubtitle.setMaxWidth(360);
+        placeholderBox.setAlignment(Pos.CENTER);
+        placeholderBox.getStyleClass().add("plugins-pane-placeholder");
 
-        showPlaceholder();
+        listPlaceholderLabel.setWrapText(true);
+        listPlaceholderLabel.setMaxWidth(Double.MAX_VALUE);
+        listPlaceholderLabel.setAlignment(Pos.CENTER);
+        headerLabel.getStyleClass().add("plugins-pane-title");
+        headerLabel.setWrapText(true);
 
-        listView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue == null) {
-                showPlaceholder();
-                return;
+        getStyleClass().add("plugins-pane");
+        setDividerPositions(DEFAULT_DIVIDER_POSITION);
+
+        setupListPane();
+        Node detailPane = setupDetailPane();
+        getItems().setAll(createListSection(), detailPane);
+        SplitPane.setResizableWithParent(getItems().getFirst(), false);
+
+        PluginManager.getLoadedPluginsList().addListener((ListChangeListener<PluginLoadResult>) change -> {
+            boolean needsRefresh = false;
+            while (change.next()) {
+                if (change.wasAdded()) {
+                    for (PluginLoadResult result : change.getAddedSubList()) {
+                        if (!enabledPlugins.containsKey(result.descriptor())) {
+                            enabledPlugins.put(result.descriptor(), false);
+                            needsRefresh = true;
+                        }
+                    }
+                }
             }
 
-            showDetails(newValue.descriptor());
+            if (needsRefresh) {
+                refreshList();
+            }
         });
 
         setEnabledPlugins(defaultEnabledPlugins);
 
-        getItems().addAll(left, detailsScroll);
-        setDividerPositions(0.38);
+        L18n.currentLanguageProperty().addListener((obs, oldLang, newLang) -> {
+            updateLocalizedStaticTexts();
+            updateDetails(activeDescriptor);
+        });
+        updateLocalizedStaticTexts();
+    }
+
+    public Map<PluginDescriptor, Boolean> getEnabledPlugins() {
+        return new LinkedHashMap<>(enabledPlugins);
     }
 
     public void setEnabledPlugins(Map<PluginDescriptor, Boolean> state) {
         enabledPlugins.clear();
-        enabledPlugins.putAll(state);
-
-        items.setAll(
-            state.entrySet().stream()
-                .map(entry -> new PluginModel(entry.getKey(), entry.getValue()))
-                .toList()
-        );
-
-        if (!items.isEmpty() && listView.getSelectionModel().getSelectedItem() == null) {
-            listView.getSelectionModel().selectFirst();
-        } else if (items.isEmpty()) {
-            showPlaceholder();
+        if (state != null) {
+            enabledPlugins.putAll(state);
         }
+
+        PluginManager.getLoadedPluginsList()
+            .stream()
+            .map(PluginLoadResult::descriptor)
+            .forEach(descriptor -> enabledPlugins.putIfAbsent(descriptor, false));
+
+        refreshList();
     }
 
-    private void showPlaceholder() {
-        detailsBox.getChildren().setAll(createPlaceholderCard());
+    private void setupListPane() {
+        pluginListView.setItems(filteredPlugins);
+        pluginListView.setPlaceholder(listPlaceholderLabel);
+        pluginListView.setPrefWidth(280);
+        pluginListView.setBordered(true);
+        pluginListView.setDense(true);
+        pluginListView.getSelectionModel().selectedItemProperty()
+            .addListener((obs, oldSelection, descriptor) -> updateDetails(descriptor));
+        pluginListView.setCellFactory(list -> new PluginListCell());
+
+        filteredPlugins.addListener((ListChangeListener<PluginDescriptor>) change -> {
+            if (activeDescriptor != null && !filteredPlugins.contains(activeDescriptor)) {
+                if (!filteredPlugins.isEmpty()) {
+                    pluginListView.getSelectionModel().select(filteredPlugins.getFirst());
+                } else {
+                    pluginListView.getSelectionModel().clearSelection();
+                    updateDetails(null);
+                }
+            }
+        });
     }
 
-    private void showDetails(PluginDescriptor descriptor) {
-        var card = new RRCard();
-        card.getStyleClass().add("plugin-details-card");
-        card.setPadding(new Insets(20));
-        card.setSpacing(16);
+    private Node createListSection() {
+        var searchField = new RRTextField();
+        searchField.setLocalizedPlaceholder("railroad.plugins.search.placeholder");
+        searchField.textProperty().addListener((obs, oldText, newText) -> applyFilter(newText));
+
+        var container = new RRVBox();
+        container.setSpacing(12);
+        container.setPadding(new Insets(16));
+        container.getChildren().addAll(headerLabel, searchField, pluginListView);
+        VBox.setVgrow(pluginListView, Priority.ALWAYS);
+        return container;
+    }
 
-        var header = new RRHBox(12);
-        header.setAlignment(Pos.CENTER_LEFT);
+    private Node setupDetailPane() {
+        detailContainer.setPadding(new Insets(24));
+        detailContainer.getStyleClass().add("plugin-detail-container");
+
+        var iconWrapper = new StackPane();
+        iconWrapper.getStyleClass().add("plugin-detail-icon");
         var icon = new FontIcon(FontAwesomeSolid.PUZZLE_PIECE);
         icon.setIconSize(28);
-        icon.getStyleClass().add("plugin-icon");
-
-        var title = new RRVBox(4);
-        var name = new Label(descriptor.getName());
-        name.getStyleClass().add("plugin-details-name");
-        var version = new LocalizedLabel("railroad.plugins.details.version", descriptor.getVersion());
-        version.getStyleClass().add("plugin-details-version");
-        title.getChildren().addAll(name, version);
-        header.getChildren().addAll(icon, title);
-
-        var info = new RRVBox(12);
-        info.getStyleClass().add("plugin-info-box");
-
-        if (isNotBlankOrNull(descriptor.getDescription())) {
-            var desc = new LocalizedLabel(resolveText(descriptor.getDescription()));
-            desc.getStyleClass().add("plugin-description");
-            desc.setWrapText(true);
-            info.getChildren().add(desc);
-        }
+        iconWrapper.getChildren().add(icon);
 
-        if (isNotBlankOrNull(descriptor.getAuthor()))
-            info.getChildren().add(infoRow("railroad.plugins.details.author", descriptor.getAuthor()));
+        nameLabel.getStyleClass().add("plugin-detail-name");
+        nameLabel.setWrapText(true);
+        metaLabel.getStyleClass().add("plugin-detail-meta");
 
-        if (isNotBlankOrNull(descriptor.getWebsite()))
-            info.getChildren().add(infoRow("railroad.plugins.details.website", descriptor.getWebsite()));
+        detailToggle.selectedProperty().addListener((obs, oldValue, enabled) -> {
+            if (updatingDetailToggle) return;
+            setPluginEnabled(activeDescriptor, enabled);
+        });
 
-        if (isNotBlankOrNull(descriptor.getLicense()))
-            info.getChildren().add(infoRow("railroad.plugins.details.license", descriptor.getLicense()));
+        var headerTexts = new VBox(4, nameLabel, metaLabel);
+        HBox.setHgrow(headerTexts, Priority.ALWAYS);
+
+        var header = new HBox(16, iconWrapper, headerTexts, detailToggle);
+        header.setAlignment(Pos.CENTER_LEFT);
 
-        info.getChildren().add(infoRow("railroad.plugins.details.id", descriptor.getId()));
-        info.getChildren().add(infoRow("railroad.plugins.details.main_class", descriptor.getMainClass()));
+        descriptionValue.setWrapText(true);
+        descriptionValue.getStyleClass().add("plugin-detail-description");
 
-        if (descriptor.getDependencies() != null && !descriptor.getDependencies().artifacts().isEmpty()) {
-            var depsLabel = new LocalizedLabel("railroad.plugins.details.dependencies");
-            depsLabel.getStyleClass().add("plugin-info-label");
-            var deps = new RRVBox(4);
-            for (MavenDep dependency : descriptor.getDependencies().artifacts()) {
-                var label = new Label("• " + dependency.getFullName());
-                label.getStyleClass().add("plugin-dependency");
-                deps.getChildren().add(label);
+        websiteLink.visibleProperty().bind(websiteLink.textProperty().isNotEmpty());
+        websiteLink.managedProperty().bind(websiteLink.visibleProperty());
+        websiteLink.setOnAction(event -> {
+            String url = websiteLink.getText();
+            if (url == null || url.isBlank()) return;
+            if (hostServices != null) {
+                hostServices.showDocument(url);
+            } else {
+                Railroad.LOGGER.warn("Unable to open plugin website, HostServices unavailable: {}", url);
             }
-            info.getChildren().addAll(depsLabel, deps);
-        }
+        });
 
-        card.addContent(header, info);
-        detailsBox.getChildren().setAll(card);
-    }
+        GridPane metadataGrid = buildMetadataGrid();
 
-    private HBox infoRow(String key, String value) {
-        var row = new RRHBox(8);
-        row.setAlignment(Pos.CENTER_LEFT);
-        var keyLabel = new LocalizedLabel(key);
-        keyLabel.getStyleClass().add("plugin-info-label");
-        var valueLabel = new Label(value);
-        valueLabel.getStyleClass().add("plugin-info-value");
-        valueLabel.setWrapText(true);
-        HBox.setHgrow(valueLabel, Priority.ALWAYS);
-        row.getChildren().addAll(keyLabel, valueLabel);
-        return row;
-    }
+        detailContainer.getChildren().addAll(header, descriptionValue, websiteLink, metadataGrid);
 
-    private Node createPlaceholderCard() {
-        var card = new RRCard(18, new Insets(36));
-        card.getStyleClass().add("plugin-details-placeholder-card");
-        var icon = new FontIcon(FontAwesomeSolid.PUZZLE_PIECE);
-        icon.setIconSize(56);
-        icon.getStyleClass().add("plugin-placeholder-icon");
-        var title = new LocalizedLabel("railroad.plugins.placeholder.title");
-        title.getStyleClass().add("plugin-placeholder-title");
-        var sub = new LocalizedLabel("railroad.plugins.placeholder.subtitle");
-        sub.getStyleClass().add("plugin-placeholder-subtitle");
-        sub.setWrapText(true);
-        sub.setMaxWidth(420);
-
-        var box = new RRVBox(12);
-        box.setAlignment(Pos.CENTER);
-        box.getChildren().addAll(icon, title, sub);
-        card.addContent(box);
-
-        var wrap = new RRVBox(card);
-        wrap.setAlignment(Pos.CENTER);
-        VBox.setVgrow(wrap, Priority.ALWAYS);
-        return wrap;
+        var detailScroll = new ScrollPane(detailContainer);
+        detailScroll.setFitToWidth(true);
+        detailScroll.setFitToHeight(true);
+        detailScroll.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        detailScroll.getStyleClass().add("plugin-detail-scroll");
+
+        var stack = new StackPane(placeholderBox, detailScroll);
+        StackPane.setAlignment(placeholderBox, Pos.CENTER);
+
+        detailContainer.setVisible(false);
+        detailContainer.setManaged(false);
+
+        return stack;
     }
 
-    private static boolean isNotBlankOrNull(String str) {
-        return str != null && !str.isBlank();
+    private GridPane buildMetadataGrid() {
+        var grid = new GridPane();
+        grid.setHgap(16);
+        grid.setVgap(10);
+        grid.getStyleClass().add("plugin-detail-grid");
+
+        addMetadataRow(grid, 0, "railroad.plugins.details.label.identifier", idValue);
+        addMetadataRow(grid, 1, "railroad.plugins.details.label.version", versionValue);
+        addMetadataRow(grid, 2, "railroad.plugins.details.label.author", authorValue);
+        addMetadataRow(grid, 3, "railroad.plugins.details.label.license", licenseValue);
+        addMetadataRow(grid, 4, "railroad.plugins.details.label.main_class", mainClassValue);
+        addMetadataRow(grid, 5, "railroad.plugins.details.label.dependencies", dependenciesValue);
+
+        return grid;
     }
 
-    private static String resolveText(String maybeKey) {
-        var localizationService = ServiceLocator.getService(LocalizationService.class);
-        if (localizationService != null && localizationService.isKeyValid(maybeKey))
-            return localizationService.get(maybeKey);
+    private void addMetadataRow(GridPane grid, int row, String labelKey, Label valueLabel) {
+        var label = new LocalizedLabel(labelKey);
+        label.getStyleClass().add("plugin-detail-label");
+        valueLabel.getStyleClass().add("plugin-detail-value");
+        valueLabel.setWrapText(true);
 
-        return maybeKey;
+        grid.add(label, 0, row);
+        grid.add(valueLabel, 1, row);
     }
 
-    private record PluginModel(PluginDescriptor descriptor, boolean enabled) {
-        String nameLower() {
-            return descriptor.getName().toLowerCase();
+    private void applyFilter(String query) {
+        if (query == null || query.isBlank()) {
+            filteredPlugins.setPredicate(Objects::nonNull);
+            return;
         }
 
-        String authorLower() {
-            return isNotBlankOrNull(descriptor.getAuthor()) ? descriptor.getAuthor().toLowerCase() : "";
+        String needle = query.toLowerCase(Locale.ENGLISH);
+        filteredPlugins.setPredicate(descriptor -> {
+            if (descriptor == null)
+                return false;
+
+            return contains(descriptor.getName(), needle) ||
+                contains(descriptor.getId(), needle) ||
+                contains(descriptor.getAuthor(), needle);
+        });
+
+        if (activeDescriptor != null && !filteredPlugins.contains(activeDescriptor)) {
+            if (!filteredPlugins.isEmpty()) {
+                pluginListView.getSelectionModel().select(filteredPlugins.getFirst());
+            } else {
+                pluginListView.getSelectionModel().clearSelection();
+                updateDetails(null);
+            }
         }
+    }
+
+    private boolean contains(String source, String query) {
+        return source != null && source.toLowerCase(Locale.ENGLISH).contains(query);
+    }
+
+    private void refreshList() {
+        PluginDescriptor selected = pluginListView.getSelectionModel().getSelectedItem();
+
+        var ordered = enabledPlugins.keySet().stream()
+            .sorted(Comparator.comparing(this::sortKey, String.CASE_INSENSITIVE_ORDER)
+                .thenComparing(PluginDescriptor::getId, Comparator.nullsLast(String::compareToIgnoreCase)))
+            .toList();
+
+        pluginItems.setAll(ordered);
 
-        String descriptionLower() {
-            var description = descriptor.getDescription();
-            var localizationService = ServiceLocator.getService(LocalizationService.class);
-            String txt = (localizationService != null && localizationService.isKeyValid(description)) ?
-                localizationService.get(description) :
-                description;
-            return isNotBlankOrNull(txt) ? txt.toLowerCase() : "";
+        if (selected != null && pluginItems.contains(selected)) {
+            pluginListView.getSelectionModel().select(selected);
+        } else if (!pluginItems.isEmpty()) {
+            pluginListView.getSelectionModel().selectFirst();
+        } else {
+            pluginListView.getSelectionModel().clearSelection();
+            updateDetails(null);
         }
     }
 
-    private class PluginCell extends ListCell<PluginModel> {
-        private final CheckBox check = new CheckBox();
-        private final Label name = new Label();
-        private final Label meta = new Label();
-        private final Label summary = new Label();
-        private final HBox root = new RRHBox(12);
-
-        PluginCell() {
-            getStyleClass().add("plugin-item");
-            name.getStyleClass().add("plugin-name");
-            meta.getStyleClass().add("plugin-version");
-            summary.getStyleClass().add("plugin-summary");
-            summary.setWrapText(true);
-
-            var info = new RRVBox(4);
-            info.getChildren().addAll(name, meta, summary);
-            HBox.setHgrow(info, Priority.ALWAYS);
-            root.setAlignment(Pos.CENTER_LEFT);
-            root.getChildren().addAll(check, info);
+    private void updateDetails(PluginDescriptor descriptor) {
+        activeDescriptor = descriptor;
+        boolean hasSelection = descriptor != null;
+
+        detailContainer.setVisible(hasSelection);
+        detailContainer.setManaged(hasSelection);
+        placeholderBox.setVisible(!hasSelection);
+        placeholderBox.setManaged(!hasSelection);
+
+        if (!hasSelection)
+            return;
+
+        String pluginName = textOrFallback(descriptor.getName(), descriptor.getId());
+        nameLabel.setText(pluginName);
+        metaLabel.setText(buildMetaText(descriptor));
+        descriptionValue.setText(textOrFallback(descriptor.getDescription(),
+            L18n.localize("railroad.plugins.details.no_description")));
+        websiteLink.setText(textOrFallback(descriptor.getWebsite(), ""));
+
+        String unknown = L18n.localize("railroad.generic.unknown");
+        idValue.setText(textOrFallback(descriptor.getId(), unknown));
+        versionValue.setText(textOrFallback(descriptor.getVersion(), unknown));
+        authorValue.setText(textOrFallback(descriptor.getAuthor(), unknown));
+        licenseValue.setText(textOrFallback(descriptor.getLicense(), unknown));
+        mainClassValue.setText(textOrFallback(descriptor.getMainClass(), unknown));
+        dependenciesValue.setText(formatDependencies(descriptor.getDependencies()));
+
+        updatingDetailToggle = true;
+        detailToggle.setSelected(enabledPlugins.getOrDefault(descriptor, false));
+        updatingDetailToggle = false;
+    }
+
+    private String buildMetaText(PluginDescriptor descriptor) {
+        String unknown = L18n.localize("railroad.generic.unknown");
+        String version = textOrFallback(descriptor.getVersion(), unknown);
+        String author = textOrFallback(descriptor.getAuthor(), unknown);
+        String versionMeta = L18n.localize("railroad.plugins.list.version", version);
+        String authorMeta = L18n.localize("railroad.plugins.list.author", author);
+        return versionMeta + "  •  " + authorMeta;
+    }
+
+    private String formatDependencies(MavenDeps deps) {
+        if (deps == null)
+            return L18n.localize("railroad.plugins.details.dependencies.none");
+
+        int repoCount = deps.repositories() == null ? 0 : deps.repositories().size();
+        int artifactCount = deps.artifacts() == null ? 0 : deps.artifacts().size();
+
+        if (repoCount == 0 && artifactCount == 0)
+            return L18n.localize("railroad.plugins.details.dependencies.none");
+
+        return L18n.localize("railroad.plugins.details.dependencies.count", repoCount, artifactCount);
+    }
+
+    private String textOrFallback(String value, String fallback) {
+        return value == null || value.isBlank() ? fallback : value;
+    }
+
+    private void setPluginEnabled(PluginDescriptor descriptor, boolean enabled) {
+        if (descriptor == null)
+            return;
+
+        boolean current = enabledPlugins.getOrDefault(descriptor, false);
+        if (current == enabled)
+            return;
+
+        enabledPlugins.put(descriptor, enabled);
+        pluginListView.refresh();
+    }
+
+    private String sortKey(PluginDescriptor descriptor) {
+        if (descriptor == null)
+            return "";
+
+        if (descriptor.getName() != null && !descriptor.getName().isBlank())
+            return descriptor.getName();
+
+        if (descriptor.getId() != null && !descriptor.getId().isBlank())
+            return descriptor.getId();
+
+        return descriptor.getClass().getSimpleName();
+    }
+
+    private void updateLocalizedStaticTexts() {
+        detailToggle.setText(L18n.localize("railroad.plugins.details.enable"));
+    }
+
+    private class PluginListCell extends ListCell<PluginDescriptor> {
+        private final Label title = new Label();
+        private final Label subtitle = new Label();
+        private final FontIcon icon = new FontIcon(FontAwesomeSolid.PUZZLE_PIECE);
+        private final CheckBox toggle = new CheckBox();
+        private final HBox container = new HBox(12);
+        private boolean updating;
+
+        private PluginListCell() {
+            container.getStyleClass().add("plugin-cell-container");
+
+            title.getStyleClass().add("plugin-cell-title");
+            subtitle.getStyleClass().add("plugin-cell-subtitle");
+            subtitle.setWrapText(true);
+
+            icon.setIconSize(18);
+            icon.getStyleClass().add("plugin-cell-icon");
+
+            toggle.setFocusTraversable(false);
+            toggle.selectedProperty().addListener((obs, oldValue, enabled) -> {
+                if (updating)
+                    return;
+
+                PluginDescriptor descriptor = getItem();
+                if (descriptor != null && !isEmpty()) {
+                    setPluginEnabled(descriptor, enabled);
+                    if (descriptor.equals(activeDescriptor)) {
+                        updatingDetailToggle = true;
+                        detailToggle.setSelected(enabled);
+                        updatingDetailToggle = false;
+                    }
+                }
+            });
+
+            var textContainer = new VBox(2, title, subtitle);
+            HBox.setHgrow(textContainer, Priority.ALWAYS);
+
+            container.setAlignment(Pos.CENTER_LEFT);
+            container.getChildren().addAll(icon, textContainer, toggle);
             setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+            setPrefHeight(Region.USE_COMPUTED_SIZE);
 
-            root.setMaxWidth(Double.MAX_VALUE);
+            selectedProperty().addListener(
+                (obs, oldSelected, newSelected) -> updateSelectedState(newSelected));
+            updateSelectedState(isSelected());
         }
 
         @Override
-        protected void updateItem(PluginModel vm, boolean empty) {
-            super.updateItem(vm, empty);
-            if (empty || vm == null) {
+        protected void updateItem(PluginDescriptor descriptor, boolean empty) {
+            super.updateItem(descriptor, empty);
+            if (empty || descriptor == null) {
                 setGraphic(null);
                 return;
             }
 
-            var descriptor = vm.descriptor();
-            name.setText(descriptor.getName());
-            meta.setText(ServiceLocator.getService(LocalizationService.class) != null
-                ? ServiceLocator.getService(LocalizationService.class).get("railroad.plugins.list.version", descriptor.getVersion())
-                : "v" + descriptor.getVersion());
-
-            var description = resolveText(descriptor.getDescription());
-            if (isNotBlankOrNull(description)) {
-                summary.setManaged(true);
-                summary.setVisible(true);
-                summary.setText(description.length() > 160 ? description.substring(0, 157) + "…" : description);
-            } else {
-                summary.setManaged(false);
-                summary.setVisible(false);
-            }
+            title.setText(textOrFallback(descriptor.getName(), descriptor.getId()));
+            subtitle.setText(buildMetaText(descriptor));
 
-            check.setSelected(enabledPlugins.getOrDefault(descriptor, false));
-            check.selectedProperty().addListener((observable, oldValue, newValue) ->
-                enabledPlugins.put(descriptor, newValue));
+            updating = true;
+            toggle.setSelected(enabledPlugins.getOrDefault(descriptor, false));
+            updating = false;
 
-            setGraphic(root);
+            setGraphic(container);
+            updateSelectedState(isSelected());
+        }
+
+        private void updateSelectedState(boolean selected) {
+            if (selected) {
+                if (!container.getStyleClass().contains("plugin-cell-selected")) {
+                    container.getStyleClass().add("plugin-cell-selected");
+                }
+            } else {
+                container.getStyleClass().remove("plugin-cell-selected");
+            }
         }
     }
 }
diff --git a/src/main/java/dev/railroadide/railroad/project/FacetDetectedEvent.java b/src/main/java/dev/railroadide/railroad/project/FacetDetectedEvent.java
new file mode 100644
index 00000000..9234a565
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/project/FacetDetectedEvent.java
@@ -0,0 +1,7 @@
+package dev.railroadide.railroad.project;
+
+import dev.railroadide.railroad.project.facet.Facet;
+import dev.railroadide.railroadpluginapi.event.Event;
+
+public record FacetDetectedEvent(Project project, Facet<?> facet) implements Event {
+}
diff --git a/src/main/java/dev/railroadide/railroad/project/Project.java b/src/main/java/dev/railroadide/railroad/project/Project.java
index 5b8fb39c..628459c4 100644
--- a/src/main/java/dev/railroadide/railroad/project/Project.java
+++ b/src/main/java/dev/railroadide/railroad/project/Project.java
@@ -9,9 +9,13 @@
 import dev.railroadide.railroad.Railroad;
 import dev.railroadide.railroad.config.ConfigHandler;
 import dev.railroadide.railroad.ide.IDESetup;
+import dev.railroadide.railroad.ide.runconfig.RunConfigurationManager;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.project.data.ProjectDataStore;
 import dev.railroadide.railroad.project.facet.Facet;
 import dev.railroadide.railroad.project.facet.FacetManager;
 import dev.railroadide.railroad.project.facet.FacetType;
+import dev.railroadide.railroad.gradle.project.GradleManager;
 import dev.railroadide.railroad.utility.StringUtils;
 import dev.railroadide.railroadpluginapi.events.ProjectAliasChangedEvent;
 import javafx.beans.property.*;
@@ -19,6 +23,7 @@
 import javafx.collections.ObservableSet;
 import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.image.Image;
+import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
 import javax.imageio.ImageIO;
@@ -29,6 +34,7 @@
 import java.nio.file.Path;
 import java.util.*;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 public class Project implements JsonSerializable<JsonObject>, dev.railroadide.railroadpluginapi.dto.Project {
     private final ObjectProperty<Path> path = new ReadOnlyObjectWrapper<>();
@@ -38,6 +44,12 @@ public class Project implements JsonSerializable<JsonObject>, dev.railroadide.ra
     private final ObjectProperty<Repository> repository = new SimpleObjectProperty<>();
     private final StringProperty id = new SimpleStringProperty();
     private final ObservableSet<Facet<?>> facets = FXCollections.observableSet();
+    @Getter
+    private final ProjectDataStore dataStore;
+    @Getter
+    private final RunConfigurationManager runConfigManager;
+    @Getter
+    private final GradleManager gradleManager;
 
     public Project(Path path) {
         this(path, path.getFileName().toString());
@@ -51,6 +63,9 @@ public Project(Path path, String alias, Image icon) {
         this.path.set(path);
         this.alias.set(alias);
         this.icon.set(icon == null ? createIcon(this) : icon);
+        this.dataStore = new ProjectDataStore(this);
+        this.runConfigManager = new RunConfigurationManager(this);
+        this.gradleManager = new GradleManager(this);
     }
 
     private static BufferedImage createIconImage(Project project) {
@@ -118,10 +133,11 @@ public static Path getPathFromBase64(String base64Path) {
 
     private void discoverFacets() {
         this.facets.clear();
-        /*FacetManager.scan(this).thenAcceptAsync(facets -> {
+        FacetManager.scan(this).thenAcceptAsync(facets -> {
             for (Facet<?> facet : facets) {
                 if (facet != null) {
                     this.facets.add(facet);
+                    Railroad.EVENT_BUS.publish(new FacetDetectedEvent(this, facet));
                 } else {
                     Railroad.LOGGER.warn("Discovered null facet for project: {}", getPathString());
                 }
@@ -129,7 +145,40 @@ private void discoverFacets() {
         }).exceptionally(ex -> {
             Railroad.LOGGER.error("Failed to discover facets for project: {}", getPathString(), ex);
             return null;
-        });*/
+        });
+    }
+
+    /**
+     * Check if the project has a facet of the specified type.
+     *
+     * @param type The facet type to check.
+     * @return True if the project has the facet, false otherwise.
+     */
+    public boolean hasFacet(FacetType<?> type) {
+        for (Facet<?> facet : facets) {
+            if (facet.getType().equals(type)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the facet of the specified type.
+     *
+     * @param type The facet type to get.
+     * @param <D>  The data type of the facet.
+     * @return An Optional containing the facet if found, otherwise empty.
+     */
+    @SuppressWarnings("unchecked")
+    public <D> Optional<Facet<D>> getFacet(FacetType<D> type) {
+        for (Facet<?> facet : facets) {
+            if (facet.getType().equals(type))
+                return Optional.of((Facet<D>) facet);
+        }
+
+        return Optional.empty();
     }
 
     @Override
@@ -156,13 +205,11 @@ public String toString() {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
+        if (this == obj)
             return true;
-        }
 
-        if (obj == null || getClass() != obj.getClass()) {
+        if (obj == null || getClass() != obj.getClass())
             return false;
-        }
 
         Project project = (Project) obj;
         return path.equals(project.path);
@@ -363,4 +410,20 @@ public ObjectProperty<Repository> repositoryProperty() {
     public LongProperty lastOpenedProperty() {
         return lastOpened;
     }
+
+    public CompletableFuture<Runnable> build(JDK jdk) {
+        CompletableFuture<Runnable> future = new CompletableFuture<>();
+        CompletableFuture.runAsync(() -> {
+            if (hasFacet(FacetManager.GRADLE)) {
+                gradleManager.runBuildTaskAsync("build", jdk, future);
+            } else if (hasFacet(FacetManager.MAVEN)) {
+                // TODO: Implement Maven build support
+                future.completeExceptionally(new UnsupportedOperationException("Maven build support is not implemented yet."));
+            } else {
+                future.completeExceptionally(new IllegalStateException("Project does not have a build facet."));
+            }
+        });
+
+        return future;
+    }
 }
diff --git a/src/main/java/dev/railroadide/railroad/project/data/ProjectDataStore.java b/src/main/java/dev/railroadide/railroad/project/data/ProjectDataStore.java
new file mode 100644
index 00000000..7111540d
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/project/data/ProjectDataStore.java
@@ -0,0 +1,370 @@
+package dev.railroadide.railroad.project.data;
+
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.project.Project;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.*;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Provides thread-safe access to the per-project data directory ({@code PROJECT/.railroad}).
+ * Callers can store any number of files (JSON, binary, etc.) and use the provided helpers to
+ * work with bytes, text, or JSON-serialized DTOs.
+ */
+public final class ProjectDataStore {
+    private final Project project;
+
+    private final CopyOnWriteArrayList<FileChangeListener> fileChangeListeners = new CopyOnWriteArrayList<>();
+    private final Object watcherLock = new Object();
+    private volatile WatchService watchService;
+    private volatile ExecutorService watchExecutor;
+    private volatile Path watchRoot;
+
+    public ProjectDataStore(Project project) {
+        this.project = Objects.requireNonNull(project, "project");
+    }
+
+    /**
+     * Ensures the per-project data directory exists and returns it.
+     */
+    public Path dataDirectory() {
+        Path projectPath = project.getPath();
+        if (projectPath == null)
+            throw new IllegalStateException("Project path is not set yet");
+
+        Path dir = projectPath.resolve(".railroad");
+        try {
+            Files.createDirectories(dir);
+        } catch (IOException exception) {
+            throw new IllegalStateException("Failed to create project data directory at " + dir, exception);
+        }
+
+        return dir;
+    }
+
+    /**
+     * Resolves a path within the per-project data directory.
+     */
+    public Path resolve(String first, String... more) {
+        return resolveInternal(Path.of(first, more));
+    }
+
+    /**
+     * Registers a listener that will be notified whenever a file under {@code .railroad} changes.
+     */
+    public void addFileChangeListener(FileChangeListener listener) {
+        Objects.requireNonNull(listener, "listener");
+        fileChangeListeners.add(listener);
+        ensureWatcherStarted();
+    }
+
+    /**
+     * Removes a previously registered listener. When none remain the watcher is stopped.
+     */
+    public void removeFileChangeListener(FileChangeListener listener) {
+        if (listener == null)
+            return;
+
+        fileChangeListeners.remove(listener);
+        if (fileChangeListeners.isEmpty()) {
+            stopWatcher(false);
+        }
+    }
+
+    /**
+     * Stores raw bytes at the given relative path (creating parent directories if needed).
+     * Passing {@code null} bytes deletes the file.
+     */
+    public synchronized void writeBytes(String relativePath, byte[] bytes) {
+        Objects.requireNonNull(relativePath, "relativePath");
+        Path target = resolveInternal(Path.of(relativePath));
+
+        if (bytes == null) {
+            delete(relativePath);
+            return;
+        }
+
+        try {
+            Path parent = target.getParent();
+            if (parent != null) {
+                Files.createDirectories(parent);
+            }
+
+            Files.write(target, bytes);
+        } catch (IOException exception) {
+            throw new IllegalStateException("Failed to write project data file " + target, exception);
+        }
+    }
+
+    /**
+     * Writes UTF-8 text to the given relative path.
+     */
+    public synchronized void writeString(String relativePath, CharSequence content) {
+        writeBytes(relativePath, content == null ? null : content.toString().getBytes(StandardCharsets.UTF_8));
+    }
+
+    /**
+     * Serializes a DTO as JSON and stores it at the given relative path (e.g. {@code configs/plugin.json}).
+     */
+    public synchronized <T> void writeJson(String relativePath, T value) {
+        writeString(relativePath, value == null ? null : Railroad.GSON.toJson(value));
+    }
+
+    /**
+     * Reads all bytes from the given relative path if the file exists.
+     */
+    public synchronized Optional<byte[]> readBytes(String relativePath) {
+        Objects.requireNonNull(relativePath, "relativePath");
+        Path target = resolveInternal(Path.of(relativePath));
+
+        if (Files.notExists(target))
+            return Optional.empty();
+
+        try {
+            return Optional.of(Files.readAllBytes(target));
+        } catch (IOException exception) {
+            throw new IllegalStateException("Failed to read project data file " + target, exception);
+        }
+    }
+
+    /**
+     * Reads a UTF-8 encoded file as text.
+     */
+    public synchronized Optional<String> readString(String relativePath) {
+        return readBytes(relativePath).map(bytes -> new String(bytes, StandardCharsets.UTF_8));
+    }
+
+    /**
+     * Deserializes JSON from the given relative path into {@code type}.
+     */
+    public synchronized <T> Optional<T> readJson(String relativePath, Class<T> type) {
+        Objects.requireNonNull(type, "type");
+        return readString(relativePath).filter(content -> !content.isBlank())
+            .map(content -> Railroad.GSON.fromJson(content, type));
+    }
+
+    /**
+     * Deletes the file at the given relative path, if it exists.
+     */
+    public synchronized void delete(String relativePath) {
+        Objects.requireNonNull(relativePath, "relativePath");
+        Path target = resolveInternal(Path.of(relativePath));
+
+        try {
+            Files.deleteIfExists(target);
+        } catch (IOException exception) {
+            throw new IllegalStateException("Failed to delete project data file " + target, exception);
+        }
+    }
+
+    /**
+     * Returns {@code true} if a file exists at the given relative path.
+     */
+    public synchronized boolean exists(String relativePath) {
+        Objects.requireNonNull(relativePath, "relativePath");
+        Path target = resolveInternal(Path.of(relativePath));
+        return Files.exists(target);
+    }
+
+    /**
+     * Lists all files under the project data directory, returned as paths relative to it.
+     */
+    public synchronized List<Path> listFiles() {
+        Path dir = dataDirectory();
+        try (var stream = Files.walk(dir)) {
+            return stream.filter(Files::isRegularFile)
+                .map(dir::relativize)
+                .toList();
+        } catch (IOException exception) {
+            throw new IllegalStateException("Failed to enumerate project data files under " + dir, exception);
+        }
+    }
+
+    private Path resolveInternal(Path relative) {
+        Objects.requireNonNull(relative, "relativePath");
+        Path normalized = relative.normalize();
+        if (normalized.isAbsolute())
+            throw new IllegalArgumentException("Expected a relative path but got " + relative);
+
+        for (Path part : normalized) {
+            if ("..".equals(part.toString()))
+                throw new IllegalArgumentException("Path escapes project data directory: " + relative);
+        }
+
+        Path path = dataDirectory();
+        Path resolved = path.resolve(normalized);
+        try {
+            if (Files.notExists(resolved)) {
+                Files.createDirectories(resolved.getParent());
+                Files.createFile(resolved);
+            }
+
+            Path dataDirReal = path.toRealPath();
+            Path resolvedReal = resolved.toRealPath();
+            if (!resolvedReal.startsWith(dataDirReal))
+                throw new IllegalArgumentException("Resolved path escapes project data directory: " + relative);
+
+            return resolved;
+        } catch (IOException exception) {
+            throw new IllegalStateException("Failed to resolve real path for " + resolved, exception);
+        }
+    }
+
+    private void ensureWatcherStarted() {
+        synchronized (watcherLock) {
+            if (watchExecutor != null || fileChangeListeners.isEmpty())
+                return;
+
+            try {
+                Path root = dataDirectory();
+                watchRoot = root;
+                watchService = root.getFileSystem().newWatchService();
+                registerDirectoryRecursive(root);
+
+                watchExecutor = Executors.newSingleThreadExecutor(runnable -> {
+                    var thread = new Thread(runnable, "ProjectDataStoreWatcher-" + project.getId());
+                    thread.setDaemon(true);
+                    return thread;
+                });
+                watchExecutor.submit(this::watchLoop);
+            } catch (IOException exception) {
+                stopWatcher(true);
+                throw new IllegalStateException("Failed to start file watcher for project data", exception);
+            }
+        }
+    }
+
+    private void registerDirectoryRecursive(Path root) throws IOException {
+        try (var stream = Files.walk(root)) {
+            stream.filter(Files::isDirectory).forEach(this::registerDirectorySafely);
+        }
+    }
+
+    private void registerDirectorySafely(Path dir) {
+        WatchService service = watchService;
+        if (service == null)
+            return;
+
+        try {
+            dir.register(
+                service,
+                StandardWatchEventKinds.ENTRY_CREATE,
+                StandardWatchEventKinds.ENTRY_DELETE,
+                StandardWatchEventKinds.ENTRY_MODIFY
+            );
+        } catch (IOException exception) {
+            Railroad.LOGGER.warn("Failed to register directory {} for project data watcher", dir, exception);
+        }
+    }
+
+    private void watchLoop() {
+        try {
+            while (!Thread.currentThread().isInterrupted()) {
+                WatchKey key;
+                try {
+                    key = watchService.take();
+                } catch (InterruptedException exception) {
+                    Thread.currentThread().interrupt();
+                    break;
+                } catch (ClosedWatchServiceException exception) {
+                    break;
+                }
+
+                Path dir = (Path) key.watchable();
+                for (WatchEvent<?> event : key.pollEvents()) {
+                    WatchEvent.Kind<?> kind = event.kind();
+                    if (kind == StandardWatchEventKinds.OVERFLOW)
+                        continue;
+
+                    @SuppressWarnings("unchecked")
+                    Path name = ((WatchEvent<Path>) event).context();
+                    Path child = dir.resolve(name);
+
+                    if (kind == StandardWatchEventKinds.ENTRY_CREATE) {
+                        try {
+                            if (Files.isDirectory(child))
+                                registerDirectoryRecursive(child);
+                        } catch (IOException exception) {
+                            Railroad.LOGGER.warn("Failed to register new directory {} for watcher", child, exception);
+                        }
+                    }
+
+                    notifyFileChangeListeners(child, kind);
+                }
+
+                if (!key.reset())
+                    break;
+            }
+        } finally {
+            stopWatcher(true);
+            if (!fileChangeListeners.isEmpty()) {
+                ensureWatcherStarted();
+            }
+        }
+    }
+
+    private void notifyFileChangeListeners(Path absolutePath, WatchEvent.Kind<?> kind) {
+        Path root = watchRoot;
+        if (root == null || fileChangeListeners.isEmpty())
+            return;
+
+        Path relative;
+        try {
+            relative = root.relativize(absolutePath);
+        } catch (IllegalArgumentException exception) {
+            Railroad.LOGGER.warn("Watcher produced path outside of project data directory: {}", absolutePath);
+            return;
+        }
+
+        for (FileChangeListener listener : fileChangeListeners) {
+            try {
+                listener.onFileChanged(relative, kind);
+            } catch (Exception exception) {
+                Railroad.LOGGER.error("Project data file change listener threw an exception", exception);
+            }
+        }
+    }
+
+    private void stopWatcher(boolean force) {
+        synchronized (watcherLock) {
+            if (watchExecutor == null)
+                return;
+
+            if (!force && !fileChangeListeners.isEmpty())
+                return;
+
+            ExecutorService executor = watchExecutor;
+            watchExecutor = null;
+
+            WatchService service = watchService;
+            watchService = null;
+            watchRoot = null;
+
+            if (service != null || executor != null) {
+                try {
+                    if (service != null) {
+                        service.close();
+                    }
+                } catch (IOException exception) {
+                    Railroad.LOGGER.warn("Failed to close project data watch service", exception);
+                } finally {
+                    if (executor != null) {
+                        executor.shutdownNow();
+                    }
+                }
+            }
+        }
+    }
+
+    @FunctionalInterface
+    public interface FileChangeListener {
+        void onFileChanged(Path relativePath, WatchEvent.Kind<?> kind);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/project/facet/FacetDetector.java b/src/main/java/dev/railroadide/railroad/project/facet/FacetDetector.java
index 61242c6d..ef33b44f 100644
--- a/src/main/java/dev/railroadide/railroad/project/facet/FacetDetector.java
+++ b/src/main/java/dev/railroadide/railroad/project/facet/FacetDetector.java
@@ -1,8 +1,7 @@
 package dev.railroadide.railroad.project.facet;
 
-import org.jetbrains.annotations.NotNull;
+import dev.railroadide.railroad.project.Project;
 
-import java.nio.file.Path;
 import java.util.Optional;
 
 /**
@@ -16,8 +15,8 @@ public interface FacetDetector<D> {
     /**
      * Detects a facet based on the provided path.
      *
-     * @param path the path to analyze for facet detection
+     * @param project the project context for detection
      * @return an {@link Optional} containing the detected facet if found, or an {@link Optional#empty} if no facet is detected
      */
-    Optional<Facet<D>> detect(@NotNull Path path);
+    Optional<Facet<D>> detect(Project project);
 }
diff --git a/src/main/java/dev/railroadide/railroad/project/facet/FacetManager.java b/src/main/java/dev/railroadide/railroad/project/facet/FacetManager.java
index 9f199af4..de86d6dc 100644
--- a/src/main/java/dev/railroadide/railroad/project/facet/FacetManager.java
+++ b/src/main/java/dev/railroadide/railroad/project/facet/FacetManager.java
@@ -12,8 +12,6 @@
 import dev.railroadide.railroad.project.facet.detector.MavenFacetDetector;
 import org.jetbrains.annotations.NotNull;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
@@ -148,32 +146,16 @@ public static <D> FacetType<D> registerFacet(@NotNull FacetType<D> facetType, @N
     }
 
     public static CompletableFuture<Collection<Facet<?>>> scan(@NotNull Project project) {
-        if (project == null)
-            throw new IllegalArgumentException("Project must not be null");
-
-        return scan(project.getPath());
-    }
-
-    public static CompletableFuture<Collection<Facet<?>>> scan(@NotNull Path projectPath) {
-        if (projectPath == null)
-            throw new IllegalArgumentException("Project path must not be null");
-
-        if (Files.notExists(projectPath))
-            throw new IllegalArgumentException("Project path does not exist: " + projectPath);
-
-        if (!Files.isDirectory(projectPath))
-            throw new IllegalArgumentException("Project path must be a directory: " + projectPath);
-
         return CompletableFuture.supplyAsync(() -> {
             Set<Facet<?>> facets = DETECTORS.stream()
-                .map(detector -> detector.detect(projectPath))
+                .map(detector -> detector.detect(project))
                 .flatMap(Optional::stream)
                 .collect(Collectors.toSet());
 
             if (facets.isEmpty()) {
-                Railroad.LOGGER.warn("No facets detected for project at {}", projectPath);
+                Railroad.LOGGER.warn("No facets detected for project at {}", project.getPath());
             } else {
-                Railroad.LOGGER.info("Detected {} facets for project at {}", facets.size(), projectPath);
+                Railroad.LOGGER.info("Detected {} facets for project at {}", facets.size(), project.getPath());
             }
 
             return facets;
diff --git a/src/main/java/dev/railroadide/railroad/project/facet/data/FabricFacetData.java b/src/main/java/dev/railroadide/railroad/project/facet/data/FabricFacetData.java
index 236d7706..b4017343 100644
--- a/src/main/java/dev/railroadide/railroad/project/facet/data/FabricFacetData.java
+++ b/src/main/java/dev/railroadide/railroad/project/facet/data/FabricFacetData.java
@@ -26,4 +26,8 @@ public class FabricFacetData extends MinecraftModFacetData {
      * The version of Loom used by the project.
      */
     private String loomVersion;
+    /**
+     * Whether the project is using Architectury Loom.
+     */
+    private boolean isArchitecturyLoom;
 }
diff --git a/src/main/java/dev/railroadide/railroad/project/facet/data/GradleFacetData.java b/src/main/java/dev/railroadide/railroad/project/facet/data/GradleFacetData.java
index 205076f2..e30f6198 100644
--- a/src/main/java/dev/railroadide/railroad/project/facet/data/GradleFacetData.java
+++ b/src/main/java/dev/railroadide/railroad/project/facet/data/GradleFacetData.java
@@ -2,22 +2,7 @@
 
 import lombok.Data;
 
-/**
- * Holds information about the Gradle build configuration for a project facet.
- * Used by the Gradle facet to describe the build file, version, and script type.
- */
 @Data
 public class GradleFacetData {
-    /**
-     * The version of Gradle used by the project, if detected.
-     */
-    private String gradleVersion;
-    /**
-     * The path to the Gradle build file (build.gradle or build.gradle.kts).
-     */
-    private String buildFilePath;
-    /**
-     * True if the build file is a Kotlin script (build.gradle.kts), false if Groovy (build.gradle).
-     */
-    private boolean isKts;
+
 }
diff --git a/src/main/java/dev/railroadide/railroad/project/facet/detector/FabricFacetDetector.java b/src/main/java/dev/railroadide/railroad/project/facet/detector/FabricFacetDetector.java
index b06f4071..8efe96cb 100644
--- a/src/main/java/dev/railroadide/railroad/project/facet/detector/FabricFacetDetector.java
+++ b/src/main/java/dev/railroadide/railroad/project/facet/detector/FabricFacetDetector.java
@@ -1,26 +1,21 @@
 package dev.railroadide.railroad.project.facet.detector;
 
 import com.google.gson.JsonObject;
-import dev.railroadide.fabricExtractorPlugin.model.FabricExtractorModel;
-import dev.railroadide.railroad.AppResources;
 import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.gradle.model.GradleBuildModel;
+import dev.railroadide.railroad.gradle.service.GradleModelService;
+import dev.railroadide.railroad.project.Project;
 import dev.railroadide.railroad.project.facet.Facet;
 import dev.railroadide.railroad.project.facet.FacetDetector;
 import dev.railroadide.railroad.project.facet.FacetManager;
 import dev.railroadide.railroad.project.facet.data.FabricFacetData;
+import dev.railroadide.railroadplugin.dto.FabricDataModel;
 import org.gradle.api.GradleException;
 import org.gradle.tooling.BuildException;
-import org.gradle.tooling.GradleConnector;
-import org.gradle.tooling.ProjectConnection;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -28,32 +23,15 @@
  * This detector is used by the facet system to identify Fabric mod projects and extract relevant configuration data.
  */
 public class FabricFacetDetector implements FacetDetector<FabricFacetData> {
-    /**
-     * Extracts the Gradle init script for Fabric metadata extraction to a temporary file.
-     *
-     * @return the path to the extracted init script
-     * @throws IOException if the script cannot be extracted
-     */
-    private static Path extractInitScript() throws IOException {
-        try (InputStream inputStream = AppResources.getResourceAsStream("scripts/init-fabric-extractor.gradle")) {
-            if (inputStream == null)
-                throw new IllegalStateException("init script resource missing");
-
-            Path tempFile = Files.createTempFile("init-fabric-extractor", ".gradle");
-            Files.copy(inputStream, tempFile, StandardCopyOption.REPLACE_EXISTING);
-            tempFile.toFile().deleteOnExit();
-            return tempFile;
-        }
-    }
-
     /**
      * Detects a Fabric facet in the given path by searching for fabric.mod.json and extracting mod metadata and build info.
      *
-     * @param path the project directory to analyze
+     * @param project the project context for detection
      * @return an Optional containing the Fabric facet if detected, or empty if not found
      */
     @Override
-    public Optional<Facet<FabricFacetData>> detect(@NotNull Path path) {
+    public Optional<Facet<FabricFacetData>> detect(Project project) {
+        Path path = project.getPath();
         Path fabricModJson = path.resolve("src").resolve("main").resolve("resources").resolve("fabric.mod.json");
         if (Files.notExists(fabricModJson) || !Files.isRegularFile(fabricModJson) || !Files.isReadable(fabricModJson))
             return Optional.empty();
@@ -76,42 +54,20 @@ public Optional<Facet<FabricFacetData>> detect(@NotNull Path path) {
             data.setIssuesUrl(contact.has("issues") ? contact.get("issues").getAsString() : "");
             data.setChangelogUrl(json.has("changelog") ? json.get("changelog").getAsString() : "");
 
-            Path buildFilePath = null;
-            for (String buildFile : GradleFacetDetector.BUILD_FILES) {
-                Path tryBuildFilePath = path.resolve(buildFile);
-                if (Files.exists(tryBuildFilePath) && Files.isRegularFile(tryBuildFilePath) && Files.isReadable(tryBuildFilePath)) {
-                    buildFilePath = tryBuildFilePath;
-                    break;
+            GradleModelService gradleModelService = project.getGradleManager().getGradleModelService();
+            gradleModelService.getCachedModel().ifPresent(gradleBuildModel -> {
+                FabricDataModel fabricDataModel = gradleBuildModel.fabricData();
+                data.setMinecraftVersion(fabricDataModel.minecraftVersion());
+                data.setYarnMappingsVersion(fabricDataModel.mappingsVersion());
+                data.setFabricLoaderVersion(fabricDataModel.loaderVersion());
+                data.setFabricApiVersion(fabricDataModel.fabricApiVersion());
+                if (fabricDataModel.loomVersion() != null) {
+                    data.setLoomVersion(fabricDataModel.loomVersion().version());
+                    data.setArchitecturyLoom(fabricDataModel.loomVersion().isArchitecturyLoom());
                 }
-            }
-
-            data.setBuildFilePath(Objects.toString(buildFilePath));
-
-            String minecraftVersion, fabricLoaderVersion, fabricApiVersion, yarnMappingsVersion, loomVersion;
-            try (ProjectConnection connection = GradleConnector.newConnector()
-                .forProjectDirectory(path.toFile())
-                .connect()) {
-                Path initScriptPath = extractInitScript();
-
-                OutputStream outputStream = OutputStream.nullOutputStream();
-                FabricExtractorModel model = connection.model(FabricExtractorModel.class)
-                    .withArguments("--init-script", initScriptPath.toAbsolutePath().toString())
-                    .setStandardOutput(outputStream)
-                    .setStandardError(outputStream)
-                    .get();
-
-                minecraftVersion = model.minecraftVersion();
-                fabricLoaderVersion = model.loaderVersion();
-                fabricApiVersion = model.fabricApiVersion();
-                yarnMappingsVersion = model.mappingsVersion();
-                loomVersion = model.loomVersion();
-            }
 
-            data.setMinecraftVersion(minecraftVersion);
-            data.setFabricLoaderVersion(fabricLoaderVersion);
-            data.setFabricApiVersion(fabricApiVersion);
-            data.setYarnMappingsVersion(yarnMappingsVersion);
-            data.setLoomVersion(loomVersion);
+                // TODO: Set source file
+            });
 
             return Optional.of(new Facet<>(FacetManager.FABRIC, data));
         } catch (IOException exception) {
diff --git a/src/main/java/dev/railroadide/railroad/project/facet/detector/GradleFacetDetector.java b/src/main/java/dev/railroadide/railroad/project/facet/detector/GradleFacetDetector.java
index a47ecb7b..dde04337 100644
--- a/src/main/java/dev/railroadide/railroad/project/facet/detector/GradleFacetDetector.java
+++ b/src/main/java/dev/railroadide/railroad/project/facet/detector/GradleFacetDetector.java
@@ -1,11 +1,10 @@
 package dev.railroadide.railroad.project.facet.detector;
 
-import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.project.Project;
 import dev.railroadide.railroad.project.facet.Facet;
 import dev.railroadide.railroad.project.facet.FacetDetector;
 import dev.railroadide.railroad.project.facet.FacetManager;
 import dev.railroadide.railroad.project.facet.data.GradleFacetData;
-import org.jetbrains.annotations.NotNull;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -22,74 +21,19 @@ public class GradleFacetDetector implements FacetDetector<GradleFacetData> {
     /**
      * Detects a Gradle facet in the given path by searching for build.gradle or build.gradle.kts files and reading Gradle version info.
      *
-     * @param path the project directory to analyze
+     * @param project the project to inspect
      * @return an Optional containing the Gradle facet if detected, or empty if not found
      */
     @Override
-    public Optional<Facet<GradleFacetData>> detect(@NotNull Path path) {
+    public Optional<Facet<GradleFacetData>> detect(Project project) {
         for (String buildFile : BUILD_FILES) {
-            Path buildFilePath = path.resolve(buildFile);
+            Path buildFilePath = project.getPath().resolve(buildFile);
             if (Files.exists(buildFilePath)) {
-                var data = new GradleFacetData();
-                String buildFilePathStr = buildFilePath.toString();
-                boolean isKts = buildFile.endsWith(".kts");
-                String gradleVersion;
-                Optional<Path> wrapperProperties = findWrapperProperties(path);
-                if (wrapperProperties.isPresent()) {
-                    try {
-                        List<String> lines = Files.readAllLines(wrapperProperties.get());
-                        gradleVersion = parseGradleVersion(lines);
-                    } catch (Exception exception) {
-                        Railroad.LOGGER.error("Error reading gradle-wrapper.properties", exception);
-                        gradleVersion = null;
-                    }
-                } else {
-                    gradleVersion = null;
-                }
-
-                data.setGradleVersion(gradleVersion);
-                data.setBuildFilePath(buildFilePathStr);
-                data.setKts(isKts);
-
+                var data = new GradleFacetData(); // TODO: Come back to this and figure out what data it should store
                 return Optional.of(new Facet<>(FacetManager.GRADLE, data));
             }
         }
 
         return Optional.empty();
     }
-
-    /**
-     * Finds the gradle-wrapper.properties file in the project directory, if present.
-     *
-     * @param path the project directory
-     * @return an Optional containing the path to gradle-wrapper.properties, or empty if not found
-     */
-    private Optional<Path> findWrapperProperties(@NotNull Path path) {
-        Path wrapperProperties = path.resolve("gradle/wrapper/gradle-wrapper.properties");
-        if (Files.exists(wrapperProperties)) {
-            return Optional.of(wrapperProperties);
-        }
-
-        return Optional.empty();
-    }
-
-    /**
-     * Parses the Gradle version from the lines of a gradle-wrapper.properties file.
-     *
-     * @param lines the lines of the properties file
-     * @return the Gradle version string, or null if not found
-     */
-    private String parseGradleVersion(List<String> lines) {
-        for (String line : lines) {
-            if (line.startsWith("distributionUrl=")) {
-                String url = line.substring("distributionUrl=".length());
-                String[] parts = url.split("/");
-                if (parts.length > 1) {
-                    return parts[parts.length - 1].replace("gradle-", "").replace(".zip", "");
-                }
-            }
-        }
-
-        return null;
-    }
 }
diff --git a/src/main/java/dev/railroadide/railroad/project/facet/detector/JavaFacetDetector.java b/src/main/java/dev/railroadide/railroad/project/facet/detector/JavaFacetDetector.java
index f96bf01c..970fc08e 100644
--- a/src/main/java/dev/railroadide/railroad/project/facet/detector/JavaFacetDetector.java
+++ b/src/main/java/dev/railroadide/railroad/project/facet/detector/JavaFacetDetector.java
@@ -1,8 +1,7 @@
 package dev.railroadide.railroad.project.facet.detector;
 
-import dev.railroadide.javaVersionExtractorPlugin.model.JavaVersionModel;
-import dev.railroadide.railroad.AppResources;
 import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.project.Project;
 import dev.railroadide.railroad.project.facet.Facet;
 import dev.railroadide.railroad.project.facet.FacetDetector;
 import dev.railroadide.railroad.project.facet.FacetManager;
@@ -14,19 +13,13 @@
 import org.apache.maven.model.building.*;
 import org.codehaus.plexus.configuration.PlexusConfigurationException;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
-import org.gradle.api.GradleException;
-import org.gradle.tooling.BuildException;
-import org.gradle.tooling.GradleConnector;
-import org.gradle.tooling.ProjectConnection;
+import org.gradle.tooling.model.java.InstalledJdk;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.DataInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
@@ -41,14 +34,20 @@ public class JavaFacetDetector implements FacetDetector<JavaFacetData> {
      * Attempts to determine the most reliable Java version for the given project path.
      * Checks Gradle, Maven, compiled class files, and system properties in order.
      *
-     * @param path the project directory
+     * @param project the project
      * @return the detected JavaVersion, or an invalid version if not found
      */
-    private static JavaVersion findMostReliableJavaVersion(@NotNull Path path) {
-        JavaVersion gradleVersion = getJavaVersionFromGradle(path);
+    private static JavaVersion findMostReliableJavaVersion(@NotNull Project project) {
+        JavaVersion gradleVersion = getJavaVersionFromGradle(project);
         if (gradleVersion.major() != -1)
             return gradleVersion;
 
+        Path path = project.getPath();
+        if (path == null) {
+            Railroad.LOGGER.warn("Project path is null for project: {}", project.getAlias());
+            return JavaVersion.fromMajor(-1);
+        }
+
         JavaVersion mavenVersion = getJavaVersionFromMaven(path);
         if (mavenVersion.major() != -1)
             return mavenVersion;
@@ -63,7 +62,7 @@ private static JavaVersion findMostReliableJavaVersion(@NotNull Path path) {
             return systemVersion;
 
         Railroad.LOGGER.warn("No reliable Java version found for path: {}", path);
-        return JavaVersion.fromMajor(-1); // Fallback to an invalid version
+        return JavaVersion.fromMajor(-1);
     }
 
     /**
@@ -124,57 +123,24 @@ private static JavaVersion parseJavaVersionFromClassFile(@NotNull Path classFile
     /**
      * Attempts to extract the Java version from a Gradle project by connecting to the build and reading configuration.
      *
-     * @param path the project directory
+     * @param project the project
      * @return the JavaVersion specified in the Gradle build, or an invalid version if not found
      */
-    private static JavaVersion getJavaVersionFromGradle(@NotNull Path path) {
-        boolean hasBuildFile = false;
-        for (String buildFile : GradleFacetDetector.BUILD_FILES) {
-            Path tryBuildFilePath = path.resolve(buildFile);
-            if (Files.exists(tryBuildFilePath) && Files.isRegularFile(tryBuildFilePath) && Files.isReadable(tryBuildFilePath)) {
-                hasBuildFile = true;
-                break;
-            }
-        }
-
-        if (!hasBuildFile)
-            return JavaVersion.fromMajor(-1); // No Gradle build file found
-
-        try (ProjectConnection connection = GradleConnector.newConnector()
-            .forProjectDirectory(path.toFile())
-            .connect()) {
-            if (connection == null)
-                return JavaVersion.fromMajor(-1); // No Gradle connection
-
-            Path initScriptPath = extractInitScript();
-
-            OutputStream outputStream = OutputStream.nullOutputStream();
-            JavaVersionModel model = connection.model(JavaVersionModel.class)
-                .withArguments("--init-script", initScriptPath.toAbsolutePath().toString())
-                .setStandardOutput(outputStream)
-                .setStandardError(outputStream)
-                .get();
-            if (model == null) {
-                Railroad.LOGGER.warn("No Java version model found in Gradle project at path: {}", path);
-                return JavaVersion.fromMajor(-1);
-            }
-
-            JavaVersion sourceVersion = JavaVersion.fromReleaseString(model.sourceCompatibility());
-            JavaVersion targetVersion = JavaVersion.fromReleaseString(model.targetCompatibility());
-            System.out.println("Source compatibility: " + sourceVersion);
-            System.out.println("Target compatibility: " + targetVersion);
-
-            return sourceVersion.compareTo(targetVersion) >= 0 ?
-                sourceVersion :
-                targetVersion;
-        } catch (IOException exception) {
-            Railroad.LOGGER.error("IO exception while detecting Java version in path: {}", path, exception);
-        } catch (GradleException | BuildException ignored) {
-        } catch (Exception exception) {
-            Railroad.LOGGER.error("Unexpected error while detecting Java version in path: {}", path, exception);
-        }
+    private static JavaVersion getJavaVersionFromGradle(@NotNull Project project) {
+        if (!project.getGradleManager().isGradleProject())
+            return JavaVersion.fromMajor(-1);
 
-        return JavaVersion.fromMajor(-1);
+        return project.getGradleManager().getGradleModelService().getCachedModel()
+            .map(gradleBuildModel -> {
+                try {
+                    InstalledJdk jdk = gradleBuildModel.project().javaLanguageSettings().getJdk();
+                    return JavaVersion.fromMajor(Integer.parseInt(jdk.getJavaVersion().getMajorVersion()));
+                } catch (NumberFormatException exception) {
+                    Railroad.LOGGER.error("Error parsing Java version from Gradle model for project: {}", project.getAlias(), exception);
+                    return JavaVersion.fromMajor(-1);
+                }
+            })
+            .orElse(JavaVersion.fromMajor(-1));
     }
 
     /**
@@ -238,50 +204,28 @@ private static JavaVersion getJavaVersionFromMaven(Path projectDir) {
         }
     }
 
-    /**
-     * Extracts the Gradle init script for Java version detection to a temporary file.
-     *
-     * @return the path to the extracted init script
-     * @throws IOException if the script cannot be extracted
-     */
-    private static Path extractInitScript() throws IOException {
-        try (InputStream inputStream = AppResources.getResourceAsStream("scripts/init-java-version.gradle")) {
-            if (inputStream == null)
-                throw new IllegalStateException("init script resource missing");
-
-            Path tempFile = Files.createTempFile("init-java-version", ".gradle");
-            Files.copy(inputStream, tempFile, StandardCopyOption.REPLACE_EXISTING);
-            tempFile.toFile().deleteOnExit();
-            return tempFile;
-        }
-    }
-
     /**
      * Detects a Java facet in the given path by searching for .java files and determining the Java version.
      *
-     * @param path the project directory or file to analyze
+     * @param project the project
      * @return an Optional containing the Java facet if detected, or empty if not found
      */
     @Override
-    public Optional<Facet<JavaFacetData>> detect(@NotNull Path path) {
+    public Optional<Facet<JavaFacetData>> detect(Project project) {
         long javaFileCount = 0;
         try {
-            if (Files.isDirectory(path)) {
-                try (Stream<Path> javaFiles = Files.find(path, 10,
-                    (p, attrs) -> p.toString().endsWith(".java"))) {
-                    javaFileCount = javaFiles.count();
-                }
-            } else if (path.toString().endsWith(".java")) {
-                javaFileCount = 1;
+            try (Stream<Path> javaFiles = Files.find(project.getPath(), 10,
+                (p, attrs) -> p.toString().endsWith(".java"))) {
+                javaFileCount = javaFiles.count();
             }
         } catch (IOException exception) {
-            Railroad.LOGGER.error("Error while detecting Java files in path: {}", path, exception);
+            Railroad.LOGGER.error("Error while detecting Java files in path: {}", project.getPath(), exception);
         }
 
         JavaFacetData data = null;
         if (javaFileCount > 0) {
             data = new JavaFacetData();
-            JavaVersion highestJavaVersion = findMostReliableJavaVersion(path);
+            JavaVersion highestJavaVersion = findMostReliableJavaVersion(project);
             data.setVersion(highestJavaVersion);
         }
 
diff --git a/src/main/java/dev/railroadide/railroad/project/facet/detector/MavenFacetDetector.java b/src/main/java/dev/railroadide/railroad/project/facet/detector/MavenFacetDetector.java
index 16633224..0f0fe231 100644
--- a/src/main/java/dev/railroadide/railroad/project/facet/detector/MavenFacetDetector.java
+++ b/src/main/java/dev/railroadide/railroad/project/facet/detector/MavenFacetDetector.java
@@ -1,13 +1,13 @@
 package dev.railroadide.railroad.project.facet.detector;
 
 import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.project.Project;
 import dev.railroadide.railroad.project.facet.Facet;
 import dev.railroadide.railroad.project.facet.FacetDetector;
 import dev.railroadide.railroad.project.facet.FacetManager;
 import dev.railroadide.railroad.project.facet.data.MavenFacetData;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.building.*;
-import org.jetbrains.annotations.NotNull;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -23,12 +23,12 @@ public class MavenFacetDetector implements FacetDetector<MavenFacetData> {
     /**
      * Detects a Maven facet in the given path by searching for pom.xml and extracting Maven coordinates.
      *
-     * @param path the project directory to analyze
+     * @param project the project to inspect
      * @return an Optional containing the Maven facet if detected, or empty if not found
      */
     @Override
-    public Optional<Facet<MavenFacetData>> detect(@NotNull Path path) {
-        Path pomFile = path.resolve("pom.xml");
+    public Optional<Facet<MavenFacetData>> detect(Project project) {
+        Path pomFile = project.getPath().resolve("pom.xml");
         if (Files.notExists(pomFile) || !Files.isRegularFile(pomFile) || !Files.isReadable(pomFile))
             return Optional.empty();
 
diff --git a/src/main/java/dev/railroadide/railroad/project/ProjectValidators.java b/src/main/java/dev/railroadide/railroad/project/onboarding/ProjectValidators.java
similarity index 79%
rename from src/main/java/dev/railroadide/railroad/project/ProjectValidators.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/ProjectValidators.java
index cda96cd1..3cd7391e 100644
--- a/src/main/java/dev/railroadide/railroad/project/ProjectValidators.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/ProjectValidators.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project;
+package dev.railroadide.railroad.project.onboarding;
 
 import dev.railroadide.core.form.ValidationResult;
 import dev.railroadide.core.utility.StringUtils;
@@ -17,27 +17,88 @@
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.util.Locale;
+import java.util.jar.JarFile;
 
+// TODO: These are not all project creation specific, so they should be moved and modified to a more general util class
 public class ProjectValidators {
     private static final String USER_AGENT = "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 (.NET CLR 3.5.30729)";
 
-    public static ValidationResult validatePath(TextField field) {
+    public static ValidationResult validateDirectoryPath(TextField field) {
+        return validatePath(field, true);
+    }
+
+    public static ValidationResult validateGradleProjectPath(TextField field) {
+        ValidationResult result = validateDirectoryPath(field);
+        if (result.status() == ValidationResult.Status.ERROR)
+            return result;
+
+        String text = field.getText();
+        Path path = Path.of(text);
+        if (Files.notExists(path.resolve("build.gradle")) && Files.notExists(path.resolve("build.gradle.kts")))
+            return ValidationResult.warning("railroad.project.creation.location.warning.not_gradle_project");
+
+        return ValidationResult.ok();
+    }
+
+    public static ValidationResult validateFilePath(TextField field, String extension) {
+        ValidationResult result = validatePath(field, false);
+        if (result.status() == ValidationResult.Status.ERROR)
+            return result;
+
+        String text = field.getText();
+        if (extension != null && !extension.isBlank() && !text.endsWith("." + extension))
+            return ValidationResult.error("railroad.project.creation.location.error.invalid_extension");
+
+        return ValidationResult.ok();
+    }
+
+    public static ValidationResult validateJarFilePath(TextField field) {
+        ValidationResult result = validateFilePath(field, "jar");
+        if (result.status() == ValidationResult.Status.ERROR)
+            return result;
+
+        String text = field.getText();
+        if (!text.endsWith(".jar"))
+            return result;
+
+        Path path = Path.of(text);
+        try (var ignored = new JarFile(path.toFile())) {
+            return ValidationResult.ok();
+        } catch (IOException exception) {
+            return ValidationResult.error("railroad.project.creation.location.error.invalid_jar");
+        }
+    }
+
+    private static ValidationResult validatePath(TextField field, boolean expectDirectory) {
         String text = field.getText();
         if (text == null || text.isBlank())
             return ValidationResult.error("railroad.project.creation.location.error.required");
 
+        Path path;
         try {
-            Path path = Path.of(text);
-            if (Files.notExists(path)) {
-                // Create the directory if it doesn't exist
-                try {
+            path = Path.of(text);
+        } catch (InvalidPathException exception) {
+            return ValidationResult.error("railroad.project.creation.location.error.invalid_path");
+        }
+
+        if (Files.notExists(path)) {
+            try {
+                if (expectDirectory) {
                     Files.createDirectories(path);
-                    Files.deleteIfExists(path);
-                } catch (IOException ignored) {
-                    return ValidationResult.error("railroad.project.creation.location.error.cannot_create");
+                } else {
+                    Path parent = path.getParent();
+                    if (parent != null) {
+                        Files.createDirectories(parent);
+                    }
                 }
+
+                Files.deleteIfExists(path);
+            } catch (IOException ignored) {
+                return ValidationResult.error("railroad.project.creation.location.error.cannot_create");
             }
+        }
 
+        if (expectDirectory) {
             if (!Files.isDirectory(path))
                 return ValidationResult.error("railroad.project.creation.location.error.not_directory");
 
@@ -48,8 +109,8 @@ public static ValidationResult validatePath(TextField field) {
             } catch (IOException ignored) {
                 return ValidationResult.error("railroad.project.creation.location.error.not_readable");
             }
-        } catch (InvalidPathException exception) {
-            return ValidationResult.error("railroad.project.creation.location.error.invalid_path");
+        } else if (Files.isDirectory(path)) {
+            return ValidationResult.error("railroad.project.creation.location.error.is_directory");
         }
 
         if (text.contains("OneDrive"))
@@ -127,6 +188,17 @@ public static ValidationResult validateMainClass(TextField field) {
         return ValidationResult.ok();
     }
 
+    public static ValidationResult validateQualifiedMainClass(TextField field) {
+        String text = field.getText();
+        if (text == null || text.isBlank())
+            return ValidationResult.error("railroad.project.creation.qualified_main_class.error.required");
+
+        if (!text.matches("([a-zA-Z_][a-zA-Z0-9_]*\\.)*[a-zA-Z_][a-zA-Z0-9_]*"))
+            return ValidationResult.error("railroad.project.creation.qualified_main_class.error.invalid_format");
+
+        return ValidationResult.ok();
+    }
+
     public static ValidationResult validateAuthor(TextField field) {
         String text = field.getText();
         if (text.isBlank())
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/DefaultProjectCreationPipelineService.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/DefaultProjectCreationPipelineService.java
similarity index 97%
rename from src/main/java/dev/railroadide/railroad/project/creation/DefaultProjectCreationPipelineService.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/DefaultProjectCreationPipelineService.java
index 58ec63fe..b6a8346c 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/DefaultProjectCreationPipelineService.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/DefaultProjectCreationPipelineService.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation;
+package dev.railroadide.railroad.project.onboarding.creation;
 
 import dev.railroadide.core.project.ProjectCreationPipeline;
 import dev.railroadide.core.project.ProjectType;
@@ -8,7 +8,7 @@
 import dev.railroadide.core.project.creation.ProjectServiceRegistry;
 import dev.railroadide.core.project.creation.service.*;
 import dev.railroadide.railroad.project.ProjectTypeRegistry;
-import dev.railroadide.railroad.project.creation.step.*;
+import dev.railroadide.railroad.project.onboarding.creation.step.*;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/ProjectContextKeys.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/ProjectContextKeys.java
similarity index 90%
rename from src/main/java/dev/railroadide/railroad/project/creation/ProjectContextKeys.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/ProjectContextKeys.java
index 6d9a57d9..a48687a1 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/ProjectContextKeys.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/ProjectContextKeys.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation;
+package dev.railroadide.railroad.project.onboarding.creation;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.creation.modjson.FabricModJson;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/service/GroovyTemplateEngineService.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/GroovyTemplateEngineService.java
similarity index 91%
rename from src/main/java/dev/railroadide/railroad/project/creation/service/GroovyTemplateEngineService.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/GroovyTemplateEngineService.java
index 107fe1da..f75275cc 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/service/GroovyTemplateEngineService.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/GroovyTemplateEngineService.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.service;
+package dev.railroadide.railroad.project.onboarding.creation.service;
 
 import dev.railroadide.core.project.creation.service.TemplateEngineService;
 import groovy.text.StreamingTemplateEngine;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/service/JGitService.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/JGitService.java
similarity index 89%
rename from src/main/java/dev/railroadide/railroad/project/creation/service/JGitService.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/JGitService.java
index e8e42f8a..16be7ab8 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/service/JGitService.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/JGitService.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.service;
+package dev.railroadide.railroad.project.onboarding.creation.service;
 
 import dev.railroadide.core.project.creation.service.GitService;
 import org.eclipse.jgit.api.Git;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/service/MessageDigestChecksumService.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/MessageDigestChecksumService.java
similarity index 94%
rename from src/main/java/dev/railroadide/railroad/project/creation/service/MessageDigestChecksumService.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/MessageDigestChecksumService.java
index a7c12f08..c96b04e3 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/service/MessageDigestChecksumService.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/MessageDigestChecksumService.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.service;
+package dev.railroadide.railroad.project.onboarding.creation.service;
 
 import dev.railroadide.core.project.creation.service.ChecksumService;
 
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/service/NioFilesService.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/NioFilesService.java
similarity index 96%
rename from src/main/java/dev/railroadide/railroad/project/creation/service/NioFilesService.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/NioFilesService.java
index ef521a9d..1600bf91 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/service/NioFilesService.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/NioFilesService.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.service;
+package dev.railroadide.railroad.project.onboarding.creation.service;
 
 import dev.railroadide.core.project.creation.service.FilesService;
 import dev.railroadide.railroad.utility.FileUtils;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/service/NioZipService.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/NioZipService.java
similarity index 84%
rename from src/main/java/dev/railroadide/railroad/project/creation/service/NioZipService.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/NioZipService.java
index 754276dc..ae8c3cb8 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/service/NioZipService.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/NioZipService.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.service;
+package dev.railroadide.railroad.project.onboarding.creation.service;
 
 import dev.railroadide.core.project.creation.service.ZipService;
 import dev.railroadide.railroad.utility.FileUtils;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/service/OkHttpService.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/OkHttpService.java
similarity index 97%
rename from src/main/java/dev/railroadide/railroad/project/creation/service/OkHttpService.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/OkHttpService.java
index 117a77af..8cab24d3 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/service/OkHttpService.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/OkHttpService.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.service;
+package dev.railroadide.railroad.project.onboarding.creation.service;
 
 import dev.railroadide.core.project.creation.service.HttpService;
 import dev.railroadide.railroad.Railroad;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/service/ToolingGradleService.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/ToolingGradleService.java
similarity index 98%
rename from src/main/java/dev/railroadide/railroad/project/creation/service/ToolingGradleService.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/ToolingGradleService.java
index 18d3c47a..ff1f80f5 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/service/ToolingGradleService.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/service/ToolingGradleService.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.service;
+package dev.railroadide.railroad.project.onboarding.creation.service;
 
 import dev.railroadide.core.project.creation.service.GradleService;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/CreateAccessTransformerStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/CreateAccessTransformerStep.java
similarity index 90%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/CreateAccessTransformerStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/CreateAccessTransformerStep.java
index 46325fe0..6b82994e 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/CreateAccessTransformerStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/CreateAccessTransformerStep.java
@@ -1,10 +1,10 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.creation.CreationStep;
 import dev.railroadide.core.project.creation.ProgressReporter;
 import dev.railroadide.core.project.creation.service.FilesService;
-import dev.railroadide.railroad.project.data.ForgeProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.ForgeProjectKeys;
 
 import java.nio.file.Path;
 
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/CreateDirectoriesStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/CreateDirectoriesStep.java
similarity index 92%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/CreateDirectoriesStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/CreateDirectoriesStep.java
index 087626db..76438d41 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/CreateDirectoriesStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/CreateDirectoriesStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.creation.CreationStep;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/CreateMixinsJsonStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/CreateMixinsJsonStep.java
similarity index 87%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/CreateMixinsJsonStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/CreateMixinsJsonStep.java
index 093eb53f..b552bb05 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/CreateMixinsJsonStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/CreateMixinsJsonStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.creation.CreationStep;
@@ -6,9 +6,9 @@
 import dev.railroadide.core.project.creation.mixin.MixinConfig;
 import dev.railroadide.core.project.creation.service.FilesService;
 import dev.railroadide.railroad.Railroad;
-import dev.railroadide.railroad.project.data.ForgeProjectKeys;
-import dev.railroadide.railroad.project.data.MavenProjectKeys;
-import dev.railroadide.railroad.project.data.MinecraftProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.ForgeProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MavenProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MinecraftProjectKeys;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/DownloadFabricExampleModStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/DownloadFabricExampleModStep.java
similarity index 91%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/DownloadFabricExampleModStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/DownloadFabricExampleModStep.java
index 972b8d9c..897a6dc2 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/DownloadFabricExampleModStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/DownloadFabricExampleModStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.creation.CreationStep;
@@ -8,7 +8,7 @@
 import dev.railroadide.core.project.creation.service.HttpService;
 import dev.railroadide.core.project.creation.service.ZipService;
 import dev.railroadide.core.switchboard.pojo.MinecraftVersion;
-import dev.railroadide.railroad.project.creation.ProjectContextKeys;
+import dev.railroadide.railroad.project.onboarding.creation.ProjectContextKeys;
 
 import java.net.URI;
 import java.nio.file.Path;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/DownloadForgeMdkStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/DownloadForgeMdkStep.java
similarity index 94%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/DownloadForgeMdkStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/DownloadForgeMdkStep.java
index 91841a6a..6cb5d0b2 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/DownloadForgeMdkStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/DownloadForgeMdkStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.creation.CreationStep;
@@ -7,7 +7,7 @@
 import dev.railroadide.core.project.creation.service.FilesService;
 import dev.railroadide.core.project.creation.service.HttpService;
 import dev.railroadide.core.project.creation.service.ZipService;
-import dev.railroadide.railroad.project.data.ForgeProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.ForgeProjectKeys;
 
 import java.net.URI;
 import java.nio.file.Path;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/ExtractFabricExampleModStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/ExtractFabricExampleModStep.java
similarity index 92%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/ExtractFabricExampleModStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/ExtractFabricExampleModStep.java
index 2d767be0..0f8938f2 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/ExtractFabricExampleModStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/ExtractFabricExampleModStep.java
@@ -1,11 +1,11 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.creation.CreationStep;
 import dev.railroadide.core.project.creation.ProgressReporter;
 import dev.railroadide.core.project.creation.service.FilesService;
 import dev.railroadide.core.project.creation.service.ZipService;
-import dev.railroadide.railroad.project.creation.ProjectContextKeys;
+import dev.railroadide.railroad.project.onboarding.creation.ProjectContextKeys;
 
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/ExtractForgeMdkStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/ExtractForgeMdkStep.java
similarity index 94%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/ExtractForgeMdkStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/ExtractForgeMdkStep.java
index 91dafd9f..b9366715 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/ExtractForgeMdkStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/ExtractForgeMdkStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.creation.CreationStep;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/InitGitStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/InitGitStep.java
similarity index 93%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/InitGitStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/InitGitStep.java
index cfbcc888..b06e8cf5 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/InitGitStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/InitGitStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.ProjectData;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/RenameClassesStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/RenameClassesStep.java
similarity index 95%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/RenameClassesStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/RenameClassesStep.java
index 63278465..1753d336 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/RenameClassesStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/RenameClassesStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import com.github.javaparser.StaticJavaParser;
 import com.github.javaparser.ast.CompilationUnit;
@@ -9,9 +9,9 @@
 import dev.railroadide.core.project.creation.CreationStep;
 import dev.railroadide.core.project.creation.ProgressReporter;
 import dev.railroadide.core.project.creation.service.FilesService;
-import dev.railroadide.railroad.project.data.FabricProjectKeys;
-import dev.railroadide.railroad.project.data.MavenProjectKeys;
-import dev.railroadide.railroad.project.data.MinecraftProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.FabricProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MavenProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MinecraftProjectKeys;
 
 import java.nio.file.Path;
 
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/RenameMixinsStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/RenameMixinsStep.java
similarity index 88%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/RenameMixinsStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/RenameMixinsStep.java
index 8ca15bb0..a727b9ad 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/RenameMixinsStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/RenameMixinsStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.creation.CreationStep;
@@ -6,9 +6,9 @@
 import dev.railroadide.core.project.creation.mixin.MixinConfig;
 import dev.railroadide.core.project.creation.service.FilesService;
 import dev.railroadide.railroad.Railroad;
-import dev.railroadide.railroad.project.data.FabricProjectKeys;
-import dev.railroadide.railroad.project.data.MavenProjectKeys;
-import dev.railroadide.railroad.project.data.MinecraftProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.FabricProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MavenProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MinecraftProjectKeys;
 
 import java.nio.file.Path;
 
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/RenamePackagesStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/RenamePackagesStep.java
similarity index 93%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/RenamePackagesStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/RenamePackagesStep.java
index a72f3f45..d04f30c3 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/RenamePackagesStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/RenamePackagesStep.java
@@ -1,12 +1,12 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.creation.CreationStep;
 import dev.railroadide.core.project.creation.ProgressReporter;
 import dev.railroadide.core.project.creation.service.FilesService;
-import dev.railroadide.railroad.project.data.FabricProjectKeys;
-import dev.railroadide.railroad.project.data.MavenProjectKeys;
-import dev.railroadide.railroad.project.data.MinecraftProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.FabricProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MavenProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MinecraftProjectKeys;
 
 import java.nio.file.Path;
 
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/ResolveFabricMdkVersionStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/ResolveFabricMdkVersionStep.java
similarity index 95%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/ResolveFabricMdkVersionStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/ResolveFabricMdkVersionStep.java
index c52ee7f5..d15ee306 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/ResolveFabricMdkVersionStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/ResolveFabricMdkVersionStep.java
@@ -1,11 +1,11 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.creation.CreationStep;
 import dev.railroadide.core.project.creation.ProgressReporter;
 import dev.railroadide.core.switchboard.pojo.MinecraftVersion;
-import dev.railroadide.railroad.project.creation.ProjectContextKeys;
-import dev.railroadide.railroad.project.data.MinecraftProjectKeys;
+import dev.railroadide.railroad.project.onboarding.creation.ProjectContextKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MinecraftProjectKeys;
 import dev.railroadide.railroad.switchboard.SwitchboardRepositories;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/RunGenSourcesStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/RunGenSourcesStep.java
similarity index 91%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/RunGenSourcesStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/RunGenSourcesStep.java
index ca6eb7c0..130afe2b 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/RunGenSourcesStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/RunGenSourcesStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.creation.CreationStep;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/SetupForgeGradleWrapperStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/SetupForgeGradleWrapperStep.java
similarity index 92%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/SetupForgeGradleWrapperStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/SetupForgeGradleWrapperStep.java
index b026cfb5..d6202c0d 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/SetupForgeGradleWrapperStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/SetupForgeGradleWrapperStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.creation.CreationStep;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/UpdateFabricModJsonStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/UpdateFabricModJsonStep.java
similarity index 96%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/UpdateFabricModJsonStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/UpdateFabricModJsonStep.java
index 3f7c1f1d..922fd1fb 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/UpdateFabricModJsonStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/UpdateFabricModJsonStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -14,10 +14,10 @@
 import dev.railroadide.core.switchboard.pojo.MinecraftVersion;
 import dev.railroadide.railroad.Railroad;
 import dev.railroadide.railroad.project.LicenseRegistry;
-import dev.railroadide.railroad.project.creation.ProjectContextKeys;
-import dev.railroadide.railroad.project.data.FabricProjectKeys;
-import dev.railroadide.railroad.project.data.MavenProjectKeys;
-import dev.railroadide.railroad.project.data.MinecraftProjectKeys;
+import dev.railroadide.railroad.project.onboarding.creation.ProjectContextKeys;
+import dev.railroadide.railroad.project.onboarding.keys.FabricProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MavenProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MinecraftProjectKeys;
 
 import java.nio.file.Path;
 import java.util.*;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/UpdateForgeModsTomlStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/UpdateForgeModsTomlStep.java
similarity index 95%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/UpdateForgeModsTomlStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/UpdateForgeModsTomlStep.java
index ffc182db..94089b9f 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/UpdateForgeModsTomlStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/UpdateForgeModsTomlStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.ProjectData;
@@ -6,7 +6,7 @@
 import dev.railroadide.core.project.creation.ProgressReporter;
 import dev.railroadide.core.project.creation.service.FilesService;
 import dev.railroadide.railroad.project.DisplayTest;
-import dev.railroadide.railroad.project.data.ForgeProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.ForgeProjectKeys;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/UpdateGradleFilesStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/UpdateGradleFilesStep.java
similarity index 95%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/UpdateGradleFilesStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/UpdateGradleFilesStep.java
index ffbd83fd..c1d1e9f1 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/UpdateGradleFilesStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/UpdateGradleFilesStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.ProjectData;
@@ -12,10 +12,10 @@
 import dev.railroadide.core.switchboard.pojo.MinecraftVersion;
 import dev.railroadide.railroad.project.MappingChannelRegistry;
 import dev.railroadide.railroad.project.ProjectTypeRegistry;
-import dev.railroadide.railroad.project.creation.ProjectContextKeys;
-import dev.railroadide.railroad.project.data.FabricProjectKeys;
-import dev.railroadide.railroad.project.data.ForgeProjectKeys;
-import dev.railroadide.railroad.project.data.MinecraftProjectKeys;
+import dev.railroadide.railroad.project.onboarding.creation.ProjectContextKeys;
+import dev.railroadide.railroad.project.onboarding.keys.FabricProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.ForgeProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MinecraftProjectKeys;
 import groovy.lang.Binding;
 
 import java.net.URI;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/step/UpdateGradlePropertiesStep.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/UpdateGradlePropertiesStep.java
similarity index 95%
rename from src/main/java/dev/railroadide/railroad/project/creation/step/UpdateGradlePropertiesStep.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/UpdateGradlePropertiesStep.java
index 1bddc5b7..11dcde94 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/step/UpdateGradlePropertiesStep.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/step/UpdateGradlePropertiesStep.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.step;
+package dev.railroadide.railroad.project.onboarding.creation.step;
 
 import dev.railroadide.core.project.License;
 import dev.railroadide.core.project.ProjectContext;
@@ -13,9 +13,9 @@
 import dev.railroadide.railroad.project.LicenseRegistry;
 import dev.railroadide.railroad.project.MappingChannelRegistry;
 import dev.railroadide.railroad.project.ProjectTypeRegistry;
-import dev.railroadide.railroad.project.data.FabricProjectKeys;
-import dev.railroadide.railroad.project.data.MavenProjectKeys;
-import dev.railroadide.railroad.project.data.MinecraftProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.FabricProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MavenProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MinecraftProjectKeys;
 
 import java.io.IOException;
 import java.nio.file.Path;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/ui/ProjectCreationPane.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/ui/ProjectCreationPane.java
similarity index 97%
rename from src/main/java/dev/railroadide/railroad/project/creation/ui/ProjectCreationPane.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/ui/ProjectCreationPane.java
index a66d9a5a..45ffcc12 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/ui/ProjectCreationPane.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/ui/ProjectCreationPane.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.creation.ui;
+package dev.railroadide.railroad.project.onboarding.creation.ui;
 
 import dev.railroadide.core.project.ProjectContext;
 import dev.railroadide.core.project.ProjectData;
diff --git a/src/main/java/dev/railroadide/railroad/project/creation/ui/ProjectCreationView.java b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/ui/ProjectCreationView.java
similarity index 97%
rename from src/main/java/dev/railroadide/railroad/project/creation/ui/ProjectCreationView.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/creation/ui/ProjectCreationView.java
index 213cd31b..07c418cc 100644
--- a/src/main/java/dev/railroadide/railroad/project/creation/ui/ProjectCreationView.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/creation/ui/ProjectCreationView.java
@@ -1,10 +1,11 @@
-package dev.railroadide.railroad.project.creation.ui;
+package dev.railroadide.railroad.project.onboarding.creation.ui;
 
 import dev.railroadide.core.project.ProjectData;
 import dev.railroadide.core.ui.*;
 import dev.railroadide.core.ui.localized.LocalizedLabel;
 import dev.railroadide.core.ui.localized.LocalizedTitledPane;
 import dev.railroadide.core.ui.localized.LocalizedTooltip;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import dev.railroadide.railroad.localization.L18n;
 import io.github.palexdev.materialfx.controls.MFXProgressSpinner;
 import javafx.animation.FadeTransition;
@@ -93,7 +94,7 @@ public ProjectCreationView(ProjectData data) {
         logsPane.setExpanded(false);
         logsPane.getStyleClass().add("rr-logs-pane");
 
-        cancelBtn.setVariant(RRButton.ButtonVariant.SECONDARY);
+        cancelBtn.setVariant(ButtonVariant.SECONDARY);
         cancelBtn.setTooltip(new LocalizedTooltip("railroad.project.creation.cancel.tooltip"));
         var footer = new RRHBox(12);
         footer.setAlignment(Pos.CENTER);
diff --git a/src/main/java/dev/railroadide/railroad/project/onboarding/impl/FabricProjectOnboarding.java b/src/main/java/dev/railroadide/railroad/project/onboarding/impl/FabricProjectOnboarding.java
index 6c6376b0..ddf4adf2 100644
--- a/src/main/java/dev/railroadide/railroad/project/onboarding/impl/FabricProjectOnboarding.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/impl/FabricProjectOnboarding.java
@@ -17,11 +17,11 @@
 import dev.railroadide.railroad.project.LicenseRegistry;
 import dev.railroadide.railroad.project.MappingChannelRegistry;
 import dev.railroadide.railroad.project.ProjectTypeRegistry;
-import dev.railroadide.railroad.project.ProjectValidators;
-import dev.railroadide.railroad.project.creation.ui.ProjectCreationPane;
-import dev.railroadide.railroad.project.data.FabricProjectKeys;
-import dev.railroadide.railroad.project.data.MavenProjectKeys;
-import dev.railroadide.railroad.project.data.MinecraftProjectKeys;
+import dev.railroadide.railroad.project.onboarding.ProjectValidators;
+import dev.railroadide.railroad.project.onboarding.creation.ui.ProjectCreationPane;
+import dev.railroadide.railroad.project.onboarding.keys.FabricProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MavenProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MinecraftProjectKeys;
 import dev.railroadide.railroad.project.onboarding.OnboardingContext;
 import dev.railroadide.railroad.project.onboarding.OnboardingProcess;
 import dev.railroadide.railroad.project.onboarding.flow.OnboardingFlow;
@@ -165,7 +165,7 @@ private OnboardingStep createProjectDetailsStep() {
                     FormComponent.directoryChooser(ProjectData.DefaultKeys.PATH, "railroad.project.creation.location")
                         .required()
                         .defaultPath(System.getProperty("user.home"))
-                        .validator(ProjectValidators::validatePath),
+                        .validator(ProjectValidators::validateDirectoryPath),
                     value -> {
                         if (value == null)
                             return null;
diff --git a/src/main/java/dev/railroadide/railroad/project/onboarding/impl/ForgeProjectOnboarding.java b/src/main/java/dev/railroadide/railroad/project/onboarding/impl/ForgeProjectOnboarding.java
index a1639929..6475ccd0 100644
--- a/src/main/java/dev/railroadide/railroad/project/onboarding/impl/ForgeProjectOnboarding.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/impl/ForgeProjectOnboarding.java
@@ -13,10 +13,11 @@
 import dev.railroadide.railroad.Railroad;
 import dev.railroadide.railroad.Services;
 import dev.railroadide.railroad.project.*;
-import dev.railroadide.railroad.project.creation.ui.ProjectCreationPane;
-import dev.railroadide.railroad.project.data.ForgeProjectKeys;
-import dev.railroadide.railroad.project.data.MavenProjectKeys;
-import dev.railroadide.railroad.project.data.MinecraftProjectKeys;
+import dev.railroadide.railroad.project.onboarding.ProjectValidators;
+import dev.railroadide.railroad.project.onboarding.creation.ui.ProjectCreationPane;
+import dev.railroadide.railroad.project.onboarding.keys.ForgeProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MavenProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MinecraftProjectKeys;
 import dev.railroadide.railroad.project.onboarding.OnboardingContext;
 import dev.railroadide.railroad.project.onboarding.OnboardingProcess;
 import dev.railroadide.railroad.project.onboarding.flow.OnboardingFlow;
@@ -193,7 +194,7 @@ private OnboardingStep createProjectDetailsStep() {
                     FormComponent.directoryChooser(ProjectData.DefaultKeys.PATH, "railroad.project.creation.location")
                         .required()
                         .defaultPath(System.getProperty("user.home"))
-                        .validator(ProjectValidators::validatePath),
+                        .validator(ProjectValidators::validateDirectoryPath),
                     value -> {
                         if (value == null)
                             return null;
diff --git a/src/main/java/dev/railroadide/railroad/project/onboarding/impl/NeoforgeProjectOnboarding.java b/src/main/java/dev/railroadide/railroad/project/onboarding/impl/NeoforgeProjectOnboarding.java
index 15ad35ef..ded3a875 100644
--- a/src/main/java/dev/railroadide/railroad/project/onboarding/impl/NeoforgeProjectOnboarding.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/impl/NeoforgeProjectOnboarding.java
@@ -13,10 +13,11 @@
 import dev.railroadide.railroad.Railroad;
 import dev.railroadide.railroad.Services;
 import dev.railroadide.railroad.project.*;
-import dev.railroadide.railroad.project.creation.ui.ProjectCreationPane;
-import dev.railroadide.railroad.project.data.ForgeProjectKeys;
-import dev.railroadide.railroad.project.data.MavenProjectKeys;
-import dev.railroadide.railroad.project.data.MinecraftProjectKeys;
+import dev.railroadide.railroad.project.onboarding.ProjectValidators;
+import dev.railroadide.railroad.project.onboarding.creation.ui.ProjectCreationPane;
+import dev.railroadide.railroad.project.onboarding.keys.ForgeProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MavenProjectKeys;
+import dev.railroadide.railroad.project.onboarding.keys.MinecraftProjectKeys;
 import dev.railroadide.railroad.project.onboarding.OnboardingContext;
 import dev.railroadide.railroad.project.onboarding.OnboardingProcess;
 import dev.railroadide.railroad.project.onboarding.flow.OnboardingFlow;
@@ -193,7 +194,7 @@ private OnboardingStep createProjectDetailsStep() {
                     FormComponent.directoryChooser(ProjectData.DefaultKeys.PATH, "railroad.project.creation.location")
                         .required()
                         .defaultPath(System.getProperty("user.home"))
-                        .validator(ProjectValidators::validatePath),
+                        .validator(ProjectValidators::validateDirectoryPath),
                     value -> {
                         if (value == null)
                             return null;
diff --git a/src/main/java/dev/railroadide/railroad/project/data/FabricProjectKeys.java b/src/main/java/dev/railroadide/railroad/project/onboarding/keys/FabricProjectKeys.java
similarity index 87%
rename from src/main/java/dev/railroadide/railroad/project/data/FabricProjectKeys.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/keys/FabricProjectKeys.java
index ea45706c..37d5f494 100644
--- a/src/main/java/dev/railroadide/railroad/project/data/FabricProjectKeys.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/keys/FabricProjectKeys.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.data;
+package dev.railroadide.railroad.project.onboarding.keys;
 
 public class FabricProjectKeys {
     public static final String FABRIC_LOADER_VERSION = "fabric.loaderVersion";
diff --git a/src/main/java/dev/railroadide/railroad/project/data/ForgeProjectKeys.java b/src/main/java/dev/railroadide/railroad/project/onboarding/keys/ForgeProjectKeys.java
similarity index 91%
rename from src/main/java/dev/railroadide/railroad/project/data/ForgeProjectKeys.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/keys/ForgeProjectKeys.java
index 0924a1fd..40137e42 100644
--- a/src/main/java/dev/railroadide/railroad/project/data/ForgeProjectKeys.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/keys/ForgeProjectKeys.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.data;
+package dev.railroadide.railroad.project.onboarding.keys;
 
 public class ForgeProjectKeys {
     public static final String FORGE_VERSION = "forge.forgeVersion";
diff --git a/src/main/java/dev/railroadide/railroad/project/data/MavenProjectKeys.java b/src/main/java/dev/railroadide/railroad/project/onboarding/keys/MavenProjectKeys.java
similarity index 78%
rename from src/main/java/dev/railroadide/railroad/project/data/MavenProjectKeys.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/keys/MavenProjectKeys.java
index 904431bc..9e8f0f8d 100644
--- a/src/main/java/dev/railroadide/railroad/project/data/MavenProjectKeys.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/keys/MavenProjectKeys.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.data;
+package dev.railroadide.railroad.project.onboarding.keys;
 
 public class MavenProjectKeys {
     public static final String GROUP_ID = "maven.groupId";
diff --git a/src/main/java/dev/railroadide/railroad/project/data/MinecraftProjectKeys.java b/src/main/java/dev/railroadide/railroad/project/onboarding/keys/MinecraftProjectKeys.java
similarity index 88%
rename from src/main/java/dev/railroadide/railroad/project/data/MinecraftProjectKeys.java
rename to src/main/java/dev/railroadide/railroad/project/onboarding/keys/MinecraftProjectKeys.java
index daebf37c..141af796 100644
--- a/src/main/java/dev/railroadide/railroad/project/data/MinecraftProjectKeys.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/keys/MinecraftProjectKeys.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.project.data;
+package dev.railroadide.railroad.project.onboarding.keys;
 
 public class MinecraftProjectKeys {
     public static final String MINECRAFT_VERSION = "minecraft.version";
diff --git a/src/main/java/dev/railroadide/railroad/project/onboarding/ui/BasicOnboardingUI.java b/src/main/java/dev/railroadide/railroad/project/onboarding/ui/BasicOnboardingUI.java
index 03f59be5..d87729aa 100644
--- a/src/main/java/dev/railroadide/railroad/project/onboarding/ui/BasicOnboardingUI.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/ui/BasicOnboardingUI.java
@@ -1,6 +1,7 @@
 package dev.railroadide.railroad.project.onboarding.ui;
 
 import dev.railroadide.core.ui.*;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import dev.railroadide.core.ui.localized.LocalizedLabel;
 import dev.railroadide.railroad.project.onboarding.step.OnboardingStep;
 import javafx.geometry.Insets;
@@ -72,9 +73,9 @@ public BasicOnboardingUI(Node content) {
         mainContainer.getChildren().addAll(header, contentFrame);
 
         // Buttons
-        this.backButton = createButton("railroad.generic.back", RRButton.ButtonVariant.SECONDARY, "onboarding-back-button");
-        this.nextButton = createButton("railroad.generic.next", RRButton.ButtonVariant.PRIMARY, "onboarding-next-button");
-        this.finishButton = createButton("railroad.generic.finish", RRButton.ButtonVariant.PRIMARY, "onboarding-finish-button");
+        this.backButton = createButton("railroad.generic.back", ButtonVariant.SECONDARY, "onboarding-back-button");
+        this.nextButton = createButton("railroad.generic.next", ButtonVariant.PRIMARY, "onboarding-next-button");
+        this.finishButton = createButton("railroad.generic.finish", ButtonVariant.PRIMARY, "onboarding-finish-button");
 
         this.buttonBar = new RRBorderPane();
         this.buttonBar.getStyleClass().add("onboarding-button-bar");
@@ -104,7 +105,7 @@ private StackPane createBusyOverlay() {
         return overlay;
     }
 
-    private RRButton createButton(String key, RRButton.ButtonVariant variant, String... styleClasses) {
+    private RRButton createButton(String key, ButtonVariant variant, String... styleClasses) {
         var button = new RRButton(key);
         button.setVariant(variant);
         button.getStyleClass().addAll("onboarding-button");
diff --git a/src/main/java/dev/railroadide/railroad/project/onboarding/ui/OnboardingProjectCreationPane.java b/src/main/java/dev/railroadide/railroad/project/onboarding/ui/OnboardingProjectCreationPane.java
index d97efaf3..871d87e8 100644
--- a/src/main/java/dev/railroadide/railroad/project/onboarding/ui/OnboardingProjectCreationPane.java
+++ b/src/main/java/dev/railroadide/railroad/project/onboarding/ui/OnboardingProjectCreationPane.java
@@ -3,6 +3,8 @@
 import dev.railroadide.core.ui.RRBorderPane;
 import dev.railroadide.core.ui.RRButton;
 import dev.railroadide.core.ui.RRVBox;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import dev.railroadide.railroad.Railroad;
 import dev.railroadide.railroad.window.WindowBuilder;
 import javafx.geometry.Insets;
@@ -23,8 +25,8 @@ public OnboardingProjectCreationPane(Consumer<Scene> onStartOnboarding) {
         this.onStartOnboarding = onStartOnboarding;
 
         var startOnboardingButton = new RRButton("railroad.project.creation.onboarding.start_button");
-        startOnboardingButton.setButtonSize(RRButton.ButtonSize.LARGE);
-        startOnboardingButton.setVariant(RRButton.ButtonVariant.PRIMARY);
+        startOnboardingButton.setButtonSize(ButtonSize.LARGE);
+        startOnboardingButton.setVariant(ButtonVariant.PRIMARY);
         startOnboardingButton.getStyleClass().add("start-onboarding-button");
         startOnboardingButton.setOnAction(event -> startOnboarding());
 
diff --git a/src/main/java/dev/railroadide/railroad/settings/SettingCodecs.java b/src/main/java/dev/railroadide/railroad/settings/SettingCodecs.java
index 397b6a3c..96f6a6bd 100644
--- a/src/main/java/dev/railroadide/railroad/settings/SettingCodecs.java
+++ b/src/main/java/dev/railroadide/railroad/settings/SettingCodecs.java
@@ -10,10 +10,14 @@
 import dev.railroadide.railroad.plugin.PluginManager;
 import dev.railroadide.railroad.plugin.ui.PluginsPane;
 import dev.railroadide.railroad.settings.keybinds.KeybindsList;
+import dev.railroadide.railroad.settings.ui.AbstractPathListPane;
+import dev.railroadide.railroad.settings.ui.DirectoryListPane;
+import dev.railroadide.railroad.settings.ui.FileListPane;
 import dev.railroadide.railroad.theme.ui.ThemeSettingsSection;
 import dev.railroadide.railroadpluginapi.PluginDescriptor;
 import javafx.scene.control.ComboBox;
 
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 
@@ -65,4 +69,22 @@ public class SettingCodecs {
             .jsonEncoder(KeybindsList::toJson)
             .jsonDecoder(KeybindsList::fromJson)
             .build();
+
+    public static final SettingCodec<List<Path>, DirectoryListPane> DIRECTORY_PATH_LIST =
+        SettingCodec.<List<Path>, DirectoryListPane>builder("railroad:directory_path_list")
+            .createNode(DirectoryListPane::new)
+            .nodeToValue(DirectoryListPane::getDirectories)
+            .valueToNode((directories, pane) -> pane.setDirectories(directories))
+            .jsonEncoder(AbstractPathListPane::toJson)
+            .jsonDecoder(AbstractPathListPane::fromJson)
+            .build();
+
+    public static final SettingCodec<List<Path>, FileListPane> FILE_PATH_LIST =
+        SettingCodec.<List<Path>, FileListPane>builder("railroad:file_path_list")
+            .createNode(FileListPane::new)
+            .nodeToValue(FileListPane::getFiles)
+            .valueToNode((files, pane) -> pane.setFiles(files))
+            .jsonEncoder(AbstractPathListPane::toJson)
+            .jsonDecoder(AbstractPathListPane::fromJson)
+            .build();
 }
diff --git a/src/main/java/dev/railroadide/railroad/settings/Settings.java b/src/main/java/dev/railroadide/railroad/settings/Settings.java
index 00186310..aea901c5 100644
--- a/src/main/java/dev/railroadide/railroad/settings/Settings.java
+++ b/src/main/java/dev/railroadide/railroad/settings/Settings.java
@@ -13,6 +13,7 @@
 import dev.railroadide.railroad.theme.ThemeManager;
 import dev.railroadide.railroadpluginapi.PluginDescriptor;
 
+import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -126,6 +127,34 @@ private Settings() {
         .defaultValue(new HashMap<>())
         .build());
 
+    public static final Setting<List<Path>> ADDITIONAL_JDK_SCAN_PATHS = registerSetting(Setting.builder(new TypeToken<List<Path>>() {}, "railroad:additional_jdk_scan_paths")
+        .treePath("ide")
+        .category(SettingCategory.simple("railroad:ide.jdk_management"))
+        .codec(SettingCodecs.DIRECTORY_PATH_LIST)
+        .defaultValue(List.of())
+        .build());
+
+    public static final Setting<List<Path>> EXCLUDED_JDK_SCAN_PATHS = registerSetting(Setting.builder(new TypeToken<List<Path>>() {}, "railroad:excluded_jdk_scan_paths")
+        .treePath("ide")
+        .category(SettingCategory.simple("railroad:ide.jdk_management"))
+        .codec(SettingCodecs.DIRECTORY_PATH_LIST)
+        .defaultValue(List.of())
+        .build());
+
+    public static final Setting<List<Path>> ADDITIONAL_JDKS = registerSetting(Setting.builder(new TypeToken<List<Path>>() {}, "railroad:additional_jdks")
+        .treePath("ide")
+        .category(SettingCategory.simple("railroad:ide.jdk_management"))
+        .codec(SettingCodecs.FILE_PATH_LIST)
+        .defaultValue(List.of())
+        .build());
+
+    public static final Setting<Long> JAVA_VERSION_DETECTION_TIMEOUT_MS = registerSetting(Setting.builder(Long.class, "railroad:java_version_detection_timeout_ms")
+        .treePath("ide")
+        .category(SettingCategory.simple("railroad:ide.jdk_management"))
+        .codec(DefaultSettingCodecs.LONG)
+        .defaultValue(3000L)
+        .build());
+
     public static void initialize() {
         // intentionally empty - triggers class loading and static init
     }
diff --git a/src/main/java/dev/railroadide/railroad/settings/keybinds/KeyComboNode.java b/src/main/java/dev/railroadide/railroad/settings/keybinds/KeyComboNode.java
index 47b77f9f..71726288 100644
--- a/src/main/java/dev/railroadide/railroad/settings/keybinds/KeyComboNode.java
+++ b/src/main/java/dev/railroadide/railroad/settings/keybinds/KeyComboNode.java
@@ -2,7 +2,10 @@
 
 import dev.railroadide.core.settings.keybinds.KeybindData;
 import dev.railroadide.core.ui.RRButton;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import dev.railroadide.core.utility.OperatingSystem;
+import dev.railroadide.railroad.localization.L18n;
 import javafx.scene.Scene;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCombination;
@@ -10,176 +13,137 @@
 import lombok.Setter;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 public class KeyComboNode extends RRButton {
     @Setter
     private Consumer<KeybindData> onComboModified;
-
     private KeybindData keybindData;
 
     private boolean editing = false;
-
-    private KeyCode tempKeyCode = null;
-    private KeyCombination.Modifier[] tempModifiers = new KeyCombination.Modifier[0];
-
-    /**
-     * Creates a new KeyComboNode with the specified keybind data.
-     *
-     * @param keybindData The keybind data to initialize the node with.
-     */
-    public KeyComboNode(KeybindData keybindData) {
-        this.keybindData = keybindData;
-        setVariant(ButtonVariant.PRIMARY);
-
-        if (keybindData.keyCode() == KeyCode.UNDEFINED) {
-            setText("");
-        } else {
-            updateText();
-        }
+    private KeyCode pendingKeyCode;
+    private KeyCombination.Modifier[] pendingModifiers = new KeyCombination.Modifier[0];
+
+    public KeyComboNode(KeybindData data) {
+        super("");
+        this.keybindData = data == null
+            ? new KeybindData(KeyCode.UNDEFINED, new KeyCombination.Modifier[0])
+            : data;
+
+        setVariant(ButtonVariant.SECONDARY);
+        setButtonSize(ButtonSize.SMALL);
+        getStyleClass().add("keybind-shortcut-chip");
+        updateLabel();
     }
 
-    /**
-     * Checks if two arrays of KeyCombination.Modifier are equal.
-     *
-     * @param a Array of modifiers to compare.
-     * @param b Array of modifiers to compare against.
-     * @return True if both arrays contain the same modifiers, false otherwise.
-     */
-    private static boolean areModifiersEqual(KeyCombination.Modifier[] a, KeyCombination.Modifier[] b) {
-        if (a == null && b == null) return true;
-        if (a == null || b == null) return false;
-        if (a.length != b.length) return false;
-        for (KeyCombination.Modifier modA : a) {
-            boolean found = false;
-            for (KeyCombination.Modifier modB : b) {
-                if (modA.equals(modB)) {
-                    found = true;
-                    break;
-                }
-            }
-            if (!found) return false;
+    public void toggleEditing() {
+        if (editing) {
+            return;
         }
-        return true;
-    }
 
-    /**
-     * Toggles the editing mode for this KeyComboNode.
-     * When enabled, the node will listen for key events to capture a new key combination.
-     */
-    public void toggleEditing() {
-        if (editing) return;
+        Scene scene = getScene();
+        if (scene == null) {
+            throw new IllegalStateException("KeyComboNode must be attached to a Scene before editing.");
+        }
 
         editing = true;
-        setText("[Recording...]");
-
-        Scene scene = getScene();
-        if (scene == null)
-            throw new IllegalStateException("KeyComboNode must be attached to a scene.");
+        getStyleClass().add("recording");
+        setText(L18n.localize("railroad.settings.keybinds.recording"));
 
-        scene.addEventFilter(KeyEvent.KEY_PRESSED, this::onKeyPressed);
-        scene.addEventFilter(KeyEvent.KEY_RELEASED, this::onKeyReleased);
+        scene.addEventFilter(KeyEvent.KEY_PRESSED, this::handleKeyPressed);
+        scene.addEventFilter(KeyEvent.KEY_RELEASED, this::handleKeyReleased);
     }
 
-    /**
-     * Called when a key is pressed in editing mode, and then appends the key code and modifiers to the temporary variables,
-     * which are then used to update the keybind data when the keys are released.
-     */
-    private void onKeyPressed(KeyEvent event) {
+    private void handleKeyPressed(KeyEvent event) {
         event.consume();
+        pendingKeyCode = event.getCode();
+
+        List<KeyCombination.Modifier> modifiers = new ArrayList<>();
+        if (event.isShortcutDown()) modifiers.add(KeyCombination.SHORTCUT_DOWN);
+        if (event.isControlDown()) modifiers.add(KeyCombination.CONTROL_DOWN);
+        if (event.isAltDown()) modifiers.add(KeyCombination.ALT_DOWN);
+        if (event.isShiftDown()) modifiers.add(KeyCombination.SHIFT_DOWN);
+        if (event.isMetaDown()) modifiers.add(KeyCombination.META_DOWN);
+
+        if (OperatingSystem.isMac()) {
+            if (event.isMetaDown()) {
+                modifiers.remove(KeyCombination.SHORTCUT_DOWN);
+            }
+        } else {
+            if (event.isControlDown()) {
+                modifiers.remove(KeyCombination.SHORTCUT_DOWN);
+            }
+        }
 
-        tempKeyCode = event.getCode();
-        List<KeyCombination.Modifier> mods = new ArrayList<>();
-
-        if (event.isControlDown()) mods.add(KeyCombination.CONTROL_DOWN);
-        if (event.isAltDown()) mods.add(KeyCombination.ALT_DOWN);
-        if (event.isShiftDown()) mods.add(KeyCombination.SHIFT_DOWN);
-        if (event.isShortcutDown()) mods.add(KeyCombination.SHORTCUT_DOWN);
+        pendingModifiers = modifiers.isEmpty() ? null : modifiers.toArray(new KeyCombination.Modifier[0]);
+    }
 
-        tempModifiers = mods.toArray(new KeyCombination.Modifier[0]);
-        if (tempModifiers.length == 0) {
-            tempModifiers = null;
+    private void handleKeyReleased(KeyEvent event) {
+        if (!editing || pendingKeyCode == null) {
+            return;
         }
-    }
 
-    /**
-     * Called when a key is released in editing mode. It checks if the key combination has changed,
-     * and if so, it updates the keybind data and calls the onComboModified consumer if set.
-     * It then resets the editing state and updates the node.
-     *
-     * @param event
-     */
-    private void onKeyReleased(KeyEvent event) {
-        if (!editing || tempKeyCode == null) return;
-        if (tempKeyCode.isModifierKey()) return;
         event.consume();
 
-        boolean changed = !tempKeyCode.equals(this.keybindData.keyCode()) || !areModifiersEqual(this.keybindData.modifiers(), tempModifiers);
+        if (pendingKeyCode.isModifierKey()) {
+            return; // Wait for a non-modifier key before finalizing
+        }
+
+        KeybindData updated = new KeybindData(pendingKeyCode, pendingModifiers);
+        boolean changed = !Objects.equals(keybindData.keyCode(), updated.keyCode())
+            || !Arrays.equals(keybindData.modifiers(), updated.modifiers());
 
         if (changed && onComboModified != null) {
-            onComboModified.accept(new KeybindData(tempKeyCode, tempModifiers));
+            onComboModified.accept(updated);
         }
 
-        this.keybindData = new KeybindData(tempKeyCode, tempModifiers);
-        updateText();
+        keybindData = updated;
+        finishEditing(event.getSource());
+    }
 
+    private void finishEditing(Object source) {
         editing = false;
-        tempKeyCode = null;
-        tempModifiers = null;
+        pendingKeyCode = null;
+        pendingModifiers = null;
+
+        getStyleClass().remove("recording");
+        updateLabel();
 
         Scene scene = getScene();
         if (scene != null) {
-            scene.removeEventFilter(KeyEvent.KEY_PRESSED, this::onKeyPressed);
-            scene.removeEventFilter(KeyEvent.KEY_RELEASED, this::onKeyReleased);
+            scene.removeEventFilter(KeyEvent.KEY_PRESSED, this::handleKeyPressed);
+            scene.removeEventFilter(KeyEvent.KEY_RELEASED, this::handleKeyReleased);
         }
     }
 
-    /**
-     * Updates the text of the button to reflect the current keybind data.
-     */
-    private void updateText() {
-        StringBuilder label = new StringBuilder();
-        if (this.keybindData.modifiers() == null || this.keybindData.modifiers().length == 0) {
-            label.append(this.keybindData.keyCode());
-            setText(label.toString());
+    private void updateLabel() {
+        if (keybindData.keyCode() == null || keybindData.keyCode() == KeyCode.UNDEFINED) {
+            setText(L18n.localize("railroad.settings.keybinds.click_to_record"));
             return;
         }
 
-        for (KeyCombination.Modifier mod : this.keybindData.modifiers()) {
-            label.append(localizeModifier(mod)).append(" + ");
+        StringBuilder label = new StringBuilder();
+        KeyCombination.Modifier[] modifiers = keybindData.modifiers();
+        if (modifiers != null) {
+            for (KeyCombination.Modifier modifier : modifiers) {
+                label.append(localizeModifier(modifier)).append(" + ");
+            }
         }
-
-        label.append(this.keybindData.keyCode());
+        label.append(keybindData.keyCode().getName());
         setText(label.toString());
     }
 
-    /**
-     * Converts Modifier names to the correct name depending on the operating system.
-     *
-     * @param modifier The modifier to convert.
-     * @return The localized name of the modifier.
-     */
     private String localizeModifier(KeyCombination.Modifier modifier) {
         return switch (modifier.getKey()) {
-            case SHORTCUT:
-                if (OperatingSystem.CURRENT == OperatingSystem.MAC) {
-                    yield "Command";
-                } else {
-                    yield "Control";
-                }
-            case ALT:
-                if (OperatingSystem.CURRENT == OperatingSystem.MAC) {
-                    yield "Option";
-                } else {
-                    yield "Alt";
-                }
-            case CONTROL:
-                yield "Control";
-            case SHIFT:
-                yield "Shift";
-            default:
-                yield modifier.getKey().toString();
+            case SHORTCUT -> OperatingSystem.isMac() ? "⌘" : "Ctrl";
+            case META -> "⌘";
+            case CONTROL -> "Ctrl";
+            case ALT -> OperatingSystem.isMac() ? "⌥" : "Alt";
+            case SHIFT -> "Shift";
+            default -> modifier.getKey().getName();
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/dev/railroadide/railroad/settings/keybinds/Keybinds.java b/src/main/java/dev/railroadide/railroad/settings/keybinds/Keybinds.java
index dc4d0705..15b147c8 100644
--- a/src/main/java/dev/railroadide/railroad/settings/keybinds/Keybinds.java
+++ b/src/main/java/dev/railroadide/railroad/settings/keybinds/Keybinds.java
@@ -3,11 +3,14 @@
 import dev.railroadide.core.settings.keybinds.Keybind;
 import dev.railroadide.core.settings.keybinds.KeybindCategory;
 import dev.railroadide.core.settings.keybinds.KeybindContexts;
+import dev.railroadide.railroad.Railroad;
 import dev.railroadide.railroad.ide.projectexplorer.PathItem;
 import dev.railroadide.railroad.ide.projectexplorer.ProjectExplorerPane;
+import dev.railroadide.railroad.window.WindowManager;
 import javafx.scene.control.TreeView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCombination;
+import javafx.stage.Stage;
 
 public class Keybinds {
     public static final Keybind COPY = KeybindHandler.registerKeybind(Keybind.builder()
@@ -32,6 +35,13 @@ public class Keybinds {
         })
         .build());
 
+    public static final Keybind FULLSCREEN = KeybindHandler.registerKeybind(Keybind.builder()
+        .id("railroad:fullscreen")
+        .category(new KeybindCategory("railroad:general", "railroad.settings.keybinds.category.general"))
+        .addDefaultKey(KeyCode.F11)
+        .addAction(KeybindContexts.of("railroad:ide"), $ -> WindowManager.toggleFullScreen())
+        .build());
+
     public static void initialize() {
     }
 }
diff --git a/src/main/java/dev/railroadide/railroad/settings/keybinds/KeybindsList.java b/src/main/java/dev/railroadide/railroad/settings/keybinds/KeybindsList.java
index 066fc42d..08717613 100644
--- a/src/main/java/dev/railroadide/railroad/settings/keybinds/KeybindsList.java
+++ b/src/main/java/dev/railroadide/railroad/settings/keybinds/KeybindsList.java
@@ -3,44 +3,326 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import dev.railroadide.core.settings.keybinds.Keybind;
 import dev.railroadide.core.settings.keybinds.KeybindCategory;
 import dev.railroadide.core.settings.keybinds.KeybindData;
 import dev.railroadide.core.ui.RRButton;
-import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.ui.RRCard;
+import dev.railroadide.core.ui.RRTextField;
 import dev.railroadide.core.ui.RRVBox;
 import dev.railroadide.core.ui.localized.LocalizedLabel;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import dev.railroadide.railroad.Railroad;
-import io.github.palexdev.mfxcore.builders.InsetsBuilder;
-import javafx.scene.control.TreeItem;
-import javafx.scene.control.TreeView;
+import dev.railroadide.railroad.localization.L18n;
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.ToggleButton;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCombination;
-import lombok.Getter;
+import javafx.scene.layout.*;
 import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+public class KeybindsList extends RRVBox {
+    private final Map<String, List<KeybindData>> keybinds = new LinkedHashMap<>();
+
+    private final RRTextField searchField = new RRTextField();
+    private final FlowPane categoryBar = new FlowPane();
+    private final ToggleGroup categoryToggleGroup = new ToggleGroup();
+    private final VBox cardsContainer = new VBox(12);
+    private final LocalizedLabel emptyTitle = new LocalizedLabel("railroad.settings.keybinds.empty.title");
+    private final LocalizedLabel emptySubtitle = new LocalizedLabel("railroad.settings.keybinds.empty.subtitle");
+    private final VBox emptyState = new VBox(6, emptyTitle, emptySubtitle);
+    private final StackPane listStack = new StackPane();
+
+    private String activeCategoryId;
+    private String pendingEditKey;
+    private int pendingEditIndex = -1;
+
+    public KeybindsList() {
+        this(null);
+    }
 
-public class KeybindsList extends TreeView {
-    @Getter
-    private final Map<String, List<KeybindData>> keybinds = new HashMap<>();
+    public KeybindsList(Map<String, List<KeybindData>> initialKeybinds) {
+        getStyleClass().add("keybinds-pane");
+        setSpacing(18);
+        setFillWidth(true);
 
-    /**
-     * Creates a new KeybindsList with the given keybinds map.
-     *
-     * @param map a map of keybind IDs to their corresponding list of KeybindData.
-     */
-    public KeybindsList(Map<String, List<KeybindData>> map) {
-        super(new TreeItem<>(new RRHBox()));
-        loadKeybinds(map);
-        this.setShowRoot(false);
+        createHeader();
+        createCategoryBar();
+        createListArea();
+
+        loadKeybinds(initialKeybinds);
+    }
+
+    public Map<String, List<KeybindData>> getKeybinds() {
+        Map<String, List<KeybindData>> copy = new LinkedHashMap<>();
+        keybinds.forEach((id, bindings) -> copy.put(id, new ArrayList<>(bindings)));
+        return copy;
+    }
+
+    public void loadKeybinds(Map<String, List<KeybindData>> incoming) {
+        keybinds.clear();
+
+        Map<String, List<KeybindData>> defaults = KeybindHandler.getDefaults();
+        defaults.forEach((id, combos) -> keybinds.put(id, new ArrayList<>(combos)));
+
+        if (incoming != null) {
+            incoming.forEach((id, combos) -> keybinds.put(id, new ArrayList<>(combos)));
+        }
+
+        rebuildCategoryFilters();
+        renderKeybindCards();
+    }
+
+    private void createHeader() {
+        var title = new LocalizedLabel("railroad.settings.keybinds.title");
+        title.getStyleClass().add("keybinds-header-title");
+        var subtitle = new LocalizedLabel("railroad.settings.keybinds.subtitle");
+        subtitle.getStyleClass().add("keybinds-header-subtitle");
+
+        searchField.setLocalizedPlaceholder("railroad.settings.keybinds.search");
+        searchField.textProperty().addListener((obs, oldText, newText) -> renderKeybindCards());
+
+        var headerBox = new VBox(4, title, subtitle);
+        headerBox.getStyleClass().add("keybinds-header");
+
+        getChildren().addAll(headerBox, searchField);
+    }
+
+    private void createCategoryBar() {
+        categoryBar.getStyleClass().add("keybinds-category-bar");
+        categoryBar.setHgap(8);
+        categoryBar.setVgap(8);
+        getChildren().add(categoryBar);
+    }
+
+    private void createListArea() {
+        cardsContainer.getStyleClass().add("keybinds-card-container");
+
+        emptyState.getStyleClass().add("keybinds-empty-state");
+        emptyState.setAlignment(Pos.CENTER);
+
+        listStack.getChildren().addAll(cardsContainer, emptyState);
+
+        var scrollPane = new ScrollPane(listStack);
+        scrollPane.setFitToWidth(true);
+        scrollPane.setFitToHeight(true);
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        scrollPane.getStyleClass().add("keybinds-scroll");
+
+        VBox.setVgrow(scrollPane, Priority.ALWAYS);
+        getChildren().add(scrollPane);
+    }
+
+    private void rebuildCategoryFilters() {
+        categoryBar.getChildren().clear();
 
-        TreeItem<RRHBox> root = this.getRoot();
-        root.setExpanded(true);
+        ToggleButton allButton = createCategoryChip("railroad.settings.keybinds.filter.all", null);
+        categoryBar.getChildren().add(allButton);
+
+        Set<String> seenCategories = new LinkedHashSet<>();
+        keybinds.keySet().forEach(id -> {
+            Keybind keybind = KeybindHandler.getKeybind(id);
+            if (keybind == null) return;
+            KeybindCategory category = keybind.getCategory();
+            if (category == null) return;
+            if (seenCategories.add(category.id())) {
+                categoryBar.getChildren().add(createCategoryChip(category.titleKey(), category.id()));
+            }
+        });
+
+        if (activeCategoryId == null) {
+            allButton.setSelected(true);
+            categoryToggleGroup.selectToggle(allButton);
+        } else {
+            categoryToggleGroup.getToggles().stream()
+                .filter(toggle -> Objects.equals(toggle.getUserData(), activeCategoryId))
+                .findFirst()
+                .ifPresent(toggle -> {
+                    toggle.setSelected(true);
+                    categoryToggleGroup.selectToggle(toggle);
+                });
+        }
+    }
+
+    private ToggleButton createCategoryChip(String localizationKey, String categoryId) {
+        ToggleButton chip = new ToggleButton();
+        chip.getStyleClass().add("keybinds-category-chip");
+        chip.setToggleGroup(categoryToggleGroup);
+        chip.setUserData(categoryId);
+        chip.textProperty().bind(Bindings.createStringBinding(() ->
+                localizationKey == null ? "" : L18n.localize(localizationKey),
+            L18n.currentLanguageProperty()));
+        chip.setOnAction(event -> {
+            activeCategoryId = categoryId;
+            renderKeybindCards();
+        });
+        return chip;
+    }
+
+    private void renderKeybindCards() {
+        String query = searchField.getText() == null ? "" : searchField.getText().trim().toLowerCase(Locale.ENGLISH);
+
+        List<Map.Entry<String, List<KeybindData>>> filtered = keybinds.entrySet().stream()
+            .filter(entry -> KeybindHandler.getKeybind(entry.getKey()) != null)
+            .filter(entry -> matchesCategory(entry.getKey()))
+            .filter(entry -> matchesSearch(entry.getKey(), query))
+            .sorted(Comparator.comparing(entry -> getDisplayName(entry.getKey()), String.CASE_INSENSITIVE_ORDER))
+            .toList();
+
+        cardsContainer.getChildren().setAll(filtered.stream()
+            .map(entry -> createKeybindCard(entry.getKey(), entry.getValue()))
+            .toList());
+
+        boolean hasResults = !filtered.isEmpty();
+        cardsContainer.setVisible(hasResults);
+        cardsContainer.setManaged(hasResults);
+        emptyState.setVisible(!hasResults);
+        emptyState.setManaged(!hasResults);
+
+        if (!hasResults) {
+            pendingEditKey = null;
+            pendingEditIndex = -1;
+        }
+    }
+
+    private boolean matchesCategory(String keybindId) {
+        if (activeCategoryId == null || activeCategoryId.isBlank()) {
+            return true;
+        }
+        Keybind keybind = KeybindHandler.getKeybind(keybindId);
+        return keybind != null &&
+            keybind.getCategory() != null &&
+            activeCategoryId.equals(keybind.getCategory().id());
+    }
+
+    private boolean matchesSearch(String keybindId, String query) {
+        if (query.isBlank()) return true;
+        String display = getDisplayName(keybindId).toLowerCase(Locale.ENGLISH);
+        return display.contains(query) || keybindId.toLowerCase(Locale.ENGLISH).contains(query);
+    }
+
+    private Node createKeybindCard(String keybindId, List<KeybindData> bindings) {
+        var card = new RRCard();
+        card.getStyleClass().add("keybind-card");
+
+        var title = new LocalizedLabel(localizationKeyFor(keybindId));
+        title.getStyleClass().add("keybind-card-title");
+
+        var subtitle = createSubtitleLabel(keybindId);
+        if (subtitle != null) {
+            subtitle.getStyleClass().add("keybind-card-subtitle");
+        }
+
+        var titleBox = new VBox(4);
+        titleBox.getChildren().add(title);
+        if (subtitle != null) {
+            titleBox.getChildren().add(subtitle);
+        }
+
+        var addButton = new RRButton("railroad.settings.keybinds.add_binding", FontAwesomeSolid.PLUS);
+        addButton.setButtonSize(ButtonSize.SMALL);
+        addButton.setVariant(ButtonVariant.SECONDARY);
+        addButton.getStyleClass().add("keybind-card-add");
+        addButton.setOnAction(event -> addBlankShortcut(keybindId, bindings));
+
+        var header = new HBox(12, titleBox, addButton);
+        header.getStyleClass().add("keybind-card-header");
+        header.setAlignment(Pos.CENTER_LEFT);
+        HBox.setHgrow(titleBox, Priority.ALWAYS);
+
+        var shortcutsBox = new VBox(8);
+        shortcutsBox.getStyleClass().add("keybind-card-shortcuts");
+
+        if (bindings.isEmpty()) {
+            var emptyLabel = new LocalizedLabel("railroad.settings.keybinds.no_shortcuts");
+            emptyLabel.getStyleClass().add("keybind-card-shortcuts-empty");
+            shortcutsBox.getChildren().add(emptyLabel);
+        } else {
+            for (int i = 0; i < bindings.size(); i++) {
+                shortcutsBox.getChildren().add(createShortcutRow(keybindId, bindings, bindings.get(i), i));
+            }
+        }
 
-        refreshTree();
+        card.addContent(header, shortcutsBox);
+        return card;
+    }
+
+    private LocalizedLabel createSubtitleLabel(String keybindId) {
+        String descriptionKey = localizationKeyFor(keybindId) + ".description";
+        if (L18n.isKeyValid(descriptionKey)) {
+            return new LocalizedLabel(descriptionKey);
+        }
+
+        Keybind keybind = KeybindHandler.getKeybind(keybindId);
+        if (keybind != null && keybind.getCategory() != null) {
+            String categoryKey = keybind.getCategory().titleKey();
+            if (categoryKey != null && L18n.isKeyValid(categoryKey)) {
+                return new LocalizedLabel(categoryKey);
+            }
+        }
+
+        return null;
+    }
+
+    private Node createShortcutRow(String keybindId, List<KeybindData> bindings, KeybindData binding, int index) {
+        var row = new HBox(8);
+        row.getStyleClass().add("keybind-shortcut-row");
+        row.setAlignment(Pos.CENTER_LEFT);
+
+        var comboNode = new KeyComboNode(binding);
+        comboNode.setOnAction(event -> comboNode.toggleEditing());
+        comboNode.setOnComboModified(updated -> bindings.set(index, updated));
+        maybeStartPendingEdit(keybindId, index, comboNode);
+
+        var removeButton = new RRButton("", FontAwesomeSolid.TRASH);
+        removeButton.setVariant(ButtonVariant.DANGER);
+        removeButton.setButtonSize(ButtonSize.SMALL);
+        removeButton.getStyleClass().add("keybind-shortcut-remove");
+        removeButton.setOnAction(event -> {
+            bindings.remove(index);
+            renderKeybindCards();
+        });
+
+        row.getChildren().addAll(comboNode, removeButton);
+        return row;
+    }
+
+    private void maybeStartPendingEdit(String keybindId, int index, KeyComboNode comboNode) {
+        if (Objects.equals(pendingEditKey, keybindId) && pendingEditIndex == index) {
+            Platform.runLater(comboNode::toggleEditing);
+            pendingEditKey = null;
+            pendingEditIndex = -1;
+        }
+    }
+
+    private void addBlankShortcut(String keybindId, List<KeybindData> bindings) {
+        var newBinding = new KeybindData(KeyCode.UNDEFINED, new KeyCombination.Modifier[0]);
+        bindings.add(newBinding);
+        pendingEditKey = keybindId;
+        pendingEditIndex = bindings.size() - 1;
+        renderKeybindCards();
+    }
+
+    private String getDisplayName(String keybindId) {
+        String key = localizationKeyFor(keybindId);
+        if (L18n.isKeyValid(key)) {
+            return L18n.localize(key);
+        }
+        return keybindId;
+    }
+
+    private String localizationKeyFor(String keybindId) {
+        if (keybindId == null || !keybindId.contains(":")) {
+            return "railroad.settings.keybinds." + keybindId;
+        }
+        return "railroad.settings.keybinds." + keybindId.split(":", 2)[1];
     }
 
     /**
@@ -80,7 +362,7 @@ public static JsonElement toJson(Map<String, List<KeybindData>> keybinds) {
      * @return a map of keybind IDs to lists of KeybindData.
      */
     public static Map<String, List<KeybindData>> fromJson(JsonElement json) {
-        var map = new HashMap<String, List<KeybindData>>();
+        var map = new LinkedHashMap<String, List<KeybindData>>();
 
         for (Map.Entry<String, JsonElement> keybindJson : json.getAsJsonObject().entrySet()) {
             var id = keybindJson.getKey();
@@ -104,20 +386,11 @@ public static Map<String, List<KeybindData>> fromJson(JsonElement json) {
 
                 for (String mod : modParts) {
                     switch (mod.trim()) {
-                        case "Shortcut":
-                            modifiers.add(KeyCombination.SHORTCUT_DOWN);
-                            break;
-                        case "Ctrl":
-                            modifiers.add(KeyCombination.CONTROL_DOWN);
-                            break;
-                        case "Shift":
-                            modifiers.add(KeyCombination.SHIFT_DOWN);
-                            break;
-                        case "Alt":
-                            modifiers.add(KeyCombination.ALT_DOWN);
-                            break;
-                        default:
-                            throw new IllegalArgumentException("Unknown modifier: " + mod);
+                        case "Shortcut" -> modifiers.add(KeyCombination.SHORTCUT_DOWN);
+                        case "Ctrl" -> modifiers.add(KeyCombination.CONTROL_DOWN);
+                        case "Shift" -> modifiers.add(KeyCombination.SHIFT_DOWN);
+                        case "Alt" -> modifiers.add(KeyCombination.ALT_DOWN);
+                        default -> throw new IllegalArgumentException("Unknown modifier: " + mod);
                     }
                 }
 
@@ -139,20 +412,11 @@ public static Map<String, List<KeybindData>> fromJson(JsonElement json) {
 
                 for (int i = 0; i < modParts.length; i++) {
                     switch (modParts[i]) {
-                        case "Shortcut":
-                            modifiers[i] = KeyCombination.SHORTCUT_DOWN;
-                            break;
-                        case "Ctrl":
-                            modifiers[i] = KeyCombination.CONTROL_DOWN;
-                            break;
-                        case "Shift":
-                            modifiers[i] = KeyCombination.SHIFT_DOWN;
-                            break;
-                        case "Alt":
-                            modifiers[i] = KeyCombination.ALT_DOWN;
-                            break;
-                        default:
-                            throw new IllegalArgumentException("Unknown modifier: " + modParts[i]);
+                        case "Shortcut" -> modifiers[i] = KeyCombination.SHORTCUT_DOWN;
+                        case "Ctrl" -> modifiers[i] = KeyCombination.CONTROL_DOWN;
+                        case "Shift" -> modifiers[i] = KeyCombination.SHIFT_DOWN;
+                        case "Alt" -> modifiers[i] = KeyCombination.ALT_DOWN;
+                        default -> throw new IllegalArgumentException("Unknown modifier: " + modParts[i]);
                     }
                 }
 
@@ -164,125 +428,4 @@ public static Map<String, List<KeybindData>> fromJson(JsonElement json) {
 
         return map;
     }
-
-    /**
-     * Refreshes the tree view to display the current keybinds.
-     * It caches the currently expanded categories, to then restore them after clearing the tree.
-     */
-    private void refreshTree() {
-        TreeItem<RRHBox> root = this.getRoot();
-
-        List<String> expandedCategoryIds = new ArrayList<>();
-        for (TreeItem<RRHBox> item : root.getChildren()) {
-            if (item.isExpanded() &&
-                item.getValue().getChildren().getFirst() instanceof LocalizedLabel label) {
-                expandedCategoryIds.add(label.getId());
-            }
-        }
-
-        root.getChildren().clear();
-
-        for (Map.Entry<String, List<KeybindData>> entry : keybinds.entrySet()) {
-            KeybindCategory category = KeybindHandler.getKeybind(entry.getKey()).getCategory();
-
-            TreeItem<RRHBox> categoryItem = root.getChildren().stream()
-                .filter(item -> item.getValue().getChildren().getFirst() instanceof LocalizedLabel label &&
-                    label.getId().equals(category.id()))
-                .findFirst()
-                .orElseGet(() -> {
-                    var categoryHeader = new LocalizedLabel(category.titleKey());
-                    categoryHeader.setId(category.id());
-                    var content = new RRHBox();
-                    content.getChildren().add(categoryHeader);
-                    var newCategoryItem = new TreeItem<>(content);
-                    root.getChildren().add(newCategoryItem);
-                    return newCategoryItem;
-                });
-
-            categoryItem.getChildren().add(createKeybindTreeItem(entry.getKey(), entry.getValue()));
-        }
-
-        for (TreeItem<RRHBox> item : root.getChildren()) {
-            if (item.getValue().getChildren().getFirst() instanceof LocalizedLabel label &&
-                expandedCategoryIds.contains(label.getId())) {
-                item.setExpanded(true);
-            }
-        }
-    }
-
-    /**
-     * Creates a TreeItem for a keybind. Which contains an add button, remove button and edit button for each keybind/key combination.
-     *
-     * @param id       the keybind ID
-     * @param keybinds a KeybindData list containing the keybinds/key combinations for the given ID.
-     * @return a TreeItem containing the keybind configuration UI.
-     */
-    private TreeItem<RRHBox> createKeybindTreeItem(String id, List<KeybindData> keybinds) {
-        var titleBox = new RRHBox();
-        var configBox = new RRVBox();
-
-        var localeKey = "railroad.settings.keybinds." + id.split(":")[1];
-
-        titleBox.getChildren().addAll(new LocalizedLabel(localeKey));
-
-        var addButton = new RRButton("", FontAwesomeSolid.PLUS);
-        addButton.setPadding(InsetsBuilder.all(5));
-        addButton.getStyleClass().add("square-button");
-        addButton.setVariant(RRButton.ButtonVariant.PRIMARY);
-        addButton.setOnAction(e -> {
-            var newKeybind = new KeybindData(KeyCode.UNDEFINED, new KeyCombination.Modifier[0]);
-            keybinds.add(newKeybind);
-            refreshTree();
-        });
-
-        titleBox.getChildren().add(addButton);
-
-        for (KeybindData keybind : keybinds) {
-            var keybindBox = new RRHBox(5);
-            var keyComboNode = new KeyComboNode(keybind);
-            keyComboNode.setOnComboModified((keybindData) -> {
-                int index = keybinds.indexOf(keybind);
-                if (index != -1 && !keybindData.equals(keybind)) {
-                    keybinds.set(index, keybindData);
-                }
-            });
-
-            var buttonBox = new RRHBox(5);
-
-            var removeButton = new RRButton("", FontAwesomeSolid.MINUS);
-            removeButton.setVariant(RRButton.ButtonVariant.DANGER);
-            removeButton.getStyleClass().add("square-button");
-            removeButton.setOnAction(e -> {
-                keybinds.remove(keybinds.get(this.keybinds.get(id).indexOf(keybind)));
-                refreshTree();
-            });
-
-            var editButton = new RRButton("", FontAwesomeSolid.PENCIL_ALT);
-            editButton.setVariant(RRButton.ButtonVariant.SECONDARY);
-            editButton.getStyleClass().add("square-button");
-            editButton.setOnAction(e -> {
-                ;
-                keyComboNode.toggleEditing();
-            });
-
-            buttonBox.getChildren().addAll(removeButton, editButton);
-            keybindBox.getChildren().addAll(keyComboNode, buttonBox);
-
-            configBox.getChildren().addAll(keybindBox);
-        }
-
-        var treeNodeContent = new RRHBox();
-        treeNodeContent.getChildren().addAll(titleBox, configBox);
-        return new TreeItem<>(treeNodeContent);
-    }
-
-    /**
-     * Loads the provided keybinds into the current instance.
-     *
-     * @param keybinds a map of keybind IDs to their corresponding KeybindData list.
-     */
-    public void loadKeybinds(Map<String, List<KeybindData>> keybinds) {
-        this.keybinds.clear();
-        this.keybinds.putAll(keybinds);
-    }
 }
diff --git a/src/main/java/dev/railroadide/railroad/settings/ui/AbstractPathListPane.java b/src/main/java/dev/railroadide/railroad/settings/ui/AbstractPathListPane.java
new file mode 100644
index 00000000..0374786a
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/settings/ui/AbstractPathListPane.java
@@ -0,0 +1,185 @@
+package dev.railroadide.railroad.settings.ui;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import dev.railroadide.core.ui.RRButton;
+import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.ui.RRListView;
+import dev.railroadide.core.ui.RRVBox;
+import dev.railroadide.core.ui.localized.LocalizedLabel;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
+import dev.railroadide.railroad.localization.L18n;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.VBox;
+import lombok.Getter;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.util.*;
+
+/**
+ * Base class for path list panes that provide add/remove controls and common styling.
+ * Subclasses need only provide the path selection implementation and localization keys.
+ */
+public abstract class AbstractPathListPane extends RRVBox {
+    private final ObservableList<Path> paths = FXCollections.observableArrayList();
+    @Getter
+    private final ListView<Path> listView = new RRListView<>(paths);
+
+    protected AbstractPathListPane(Collection<Path> initialPaths,
+                                   String placeholderKey,
+                                   String addTooltipKey,
+                                   String removeTooltipKey) {
+        setSpacing(12);
+        setFillWidth(true);
+        getStyleClass().add("path-list-pane");
+
+        listView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
+        listView.setPlaceholder(new LocalizedLabel(placeholderKey));
+        listView.setMinHeight(200);
+        listView.setCellFactory(view -> new ListCell<>() {
+            @Override
+            protected void updateItem(Path item, boolean empty) {
+                super.updateItem(item, empty);
+                setText(empty || item == null ? null : item.toString());
+            }
+        });
+        VBox.setVgrow(listView, Priority.NEVER);
+
+        var controls = new RRHBox(8);
+
+        var addButton = new RRButton(null, FontAwesomeSolid.PLUS);
+        addButton.setButtonSize(ButtonSize.SMALL);
+        addButton.setVariant(ButtonVariant.SUCCESS);
+        addButton.setTooltip(new Tooltip(L18n.localize(addTooltipKey)));
+
+        var removeButton = new RRButton(null, FontAwesomeSolid.MINUS);
+        removeButton.setButtonSize(ButtonSize.SMALL);
+        removeButton.setVariant(ButtonVariant.DANGER);
+        removeButton.setTooltip(new Tooltip(L18n.localize(removeTooltipKey)));
+        removeButton.setDisable(true);
+
+        controls.getChildren().addAll(addButton, removeButton);
+
+        addButton.setOnAction($ -> {
+            Path selected = choosePath();
+            if (selected == null) {
+                return;
+            }
+
+            addPath(selected);
+        });
+
+        removeButton.setOnAction($ -> {
+            Path selected = listView.getSelectionModel().getSelectedItem();
+            if (selected != null) {
+                paths.remove(selected);
+            }
+        });
+
+        listView.getSelectionModel().selectedItemProperty().addListener(
+            (obs, oldValue, newValue) -> removeButton.setDisable(newValue == null));
+
+        getChildren().addAll(listView, controls);
+
+        setPaths(initialPaths);
+    }
+
+    protected AbstractPathListPane(String placeholderKey,
+                                   String addTooltipKey,
+                                   String removeTooltipKey) {
+        this(Collections.emptyList(), placeholderKey, addTooltipKey, removeTooltipKey);
+    }
+
+    /**
+     * Allows subclasses to trigger the same path management behaviour for specific selections.
+     *
+     * @return The user-selected path, or {@code null} if selection was cancelled.
+     */
+    protected abstract Path choosePath();
+
+    /**
+     * Returns the currently listed paths.
+     */
+    public List<Path> getPaths() {
+        return new ArrayList<>(paths);
+    }
+
+    /**
+     * Replaces the current list of paths with the given collection.
+     */
+    public void setPaths(Collection<Path> newPaths) {
+        paths.setAll(normalizePaths(newPaths));
+    }
+
+    private void addPath(Path path) {
+        Path normalized = normalize(path);
+        if (normalized == null)
+            return;
+
+        if (paths.stream().noneMatch(existing -> existing.equals(normalized))) {
+            paths.add(normalized);
+        }
+    }
+
+    private static List<Path> normalizePaths(Collection<Path> source) {
+        if (source == null || source.isEmpty())
+            return Collections.emptyList();
+
+        Set<Path> normalized = new LinkedHashSet<>();
+        for (Path path : source) {
+            Path normalizedPath = normalize(path);
+            if (normalizedPath != null) {
+                normalized.add(normalizedPath);
+            }
+        }
+
+        return new ArrayList<>(normalized);
+    }
+
+    private static Path normalize(Path path) {
+        if (path == null)
+            return null;
+
+        try {
+            return path.toAbsolutePath().normalize();
+        } catch (InvalidPathException ignored) {
+            return null;
+        }
+    }
+
+    public static JsonElement toJson(List<Path> paths) {
+        var array = new JsonArray();
+        for (Path path : paths) {
+            array.add(path.toString());
+        }
+
+        return array;
+    }
+
+    public static List<Path> fromJson(JsonElement jsonElement) {
+        var paths = new ArrayList<Path>();
+        if (jsonElement == null || !jsonElement.isJsonArray())
+            return paths;
+
+        var jsonArray = jsonElement.getAsJsonArray();
+        for (JsonElement element : jsonArray) {
+            try {
+                Path path = Path.of(element.getAsString());
+                paths.add(path);
+            } catch (InvalidPathException ignored) {
+            }
+        }
+
+        return paths;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/settings/ui/DetectedJdkListPane.java b/src/main/java/dev/railroadide/railroad/settings/ui/DetectedJdkListPane.java
new file mode 100644
index 00000000..7a8aec82
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/settings/ui/DetectedJdkListPane.java
@@ -0,0 +1,149 @@
+package dev.railroadide.railroad.settings.ui;
+
+import dev.railroadide.core.ui.RRButton;
+import dev.railroadide.core.ui.RRHBox;
+import dev.railroadide.core.ui.RRListView;
+import dev.railroadide.core.ui.RRVBox;
+import dev.railroadide.core.ui.localized.LocalizedLabel;
+import dev.railroadide.core.ui.localized.LocalizedTooltip;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
+import dev.railroadide.railroad.AppResources;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.JDKManager;
+import dev.railroadide.railroad.localization.L18n;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeBrands;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Displays the JDKs detected by {@link JDKManager} with a quick refresh action.
+ */
+public class DetectedJdkListPane extends RRVBox {
+    private final ObservableList<JDK> items = FXCollections.observableArrayList();
+    private final ListView<JDK> listView = new RRListView<>(items);
+    private final LocalizedLabel countLabel = new LocalizedLabel("railroad.settings.ide.jdk_management.detected.count", 0);
+
+    public DetectedJdkListPane() {
+        setSpacing(12);
+        setFillWidth(true);
+        getStyleClass().add("detected-jdk-list-pane");
+
+        var header = new RRHBox(8);
+        header.setFillHeight(true);
+        var title = new LocalizedLabel("railroad.settings.ide.jdk_management.detected.title");
+        title.getStyleClass().add("section-label");
+
+        var refreshButton = new RRButton(null, FontAwesomeSolid.SYNC);
+        refreshButton.setButtonSize(ButtonSize.SMALL);
+        refreshButton.setVariant(ButtonVariant.SECONDARY);
+        refreshButton.setTooltip(new LocalizedTooltip("railroad.settings.ide.jdk_management.detected.refresh.tooltip"));
+        refreshButton.setOnAction($ -> refresh());
+
+        header.getChildren().addAll(title, refreshButton);
+
+        listView.setItems(items);
+        listView.setFocusTraversable(false);
+        listView.setMinHeight(160);
+        listView.setPrefHeight(220);
+        listView.setMaxHeight(220);
+        listView.setCellFactory(view -> new JdkCell());
+        listView.setPlaceholder(new LocalizedLabel("railroad.settings.ide.jdk_management.detected.empty"));
+
+        getChildren().addAll(header, listView, countLabel);
+
+        refresh();
+    }
+
+    private void refresh() {
+        JDKManager.refreshJDKs();
+        List<JDK> detected = JDKManager.getAvailableJDKs();
+        var copy = new ArrayList<>(detected);
+        items.setAll(copy);
+        countLabel.setKey("railroad.settings.ide.jdk_management.detected.count", detected.size());
+    }
+
+    public static class JdkCell extends ListCell<JDK> {
+        private final HBox container = new HBox(12);
+        private final VBox textContainer = new VBox(2);
+        private final LocalizedLabel versionLabel = new LocalizedLabel("");
+        private final LocalizedLabel nameLabel = new LocalizedLabel("");
+        private final LocalizedLabel pathLabel = new LocalizedLabel("");
+
+        public JdkCell() {
+            container.setAlignment(Pos.CENTER_LEFT);
+            container.getStyleClass().add("detected-jdk-cell");
+
+            versionLabel.getStyleClass().add("detected-jdk-version");
+            nameLabel.getStyleClass().add("detected-jdk-name");
+            pathLabel.getStyleClass().add("detected-jdk-path");
+
+            textContainer.getChildren().addAll(versionLabel, nameLabel, pathLabel);
+            HBox.setHgrow(textContainer, Priority.ALWAYS);
+        }
+
+        @Override
+        protected void updateItem(JDK item, boolean empty) {
+            super.updateItem(item, empty);
+            if (empty || item == null) {
+                setGraphic(null);
+                return;
+            }
+
+            JDK.Brand brand = item.brand();
+            Node iconView = null;
+            if (brand.isImage()) {
+                try {
+                    var image = new Image(AppResources.getResourceAsStream(brand.getImagePath()), 20, 20, true, true);
+                    iconView = new ImageView(image);
+                } catch (Exception exception) {
+                    Railroad.LOGGER.error("Failed to load image icon for JDK brand {}", brand.name(), exception);
+                }
+            } else if (brand.isIkon()) {
+                var icon = new FontIcon(brand.getIcon());
+                icon.setIconSize(20);
+                iconView = icon;
+            }
+
+            if (iconView == null) {
+                Railroad.LOGGER.warn("No icon found for JDK brand {}, using default Java icon", brand.name());
+                iconView = new FontIcon(FontAwesomeBrands.JAVA);
+                ((FontIcon) iconView).setIconSize(20);
+            }
+
+            iconView.getStyleClass().add("detected-jdk-icon");
+
+            String version = item.version() != null
+                ? item.version().toReleaseString()
+                : L18n.localize("railroad.settings.ide.jdk_management.detected.unknown_version");
+            if (version.endsWith(".0") && version.length() > 2) {
+                version = version.substring(0, version.length() - 2);
+            }
+            versionLabel.setKey("railroad.settings.ide.jdk_management.detected.version", version);
+
+            String name = item.name();
+            nameLabel.setKey("railroad.settings.ide.jdk_management.detected.name", name);
+
+            pathLabel.setKey("railroad.settings.ide.jdk_management.detected.path", item.path());
+
+            container.getChildren().setAll(iconView, textContainer);
+            setGraphic(container);
+            setText(null);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/settings/ui/DirectoryListPane.java b/src/main/java/dev/railroadide/railroad/settings/ui/DirectoryListPane.java
new file mode 100644
index 00000000..a0d0086a
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/settings/ui/DirectoryListPane.java
@@ -0,0 +1,48 @@
+package dev.railroadide.railroad.settings.ui;
+
+import dev.railroadide.railroad.localization.L18n;
+import javafx.stage.DirectoryChooser;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Directory-specific implementation of {@link AbstractPathListPane}.
+ */
+public class DirectoryListPane extends AbstractPathListPane {
+    public DirectoryListPane(Collection<Path> initialDirectories) {
+        super(
+            initialDirectories,
+            "railroad.settings.directories.empty",
+            "railroad.settings.directories.add.tooltip",
+            "railroad.settings.directories.remove.tooltip"
+        );
+        getStyleClass().add("directory-list-pane");
+    }
+
+    public DirectoryListPane() {
+        this(Collections.emptyList());
+    }
+
+    @Override
+    protected Path choosePath() {
+        var chooser = new DirectoryChooser();
+        chooser.setTitle(L18n.localize("railroad.settings.directories.add.title"));
+        File selectedDirectory = chooser.showDialog(getScene().getWindow());
+        if (selectedDirectory == null)
+            return null;
+
+        return selectedDirectory.toPath();
+    }
+
+    public List<Path> getDirectories() {
+        return getPaths();
+    }
+
+    public void setDirectories(Collection<Path> directories) {
+        setPaths(directories);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/settings/ui/FileListPane.java b/src/main/java/dev/railroadide/railroad/settings/ui/FileListPane.java
new file mode 100644
index 00000000..14beacc9
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/settings/ui/FileListPane.java
@@ -0,0 +1,48 @@
+package dev.railroadide.railroad.settings.ui;
+
+import dev.railroadide.railroad.localization.L18n;
+import javafx.stage.FileChooser;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * File-specific implementation of {@link AbstractPathListPane}.
+ */
+public class FileListPane extends AbstractPathListPane {
+    public FileListPane(Collection<Path> initialFiles) {
+        super(
+            initialFiles,
+            "railroad.settings.files.empty",
+            "railroad.settings.files.add.tooltip",
+            "railroad.settings.files.remove.tooltip"
+        );
+        getStyleClass().add("file-list-pane");
+    }
+
+    public FileListPane() {
+        this(Collections.emptyList());
+    }
+
+    @Override
+    protected Path choosePath() {
+        var chooser = new FileChooser();
+        chooser.setTitle(L18n.localize("railroad.settings.files.add.title"));
+        File selectedFile = chooser.showOpenDialog(getScene().getWindow());
+        if (selectedFile == null)
+            return null;
+
+        return selectedFile.toPath();
+    }
+
+    public List<Path> getFiles() {
+        return getPaths();
+    }
+
+    public void setFiles(Collection<Path> files) {
+        setPaths(files);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/settings/ui/SettingsPane.java b/src/main/java/dev/railroadide/railroad/settings/ui/SettingsPane.java
index 6a1d9341..667e31b5 100644
--- a/src/main/java/dev/railroadide/railroad/settings/ui/SettingsPane.java
+++ b/src/main/java/dev/railroadide/railroad/settings/ui/SettingsPane.java
@@ -16,6 +16,7 @@
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
+import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.SplitPane;
 import javafx.scene.control.TreeItem;
@@ -78,7 +79,7 @@ public SettingsPane() {
         rightVbox.getStyleClass().remove("background-2");
         rightVbox.getStyleClass().add("settings-right-pane");
 
-        var pathLabel = new LocalizedLabel("");
+        var pathLabel = new Label("");
         pathLabel.getStyleClass().add("settings-path-title");
         var settingsContentBox = new RRVBox();
         settingsContentBox.setSpacing(20);
@@ -125,11 +126,20 @@ public SettingsPane() {
             }
 
             pathLabel.setText(pathBuilder.toString());
-            settingsContentBox.getChildren().setAll(SettingsUIHandler.createSettingsSection(
+            var vbox = SettingsUIHandler.createSettingsSection(
                 SettingsHandler.SETTINGS_REGISTRY.values(),
                 parts[parts.length - 1],
                 applyListeners
-            ));
+            );
+
+            // TODO: Temporary until we add a decorations system.
+            if ("ide".equals(parts[parts.length - 1])) {
+                var detectedPane = new DetectedJdkListPane();
+                VBox.setMargin(detectedPane, new Insets(10, 10, 0, 10));
+                vbox.getChildren().add(detectedPane);
+            }
+
+            settingsContentBox.getChildren().setAll(vbox);
         });
 
         var searchHandler = new SettingsSearchHandler(SettingsHandler.SETTINGS_REGISTRY.values());
diff --git a/src/main/java/dev/railroadide/railroad/theme/ThemeManager.java b/src/main/java/dev/railroadide/railroad/theme/ThemeManager.java
index c7b609c5..50ac446f 100644
--- a/src/main/java/dev/railroadide/railroad/theme/ThemeManager.java
+++ b/src/main/java/dev/railroadide/railroad/theme/ThemeManager.java
@@ -5,6 +5,8 @@
 import dev.railroadide.railroad.settings.Settings;
 import dev.railroadide.railroad.settings.handler.SettingsHandler;
 import javafx.application.Platform;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.scene.Scene;
 import javafx.scene.input.KeyCode;
 
@@ -23,7 +25,9 @@
 
 public class ThemeManager {
     private static boolean debug = false;
-    private static String currentTheme;
+    
+    private static final StringProperty currentTheme = new SimpleStringProperty();
+    
     private static String baseCss;
     private static final List<String> COMPONENTS_CSS = new ArrayList<>();
     private static String debugCss;
@@ -40,7 +44,8 @@ public static void init() {
             Railroad.LOGGER.error("Failed to load component CSS files", exception);
         }
 
-        currentTheme = SettingsHandler.getValue(Settings.THEME);
+        currentTheme.addListener($ -> reloadAll());
+        currentTheme.set(SettingsHandler.getValue(Settings.THEME));
     }
 
     public static String getAsExternalForm(String path) {
@@ -51,7 +56,7 @@ public static void apply(Scene scene) {
         if (scene == null) return;
 
         TRACKED_SCENES.add(scene);
-        applyThemeToScene(currentTheme, scene);
+        applyThemeToScene(currentTheme.get(), scene);
 
         scene.setOnKeyReleased(event -> {
             if (event.isControlDown() && event.isShiftDown() && event.getCode() == KeyCode.D) {
@@ -62,15 +67,19 @@ public static void apply(Scene scene) {
         });
     }
 
+    public static StringProperty getCurrentThemeProperty() {
+        return currentTheme;
+    }
+
     public static void setTheme(String theme) {
-        if (theme == null) theme = "";
+        if (theme == null)
+            theme = "";
 
-        currentTheme = theme;
-        reloadAll();
+        currentTheme.set(theme);
     }
 
     public static String getTheme() {
-        return currentTheme;
+        return currentTheme.get();
     }
 
     public static void reloadAll() {
@@ -85,7 +94,7 @@ public static void reloadAll() {
                 }
 
                 for (Scene scene : TRACKED_SCENES) {
-                    applyThemeToScene(currentTheme, scene);
+                    applyThemeToScene(currentTheme.get(), scene);
                 }
             }
         });
diff --git a/src/main/java/dev/railroadide/railroad/theme/ui/ThemeDownloadCell.java b/src/main/java/dev/railroadide/railroad/theme/ui/ThemeDownloadCell.java
index 41269147..2edf4d68 100644
--- a/src/main/java/dev/railroadide/railroad/theme/ui/ThemeDownloadCell.java
+++ b/src/main/java/dev/railroadide/railroad/theme/ui/ThemeDownloadCell.java
@@ -5,6 +5,8 @@
 import dev.railroadide.core.ui.RRHBox;
 import dev.railroadide.core.ui.RRVBox;
 import dev.railroadide.core.ui.localized.LocalizedTooltip;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import dev.railroadide.railroad.theme.Theme;
 import dev.railroadide.railroad.theme.ThemeDownloadManager;
 import javafx.beans.property.ObjectProperty;
@@ -45,13 +47,15 @@ public ThemeDownloadCell() {
 
         card = new RRCard(12, new Insets(16));
         card.setInteractive(false);
-        card.getStyleClass().add("theme-download-card");
+        card.getStyleClass().addAll("card", "compact");
 
         content = new RRHBox(16);
         content.setAlignment(Pos.CENTER_LEFT);
+        content.getStyleClass().add("transparent-background");
 
         infoSection = new RRVBox(4);
         infoSection.setAlignment(Pos.CENTER_LEFT);
+        infoSection.getStyleClass().add("transparent-background");
         HBox.setHgrow(infoSection, Priority.ALWAYS);
 
         themeNameLabel = new Label();
@@ -64,16 +68,17 @@ public ThemeDownloadCell() {
 
         actionSection = new RRHBox(8);
         actionSection.setAlignment(Pos.CENTER_RIGHT);
+        actionSection.getStyleClass().add("transparent-background");
 
         previewButton = new RRButton();
         previewButton.setIcon(FontAwesomeSolid.EYE);
-        previewButton.setButtonSize(RRButton.ButtonSize.SMALL);
-        previewButton.setVariant(RRButton.ButtonVariant.GHOST);
+        previewButton.setButtonSize(ButtonSize.SMALL);
+        previewButton.setVariant(ButtonVariant.GHOST);
         previewButton.setTooltip(new LocalizedTooltip("railroad.home.settings.appearance.preview.tooltip"));
 
         downloadButton = new RRButton("railroad.home.settings.appearance.download");
-        downloadButton.setButtonSize(RRButton.ButtonSize.SMALL);
-        downloadButton.setVariant(RRButton.ButtonVariant.PRIMARY);
+        downloadButton.setButtonSize(ButtonSize.SMALL);
+        downloadButton.setVariant(ButtonVariant.PRIMARY);
 
         actionSection.getChildren().addAll(previewButton, downloadButton);
 
@@ -89,14 +94,14 @@ private void setupEventHandlers() {
             Theme theme = themeProperty.get();
             if (theme != null) {
                 boolean success = ThemeDownloadManager.downloadTheme(theme);
-                updateDownloadButtonState(success);
+                updateButtonStates(success);
             }
         });
 
         previewButton.setOnAction(e -> {
             Theme theme = themeProperty.get();
             if (theme != null) {
-                new ThemeExamplePane(theme.getName());
+                new ThemeExamplePane(theme.getName().replace(".css", ""));
             }
         });
     }
@@ -128,20 +133,22 @@ private void setupPropertyBindings() {
         themeProperty.addListener((observable, oldValue, newValue) -> {
             if (newValue != null) {
                 boolean isDownloaded = ThemeDownloadManager.isDownloaded(newValue);
-                updateDownloadButtonState(isDownloaded);
+                updateButtonStates(isDownloaded);
             }
         });
     }
 
-    private void updateDownloadButtonState(boolean isDownloaded) {
+    private void updateButtonStates(boolean isDownloaded) {
         if (isDownloaded) {
             downloadButton.setLocalizedText("railroad.home.settings.appearance.installed");
-            downloadButton.setVariant(RRButton.ButtonVariant.SUCCESS);
+            downloadButton.setVariant(ButtonVariant.SUCCESS);
             downloadButton.setDisable(true);
+            previewButton.setDisable(false);
         } else {
             downloadButton.setLocalizedText("railroad.home.settings.appearance.download");
-            downloadButton.setVariant(RRButton.ButtonVariant.PRIMARY);
+            downloadButton.setVariant(ButtonVariant.PRIMARY);
             downloadButton.setDisable(false);
+            previewButton.setDisable(true);
         }
     }
 
diff --git a/src/main/java/dev/railroadide/railroad/theme/ui/ThemeDownloadPane.java b/src/main/java/dev/railroadide/railroad/theme/ui/ThemeDownloadPane.java
index 391dcfd2..5b95a850 100644
--- a/src/main/java/dev/railroadide/railroad/theme/ui/ThemeDownloadPane.java
+++ b/src/main/java/dev/railroadide/railroad/theme/ui/ThemeDownloadPane.java
@@ -2,12 +2,15 @@
 
 import dev.railroadide.core.ui.*;
 import dev.railroadide.core.ui.localized.LocalizedLabel;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import dev.railroadide.railroad.theme.Theme;
 import dev.railroadide.railroad.theme.ThemeDownloadManager;
 import dev.railroadide.railroad.window.WindowBuilder;
 import javafx.application.Platform;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
+import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.ListView;
 import javafx.scene.layout.HBox;
@@ -26,13 +29,13 @@
  * Features a clean, card-based layout with better visual hierarchy and modern styling.
  */
 public class ThemeDownloadPane {
-    private final Stage stage;
     private ListView<Theme> themeListView;
     private LocalizedLabel statusLabel;
     private RRButton refreshButton;
 
     public ThemeDownloadPane(Window owner) {
         var mainContainer = new RRFormContainer();
+        mainContainer.getStyleClass().add("theme-download-container");
         mainContainer.setLocalizedTitle("railroad.home.settings.appearance.downloadtheme");
         mainContainer.setPadding(new Insets(24));
 
@@ -47,7 +50,7 @@ public ThemeDownloadPane(Window owner) {
 
         loadThemes();
 
-        stage = WindowBuilder.create()
+        WindowBuilder.create()
             .title("railroad.home.settings.appearance.downloadtheme", true)
             .minSize(690, 590)
             .owner(owner)
@@ -82,8 +85,8 @@ private VBox createThemesSection() {
 
         refreshButton = new RRButton();
         refreshButton.setIcon(FontAwesomeSolid.SYNC_ALT);
-        refreshButton.setButtonSize(RRButton.ButtonSize.SMALL);
-        refreshButton.setVariant(RRButton.ButtonVariant.GHOST);
+        refreshButton.setButtonSize(ButtonSize.SMALL);
+        refreshButton.setVariant(ButtonVariant.GHOST);
         refreshButton.setOnAction($ -> loadThemes());
 
         sectionHeader.getChildren().addAll(themesLabel, refreshButton);
@@ -103,8 +106,12 @@ private HBox createFooterSection() {
         footerSection.setPadding(new Insets(16, 0, 0, 0));
 
         var closeButton = new RRButton("railroad.generic.close");
-        closeButton.setVariant(RRButton.ButtonVariant.SECONDARY);
-        closeButton.setOnAction($ -> stage.close());
+        closeButton.setVariant(ButtonVariant.SECONDARY);
+        closeButton.setOnAction(e -> {
+            var target = (Node) e.getTarget();
+            var stage = (Stage) target.sceneProperty().get().getWindow();
+            stage.close();
+        });
 
         footerSection.getChildren().add(closeButton);
         return footerSection;
diff --git a/src/main/java/dev/railroadide/railroad/theme/ui/ThemeExamplePane.java b/src/main/java/dev/railroadide/railroad/theme/ui/ThemeExamplePane.java
index 12329969..8a080c15 100644
--- a/src/main/java/dev/railroadide/railroad/theme/ui/ThemeExamplePane.java
+++ b/src/main/java/dev/railroadide/railroad/theme/ui/ThemeExamplePane.java
@@ -1,16 +1,22 @@
 package dev.railroadide.railroad.theme.ui;
 
 import dev.railroadide.core.ui.*;
+import dev.railroadide.core.ui.localized.LocalizedComboBox;
 import dev.railroadide.core.ui.localized.LocalizedLabel;
+import dev.railroadide.core.ui.localized.LocalizedTableColumn;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import dev.railroadide.railroad.localization.L18n;
 import dev.railroadide.railroad.theme.ThemeManager;
 import dev.railroadide.railroad.window.WindowBuilder;
 import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
+import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.HBox;
@@ -25,9 +31,7 @@
  * A modernized theme preview pane that shows a live UI demonstration.
  * Features various components styled according to the selected theme.
  */
-// TODO: Translate
 public class ThemeExamplePane {
-    private final Stage stage;
     private final String themeName;
 
     public ThemeExamplePane(final String themeName) {
@@ -40,20 +44,23 @@ public ThemeExamplePane(final String themeName) {
         scrollPane.getStyleClass().add("theme-preview-scroll-pane");
 
         var previewScene = new Scene(scrollPane, 900, 700);
-        ThemeManager.applyThemeToScene(themeName, previewScene);
 
-        this.stage = WindowBuilder.create()
+        WindowBuilder builder = WindowBuilder.create()
             .title(L18n.localize("railroad.home.settings.appearance.preview") + " - " + formatThemeName(themeName))
             .scene(previewScene)
             .modality(Modality.APPLICATION_MODAL)
             .resizable(true)
             .minWidth(890)
-            .minHeight(690)
-            .build();
+            .minHeight(690);
+
+        ThemeManager.applyThemeToScene(themeName, previewScene);
+
+        builder.build();
     }
 
     private VBox createPreviewContent() {
-        var mainContainer = new RRVBox(20);
+
+        var mainContainer = new RRFormContainer();
         mainContainer.setPadding(new Insets(24));
         mainContainer.setAlignment(Pos.TOP_LEFT);
         mainContainer.getStyleClass().add("theme-example-main-container");
@@ -98,7 +105,13 @@ private HBox createNavigationSection() {
         navigation.setAlignment(Pos.CENTER_LEFT);
         navigation.setPadding(new Insets(16, 0, 16, 0));
 
-        var navItems = Arrays.asList("Home", "Projects", "Settings", "Help");
+        var navItems = Arrays.asList(
+            "railroad.home.settings.appearance.preview.navigation.0",
+            "railroad.home.settings.appearance.preview.navigation.1",
+            "railroad.home.settings.appearance.preview.navigation.2",
+            "railroad.home.settings.appearance.preview.navigation.3"
+        );
+
         for (String item : navItems) {
             var navButton = new RRButton(item);
             navButton.setOnMouseEntered(e -> navButton.getStyleClass().add("theme-example-nav-button-hover"));
@@ -116,13 +129,12 @@ private VBox createFormSection() {
 
         var textFieldRow = new RRHBox(12);
         textFieldRow.setAlignment(Pos.CENTER_LEFT);
+        textFieldRow.getStyleClass().add("transparent-background");
 
-        var textField = new RRTextField();
-        textField.setPromptText("Enter text here...");
+        var textField = new RRTextField("railroad.home.settings.appearance.preview.form.text_prompt");
         textField.setPrefWidth(200);
 
-        var passwordField = new PasswordField(); // TODO: Create RRPasswordField
-        passwordField.setPromptText("Password");
+        var passwordField = new RRPasswordField("railroad.home.settings.appearance.preview.form.password_prompt");
         passwordField.setPrefWidth(200);
 
         textFieldRow.getChildren().addAll(
@@ -132,21 +144,28 @@ private VBox createFormSection() {
 
         var controlsRow = new RRHBox(12);
         controlsRow.setAlignment(Pos.CENTER_LEFT);
-
-        var comboBox = new ComboBox<>(); // TODO: Use LocalizedComboBox
-        comboBox.getItems().addAll("Option 1", "Option 2", "Option 3");
-        comboBox.setValue("Option 1");
+        controlsRow.getStyleClass().add("transparent-background");
+
+        var comboBox = LocalizedComboBox.fromLocalizationKeys(FXCollections.observableArrayList(
+            "railroad.home.settings.appearance.preview.form.combo_box.items.0",
+            "railroad.home.settings.appearance.preview.form.combo_box.items.1",
+            "railroad.home.settings.appearance.preview.form.combo_box.items.2"
+        ));
+        comboBox.setValue("railroad.home.settings.appearance.preview.form.combo_box.items.0");
         comboBox.setPrefWidth(150);
 
-        var checkBox = new CheckBox("Enable feature"); // TODO: Create RRCheckBox
+        var checkBox = new RRCheckBox("railroad.home.settings.appearance.preview.form.check_box.label");
         checkBox.setSelected(true);
 
-        var radioButton = new RadioButton("Radio option"); // TODO: Create RRRadioButton
+        var toggleButton = new RRToggleButton("railroad.home.settings.appearance.preview.form.toggle_button.label");
+        toggleButton.setSelected(false);
+
+        var radioButton = new RRRadioButton("railroad.home.settings.appearance.preview.form.radio_button.label");
         radioButton.setSelected(true);
 
         controlsRow.getChildren().addAll(
             new LocalizedLabel("railroad.theme.preview.dropdown"), comboBox,
-            checkBox, radioButton
+            toggleButton, checkBox, radioButton
         );
 
         formSection.addContent(textFieldRow, controlsRow);
@@ -159,23 +178,23 @@ private VBox createListSection() {
 
         var listView = new RRListView<>();
         listView.getItems().addAll(
-            "Project 1 - Minecraft Mod",
-            "Project 2 - Fabric Plugin",
-            "Project 3 - Forge Extension",
-            "Project 4 - Neoforge Addon",
-            "Project 5 - Quilt Mod",
-            "Project 6 - Bukkit Plugin",
-            "Project 7 - Spigot Extension",
-            "Project 8 - Paper Addon"
+            L18n.localize("railroad.home.settings.appearance.preview.list.items.0"),
+            L18n.localize("railroad.home.settings.appearance.preview.list.items.1"),
+            L18n.localize("railroad.home.settings.appearance.preview.list.items.2"),
+            L18n.localize("railroad.home.settings.appearance.preview.list.items.3"),
+            L18n.localize("railroad.home.settings.appearance.preview.list.items.4"),
+            L18n.localize("railroad.home.settings.appearance.preview.list.items.5"),
+            L18n.localize("railroad.home.settings.appearance.preview.list.items.6"),
+            L18n.localize("railroad.home.settings.appearance.preview.list.items.7")
         );
         listView.setPrefHeight(250);
         listView.setMinHeight(200);
         listView.getStyleClass().add("theme-example-list-view");
 
-        var table = new TableView<ProjectData>();
-        var nameColumn = new TableColumn<ProjectData, String>("Name");
-        var typeColumn = new TableColumn<ProjectData, String>("Type");
-        var statusColumn = new TableColumn<ProjectData, String>("Status");
+        var table = new RRTableView<ProjectData>();
+        var nameColumn = new LocalizedTableColumn<ProjectData, String>("railroad.home.settings.appearance.preview.table.columns.0");
+        var typeColumn = new LocalizedTableColumn<ProjectData, String>("railroad.home.settings.appearance.preview.table.columns.1");
+        var statusColumn = new LocalizedTableColumn<ProjectData, String>("railroad.home.settings.appearance.preview.table.columns.2");
 
         nameColumn.setCellValueFactory(new PropertyValueFactory<>("name"));
         typeColumn.setCellValueFactory(new PropertyValueFactory<>("type"));
@@ -208,36 +227,38 @@ private VBox createButtonSection() {
 
         var buttonRow1 = new RRHBox(12);
         buttonRow1.setAlignment(Pos.CENTER_LEFT);
+        buttonRow1.getStyleClass().add("transparent-background");
 
-        var primaryButton = new RRButton("Primary Button");
-        primaryButton.setVariant(RRButton.ButtonVariant.PRIMARY);
+        var primaryButton = new RRButton("railroad.home.settings.appearance.preview.button.primary");
+        primaryButton.setVariant(ButtonVariant.PRIMARY);
 
-        var secondaryButton = new RRButton("Secondary Button");
-        secondaryButton.setVariant(RRButton.ButtonVariant.SECONDARY);
+        var secondaryButton = new RRButton("railroad.home.settings.appearance.preview.button.secondary");
+        secondaryButton.setVariant(ButtonVariant.SECONDARY);
 
-        var dangerButton = new RRButton("Danger Button");
-        dangerButton.setVariant(RRButton.ButtonVariant.DANGER);
+        var dangerButton = new RRButton("railroad.home.settings.appearance.preview.button.danger");
+        dangerButton.setVariant(ButtonVariant.DANGER);
 
-        var successButton = new RRButton("Success Button");
-        successButton.setVariant(RRButton.ButtonVariant.SUCCESS);
+        var successButton = new RRButton("railroad.home.settings.appearance.preview.button.success");
+        successButton.setVariant(ButtonVariant.SUCCESS);
 
         buttonRow1.getChildren().addAll(primaryButton, secondaryButton, dangerButton, successButton);
 
         var buttonRow2 = new RRHBox(12);
         buttonRow2.setAlignment(Pos.CENTER_LEFT);
+        buttonRow2.getStyleClass().add("transparent-background");
 
-        var ghostButton = new RRButton("Ghost Button");
-        ghostButton.setVariant(RRButton.ButtonVariant.GHOST);
+        var ghostButton = new RRButton("railroad.home.settings.appearance.preview.button.ghost");
+        ghostButton.setVariant(ButtonVariant.GHOST);
 
-        var smallButton = new RRButton("Small Button");
-        smallButton.setButtonSize(RRButton.ButtonSize.SMALL);
+        var smallButton = new RRButton("railroad.home.settings.appearance.preview.button.small");
+        smallButton.setButtonSize(ButtonSize.SMALL);
 
-        var largeButton = new RRButton("Large Button");
-        largeButton.setButtonSize(RRButton.ButtonSize.LARGE);
+        var largeButton = new RRButton("railroad.home.settings.appearance.preview.button.large");
+        largeButton.setButtonSize(ButtonSize.LARGE);
 
         var iconButton = new RRButton();
         iconButton.setIcon(FontAwesomeSolid.STAR);
-        iconButton.setVariant(RRButton.ButtonVariant.GHOST);
+        iconButton.setVariant(ButtonVariant.GHOST);
 
         buttonRow2.getChildren().addAll(ghostButton, smallButton, largeButton, iconButton);
 
@@ -251,15 +272,24 @@ private HBox createFooterSection() {
         footer.setPadding(new Insets(16, 0, 0, 0));
 
         var closeButton = new RRButton("railroad.home.settings.appearance.preview.close");
-        closeButton.setVariant(RRButton.ButtonVariant.SECONDARY);
-        closeButton.setOnAction(e -> stage.close());
+        closeButton.setVariant(ButtonVariant.SECONDARY);
+        closeButton.setOnAction(e -> {
+            var target = (Node) e.getTarget();
+            var stage = (Stage) target.sceneProperty().get().getWindow();
+            stage.close();
+        });
 
         var applyButton = new RRButton("railroad.home.settings.appearance.preview.apply");
-        applyButton.setVariant(RRButton.ButtonVariant.PRIMARY);
-        applyButton.setOnAction($ -> {
+        applyButton.setVariant(ButtonVariant.PRIMARY);
+        applyButton.setOnAction(e -> {
             // Apply the theme to the main application
             ThemeManager.setTheme(themeName.replace(".css", ""));
+
+            var target = (Node) e.getTarget();
+            var stage = (Stage) target.sceneProperty().get().getWindow();
             stage.close();
+
+            applyButton.sceneProperty();
         });
 
         footer.getChildren().addAll(closeButton, applyButton);
@@ -274,9 +304,20 @@ private String formatThemeName(String themeName) {
             .replace("_", " ");
     }
 
-    public record ProjectData(SimpleStringProperty name, SimpleStringProperty type, SimpleStringProperty status) {
+    public class ProjectData {
+
+        public final StringProperty name = new SimpleStringProperty(this, "name", null);
+        public final StringProperty type = new SimpleStringProperty(this, "type", null);
+        public final StringProperty status = new SimpleStringProperty(this, "status", null);
+
+        public String getName() { return name.get(); }
+        public String getType() { return type.get(); }
+        public String getStatus() { return status.get(); }
+
         public ProjectData(String name, String type, String status) {
-            this(new SimpleStringProperty(name), new SimpleStringProperty(type), new SimpleStringProperty(status));
+            this.name.set(name);
+            this.type.set(type);
+            this.status.set(status);
         }
     }
 }
diff --git a/src/main/java/dev/railroadide/railroad/theme/ui/ThemeSelector.java b/src/main/java/dev/railroadide/railroad/theme/ui/ThemeSelector.java
index 171bc6be..b92b26b0 100644
--- a/src/main/java/dev/railroadide/railroad/theme/ui/ThemeSelector.java
+++ b/src/main/java/dev/railroadide/railroad/theme/ui/ThemeSelector.java
@@ -2,12 +2,14 @@
 
 import dev.railroadide.core.ui.RRButton;
 import dev.railroadide.core.ui.RRFormSection;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import dev.railroadide.railroad.settings.Settings;
 import dev.railroadide.railroad.settings.handler.SettingsHandler;
 import dev.railroadide.railroad.theme.ThemeDownloadManager;
 import dev.railroadide.railroad.theme.ThemeManager;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.geometry.Pos;
 import javafx.scene.control.ComboBox;
 import javafx.scene.layout.HBox;
@@ -23,7 +25,7 @@
  * Features a clean layout with theme preview and easy switching.
  */
 public class ThemeSelector extends VBox {
-    private final ObjectProperty<String> selectedThemeProperty;
+    private final StringProperty selectedThemeProperty;
     private ComboBox<String> themeComboBox;
     private RRButton previewButton;
     private RRButton downloadButton;
@@ -33,7 +35,7 @@ public ThemeSelector() {
     }
 
     public ThemeSelector(String currentTheme) {
-        selectedThemeProperty = new SimpleObjectProperty<>(currentTheme);
+        selectedThemeProperty = new SimpleStringProperty(currentTheme);
 
         setSpacing(16);
         setAlignment(Pos.TOP_LEFT);
@@ -55,8 +57,8 @@ private VBox createContentSection() {
 
         previewButton = new RRButton();
         previewButton.setIcon(FontAwesomeSolid.EYE);
-        previewButton.setButtonSize(RRButton.ButtonSize.SMALL);
-        previewButton.setVariant(RRButton.ButtonVariant.GHOST);
+        previewButton.setButtonSize(ButtonSize.SMALL);
+        previewButton.setVariant(ButtonVariant.GHOST);
         previewButton.setOnAction(e -> previewSelectedTheme());
 
         var selectionRow = new HBox(12);
@@ -67,7 +69,7 @@ private VBox createContentSection() {
 
         downloadButton = new RRButton("railroad.home.settings.appearance.downloadtheme");
         downloadButton.setIcon(FontAwesomeSolid.DOWNLOAD);
-        downloadButton.setVariant(RRButton.ButtonVariant.PRIMARY);
+        downloadButton.setVariant(ButtonVariant.PRIMARY);
         downloadButton.setOnAction(e -> new ThemeDownloadPane(getScene().getWindow()));
 
         section.addContent(downloadButton);
@@ -90,18 +92,23 @@ private void loadAvailableThemes() {
 
         themeComboBox.setValue(selectedThemeProperty.get());
 
+        ThemeManager.getCurrentThemeProperty().addListener((observable, oldValue, newValue) -> {
+            themeComboBox.setValue(newValue);
+        });
+        
         themeComboBox.valueProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue != null && !newValue.equals(oldValue)) {
-                selectedThemeProperty.set(newValue);
-                applyTheme(newValue);
-            }
+            selectedThemeProperty.set(newValue);
+        });
+
+        selectedThemeProperty.addListener((observable, oldValue, newValue) -> {
+            applyTheme(newValue);
         });
     }
 
     private void previewSelectedTheme() {
         String selectedTheme = themeComboBox.getValue();
         if (selectedTheme != null) {
-            new ThemeExamplePane(selectedTheme + ".css");
+            new ThemeExamplePane(selectedTheme);
         }
     }
 
@@ -109,7 +116,7 @@ private void applyTheme(String themeName) {
         ThemeManager.setTheme(themeName);
     }
 
-    public ObjectProperty<String> selectedThemeProperty() {
+    public StringProperty selectedThemeProperty() {
         return selectedThemeProperty;
     }
 
diff --git a/src/main/java/dev/railroadide/railroad/ui/nodes/ProjectListCell.java b/src/main/java/dev/railroadide/railroad/ui/nodes/ProjectListCell.java
index 3863bfca..e7ed1b16 100644
--- a/src/main/java/dev/railroadide/railroad/ui/nodes/ProjectListCell.java
+++ b/src/main/java/dev/railroadide/railroad/ui/nodes/ProjectListCell.java
@@ -1,9 +1,15 @@
 package dev.railroadide.railroad.ui.nodes;
 
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
+
 import dev.railroadide.core.ui.RRButton;
 import dev.railroadide.core.ui.RRCard;
+import dev.railroadide.core.ui.styling.ButtonSize;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import dev.railroadide.railroad.Railroad;
 import dev.railroadide.railroad.project.Project;
+import dev.railroadide.railroad.project.facet.Facet;
 import dev.railroadide.railroad.utility.StringUtils;
 import io.github.palexdev.mfxcore.builders.InsetsBuilder;
 import javafx.geometry.Insets;
@@ -19,8 +25,7 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
-import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
-import org.kordamp.ikonli.javafx.FontIcon;
+import javafx.scene.control.Tooltip;
 
 /**
  * A modern list cell component for displaying project items in project lists.
@@ -31,11 +36,12 @@ public class ProjectListCell extends ListCell<Project> {
     private final RRCard card = new RRCard(14, new Insets(8, 32, 8, 32));
     private final HBox root = new HBox(16);
     private final ImageView icon = new ImageView();
-    private final VBox infoBox = new VBox(7);
+    private final VBox infoBox = new VBox(4);
     private final Label nameLabel = new Label();
     private final Label pathLabel = new Label();
     private final Label lastOpenedLabel = new Label();
     private final RRButton ellipsisButton = new RRButton();
+    private final HBox facetTagsBox = new HBox(5);
 
     /**
      * Constructs a new ProjectListCell with modern styling and context menu functionality.
@@ -60,18 +66,21 @@ public ProjectListCell() {
         icon.setEffect(new DropShadow(8, Color.rgb(0, 0, 0, 0.10)));
 
         infoBox.setAlignment(Pos.CENTER_LEFT);
-        infoBox.setSpacing(7);
         VBox.setVgrow(infoBox, Priority.ALWAYS);
         nameLabel.getStyleClass().add("project-list-name");
+
+        facetTagsBox.getStyleClass().add("project-list-facet-tags");
+        facetTagsBox.setAlignment(Pos.CENTER_LEFT);
+
         pathLabel.getStyleClass().add("project-list-path");
         lastOpenedLabel.getStyleClass().add("project-list-last-opened");
-        infoBox.getChildren().addAll(nameLabel, pathLabel, lastOpenedLabel);
 
+        infoBox.getChildren().addAll(nameLabel, facetTagsBox, pathLabel, lastOpenedLabel);
         var ellipsisIcon = new FontIcon(FontAwesomeSolid.ELLIPSIS_V);
         ellipsisIcon.setIconSize(16);
         ellipsisButton.setGraphic(ellipsisIcon);
-        ellipsisButton.setButtonSize(RRButton.ButtonSize.SMALL);
-        ellipsisButton.setVariant(RRButton.ButtonVariant.GHOST);
+        ellipsisButton.setButtonSize(ButtonSize.SMALL);
+        ellipsisButton.setVariant(ButtonVariant.GHOST);
         ellipsisButton.setPrefWidth(32);
         ellipsisButton.setPrefHeight(32);
         ellipsisButton.getStyleClass().add("project-list-ellipsis-button");
@@ -105,6 +114,10 @@ public ProjectListCell() {
     @Override
     protected void updateItem(Project project, boolean empty) {
         super.updateItem(project, empty);
+
+        // Always clear old tags, as cells are reused
+        facetTagsBox.getChildren().clear(); 
+
         if (empty || project == null) {
             setText(null);
             setGraphic(null);
@@ -114,7 +127,23 @@ protected void updateItem(Project project, boolean empty) {
             nameLabel.setText(project.getAlias());
             pathLabel.setText(project.getPathString());
             lastOpenedLabel.setText(StringUtils.formatElapsed(project.getLastOpened()));
+
+            // Populate Facet Tags
+            for (Facet<?> facet : project.getFacets()) {
+                if (facet != null && facet.getType() != null) {
+                    // Use the FacetType's name for the tag
+                    Label tagLabel = new Label(facet.getType().name()); 
+                    tagLabel.getStyleClass().add("project-list-facet-tag");
+                    tagLabel.getStyleClass().add("facet-" + facet.getType().id());
+                    String description = facet.getType().description();
+                    if (description != null && !description.isBlank()) {
+                        Tooltip.install(tagLabel, new Tooltip(description));
+                    }
+                    facetTagsBox.getChildren().add(tagLabel);
+                }
+            }
             setGraphic(card);
         }
     }
+
 } 
\ No newline at end of file
diff --git a/src/main/java/dev/railroadide/railroad/utility/FileUtils.java b/src/main/java/dev/railroadide/railroad/utility/FileUtils.java
index 1760c91f..8e96a4ad 100644
--- a/src/main/java/dev/railroadide/railroad/utility/FileUtils.java
+++ b/src/main/java/dev/railroadide/railroad/utility/FileUtils.java
@@ -13,7 +13,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.util.Comparator;
+import java.util.*;
 import java.util.List;
 import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
@@ -414,4 +414,35 @@ public static void copyDirectoryContents(Path src, Path dst, CopyOption... optio
             throw new RuntimeException("Failed to copy directory contents", exception);
         }
     }
+
+    /**
+     * Normalizes a collection of paths by converting them to absolute paths and removing duplicates.
+     *
+     * @param paths the collection of paths to normalize
+     * @return a list of normalized paths
+     */
+    public static List<Path> normalizePaths(Collection<Path> paths) {
+        if (paths == null || paths.isEmpty())
+            return Collections.emptyList();
+
+        Set<Path> normalized = new LinkedHashSet<>();
+        for (Path path : paths) {
+            normalized.add(normalizePath(path));
+        }
+
+        return new ArrayList<>(normalized);
+    }
+
+    /**
+     * Normalizes a path by converting it to an absolute path.
+     *
+     * @param path the path to normalize
+     * @return the normalized path
+     */
+    public static Path normalizePath(Path path) {
+        if (path == null)
+            return null;
+
+        return path.toAbsolutePath().normalize();
+    }
 }
diff --git a/src/main/java/dev/railroadide/railroad/utility/MacUtils.java b/src/main/java/dev/railroadide/railroad/utility/MacUtils.java
index 2d0963f1..8e1bedec 100644
--- a/src/main/java/dev/railroadide/railroad/utility/MacUtils.java
+++ b/src/main/java/dev/railroadide/railroad/utility/MacUtils.java
@@ -18,7 +18,7 @@ public class MacUtils {
      * Initializes the Mac's menu bar, which provides the Application Menu and its MenuItems
      */
     public static void initialize() {
-        if (OperatingSystem.CURRENT != OperatingSystem.MAC) return;
+        if (!OperatingSystem.isMac()) return;
 
         var toolkit = MenuToolkit.toolkit();
 
@@ -40,7 +40,7 @@ public static void initialize() {
      * @param stage The stage to which the menu bar should be added
      */
     public static void show(Stage stage) {
-        if (OperatingSystem.CURRENT != OperatingSystem.MAC) return;
+        if (!OperatingSystem.isMac()) return;
 
         MenuToolkit.toolkit().setMenuBar(stage, bar);
     }
diff --git a/src/main/java/dev/railroadide/railroad/utility/StringUtils.java b/src/main/java/dev/railroadide/railroad/utility/StringUtils.java
index 6dd843d2..94f20cb1 100644
--- a/src/main/java/dev/railroadide/railroad/utility/StringUtils.java
+++ b/src/main/java/dev/railroadide/railroad/utility/StringUtils.java
@@ -1,8 +1,11 @@
 package dev.railroadide.railroad.utility;
 
 import io.github.palexdev.mfxcore.utils.ExceptionUtils;
+import org.jetbrains.annotations.Nullable;
 
 import java.time.*;
+import java.util.HashMap;
+import java.util.Map;
 
 public final class StringUtils {
     private StringUtils() {
@@ -110,4 +113,123 @@ public static String exceptionToString(Throwable exception) {
 
         return sb.toString();
     }
+
+    /**
+     * Converts a map of environment variables to a string representation.
+     *
+     * @param envVars The map of environment variables.
+     * @return A string representation of the environment variables.
+     */
+    public static String environmentVariablesToString(@Nullable Map<String, String> envVars) {
+        if (envVars == null || envVars.isEmpty())
+            return "";
+
+        var stringBuilder = new StringBuilder();
+        for (Map.Entry<String, String> entry : envVars.entrySet()) {
+            stringBuilder.append(entry.getKey()).append("=").append(entry.getValue()).append(";");
+        }
+
+        return stringBuilder.toString();
+    }
+
+    /**
+     * Validates if a given string is a valid representation of environment variables.
+     * The expected format is "KEY1=VALUE1;KEY2=VALUE2;...".
+     *
+     * @param text The string to validate.
+     * @return True if the string is valid, false otherwise.
+     */
+    public static boolean isValidEnvironmentVariablesString(@Nullable String text) {
+        if (text == null)
+            return false;
+
+        if (text.isBlank())
+            return true;
+
+        String[] pairs = text.split(";");
+        for (String pair : pairs) {
+            if (pair.isBlank())
+                continue;
+
+            // TODO: Handle cases where the value might contain '='
+            String[] keyValue = pair.split("=", 2);
+            if (keyValue.length != 2 || keyValue[0].isBlank())
+                return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Converts an array of strings into a single string, with each element separated by the specified delimiter.
+     *
+     * @param vmOptions The array of strings to convert.
+     * @param delimiter The delimiter to use between elements.
+     * @return A single string with elements separated by the delimiter.
+     */
+    public static String stringArrayToString(String[] vmOptions, String delimiter) {
+        if (vmOptions == null || vmOptions.length == 0)
+            return "";
+
+        return String.join(delimiter, vmOptions);
+    }
+
+    /**
+     * Converts a string representation of environment variables into a map.
+     * The expected format is "KEY1=VALUE1;KEY2=VALUE2;...".
+     *
+     * @param environmentVariables The string representation of environment variables.
+     * @return A map of environment variables.
+     */
+    public static Map<String, String> stringToEnvironmentVariables(String environmentVariables) {
+        Map<String, String> envVars = new HashMap<>();
+        if (environmentVariables == null || environmentVariables.isBlank())
+            return envVars;
+
+        String[] pairs = environmentVariables.split(";");
+        for (String pair : pairs) {
+            if (pair.isBlank())
+                continue;
+
+            // TODO: Handle cases where the value might contain '='
+            String[] keyValue = pair.split("=", 2);
+            if (keyValue.length == 2) {
+                envVars.put(keyValue[0], keyValue[1]);
+            }
+        }
+
+        return envVars;
+    }
+
+    /**
+     * Splits a string into an array of strings based on the specified delimiter.
+     *
+     * @param str       The string to split.
+     * @param delimiter The delimiter to use for splitting.
+     * @return An array of strings obtained by splitting the input string.
+     */
+    public static String[] stringToStringArray(String str, String delimiter) {
+        if (str == null || str.isBlank())
+            return new String[0];
+
+        return str.split(delimiter);
+    }
+
+    public static String capitalizeFirstLetterOfEachWord(String input) {
+        String[] words = input.split(" ");
+        var capitalized = new StringBuilder();
+        for (int i = 0; i < words.length; i++) {
+            String word = words[i];
+            if (!word.isEmpty()) {
+                capitalized.append(Character.toUpperCase(word.charAt(0)))
+                    .append(word.substring(1).toLowerCase());
+
+                if (i < words.length - 1) {
+                    capitalized.append(" ");
+                }
+            }
+        }
+
+        return capitalized.toString().trim();
+    }
 }
diff --git a/src/main/java/dev/railroadide/railroad/utility/function/ThrowingSupplier.java b/src/main/java/dev/railroadide/railroad/utility/function/ThrowingSupplier.java
new file mode 100644
index 00000000..fd29fe1b
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/utility/function/ThrowingSupplier.java
@@ -0,0 +1,11 @@
+package dev.railroadide.railroad.utility.function;
+
+/**
+ * Represents a supplier of results that can throw checked exceptions.
+ *
+ * @param <T> the type of results supplied by this supplier
+ */
+@FunctionalInterface
+public interface ThrowingSupplier<T> {
+    T get() throws Exception;
+}
diff --git a/src/main/java/dev/railroadide/railroad/utility/icon/RailroadBrandsIcon.java b/src/main/java/dev/railroadide/railroad/utility/icon/RailroadBrandsIcon.java
new file mode 100644
index 00000000..a6f458cb
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/utility/icon/RailroadBrandsIcon.java
@@ -0,0 +1,967 @@
+package dev.railroadide.railroad.utility.icon;
+
+import org.kordamp.ikonli.Ikon;
+
+public enum RailroadBrandsIcon implements Ikon {
+    ONE_PASSWORD("rrb-1password", 0xE900),
+    FIVE_HUNDRED_PX("rrb-500px", 0xE901),
+    ABBROBOTSTUDIO("rrb-abbrobotstudio", 0xE902),
+    ABOUT_DOT_ME("rrb-about-dot-me", 0xE903),
+    ABSTRACT("rrb-abstract", 0xE904),
+    ACADEMIA("rrb-academia", 0xE905),
+    ACCUSOFT("rrb-accusoft", 0xE906),
+    ACM("rrb-acm", 0xE907),
+    ADDTHIS("rrb-addthis", 0xE908),
+    ADGUARD("rrb-adguard", 0xE909),
+    ADOBE("rrb-adobe", 0xE90A),
+    ADOBEACROBATREADER("rrb-adobeacrobatreader", 0xE90B),
+    ADOBEAFTEREFFECTS("rrb-adobeaftereffects", 0xE90C),
+    ADOBEAUDITION("rrb-adobeaudition", 0xE90D),
+    ADOBECREATIVECLOUD("rrb-adobecreativecloud", 0xE90E),
+    ADOBEDREAMWEAVER("rrb-adobedreamweaver", 0xE90F),
+    ADOBEILLUSTRATOR("rrb-adobeillustrator", 0xE910),
+    ADOBEINDESIGN("rrb-adobeindesign", 0xE911),
+    ADOBELIGHTROOMCC("rrb-adobelightroomcc", 0xE912),
+    ADOBELIGHTROOMCLASSIC("rrb-adobelightroomclassic", 0xE913),
+    ADOBEPHOTOSHOP("rrb-adobephotoshop", 0xE914),
+    ADOBEPREMIERE("rrb-adobepremiere", 0xE915),
+    ADOBETYPEKIT("rrb-adobetypekit", 0xE916),
+    ADOBEXD("rrb-adobexd", 0xE917),
+    AIRBNB("rrb-airbnb", 0xE918),
+    AIRPLAYAUDIO("rrb-airplayaudio", 0xE919),
+    AIRPLAYVIDEO("rrb-airplayvideo", 0xE91A),
+    ALGOLIA("rrb-algolia", 0xE91B),
+    ALLIEDMODDERS("rrb-alliedmodders", 0xE91C),
+    AMAZON("rrb-amazon", 0xE91D),
+    AMAZONALEXA("rrb-amazonalexa", 0xE91E),
+    AMAZONAWS("rrb-amazonaws", 0xE91F),
+    AMD("rrb-amd", 0xE920),
+    AMERICANEXPRESS("rrb-americanexpress", 0xE921),
+    ANACONDA("rrb-anaconda", 0xE922),
+    ANALOGUE("rrb-analogue", 0xE923),
+    ANCHOR("rrb-anchor", 0xE924),
+    ANDROID("rrb-android", 0xE925),
+    ANGELLIST("rrb-angellist", 0xE926),
+    ANGULAR("rrb-angular", 0xE927),
+    ANGULARUNIVERSAL("rrb-angularuniversal", 0xE928),
+    ANSIBLE("rrb-ansible", 0xE929),
+    APACHE("rrb-apache", 0xE92A),
+    APACHEAIRFLOW("rrb-apacheairflow", 0xE92B),
+    APACHECORDOVA("rrb-apachecordova", 0xE92C),
+    APACHEFLINK("rrb-apacheflink", 0xE92D),
+    APACHEKAFKA("rrb-apachekafka", 0xE92E),
+    APACHENETBEANSIDE("rrb-apachenetbeanside", 0xE92F),
+    APACHEOPENOFFICE("rrb-apacheopenoffice", 0xE930),
+    APACHEROCKETMQ("rrb-apacherocketmq", 0xE931),
+    APACHESPARK("rrb-apachespark", 0xE932),
+    APPLE("rrb-apple", 0xE933),
+    APPLEMUSIC("rrb-applemusic", 0xE934),
+    APPLEPAY("rrb-applepay", 0xE935),
+    APPLEPODCASTS("rrb-applepodcasts", 0xE936),
+    APPVEYOR("rrb-appveyor", 0xE937),
+    ARAL("rrb-aral", 0xE938),
+    ARCHIVEOFOUROWN("rrb-archiveofourown", 0xE939),
+    ARCHLINUX("rrb-archlinux", 0xE93A),
+    ARDUINO("rrb-arduino", 0xE93B),
+    ARTSTATION("rrb-artstation", 0xE93C),
+    ARXIV("rrb-arxiv", 0xE93D),
+    ASANA("rrb-asana", 0xE93E),
+    ASCIIDOCTOR("rrb-asciidoctor", 0xE93F),
+    AT_AND_T("rrb-at-and-t", 0xE940),
+    ATLASSIAN("rrb-atlassian", 0xE941),
+    ATOM("rrb-atom", 0xE942),
+    AUDI("rrb-audi", 0xE943),
+    AUDIBLE("rrb-audible", 0xE944),
+    AURELIA("rrb-aurelia", 0xE945),
+    AUTH0("rrb-auth0", 0xE946),
+    AUTOMATIC("rrb-automatic", 0xE947),
+    AUTOTASK("rrb-autotask", 0xE948),
+    AVENTRIX("rrb-aventrix", 0xE949),
+    AWESOMEWM("rrb-awesomewm", 0xE94A),
+    AZUREARTIFACTS("rrb-azureartifacts", 0xE94B),
+    AZUREDEVOPS("rrb-azuredevops", 0xE94C),
+    AZUREPIPELINES("rrb-azurepipelines", 0xE94D),
+    BABEL("rrb-babel", 0xE94E),
+    BAIDU("rrb-baidu", 0xE94F),
+    BAMBOO("rrb-bamboo", 0xE950),
+    BANCONTACT("rrb-bancontact", 0xE951),
+    BANDCAMP("rrb-bandcamp", 0xE952),
+    BANDLAB("rrb-bandlab", 0xE953),
+    BASECAMP("rrb-basecamp", 0xE954),
+    BATHASU("rrb-bathasu", 0xE955),
+    BEATS("rrb-beats", 0xE956),
+    BEATSBYDRE("rrb-beatsbydre", 0xE957),
+    BEHANCE("rrb-behance", 0xE958),
+    BIGCARTEL("rrb-bigcartel", 0xE959),
+    BING("rrb-bing", 0xE95A),
+    BIT("rrb-bit", 0xE95B),
+    BITBUCKET("rrb-bitbucket", 0xE95C),
+    BITCOIN("rrb-bitcoin", 0xE95D),
+    BITDEFENDER("rrb-bitdefender", 0xE95E),
+    BITLY("rrb-bitly", 0xE95F),
+    BITRISE("rrb-bitrise", 0xE960),
+    BLACKBERRY("rrb-blackberry", 0xE961),
+    BLENDER("rrb-blender", 0xE962),
+    BLOGGER("rrb-blogger", 0xE963),
+    BMCSOFTWARE("rrb-bmcsoftware", 0xE964),
+    BOEING("rrb-boeing", 0xE965),
+    BOOST("rrb-boost", 0xE966),
+    BOOTSTRAP("rrb-bootstrap", 0xE967),
+    BOWER("rrb-bower", 0xE968),
+    BOX("rrb-box", 0xE969),
+    BRAND_DOT_AI("rrb-brand-dot-ai", 0xE96A),
+    BRANDFOLDER("rrb-brandfolder", 0xE96B),
+    BRAVE("rrb-brave", 0xE96C),
+    BREAKER("rrb-breaker", 0xE96D),
+    BROADCOM("rrb-broadcom", 0xE96E),
+    BUDDY("rrb-buddy", 0xE96F),
+    BUFFER("rrb-buffer", 0xE970),
+    BUYMEACOFFEE("rrb-buymeacoffee", 0xE971),
+    BUZZFEED("rrb-buzzfeed", 0xE972),
+    C("rrb-c", 0xE973),
+    CAKEPHP("rrb-cakephp", 0xE974),
+    CAMPAIGNMONITOR("rrb-campaignmonitor", 0xE975),
+    CANVA("rrb-canva", 0xE976),
+    CASHAPP("rrb-cashapp", 0xE977),
+    CASSANDRA("rrb-cassandra", 0xE978),
+    CASTORAMA("rrb-castorama", 0xE979),
+    CASTRO("rrb-castro", 0xE97A),
+    CENTOS("rrb-centos", 0xE97B),
+    CEVO("rrb-cevo", 0xE97C),
+    CHASE("rrb-chase", 0xE97D),
+    CHEF("rrb-chef", 0xE97E),
+    CIRCLE("rrb-circle", 0xE97F),
+    CIRCLECI("rrb-circleci", 0xE980),
+    CIRRUSCI("rrb-cirrusci", 0xE981),
+    CISCO("rrb-cisco", 0xE982),
+    CIVICRM("rrb-civicrm", 0xE983),
+    CLOCKIFY("rrb-clockify", 0xE984),
+    CLOJURE("rrb-clojure", 0xE985),
+    CLOUDBEES("rrb-cloudbees", 0xE986),
+    CLOUDFLARE("rrb-cloudflare", 0xE987),
+    CMAKE("rrb-cmake", 0xE988),
+    CO_OP("rrb-co-op", 0xE989),
+    CODACY("rrb-codacy", 0xE98A),
+    CODECADEMY("rrb-codecademy", 0xE98B),
+    CODECHEF("rrb-codechef", 0xE98C),
+    CODECLIMATE("rrb-codeclimate", 0xE98D),
+    CODECOV("rrb-codecov", 0xE98E),
+    CODEFACTOR("rrb-codefactor", 0xE98F),
+    CODEFORCES("rrb-codeforces", 0xE990),
+    CODEIGNITER("rrb-codeigniter", 0xE991),
+    CODEPEN("rrb-codepen", 0xE992),
+    CODERWALL("rrb-coderwall", 0xE993),
+    CODESANDBOX("rrb-codesandbox", 0xE994),
+    CODESHIP("rrb-codeship", 0xE995),
+    CODEWARS("rrb-codewars", 0xE996),
+    CODIO("rrb-codio", 0xE997),
+    COFFEESCRIPT("rrb-coffeescript", 0xE998),
+    COINBASE("rrb-coinbase", 0xE999),
+    COMMONWORKFLOWLANGUAGE("rrb-commonworkflowlanguage", 0xE99A),
+    COMPOSER("rrb-composer", 0xE99B),
+    COMPROPAGO("rrb-compropago", 0xE99C),
+    CONDA_FORGE("rrb-conda-forge", 0xE99D),
+    CONEKTA("rrb-conekta", 0xE99E),
+    CONFLUENCE("rrb-confluence", 0xE99F),
+    CORONARENDERER("rrb-coronarenderer", 0xE9A0),
+    COURSERA("rrb-coursera", 0xE9A1),
+    COVERALLS("rrb-coveralls", 0xE9A2),
+    CPANEL("rrb-cpanel", 0xE9A3),
+    CPLUSPLUS("rrb-cplusplus", 0xE9A4),
+    CREATIVECOMMONS("rrb-creativecommons", 0xE9A5),
+    CREHANA("rrb-crehana", 0xE9A6),
+    CRUNCHBASE("rrb-crunchbase", 0xE9A7),
+    CRUNCHYROLL("rrb-crunchyroll", 0xE9A8),
+    CRYENGINE("rrb-cryengine", 0xE9A9),
+    CSHARP("rrb-csharp", 0xE9AA),
+    CSS3("rrb-css3", 0xE9AB),
+    CSSWIZARDRY("rrb-csswizardry", 0xE9AC),
+    CURL("rrb-curl", 0xE9AD),
+    D3_DOT_JS("rrb-d3-dot-js", 0xE9AE),
+    DAILYMOTION("rrb-dailymotion", 0xE9AF),
+    DART("rrb-dart", 0xE9B0),
+    DASHLANE("rrb-dashlane", 0xE9B1),
+    DATACAMP("rrb-datacamp", 0xE9B2),
+    DAZN("rrb-dazn", 0xE9B3),
+    DBLP("rrb-dblp", 0xE9B4),
+    DEBIAN("rrb-debian", 0xE9B5),
+    DEEPIN("rrb-deepin", 0xE9B6),
+    DEEZER("rrb-deezer", 0xE9B7),
+    DELICIOUS("rrb-delicious", 0xE9B8),
+    DELIVEROO("rrb-deliveroo", 0xE9B9),
+    DELL("rrb-dell", 0xE9BA),
+    DENO("rrb-deno", 0xE9BB),
+    DEPENDABOT("rrb-dependabot", 0xE9BC),
+    DESIGNERNEWS("rrb-designernews", 0xE9BD),
+    DEV_DOT_TO("rrb-dev-dot-to", 0xE9BE),
+    DEVIANTART("rrb-deviantart", 0xE9BF),
+    DEVRANT("rrb-devrant", 0xE9C0),
+    DIASPORA("rrb-diaspora", 0xE9C1),
+    DIGG("rrb-digg", 0xE9C2),
+    DIGITALOCEAN("rrb-digitalocean", 0xE9C3),
+    DIRECTUS("rrb-directus", 0xE9C4),
+    DISCORD("rrb-discord", 0xE9C5),
+    DISCOURSE("rrb-discourse", 0xE9C6),
+    DISCOVER("rrb-discover", 0xE9C7),
+    DISQUS("rrb-disqus", 0xE9C8),
+    DISROOT("rrb-disroot", 0xE9C9),
+    DJANGO("rrb-django", 0xE9CA),
+    DLNA("rrb-dlna", 0xE9CB),
+    DOCKER("rrb-docker", 0xE9CC),
+    DOCUSIGN("rrb-docusign", 0xE9CD),
+    DOLBY("rrb-dolby", 0xE9CE),
+    DOT_NET("rrb-dot-net", 0xE9CF),
+    DRAUGIEM_DOT_LV("rrb-draugiem-dot-lv", 0xE9D0),
+    DRIBBBLE("rrb-dribbble", 0xE9D1),
+    DRONE("rrb-drone", 0xE9D2),
+    DROPBOX("rrb-dropbox", 0xE9D3),
+    DRUPAL("rrb-drupal", 0xE9D4),
+    DTUBE("rrb-dtube", 0xE9D5),
+    DUCKDUCKGO("rrb-duckduckgo", 0xE9D6),
+    DUNKED("rrb-dunked", 0xE9D7),
+    DUOLINGO("rrb-duolingo", 0xE9D8),
+    DYNATRACE("rrb-dynatrace", 0xE9D9),
+    EBAY("rrb-ebay", 0xE9DA),
+    ECLIPSEIDE("rrb-eclipseide", 0xE9DB),
+    ELASTIC("rrb-elastic", 0xE9DC),
+    ELASTICCLOUD("rrb-elasticcloud", 0xE9DD),
+    ELASTICSEARCH("rrb-elasticsearch", 0xE9DE),
+    ELASTICSTACK("rrb-elasticstack", 0xE9DF),
+    ELECTRON("rrb-electron", 0xE9E0),
+    ELEMENTARY("rrb-elementary", 0xE9E1),
+    ELEVENTY("rrb-eleventy", 0xE9E2),
+    ELLO("rrb-ello", 0xE9E3),
+    ELSEVIER("rrb-elsevier", 0xE9E4),
+    EMBER_DOT_JS("rrb-ember-dot-js", 0xE9E5),
+    EMLAKJET("rrb-emlakjet", 0xE9E6),
+    EMPIREKRED("rrb-empirekred", 0xE9E7),
+    ENVATO("rrb-envato", 0xE9E8),
+    EPEL("rrb-epel", 0xE9E9),
+    EPICGAMES("rrb-epicgames", 0xE9EA),
+    EPSON("rrb-epson", 0xE9EB),
+    ESEA("rrb-esea", 0xE9EC),
+    ESLINT("rrb-eslint", 0xE9ED),
+    ETHEREUM("rrb-ethereum", 0xE9EE),
+    ETSY("rrb-etsy", 0xE9EF),
+    EVENTBRITE("rrb-eventbrite", 0xE9F0),
+    EVENTSTORE("rrb-eventstore", 0xE9F1),
+    EVERNOTE("rrb-evernote", 0xE9F2),
+    EVERPLACES("rrb-everplaces", 0xE9F3),
+    EVRY("rrb-evry", 0xE9F4),
+    EXERCISM("rrb-exercism", 0xE9F5),
+    EXPERTSEXCHANGE("rrb-expertsexchange", 0xE9F6),
+    EXPO("rrb-expo", 0xE9F7),
+    EYEEM("rrb-eyeem", 0xE9F8),
+    F_DROID("rrb-f-droid", 0xE9F9),
+    F_SECURE("rrb-f-secure", 0xE9FA),
+    FACEBOOK("rrb-facebook", 0xE9FB),
+    FACEIT("rrb-faceit", 0xE9FC),
+    FANDANGO("rrb-fandango", 0xE9FD),
+    FAVRO("rrb-favro", 0xE9FE),
+    FEATHUB("rrb-feathub", 0xE9FF),
+    FEDORA("rrb-fedora", 0xEA00),
+    FEEDLY("rrb-feedly", 0xEA01),
+    FIDOALLIANCE("rrb-fidoalliance", 0xEA02),
+    FIGMA("rrb-figma", 0xEA03),
+    FILEZILLA("rrb-filezilla", 0xEA04),
+    FIREBASE("rrb-firebase", 0xEA05),
+    FITBIT("rrb-fitbit", 0xEA06),
+    FIVERR("rrb-fiverr", 0xEA07),
+    FLASK("rrb-flask", 0xEA08),
+    FLATTR("rrb-flattr", 0xEA09),
+    FLICKR("rrb-flickr", 0xEA0A),
+    FLIPBOARD("rrb-flipboard", 0xEA0B),
+    FLOATPLANE("rrb-floatplane", 0xEA0C),
+    FLUTTER("rrb-flutter", 0xEA0D),
+    FNAC("rrb-fnac", 0xEA0E),
+    FORMSTACK("rrb-formstack", 0xEA0F),
+    FOSSA("rrb-fossa", 0xEA10),
+    FOSSILSCM("rrb-fossilscm", 0xEA11),
+    FOURSQUARE("rrb-foursquare", 0xEA12),
+    FRAMER("rrb-framer", 0xEA13),
+    FREEBSD("rrb-freebsd", 0xEA14),
+    FREECODECAMP("rrb-freecodecamp", 0xEA15),
+    FUJIFILM("rrb-fujifilm", 0xEA16),
+    FUJITSU("rrb-fujitsu", 0xEA17),
+    FURAFFINITY("rrb-furaffinity", 0xEA18),
+    FURRYNETWORK("rrb-furrynetwork", 0xEA19),
+    GARMIN("rrb-garmin", 0xEA1A),
+    GATSBY("rrb-gatsby", 0xEA1B),
+    GAUGES("rrb-gauges", 0xEA1C),
+    GENIUS("rrb-genius", 0xEA1D),
+    GENTOO("rrb-gentoo", 0xEA1E),
+    GEOCACHING("rrb-geocaching", 0xEA1F),
+    GERRIT("rrb-gerrit", 0xEA20),
+    GHOST("rrb-ghost", 0xEA21),
+    GIMP("rrb-gimp", 0xEA22),
+    GIT("rrb-git", 0xEA23),
+    GITEA("rrb-gitea", 0xEA24),
+    GITHUB("rrb-github", 0xEA25),
+    GITLAB("rrb-gitlab", 0xEA26),
+    GITPOD("rrb-gitpod", 0xEA27),
+    GITTER("rrb-gitter", 0xEA28),
+    GLASSDOOR("rrb-glassdoor", 0xEA29),
+    GLITCH("rrb-glitch", 0xEA2A),
+    GMAIL("rrb-gmail", 0xEA2B),
+    GNOME("rrb-gnome", 0xEA2C),
+    GNU("rrb-gnu", 0xEA2D),
+    GNUICECAT("rrb-gnuicecat", 0xEA2E),
+    GNUPRIVACYGUARD("rrb-gnuprivacyguard", 0xEA2F),
+    GNUSOCIAL("rrb-gnusocial", 0xEA30),
+    GO("rrb-go", 0xEA31),
+    GODOTENGINE("rrb-godotengine", 0xEA32),
+    GOG_DOT_COM("rrb-gog-dot-com", 0xEA33),
+    GOLDENLINE("rrb-goldenline", 0xEA34),
+    GOODREADS("rrb-goodreads", 0xEA35),
+    GOOGLE("rrb-google", 0xEA36),
+    GOOGLEADS("rrb-googleads", 0xEA37),
+    GOOGLEANALYTICS("rrb-googleanalytics", 0xEA38),
+    GOOGLECHROME("rrb-googlechrome", 0xEA39),
+    GOOGLECLOUD("rrb-googlecloud", 0xEA3A),
+    GOOGLEDRIVE("rrb-googledrive", 0xEA3B),
+    GOOGLEHANGOUTS("rrb-googlehangouts", 0xEA3C),
+    GOOGLEHANGOUTSCHAT("rrb-googlehangoutschat", 0xEA3D),
+    GOOGLEKEEP("rrb-googlekeep", 0xEA3E),
+    GOOGLEPAY("rrb-googlepay", 0xEA3F),
+    GOOGLEPLAY("rrb-googleplay", 0xEA40),
+    GOOGLEPODCASTS("rrb-googlepodcasts", 0xEA41),
+    GOOGLESCHOLAR("rrb-googlescholar", 0xEA42),
+    GOOGLESEARCHCONSOLE("rrb-googlesearchconsole", 0xEA43),
+    GOV_DOT_UK("rrb-gov-dot-uk", 0xEA44),
+    GRADLE("rrb-gradle", 0xEA45),
+    GRAFANA("rrb-grafana", 0xEA46),
+    GRAPHCOOL("rrb-graphcool", 0xEA47),
+    GRAPHQL("rrb-graphql", 0xEA48),
+    GRAV("rrb-grav", 0xEA49),
+    GRAVATAR("rrb-gravatar", 0xEA4A),
+    GREENKEEPER("rrb-greenkeeper", 0xEA4B),
+    GREENSOCK("rrb-greensock", 0xEA4C),
+    GROOVY("rrb-groovy", 0xEA4D),
+    GROUPON("rrb-groupon", 0xEA4E),
+    GULP("rrb-gulp", 0xEA4F),
+    GUMROAD("rrb-gumroad", 0xEA50),
+    GUMTREE("rrb-gumtree", 0xEA51),
+    GUTENBERG("rrb-gutenberg", 0xEA52),
+    HABR("rrb-habr", 0xEA53),
+    HACKADAY("rrb-hackaday", 0xEA54),
+    HACKEREARTH("rrb-hackerearth", 0xEA55),
+    HACKERONE("rrb-hackerone", 0xEA56),
+    HACKERRANK("rrb-hackerrank", 0xEA57),
+    HACKHANDS("rrb-hackhands", 0xEA58),
+    HACKSTER("rrb-hackster", 0xEA59),
+    HAPPYCOW("rrb-happycow", 0xEA5A),
+    HASHNODE("rrb-hashnode", 0xEA5B),
+    HASKELL("rrb-haskell", 0xEA5C),
+    HATENABOOKMARK("rrb-hatenabookmark", 0xEA5D),
+    HAXE("rrb-haxe", 0xEA5E),
+    HELM("rrb-helm", 0xEA5F),
+    HERE("rrb-here", 0xEA60),
+    HEROKU("rrb-heroku", 0xEA61),
+    HEXO("rrb-hexo", 0xEA62),
+    HIGHLY("rrb-highly", 0xEA63),
+    HIPCHAT("rrb-hipchat", 0xEA64),
+    HITACHI("rrb-hitachi", 0xEA65),
+    HOCKEYAPP("rrb-hockeyapp", 0xEA66),
+    HOMEASSISTANT("rrb-homeassistant", 0xEA67),
+    HOMIFY("rrb-homify", 0xEA68),
+    HOOTSUITE("rrb-hootsuite", 0xEA69),
+    HOUZZ("rrb-houzz", 0xEA6A),
+    HP("rrb-hp", 0xEA6B),
+    HTML5("rrb-html5", 0xEA6C),
+    HTMLACADEMY("rrb-htmlacademy", 0xEA6D),
+    HUAWEI("rrb-huawei", 0xEA6E),
+    HUBSPOT("rrb-hubspot", 0xEA6F),
+    HULU("rrb-hulu", 0xEA70),
+    HUMBLEBUNDLE("rrb-humblebundle", 0xEA71),
+    HURRIYETEMLAK("rrb-hurriyetemlak", 0xEA72),
+    HYPOTHESIS("rrb-hypothesis", 0xEA73),
+    IATA("rrb-iata", 0xEA74),
+    IBM("rrb-ibm", 0xEA75),
+    ICLOUD("rrb-icloud", 0xEA76),
+    ICOMOON("rrb-icomoon", 0xEA77),
+    ICON("rrb-icon", 0xEA78),
+    ICONJAR("rrb-iconjar", 0xEA79),
+    ICQ("rrb-icq", 0xEA7A),
+    IDEAL("rrb-ideal", 0xEA7B),
+    IFIXIT("rrb-ifixit", 0xEA7C),
+    IMDB("rrb-imdb", 0xEA7D),
+    IMGUR("rrb-imgur", 0xEA7E),
+    INDEED("rrb-indeed", 0xEA7F),
+    INFLUXDB("rrb-influxdb", 0xEA80),
+    INKSCAPE("rrb-inkscape", 0xEA81),
+    INSTACART("rrb-instacart", 0xEA82),
+    INSTAGRAM("rrb-instagram", 0xEA83),
+    INSTAPAPER("rrb-instapaper", 0xEA84),
+    INTEL("rrb-intel", 0xEA85),
+    INTELLIJIDEA("rrb-intellijidea", 0xEA86),
+    INTERCOM("rrb-intercom", 0xEA87),
+    INTERNETARCHIVE("rrb-internetarchive", 0xEA88),
+    INTERNETEXPLORER("rrb-internetexplorer", 0xEA89),
+    INVISION("rrb-invision", 0xEA8A),
+    INVOICENINJA("rrb-invoiceninja", 0xEA8B),
+    IONIC("rrb-ionic", 0xEA8C),
+    IOS("rrb-ios", 0xEA8D),
+    IPFS("rrb-ipfs", 0xEA8E),
+    ISSUU("rrb-issuu", 0xEA8F),
+    ITCH_DOT_IO("rrb-itch-dot-io", 0xEA90),
+    ITUNES("rrb-itunes", 0xEA91),
+    JABBER("rrb-jabber", 0xEA92),
+    JAVA("rrb-java", 0xEA93),
+    JAVASCRIPT("rrb-javascript", 0xEA94),
+    JEKYLL("rrb-jekyll", 0xEA95),
+    JENKINS("rrb-jenkins", 0xEA96),
+    JEST("rrb-jest", 0xEA97),
+    JET("rrb-jet", 0xEA98),
+    JETBRAINS("rrb-jetbrains", 0xEA99),
+    JINJA("rrb-jinja", 0xEA9A),
+    JIRA("rrb-jira", 0xEA9B),
+    JOOMLA("rrb-joomla", 0xEA9C),
+    JQUERY("rrb-jquery", 0xEA9D),
+    JSDELIVR("rrb-jsdelivr", 0xEA9E),
+    JSFIDDLE("rrb-jsfiddle", 0xEA9F),
+    JSON("rrb-json", 0xEAA0),
+    JUPYTER("rrb-jupyter", 0xEAA1),
+    JUSTGIVING("rrb-justgiving", 0xEAA2),
+    KAGGLE("rrb-kaggle", 0xEAA3),
+    KAIOS("rrb-kaios", 0xEAA4),
+    KASPERSKY("rrb-kaspersky", 0xEAA5),
+    KENTICO("rrb-kentico", 0xEAA6),
+    KERAS("rrb-keras", 0xEAA7),
+    KEYBASE("rrb-keybase", 0xEAA8),
+    KEYCDN("rrb-keycdn", 0xEAA9),
+    KHANACADEMY("rrb-khanacademy", 0xEAAA),
+    KIBANA("rrb-kibana", 0xEAAB),
+    KICKSTARTER("rrb-kickstarter", 0xEAAC),
+    KIK("rrb-kik", 0xEAAD),
+    KIRBY("rrb-kirby", 0xEAAE),
+    KLOUT("rrb-klout", 0xEAAF),
+    KNOWN("rrb-known", 0xEAB0),
+    KO_FI("rrb-ko-fi", 0xEAB1),
+    KODI("rrb-kodi", 0xEAB2),
+    KODING("rrb-koding", 0xEAB3),
+    KOTLIN("rrb-kotlin", 0xEAB4),
+    KRITA("rrb-krita", 0xEAB5),
+    KUBERNETES("rrb-kubernetes", 0xEAB6),
+    LARAVEL("rrb-laravel", 0xEAB7),
+    LARAVELHORIZON("rrb-laravelhorizon", 0xEAB8),
+    LARAVELNOVA("rrb-laravelnova", 0xEAB9),
+    LAST_DOT_FM("rrb-last-dot-fm", 0xEABA),
+    LASTPASS("rrb-lastpass", 0xEABB),
+    LATEX("rrb-latex", 0xEABC),
+    LAUNCHPAD("rrb-launchpad", 0xEABD),
+    LEETCODE("rrb-leetcode", 0xEABE),
+    LENOVO("rrb-lenovo", 0xEABF),
+    LETSENCRYPT("rrb-letsencrypt", 0xEAC0),
+    LETTERBOXD("rrb-letterboxd", 0xEAC1),
+    LGTM("rrb-lgtm", 0xEAC2),
+    LIBERAPAY("rrb-liberapay", 0xEAC3),
+    LIBRARYTHING("rrb-librarything", 0xEAC4),
+    LIBREOFFICE("rrb-libreoffice", 0xEAC5),
+    LINE("rrb-line", 0xEAC6),
+    LINEWEBTOON("rrb-linewebtoon", 0xEAC7),
+    LINKEDIN("rrb-linkedin", 0xEAC8),
+    LINODE("rrb-linode", 0xEAC9),
+    LINUX("rrb-linux", 0xEACA),
+    LINUXFOUNDATION("rrb-linuxfoundation", 0xEACB),
+    LINUXMINT("rrb-linuxmint", 0xEACC),
+    LIVEJOURNAL("rrb-livejournal", 0xEACD),
+    LIVESTREAM("rrb-livestream", 0xEACE),
+    LLVM("rrb-llvm", 0xEACF),
+    LOGSTASH("rrb-logstash", 0xEAD0),
+    LOOP("rrb-loop", 0xEAD1),
+    LUA("rrb-lua", 0xEAD2),
+    LUFTHANSA("rrb-lufthansa", 0xEAD3),
+    LUMEN("rrb-lumen", 0xEAD4),
+    LYFT("rrb-lyft", 0xEAD5),
+    MACYS("rrb-macys", 0xEAD6),
+    MAGENTO("rrb-magento", 0xEAD7),
+    MAGISK("rrb-magisk", 0xEAD8),
+    MAIL_DOT_RU("rrb-mail-dot-ru", 0xEAD9),
+    MAILCHIMP("rrb-mailchimp", 0xEADA),
+    MAKERBOT("rrb-makerbot", 0xEADB),
+    MANAGEIQ("rrb-manageiq", 0xEADC),
+    MANJARO("rrb-manjaro", 0xEADD),
+    MAPBOX("rrb-mapbox", 0xEADE),
+    MARKDOWN("rrb-markdown", 0xEADF),
+    MARKETO("rrb-marketo", 0xEAE0),
+    MASTERCARD("rrb-mastercard", 0xEAE1),
+    MASTODON("rrb-mastodon", 0xEAE2),
+    MATERIALDESIGN("rrb-materialdesign", 0xEAE3),
+    MATHWORKS("rrb-mathworks", 0xEAE4),
+    MATRIX("rrb-matrix", 0xEAE5),
+    MATTERMOST("rrb-mattermost", 0xEAE6),
+    MATTERNET("rrb-matternet", 0xEAE7),
+    MCAFEE("rrb-mcafee", 0xEAE8),
+    MDNWEBDOCS("rrb-mdnwebdocs", 0xEAE9),
+    MEDIAFIRE("rrb-mediafire", 0xEAEA),
+    MEDIATEMPLE("rrb-mediatemple", 0xEAEB),
+    MEDIUM("rrb-medium", 0xEAEC),
+    MEETUP("rrb-meetup", 0xEAED),
+    MEGA("rrb-mega", 0xEAEE),
+    MENDELEY("rrb-mendeley", 0xEAEF),
+    MERCEDES("rrb-mercedes", 0xEAF0),
+    MESSENGER("rrb-messenger", 0xEAF1),
+    METEOR("rrb-meteor", 0xEAF2),
+    MICRO_DOT_BLOG("rrb-micro-dot-blog", 0xEAF3),
+    MICROGENETICS("rrb-microgenetics", 0xEAF4),
+    MICROSOFT("rrb-microsoft", 0xEAF5),
+    MICROSOFTACCESS("rrb-microsoftaccess", 0xEAF6),
+    MICROSOFTAZURE("rrb-microsoftazure", 0xEAF7),
+    MICROSOFTEDGE("rrb-microsoftedge", 0xEAF8),
+    MICROSOFTEXCEL("rrb-microsoftexcel", 0xEAF9),
+    MICROSOFTOFFICE("rrb-microsoftoffice", 0xEAFA),
+    MICROSOFTONEDRIVE("rrb-microsoftonedrive", 0xEAFB),
+    MICROSOFTONENOTE("rrb-microsoftonenote", 0xEAFC),
+    MICROSOFTOUTLOOK("rrb-microsoftoutlook", 0xEAFD),
+    MICROSOFTPOWERPOINT("rrb-microsoftpowerpoint", 0xEAFE),
+    MICROSOFTTEAMS("rrb-microsoftteams", 0xEAFF),
+    MICROSOFTWORD("rrb-microsoftword", 0xEB00),
+    MICROSTRATEGY("rrb-microstrategy", 0xEB01),
+    MINDS("rrb-minds", 0xEB02),
+    MINETEST("rrb-minetest", 0xEB03),
+    MINUTEMAILER("rrb-minutemailer", 0xEB04),
+    MIX("rrb-mix", 0xEB05),
+    MIXCLOUD("rrb-mixcloud", 0xEB06),
+    MIXER("rrb-mixer", 0xEB07),
+    MOJANG("rrb-mojang", 0xEB08),
+    MONERO("rrb-monero", 0xEB09),
+    MONGODB("rrb-mongodb", 0xEB0A),
+    MONKEYTIE("rrb-monkeytie", 0xEB0B),
+    MONOGRAM("rrb-monogram", 0xEB0C),
+    MONSTER("rrb-monster", 0xEB0D),
+    MONZO("rrb-monzo", 0xEB0E),
+    MOO("rrb-moo", 0xEB0F),
+    MOZILLA("rrb-mozilla", 0xEB10),
+    MOZILLAFIREFOX("rrb-mozillafirefox", 0xEB11),
+    MUSESCORE("rrb-musescore", 0xEB12),
+    MXLINUX("rrb-mxlinux", 0xEB13),
+    MYSPACE("rrb-myspace", 0xEB14),
+    MYSQL("rrb-mysql", 0xEB15),
+    NATIVESCRIPT("rrb-nativescript", 0xEB16),
+    NEC("rrb-nec", 0xEB17),
+    NEO4J("rrb-neo4j", 0xEB18),
+    NETFLIX("rrb-netflix", 0xEB19),
+    NETLIFY("rrb-netlify", 0xEB1A),
+    NEXT_DOT_JS("rrb-next-dot-js", 0xEB1B),
+    NEXTCLOUD("rrb-nextcloud", 0xEB1C),
+    NEXTDOOR("rrb-nextdoor", 0xEB1D),
+    NGINX("rrb-nginx", 0xEB1E),
+    NIM("rrb-nim", 0xEB1F),
+    NINTENDO("rrb-nintendo", 0xEB20),
+    NINTENDO3DS("rrb-nintendo3ds", 0xEB21),
+    NINTENDOGAMECUBE("rrb-nintendogamecube", 0xEB22),
+    NINTENDOSWITCH("rrb-nintendoswitch", 0xEB23),
+    NODE_DOT_JS("rrb-node-dot-js", 0xEB24),
+    NODE_RED("rrb-node-red", 0xEB25),
+    NODEMON("rrb-nodemon", 0xEB26),
+    NOKIA("rrb-nokia", 0xEB27),
+    NOTION("rrb-notion", 0xEB28),
+    NOTIST("rrb-notist", 0xEB29),
+    NPM("rrb-npm", 0xEB2A),
+    NUCLEO("rrb-nucleo", 0xEB2B),
+    NUGET("rrb-nuget", 0xEB2C),
+    NUTANIX("rrb-nutanix", 0xEB2D),
+    NUXT_DOT_JS("rrb-nuxt-dot-js", 0xEB2E),
+    NVIDIA("rrb-nvidia", 0xEB2F),
+    OBSSTUDIO("rrb-obsstudio", 0xEB30),
+    OCAML("rrb-ocaml", 0xEB31),
+    OCTAVE("rrb-octave", 0xEB32),
+    OCTOPUSDEPLOY("rrb-octopusdeploy", 0xEB33),
+    OCULUS("rrb-oculus", 0xEB34),
+    ODNOKLASSNIKI("rrb-odnoklassniki", 0xEB35),
+    OPENACCESS("rrb-openaccess", 0xEB36),
+    OPENAPIINITIATIVE("rrb-openapiinitiative", 0xEB37),
+    OPENCOLLECTIVE("rrb-opencollective", 0xEB38),
+    OPENID("rrb-openid", 0xEB39),
+    OPENSOURCEINITIATIVE("rrb-opensourceinitiative", 0xEB3A),
+    OPENSSL("rrb-openssl", 0xEB3B),
+    OPENSTREETMAP("rrb-openstreetmap", 0xEB3C),
+    OPENSUSE("rrb-opensuse", 0xEB3D),
+    OPENVPN("rrb-openvpn", 0xEB3E),
+    OPERA("rrb-opera", 0xEB3F),
+    OPSGENIE("rrb-opsgenie", 0xEB40),
+    ORACLE("rrb-oracle", 0xEB41),
+    ORCID("rrb-orcid", 0xEB42),
+    ORIGIN("rrb-origin", 0xEB43),
+    OSMC("rrb-osmc", 0xEB44),
+    OVERCAST("rrb-overcast", 0xEB45),
+    OVERLEAF("rrb-overleaf", 0xEB46),
+    OVH("rrb-ovh", 0xEB47),
+    PAGEKIT("rrb-pagekit", 0xEB48),
+    PALANTIR("rrb-palantir", 0xEB49),
+    PALOALTOSOFTWARE("rrb-paloaltosoftware", 0xEB4A),
+    PANDORA("rrb-pandora", 0xEB4B),
+    PANTHEON("rrb-pantheon", 0xEB4C),
+    PARSE_DOT_LY("rrb-parse-dot-ly", 0xEB4D),
+    PASTEBIN("rrb-pastebin", 0xEB4E),
+    PATREON("rrb-patreon", 0xEB4F),
+    PAYPAL("rrb-paypal", 0xEB50),
+    PEERTUBE("rrb-peertube", 0xEB51),
+    PERISCOPE("rrb-periscope", 0xEB52),
+    PHP("rrb-php", 0xEB53),
+    PI_HOLE("rrb-pi-hole", 0xEB54),
+    PICARTO_DOT_TV("rrb-picarto-dot-tv", 0xEB55),
+    PINBOARD("rrb-pinboard", 0xEB56),
+    PINGDOM("rrb-pingdom", 0xEB57),
+    PINGUP("rrb-pingup", 0xEB58),
+    PINTEREST("rrb-pinterest", 0xEB59),
+    PIVOTALTRACKER("rrb-pivotaltracker", 0xEB5A),
+    PJSIP("rrb-pjsip", 0xEB5B),
+    PLANGRID("rrb-plangrid", 0xEB5C),
+    PLAYER_DOT_ME("rrb-player-dot-me", 0xEB5D),
+    PLAYERFM("rrb-playerfm", 0xEB5E),
+    PLAYSTATION("rrb-playstation", 0xEB5F),
+    PLAYSTATION3("rrb-playstation3", 0xEB60),
+    PLAYSTATION4("rrb-playstation4", 0xEB61),
+    PLESK("rrb-plesk", 0xEB62),
+    PLEX("rrb-plex", 0xEB63),
+    PLURALSIGHT("rrb-pluralsight", 0xEB64),
+    PLURK("rrb-plurk", 0xEB65),
+    POCKET("rrb-pocket", 0xEB66),
+    POCKETCASTS("rrb-pocketcasts", 0xEB67),
+    POSTGRESQL("rrb-postgresql", 0xEB68),
+    POSTMAN("rrb-postman", 0xEB69),
+    POSTWOMAN("rrb-postwoman", 0xEB6A),
+    POWERSHELL("rrb-powershell", 0xEB6B),
+    PRESTASHOP("rrb-prestashop", 0xEB6C),
+    PRETTIER("rrb-prettier", 0xEB6D),
+    PRISMIC("rrb-prismic", 0xEB6E),
+    PROBOT("rrb-probot", 0xEB6F),
+    PROCESSWIRE("rrb-processwire", 0xEB70),
+    PRODUCTHUNT("rrb-producthunt", 0xEB71),
+    PROMETHEUS("rrb-prometheus", 0xEB72),
+    PROTO_DOT_IO("rrb-proto-dot-io", 0xEB73),
+    PROTONMAIL("rrb-protonmail", 0xEB74),
+    PROXMOX("rrb-proxmox", 0xEB75),
+    PUBLONS("rrb-publons", 0xEB76),
+    PURESCRIPT("rrb-purescript", 0xEB77),
+    PYPI("rrb-pypi", 0xEB78),
+    PYTHON("rrb-python", 0xEB79),
+    PYTORCH("rrb-pytorch", 0xEB7A),
+    PYUP("rrb-pyup", 0xEB7B),
+    QEMU("rrb-qemu", 0xEB7C),
+    QGIS("rrb-qgis", 0xEB7D),
+    QIITA("rrb-qiita", 0xEB7E),
+    QUALCOMM("rrb-qualcomm", 0xEB7F),
+    QUANTCAST("rrb-quantcast", 0xEB80),
+    QUANTOPIAN("rrb-quantopian", 0xEB81),
+    QUARKUS("rrb-quarkus", 0xEB82),
+    QUICKTIME("rrb-quicktime", 0xEB83),
+    QUIP("rrb-quip", 0xEB84),
+    QUORA("rrb-quora", 0xEB85),
+    QWIKLABS("rrb-qwiklabs", 0xEB86),
+    QZONE("rrb-qzone", 0xEB87),
+    R("rrb-r", 0xEB88),
+    RABBITMQ("rrb-rabbitmq", 0xEB89),
+    RADIOPUBLIC("rrb-radiopublic", 0xEB8A),
+    RAILS("rrb-rails", 0xEB8B),
+    RASPBERRYPI("rrb-raspberrypi", 0xEB8C),
+    REACT("rrb-react", 0xEB8D),
+    REACTOS("rrb-reactos", 0xEB8E),
+    REACTROUTER("rrb-reactrouter", 0xEB8F),
+    READTHEDOCS("rrb-readthedocs", 0xEB90),
+    REALM("rrb-realm", 0xEB91),
+    REASON("rrb-reason", 0xEB92),
+    REASONSTUDIOS("rrb-reasonstudios", 0xEB93),
+    REDBUBBLE("rrb-redbubble", 0xEB94),
+    REDDIT("rrb-reddit", 0xEB95),
+    REDHAT("rrb-redhat", 0xEB96),
+    REDIS("rrb-redis", 0xEB97),
+    REDUX("rrb-redux", 0xEB98),
+    RENREN("rrb-renren", 0xEB99),
+    REPL_DOT_IT("rrb-repl-dot-it", 0xEB9A),
+    RESEARCHGATE("rrb-researchgate", 0xEB9B),
+    REVERBNATION("rrb-reverbnation", 0xEB9C),
+    RIOT("rrb-riot", 0xEB9D),
+    RIPPLE("rrb-ripple", 0xEB9E),
+    RISEUP("rrb-riseup", 0xEB9F),
+    ROLLUP_DOT_JS("rrb-rollup-dot-js", 0xEBA0),
+    ROOTS("rrb-roots", 0xEBA1),
+    ROUNDCUBE("rrb-roundcube", 0xEBA2),
+    RSS("rrb-rss", 0xEBA3),
+    RSTUDIO("rrb-rstudio", 0xEBA4),
+    RUBY("rrb-ruby", 0xEBA5),
+    RUBYGEMS("rrb-rubygems", 0xEBA6),
+    RUNKEEPER("rrb-runkeeper", 0xEBA7),
+    RUST("rrb-rust", 0xEBA8),
+    SAFARI("rrb-safari", 0xEBA9),
+    SAHIBINDEN("rrb-sahibinden", 0xEBAA),
+    SALESFORCE("rrb-salesforce", 0xEBAB),
+    SALTSTACK("rrb-saltstack", 0xEBAC),
+    SAMSUNG("rrb-samsung", 0xEBAD),
+    SAMSUNGPAY("rrb-samsungpay", 0xEBAE),
+    SAP("rrb-sap", 0xEBAF),
+    SASS("rrb-sass", 0xEBB0),
+    SAUCELABS("rrb-saucelabs", 0xEBB1),
+    SCALA("rrb-scala", 0xEBB2),
+    SCALEWAY("rrb-scaleway", 0xEBB3),
+    SCRIBD("rrb-scribd", 0xEBB4),
+    SCRUTINIZERCI("rrb-scrutinizerci", 0xEBB5),
+    SEAGATE("rrb-seagate", 0xEBB6),
+    SEGA("rrb-sega", 0xEBB7),
+    SELLFY("rrb-sellfy", 0xEBB8),
+    SEMAPHORECI("rrb-semaphoreci", 0xEBB9),
+    SENSU("rrb-sensu", 0xEBBA),
+    SENTRY("rrb-sentry", 0xEBBB),
+    SERVERFAULT("rrb-serverfault", 0xEBBC),
+    SHAZAM("rrb-shazam", 0xEBBD),
+    SHELL("rrb-shell", 0xEBBE),
+    SHOPIFY("rrb-shopify", 0xEBBF),
+    SHOWPAD("rrb-showpad", 0xEBC0),
+    SIEMENS("rrb-siemens", 0xEBC1),
+    SIGNAL("rrb-signal", 0xEBC2),
+    SIMPLEICONS("rrb-simpleicons", 0xEBC3),
+    SINAWEIBO("rrb-sinaweibo", 0xEBC4),
+    SITEPOINT("rrb-sitepoint", 0xEBC5),
+    SKETCH("rrb-sketch", 0xEBC6),
+    SKILLSHARE("rrb-skillshare", 0xEBC7),
+    SKYLINER("rrb-skyliner", 0xEBC8),
+    SKYPE("rrb-skype", 0xEBC9),
+    SLACK("rrb-slack", 0xEBCA),
+    SLASHDOT("rrb-slashdot", 0xEBCB),
+    SLICKPIC("rrb-slickpic", 0xEBCC),
+    SLIDES("rrb-slides", 0xEBCD),
+    SMASHINGMAGAZINE("rrb-smashingmagazine", 0xEBCE),
+    SMUGMUG("rrb-smugmug", 0xEBCF),
+    SNAPCHAT("rrb-snapchat", 0xEBD0),
+    SNAPCRAFT("rrb-snapcraft", 0xEBD1),
+    SNYK("rrb-snyk", 0xEBD2),
+    SOCIETY6("rrb-society6", 0xEBD3),
+    SOCKET_DOT_IO("rrb-socket-dot-io", 0xEBD4),
+    SOGOU("rrb-sogou", 0xEBD5),
+    SOLUS("rrb-solus", 0xEBD6),
+    SONARCLOUD("rrb-sonarcloud", 0xEBD7),
+    SONARLINT("rrb-sonarlint", 0xEBD8),
+    SONARQUBE("rrb-sonarqube", 0xEBD9),
+    SONARSOURCE("rrb-sonarsource", 0xEBDA),
+    SONGKICK("rrb-songkick", 0xEBDB),
+    SONICWALL("rrb-sonicwall", 0xEBDC),
+    SONOS("rrb-sonos", 0xEBDD),
+    SOUNDCLOUD("rrb-soundcloud", 0xEBDE),
+    SOURCEENGINE("rrb-sourceengine", 0xEBDF),
+    SOURCEFORGE("rrb-sourceforge", 0xEBE0),
+    SOURCEGRAPH("rrb-sourcegraph", 0xEBE1),
+    SPACEMACS("rrb-spacemacs", 0xEBE2),
+    SPACEX("rrb-spacex", 0xEBE3),
+    SPARKFUN("rrb-sparkfun", 0xEBE4),
+    SPARKPOST("rrb-sparkpost", 0xEBE5),
+    SPDX("rrb-spdx", 0xEBE6),
+    SPEAKERDECK("rrb-speakerdeck", 0xEBE7),
+    SPECTRUM("rrb-spectrum", 0xEBE8),
+    SPOTIFY("rrb-spotify", 0xEBE9),
+    SPOTLIGHT("rrb-spotlight", 0xEBEA),
+    SPREAKER("rrb-spreaker", 0xEBEB),
+    SPRING("rrb-spring", 0xEBEC),
+    SPRINT("rrb-sprint", 0xEBED),
+    SQUARE("rrb-square", 0xEBEE),
+    SQUARESPACE("rrb-squarespace", 0xEBEF),
+    STACKBIT("rrb-stackbit", 0xEBF0),
+    STACKEXCHANGE("rrb-stackexchange", 0xEBF1),
+    STACKOVERFLOW("rrb-stackoverflow", 0xEBF2),
+    STACKPATH("rrb-stackpath", 0xEBF3),
+    STACKSHARE("rrb-stackshare", 0xEBF4),
+    STADIA("rrb-stadia", 0xEBF5),
+    STATAMIC("rrb-statamic", 0xEBF6),
+    STATICMAN("rrb-staticman", 0xEBF7),
+    STATUSPAGE("rrb-statuspage", 0xEBF8),
+    STEAM("rrb-steam", 0xEBF9),
+    STEAMWORKS("rrb-steamworks", 0xEBFA),
+    STEEM("rrb-steem", 0xEBFB),
+    STEEMIT("rrb-steemit", 0xEBFC),
+    STEINBERG("rrb-steinberg", 0xEBFD),
+    STENCYL("rrb-stencyl", 0xEBFE),
+    STITCHER("rrb-stitcher", 0xEBFF),
+    STORIFY("rrb-storify", 0xEC00),
+    STORYBOOK("rrb-storybook", 0xEC01),
+    STRAPI("rrb-strapi", 0xEC02),
+    STRAVA("rrb-strava", 0xEC03),
+    STRIPE("rrb-stripe", 0xEC04),
+    STRONGSWAN("rrb-strongswan", 0xEC05),
+    STUBHUB("rrb-stubhub", 0xEC06),
+    STYLED_COMPONENTS("rrb-styled-components", 0xEC07),
+    STYLESHARE("rrb-styleshare", 0xEC08),
+    STYLUS("rrb-stylus", 0xEC09),
+    SUBLIMETEXT("rrb-sublimetext", 0xEC0A),
+    SUBVERSION("rrb-subversion", 0xEC0B),
+    SUPERUSER("rrb-superuser", 0xEC0C),
+    SVELTE("rrb-svelte", 0xEC0D),
+    SVG("rrb-svg", 0xEC0E),
+    SVGO("rrb-svgo", 0xEC0F),
+    SWAGGER("rrb-swagger", 0xEC10),
+    SWARM("rrb-swarm", 0xEC11),
+    SWIFT("rrb-swift", 0xEC12),
+    SYMANTEC("rrb-symantec", 0xEC13),
+    SYMFONY("rrb-symfony", 0xEC14),
+    SYNOLOGY("rrb-synology", 0xEC15),
+    T_MOBILE("rrb-t-mobile", 0xEC16),
+    TABLEAU("rrb-tableau", 0xEC17),
+    TAILS("rrb-tails", 0xEC18),
+    TAILWINDCSS("rrb-tailwindcss", 0xEC19),
+    TAPAS("rrb-tapas", 0xEC1A),
+    TEAMVIEWER("rrb-teamviewer", 0xEC1B),
+    TED("rrb-ted", 0xEC1C),
+    TEESPRING("rrb-teespring", 0xEC1D),
+    TELEGRAM("rrb-telegram", 0xEC1E),
+    TENCENTQQ("rrb-tencentqq", 0xEC1F),
+    TENCENTWEIBO("rrb-tencentweibo", 0xEC20),
+    TENSORFLOW("rrb-tensorflow", 0xEC21),
+    TERADATA("rrb-teradata", 0xEC22),
+    TERRAFORM("rrb-terraform", 0xEC23),
+    TESLA("rrb-tesla", 0xEC24),
+    THEMIGHTY("rrb-themighty", 0xEC25),
+    THEMOVIEDATABASE("rrb-themoviedatabase", 0xEC26),
+    TIDAL("rrb-tidal", 0xEC27),
+    TIKTOK("rrb-tiktok", 0xEC28),
+    TIMESCALE("rrb-timescale", 0xEC29),
+    TINDER("rrb-tinder", 0xEC2A),
+    TODOIST("rrb-todoist", 0xEC2B),
+    TOGGL("rrb-toggl", 0xEC2C),
+    TOPCODER("rrb-topcoder", 0xEC2D),
+    TOPTAL("rrb-toptal", 0xEC2E),
+    TOR("rrb-tor", 0xEC2F),
+    TOSHIBA("rrb-toshiba", 0xEC30),
+    TRAINERROAD("rrb-trainerroad", 0xEC31),
+    TRAKT("rrb-trakt", 0xEC32),
+    TRAVISCI("rrb-travisci", 0xEC33),
+    TREEHOUSE("rrb-treehouse", 0xEC34),
+    TRELLO("rrb-trello", 0xEC35),
+    TRENDMICRO("rrb-trendmicro", 0xEC36),
+    TRIPADVISOR("rrb-tripadvisor", 0xEC37),
+    TRULIA("rrb-trulia", 0xEC38),
+    TRUSTPILOT("rrb-trustpilot", 0xEC39),
+    TUMBLR("rrb-tumblr", 0xEC3A),
+    TURKISHAIRLINES("rrb-turkishairlines", 0xEC3B),
+    TWILIO("rrb-twilio", 0xEC3C),
+    TWITCH("rrb-twitch", 0xEC3D),
+    X("rrb-x", 0xEC3E),
+    TWOO("rrb-twoo", 0xEC3F),
+    TYPESCRIPT("rrb-typescript", 0xEC40),
+    TYPO3("rrb-typo3", 0xEC41),
+    UBER("rrb-uber", 0xEC42),
+    UBEREATS("rrb-ubereats", 0xEC43),
+    UBISOFT("rrb-ubisoft", 0xEC44),
+    UBLOCKORIGIN("rrb-ublockorigin", 0xEC45),
+    UBUNTU("rrb-ubuntu", 0xEC46),
+    UDACITY("rrb-udacity", 0xEC47),
+    UDEMY("rrb-udemy", 0xEC48),
+    UIKIT("rrb-uikit", 0xEC49),
+    UMBRACO("rrb-umbraco", 0xEC4A),
+    UNITY("rrb-unity", 0xEC4B),
+    UNREALENGINE("rrb-unrealengine", 0xEC4C),
+    UNSPLASH("rrb-unsplash", 0xEC4D),
+    UNTAPPD("rrb-untappd", 0xEC4E),
+    UPWORK("rrb-upwork", 0xEC4F),
+    V("rrb-v", 0xEC50),
+    V8("rrb-v8", 0xEC51),
+    VAGRANT("rrb-vagrant", 0xEC52),
+    VALVE("rrb-valve", 0xEC53),
+    VEEAM("rrb-veeam", 0xEC54),
+    VENMO("rrb-venmo", 0xEC55),
+    VERIZON("rrb-verizon", 0xEC56),
+    VIADEO("rrb-viadeo", 0xEC57),
+    VIBER("rrb-viber", 0xEC58),
+    VIM("rrb-vim", 0xEC59),
+    VIMEO("rrb-vimeo", 0xEC5A),
+    VINE("rrb-vine", 0xEC5B),
+    VIRB("rrb-virb", 0xEC5C),
+    VISA("rrb-visa", 0xEC5D),
+    VISUALSTUDIO("rrb-visualstudio", 0xEC5E),
+    VISUALSTUDIOCODE("rrb-visualstudiocode", 0xEC5F),
+    VK("rrb-vk", 0xEC60),
+    VLCMEDIAPLAYER("rrb-vlcmediaplayer", 0xEC61),
+    VODAFONE("rrb-vodafone", 0xEC62),
+    VOLKSWAGEN("rrb-volkswagen", 0xEC63),
+    VSCO("rrb-vsco", 0xEC64),
+    VUE_DOT_JS("rrb-vue-dot-js", 0xEC65),
+    W3C("rrb-w3c", 0xEC66),
+    WATTPAD("rrb-wattpad", 0xEC67),
+    WAZE("rrb-waze", 0xEC68),
+    WEASYL("rrb-weasyl", 0xEC69),
+    WEBAUTHN("rrb-webauthn", 0xEC6A),
+    WEBCOMPONENTS_DOT_ORG("rrb-webcomponents-dot-org", 0xEC6B),
+    WEBMIN("rrb-webmin", 0xEC6C),
+    WEBPACK("rrb-webpack", 0xEC6D),
+    WEBSTORM("rrb-webstorm", 0xEC6E),
+    WECHAT("rrb-wechat", 0xEC6F),
+    WHATSAPP("rrb-whatsapp", 0xEC70),
+    WHENIWORK("rrb-wheniwork", 0xEC71),
+    WHITESOURCE("rrb-whitesource", 0xEC72),
+    WII("rrb-wii", 0xEC73),
+    WIIU("rrb-wiiu", 0xEC74),
+    WIKIPEDIA("rrb-wikipedia", 0xEC75),
+    WINDOWS("rrb-windows", 0xEC76),
+    WIRE("rrb-wire", 0xEC77),
+    WIREGUARD("rrb-wireguard", 0xEC78),
+    WISH("rrb-wish", 0xEC79),
+    WIX("rrb-wix", 0xEC7A),
+    WOLFRAM("rrb-wolfram", 0xEC7B),
+    WOLFRAMLANGUAGE("rrb-wolframlanguage", 0xEC7C),
+    WOLFRAMMATHEMATICA("rrb-wolframmathematica", 0xEC7D),
+    WORDPRESS("rrb-wordpress", 0xEC7E),
+    WORKPLACE("rrb-workplace", 0xEC7F),
+    WPENGINE("rrb-wpengine", 0xEC80),
+    WRITE_DOT_AS("rrb-write-dot-as", 0xEC81),
+    X_DOT_ORG("rrb-x-dot-org", 0xEC82),
+    X_PACK("rrb-x-pack", 0xEC83),
+    XAMARIN("rrb-xamarin", 0xEC84),
+    XBOX("rrb-xbox", 0xEC85),
+    XCODE("rrb-xcode", 0xEC86),
+    XDADEVELOPERS("rrb-xdadevelopers", 0xEC87),
+    XERO("rrb-xero", 0xEC88),
+    XFCE("rrb-xfce", 0xEC89),
+    XIAOMI("rrb-xiaomi", 0xEC8A),
+    XING("rrb-xing", 0xEC8B),
+    XMPP("rrb-xmpp", 0xEC8C),
+    XRP("rrb-xrp", 0xEC8D),
+    XSPLIT("rrb-xsplit", 0xEC8E),
+    YAHOO("rrb-yahoo", 0xEC8F),
+    YAMAHACORPORATION("rrb-yamahacorporation", 0xEC90),
+    YAMAHAMOTORCORPORATION("rrb-yamahamotorcorporation", 0xEC91),
+    YAMMER("rrb-yammer", 0xEC92),
+    YANDEX("rrb-yandex", 0xEC93),
+    YARN("rrb-yarn", 0xEC94),
+    YCOMBINATOR("rrb-ycombinator", 0xEC95),
+    YELP("rrb-yelp", 0xEC96),
+    YOUTUBE("rrb-youtube", 0xEC97),
+    ZALANDO("rrb-zalando", 0xEC98),
+    ZAPIER("rrb-zapier", 0xEC99),
+    ZEIT("rrb-zeit", 0xEC9A),
+    ZEND("rrb-zend", 0xEC9B),
+    ZENDESK("rrb-zendesk", 0xEC9C),
+    ZENDFRAMEWORK("rrb-zendframework", 0xEC9D),
+    ZEROMQ("rrb-zeromq", 0xEC9E),
+    ZERPLY("rrb-zerply", 0xEC9F),
+    ZHIHU("rrb-zhihu", 0xECA0),
+    ZILLOW("rrb-zillow", 0xECA1),
+    ZINGAT("rrb-zingat", 0xECA2),
+    ZOOM("rrb-zoom", 0xECA3),
+    ZORIN("rrb-zorin", 0xECA4),
+    ZULIP("rrb-zulip", 0xECA5);
+
+    private final String description;
+    private final int code;
+
+    RailroadBrandsIcon(String description, int code) {
+        this.description = description;
+        this.code = code;
+    }
+
+    public static RailroadBrandsIcon findByDescription(String description) {
+        for (RailroadBrandsIcon icon : values()) {
+            if (icon.getDescription().equals(description))
+                return icon;
+        }
+
+        throw new IllegalArgumentException("Unknown icon: " + description);
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    @Override
+    public int getCode() {
+        return code;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/utility/icon/RailroadBrandsIkonHandler.java b/src/main/java/dev/railroadide/railroad/utility/icon/RailroadBrandsIkonHandler.java
new file mode 100644
index 00000000..fc01c045
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/utility/icon/RailroadBrandsIkonHandler.java
@@ -0,0 +1,45 @@
+package dev.railroadide.railroad.utility.icon;
+
+import dev.railroadide.railroad.AppResources;
+import dev.railroadide.railroad.Railroad;
+import org.kordamp.ikonli.AbstractIkonHandler;
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.IkonHandler;
+import org.kordamp.jipsy.annotations.ServiceProviderFor;
+
+import java.io.InputStream;
+import java.net.URL;
+
+@ServiceProviderFor(IkonHandler.class)
+public class RailroadBrandsIkonHandler extends AbstractIkonHandler {
+    private static final String FONT_RESOURCE = "fonts/RailroadBrandIcons.ttf";
+
+    @Override
+    public boolean supports(String description) {
+        return description != null && description.startsWith("rrb-");
+    }
+
+    @Override
+    public Ikon resolve(String description) {
+        return RailroadBrandsIcon.findByDescription(description);
+    }
+
+    @Override
+    public URL getFontResource() {
+        return AppResources.getResource(FONT_RESOURCE);
+    }
+
+    @Override
+    public InputStream getFontResourceAsStream() {
+        InputStream in = AppResources.getResourceAsStream(FONT_RESOURCE);
+        if (in == null)
+            Railroad.LOGGER.error("RailroadBrandIcons: FONT NOT FOUND at {}", FONT_RESOURCE);
+
+        return in;
+    }
+
+    @Override
+    public String getFontFamily() {
+        return "RailroadBrandIcons";
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/utility/icon/RailroadBrandsIkonProvider.java b/src/main/java/dev/railroadide/railroad/utility/icon/RailroadBrandsIkonProvider.java
new file mode 100644
index 00000000..b7a974ba
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/utility/icon/RailroadBrandsIkonProvider.java
@@ -0,0 +1,12 @@
+package dev.railroadide.railroad.utility.icon;
+
+import org.kordamp.ikonli.IkonProvider;
+import org.kordamp.jipsy.annotations.ServiceProviderFor;
+
+@ServiceProviderFor(IkonProvider.class)
+public class RailroadBrandsIkonProvider implements IkonProvider<RailroadBrandsIcon> {
+    @Override
+    public Class<RailroadBrandsIcon> getIkon() {
+        return RailroadBrandsIcon.class;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/utility/icon/RailroadIcon.java b/src/main/java/dev/railroadide/railroad/utility/icon/RailroadIcon.java
new file mode 100644
index 00000000..89d984f1
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/utility/icon/RailroadIcon.java
@@ -0,0 +1,34 @@
+package dev.railroadide.railroad.utility.icon;
+
+import org.kordamp.ikonli.Ikon;
+
+public enum RailroadIcon implements Ikon {
+    JAR_FILE("rr-jar-file", 0xECA6);
+
+    private final String description;
+    private final int code;
+
+    RailroadIcon(String description, int code) {
+        this.description = description;
+        this.code = code;
+    }
+
+    public static RailroadIcon findByDescription(String description) {
+        for (RailroadIcon icon : values()) {
+            if (icon.getDescription().equals(description))
+                return icon;
+        }
+
+        throw new IllegalArgumentException("Unknown icon: " + description);
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    @Override
+    public int getCode() {
+        return code;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/utility/icon/RailroadIkonHandler.java b/src/main/java/dev/railroadide/railroad/utility/icon/RailroadIkonHandler.java
new file mode 100644
index 00000000..407d3d0b
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/utility/icon/RailroadIkonHandler.java
@@ -0,0 +1,45 @@
+package dev.railroadide.railroad.utility.icon;
+
+import dev.railroadide.railroad.AppResources;
+import dev.railroadide.railroad.Railroad;
+import org.kordamp.ikonli.AbstractIkonHandler;
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.IkonHandler;
+import org.kordamp.jipsy.annotations.ServiceProviderFor;
+
+import java.io.InputStream;
+import java.net.URL;
+
+@ServiceProviderFor(IkonHandler.class)
+public class RailroadIkonHandler extends AbstractIkonHandler {
+    private static final String FONT_RESOURCE = "fonts/RailroadIcons.ttf";
+
+    @Override
+    public boolean supports(String description) {
+        return description != null && description.startsWith("rr-");
+    }
+
+    @Override
+    public Ikon resolve(String description) {
+        return RailroadIcon.findByDescription(description);
+    }
+
+    @Override
+    public URL getFontResource() {
+        return AppResources.getResource(FONT_RESOURCE);
+    }
+
+    @Override
+    public InputStream getFontResourceAsStream() {
+        InputStream in = AppResources.getResourceAsStream(FONT_RESOURCE);
+        if (in == null)
+            Railroad.LOGGER.error("RailroadIcons: FONT NOT FOUND at {}", FONT_RESOURCE);
+
+        return in;
+    }
+
+    @Override
+    public String getFontFamily() {
+        return "RailroadIcons";
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/utility/icon/RailroadIkonProvider.java b/src/main/java/dev/railroadide/railroad/utility/icon/RailroadIkonProvider.java
new file mode 100644
index 00000000..45ca1548
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/utility/icon/RailroadIkonProvider.java
@@ -0,0 +1,12 @@
+package dev.railroadide.railroad.utility.icon;
+
+import org.kordamp.ikonli.IkonProvider;
+import org.kordamp.jipsy.annotations.ServiceProviderFor;
+
+@ServiceProviderFor(IkonProvider.class)
+public class RailroadIkonProvider implements IkonProvider<RailroadIcon> {
+    @Override
+    public Class<RailroadIcon> getIkon() {
+        return RailroadIcon.class;
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/utility/LocalDateTimeTypeAdapter.java b/src/main/java/dev/railroadide/railroad/utility/json/LocalDateTimeTypeAdapter.java
similarity index 95%
rename from src/main/java/dev/railroadide/railroad/utility/LocalDateTimeTypeAdapter.java
rename to src/main/java/dev/railroadide/railroad/utility/json/LocalDateTimeTypeAdapter.java
index 55267bf6..e0edf0f5 100644
--- a/src/main/java/dev/railroadide/railroad/utility/LocalDateTimeTypeAdapter.java
+++ b/src/main/java/dev/railroadide/railroad/utility/json/LocalDateTimeTypeAdapter.java
@@ -1,4 +1,4 @@
-package dev.railroadide.railroad.utility;
+package dev.railroadide.railroad.utility.json;
 
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
diff --git a/src/main/java/dev/railroadide/railroad/utility/json/PathTypeAdapter.java b/src/main/java/dev/railroadide/railroad/utility/json/PathTypeAdapter.java
new file mode 100644
index 00000000..fe9c68c9
--- /dev/null
+++ b/src/main/java/dev/railroadide/railroad/utility/json/PathTypeAdapter.java
@@ -0,0 +1,32 @@
+package dev.railroadide.railroad.utility.json;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+public final class PathTypeAdapter extends TypeAdapter<Path> {
+    @Override
+    public void write(JsonWriter out, Path value) throws IOException {
+        if (value == null) {
+            out.nullValue();
+            return;
+        }
+
+        out.value(value.toString());
+    }
+
+    @Override
+    public Path read(JsonReader in) throws IOException {
+        if (in.peek() == JsonToken.NULL) {
+            in.nextNull();
+            return null;
+        }
+
+        String text = in.nextString();
+        return text == null ? null : Path.of(text);
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/welcome/WelcomeHeaderPane.java b/src/main/java/dev/railroadide/railroad/welcome/WelcomeHeaderPane.java
index a1ef40cf..5a64cc40 100644
--- a/src/main/java/dev/railroadide/railroad/welcome/WelcomeHeaderPane.java
+++ b/src/main/java/dev/railroadide/railroad/welcome/WelcomeHeaderPane.java
@@ -2,25 +2,56 @@
 
 import dev.railroadide.core.ui.RRCard;
 import dev.railroadide.core.ui.RRTextField;
+import dev.railroadide.core.ui.localized.LocalizedLabel;
 import dev.railroadide.core.ui.localized.LocalizedText;
+import dev.railroadide.core.ui.styling.TextFieldSize;
+import dev.railroadide.railroad.Railroad;
+import dev.railroadide.railroad.project.Project;
 import dev.railroadide.railroad.welcome.project.ui.widget.ProjectSortComboBox;
+import javafx.collections.ListChangeListener;
+import javafx.css.PseudoClass;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
+import javafx.scene.control.Button;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 import lombok.Getter;
+import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
+import org.kordamp.ikonli.javafx.FontIcon;
 
 @Getter
 public class WelcomeHeaderPane extends RRCard {
+    private static final PseudoClass FOCUSED_PSEUDO_CLASS = PseudoClass.getPseudoClass("focused");
     private final RRTextField searchField;
     private final ProjectSortComboBox sortComboBox;
+    private final LocalizedLabel projectsStatLabel = new LocalizedLabel("railroad.home.welcome.stats.projects", 0);
 
     public WelcomeHeaderPane() {
         super(18, new Insets(24, 32, 24, 32));
         setSpacing(18);
         getStyleClass().add("welcome-card");
 
+        searchField = new RRTextField("railroad.home.welcome.projectsearch");
+        searchField.setTextFieldSize(TextFieldSize.LARGE);
+        searchField.getStyleClass().add("welcome-search-input");
+        sortComboBox = new ProjectSortComboBox();
+        var searchBar = createSearchBar();
+
+        var heroSection = createHeroSection();
+        var statsBar = createStatsBar();
+        var options = createOptionsRow(searchBar);
+
+        var content = new VBox(18, heroSection, statsBar, options);
+        content.setAlignment(Pos.CENTER_LEFT);
+        VBox.setVgrow(options, Priority.ALWAYS);
+        content.setPadding(new Insets(8, 12, 8, 12));
+
+        getChildren().setAll(content);
+        initializeProjectStats();
+    }
+
+    private VBox createHeroSection() {
         var welcomeMessage = new LocalizedText("railroad.home.welcome.greeting");
         welcomeMessage.getStyleClass().add("welcome-message");
 
@@ -30,22 +61,87 @@ public WelcomeHeaderPane() {
         var subtitle = new LocalizedText("railroad.home.welcome.projects.subtitle");
         subtitle.getStyleClass().add("welcome-subtitle");
 
-        searchField = new RRTextField("railroad.home.welcome.projectsearch");
-        sortComboBox = new ProjectSortComboBox();
+        var heroIcon = new FontIcon(FontAwesomeSolid.ROCKET);
+        heroIcon.getStyleClass().add("welcome-hero-icon");
+
+        var textGroup = new VBox(4, welcomeMessage, title, subtitle);
+        textGroup.getStyleClass().add("welcome-hero-text");
+
+        var heroRow = new HBox(16, heroIcon, textGroup);
+        heroRow.getStyleClass().add("welcome-hero");
+        heroRow.setAlignment(Pos.CENTER_LEFT);
+
+        return new VBox(heroRow);
+    }
+
+    private HBox createStatsBar() {
+        var projectsIcon = new FontIcon(FontAwesomeSolid.LIST);
+        projectsIcon.getStyleClass().add("welcome-stat-icon");
+
+        projectsStatLabel.getStyleClass().add("welcome-stat-label");
+        var projectsStat = new HBox(8, projectsIcon, projectsStatLabel);
+        projectsStat.getStyleClass().add("welcome-stat");
+        projectsStat.setAlignment(Pos.CENTER_LEFT);
 
-        var options = new HBox(14);
-        options.getChildren().addAll(searchField, sortComboBox);
+        var tipLabel = new LocalizedLabel("railroad.home.welcome.header.tip");
+        tipLabel.getStyleClass().add("welcome-tip-label");
+        var tipIcon = new FontIcon(FontAwesomeSolid.LIGHTBULB);
+        tipIcon.getStyleClass().add("welcome-tip-icon");
+        var tip = new HBox(6, tipIcon, tipLabel);
+        tip.getStyleClass().add("welcome-tip");
+        tip.setAlignment(Pos.CENTER_LEFT);
+
+        var statsBar = new HBox(18, projectsStat, tip);
+        statsBar.getStyleClass().add("welcome-stats-bar");
+        statsBar.setAlignment(Pos.CENTER_LEFT);
+        statsBar.setFillHeight(false);
+
+        return statsBar;
+    }
+
+    private HBox createOptionsRow(HBox searchBar) {
+        var options = new HBox(14, searchBar, sortComboBox);
         options.setAlignment(Pos.CENTER_LEFT);
-        HBox.setHgrow(searchField, Priority.ALWAYS);
+        HBox.setHgrow(searchBar, Priority.ALWAYS);
         HBox.setHgrow(sortComboBox, Priority.NEVER);
+        options.getStyleClass().add("welcome-options-row");
+        return options;
+    }
 
-        var vbox = new VBox(8);
-        vbox.getChildren().addAll(welcomeMessage, title, subtitle, options);
-        vbox.setAlignment(Pos.CENTER_LEFT);
-        VBox.setVgrow(options, Priority.ALWAYS);
-        vbox.setPadding(new Insets(8, 12, 8, 12));
+    private HBox createSearchBar() {
+        var searchIcon = new FontIcon(FontAwesomeSolid.SEARCH);
+        searchIcon.getStyleClass().add("welcome-search-icon");
+
+        var clearIcon = new FontIcon(FontAwesomeSolid.TIMES);
+        clearIcon.getStyleClass().add("welcome-search-clear-icon");
+
+        var clearButton = new Button();
+        clearButton.getStyleClass().add("welcome-search-clear");
+        clearButton.setGraphic(clearIcon);
+        clearButton.setFocusTraversable(false);
+        clearButton.setOnAction(event -> searchField.clear());
+        clearButton.visibleProperty().bind(searchField.textProperty().isNotEmpty());
+        clearButton.managedProperty().bind(clearButton.visibleProperty());
+
+        var searchContainer = new HBox(10, searchIcon, searchField, clearButton);
+        searchContainer.getStyleClass().add("welcome-search-container");
+        searchContainer.setAlignment(Pos.CENTER_LEFT);
+        HBox.setHgrow(searchField, Priority.ALWAYS);
+
+        searchField.focusedProperty().addListener((obs, oldValue, newValue) ->
+            searchContainer.pseudoClassStateChanged(FOCUSED_PSEUDO_CLASS, newValue)
+        );
+
+        return searchContainer;
+    }
+
+    private void initializeProjectStats() {
+        updateProjectStats();
+        Railroad.PROJECT_MANAGER.getProjects().addListener((ListChangeListener<Project>) change -> updateProjectStats());
+    }
 
-        getChildren().clear();
-        getChildren().add(vbox);
+    private void updateProjectStats() {
+        int totalProjects = Railroad.PROJECT_MANAGER.getProjects().size();
+        projectsStatLabel.setKey("railroad.home.welcome.stats.projects", totalProjects);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/dev/railroadide/railroad/welcome/project/ui/widget/ProjectSortComboBox.java b/src/main/java/dev/railroadide/railroad/welcome/project/ui/widget/ProjectSortComboBox.java
index f751c4d3..68712743 100644
--- a/src/main/java/dev/railroadide/railroad/welcome/project/ui/widget/ProjectSortComboBox.java
+++ b/src/main/java/dev/railroadide/railroad/welcome/project/ui/widget/ProjectSortComboBox.java
@@ -1,29 +1,123 @@
 package dev.railroadide.railroad.welcome.project.ui.widget;
 
+import dev.railroadide.core.localization.LocalizationService;
 import dev.railroadide.core.ui.localized.LocalizedComboBox;
-import dev.railroadide.core.ui.localized.LocalizedListCell;
+import dev.railroadide.core.ui.localized.LocalizedLabel;
+import dev.railroadide.core.utility.ServiceLocator;
 import dev.railroadide.railroad.welcome.project.ProjectSort;
 import javafx.collections.FXCollections;
+import javafx.geometry.Pos;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import javafx.util.Duration;
 import org.kordamp.ikonli.fontawesome6.FontAwesomeSolid;
 import org.kordamp.ikonli.javafx.FontIcon;
 
+import java.util.EnumMap;
+import java.util.Map;
+
 public class ProjectSortComboBox extends LocalizedComboBox<ProjectSort> {
-    private static final FontIcon ICON = FontIcon.of(FontAwesomeSolid.FILTER);
+    private static final FontAwesomeSolid DEFAULT_ICON = FontAwesomeSolid.FILTER;
+    private static final Map<ProjectSort, FontAwesomeSolid> ICON_BY_SORT = new EnumMap<>(ProjectSort.class);
+    private static final Map<ProjectSort, String> DESCRIPTION_KEYS = new EnumMap<>(ProjectSort.class);
+
+    static {
+        ICON_BY_SORT.put(ProjectSort.NONE, FontAwesomeSolid.LIST);
+        ICON_BY_SORT.put(ProjectSort.NAME, FontAwesomeSolid.SORT_ALPHA_DOWN);
+        ICON_BY_SORT.put(ProjectSort.DATE, FontAwesomeSolid.CLOCK);
+
+        DESCRIPTION_KEYS.put(ProjectSort.NONE, "railroad.home.welcome.sort.none.description");
+        DESCRIPTION_KEYS.put(ProjectSort.NAME, "railroad.home.welcome.sort.name.description");
+        DESCRIPTION_KEYS.put(ProjectSort.DATE, "railroad.home.welcome.sort.date.description");
+    }
+
+    private final LocalizationService localizationService = ServiceLocator.getService(LocalizationService.class);
+    private final Tooltip sortTooltip = new Tooltip();
 
     public ProjectSortComboBox() {
-        super(ProjectSort::getKey, ProjectSort::valueOf);
+        super(ProjectSort::getKey);
         setItems(FXCollections.observableArrayList(ProjectSort.values()));
-        setPrefWidth(120);
+        getStyleClass().addAll("rr-combo-box", "project-sort-combo");
+        setMinWidth(170);
+        setPrefWidth(220);
+        setMaxWidth(260);
+        setVisibleRowCount(ProjectSort.values().length);
 
-        setButtonCell(new LocalizedListCell<>(ProjectSort::getKey) {
-            @Override
-            protected void updateItem(ProjectSort item, boolean empty) {
-                super.updateItem(item, empty);
+        setButtonCell(new ProjectSortListCell(true));
+        setCellFactory(listView -> new ProjectSortListCell(false));
 
-                setGraphic(ICON);
-            }
-        });
+        initializeTooltip();
 
         setValue(ProjectSort.NONE);
     }
-}
\ No newline at end of file
+
+    private void initializeTooltip() {
+        sortTooltip.getStyleClass().add("project-sort-tooltip");
+        sortTooltip.setShowDelay(Duration.millis(180));
+        sortTooltip.setShowDuration(Duration.seconds(4));
+        setTooltip(sortTooltip);
+        updateTooltip(getValue());
+        valueProperty().addListener((observable, oldValue, newValue) -> updateTooltip(newValue));
+    }
+
+    private void updateTooltip(ProjectSort sort) {
+        ProjectSort targetSort = sort != null ? sort : ProjectSort.NONE;
+        String sortName = localizationService.get(targetSort.getKey());
+        sortTooltip.setText(localizationService.get("railroad.home.welcome.sort.tooltip", sortName));
+    }
+
+    private static class ProjectSortListCell extends ListCell<ProjectSort> {
+        private final boolean compact;
+        private final FontIcon icon = new FontIcon(DEFAULT_ICON);
+        private final LocalizedLabel title = new LocalizedLabel("");
+        private final LocalizedLabel description = new LocalizedLabel("");
+        private final VBox textContainer = new VBox(2);
+        private final HBox container = new HBox(10);
+
+        private ProjectSortListCell(boolean compact) {
+            this.compact = compact;
+            icon.setIconSize(16);
+            description.setManaged(!compact);
+            description.setVisible(!compact);
+
+            icon.getStyleClass().add("project-sort-option-icon");
+            title.getStyleClass().add("project-sort-option-title");
+            description.getStyleClass().add("project-sort-option-description");
+            textContainer.getStyleClass().add("project-sort-option-text");
+            container.getStyleClass().add("project-sort-option");
+
+            textContainer.getChildren().add(title);
+            if (!compact) {
+                textContainer.getChildren().add(description);
+            }
+
+            container.setAlignment(Pos.CENTER_LEFT);
+            container.getChildren().addAll(icon, textContainer);
+            HBox.setHgrow(textContainer, Priority.ALWAYS);
+        }
+
+        @Override
+        protected void updateItem(ProjectSort item, boolean empty) {
+            super.updateItem(item, empty);
+
+            if (empty || item == null) {
+                setGraphic(null);
+                setText(null);
+                return;
+            }
+
+            icon.setIconCode(ICON_BY_SORT.getOrDefault(item, DEFAULT_ICON));
+            title.setKey(item.getKey());
+
+            if (!compact) {
+                description.setKey(DESCRIPTION_KEYS.getOrDefault(item, item.getKey()));
+            }
+
+            setGraphic(container);
+            setText(null);
+        }
+    }
+}
diff --git a/src/main/java/dev/railroadide/railroad/window/AlertBuilder.java b/src/main/java/dev/railroadide/railroad/window/AlertBuilder.java
index 11ccbc20..abaec5bf 100644
--- a/src/main/java/dev/railroadide/railroad/window/AlertBuilder.java
+++ b/src/main/java/dev/railroadide/railroad/window/AlertBuilder.java
@@ -6,6 +6,7 @@
 import dev.railroadide.core.ui.RRVBox;
 import dev.railroadide.core.ui.localized.LocalizedLabel;
 import dev.railroadide.core.ui.localized.LocalizedText;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import dev.railroadide.railroad.AppResources;
 import io.github.palexdev.mfxresources.fonts.MFXFontIcon;
 import io.github.palexdev.mfxresources.fonts.fontawesome.FontAwesomeSolid;
@@ -137,13 +138,13 @@ public Scene buildScene() {
             case WARNING, ERROR -> "railroad.generic.dismiss";
             default -> "railroad.generic.cancel";
         });
-        secondary.setVariant(RRButton.ButtonVariant.SECONDARY);
+        secondary.setVariant(ButtonVariant.SECONDARY);
 
         var primary = new RRButton(switch (alertType) {
             case INFO, SUCCESS, ERROR -> "railroad.generic.ok";
             case WARNING -> "railroad.generic.proceed";
         });
-        primary.setVariant(RRButton.ButtonVariant.PRIMARY);
+        primary.setVariant(ButtonVariant.PRIMARY);
         primary.setDefaultButton(true);
 
         buttons.getChildren().addAll(secondary, primary);
diff --git a/src/main/java/dev/railroadide/railroad/window/DialogBuilder.java b/src/main/java/dev/railroadide/railroad/window/DialogBuilder.java
index 6613a3fa..c0f769bc 100644
--- a/src/main/java/dev/railroadide/railroad/window/DialogBuilder.java
+++ b/src/main/java/dev/railroadide/railroad/window/DialogBuilder.java
@@ -1,6 +1,7 @@
 package dev.railroadide.railroad.window;
 
 import dev.railroadide.core.ui.RRButton;
+import dev.railroadide.core.ui.styling.ButtonVariant;
 import javafx.scene.Scene;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
@@ -37,9 +38,9 @@ public Scene buildScene() {
         buttonsBox.getChildren().clear();
 
         var confirmButton = new RRButton("railroad.generic.confirm");
-        confirmButton.setVariant(RRButton.ButtonVariant.SUCCESS);
+        confirmButton.setVariant(ButtonVariant.SUCCESS);
         var cancelButton = new RRButton("railroad.generic.cancel");
-        cancelButton.setVariant(RRButton.ButtonVariant.DANGER);
+        cancelButton.setVariant(ButtonVariant.DANGER);
         buttonsBox.getChildren().addAll(confirmButton, cancelButton);
 
         confirmButton.setOnAction(event -> {
diff --git a/src/main/java/dev/railroadide/railroad/window/WindowBuilder.java b/src/main/java/dev/railroadide/railroad/window/WindowBuilder.java
index ebec520c..44e2c6bd 100644
--- a/src/main/java/dev/railroadide/railroad/window/WindowBuilder.java
+++ b/src/main/java/dev/railroadide/railroad/window/WindowBuilder.java
@@ -12,6 +12,7 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.Window;
+import org.joml.Matrix3x2d;
 
 import java.io.InputStream;
 import java.util.Objects;
@@ -215,6 +216,17 @@ public WindowBuilder maxSize(double maxWidth, double maxHeight) {
         return this;
     }
 
+    public WindowBuilder applyPreferredSize() {
+        Matrix3x2d matrix = Railroad.WINDOW_MANAGER.calculatePreferredWindowSize();
+        this.minWidth = matrix.m00();
+        this.minHeight = matrix.m01();
+        this.width = matrix.m10();
+        this.height = matrix.m11();
+        this.maxWidth = matrix.m20();
+        this.maxHeight = matrix.m21();
+        return this;
+    }
+
     /**
      * Build and return the configured Stage.
      */
@@ -261,10 +273,6 @@ public Stage build() {
             Railroad.WINDOW_MANAGER.registerChildWindow(stage);
         }
 
-        if (shouldBlockOwnerWindow && (modality == Modality.APPLICATION_MODAL || modality == Modality.WINDOW_MODAL)) {
-            stage.showAndWait(); // TODO: Confirm that this is actually possible to do.
-        }
-
         return stage;
     }
 }
diff --git a/src/main/java/dev/railroadide/railroad/window/WindowManager.java b/src/main/java/dev/railroadide/railroad/window/WindowManager.java
index 77b1ecb3..60f6b127 100644
--- a/src/main/java/dev/railroadide/railroad/window/WindowManager.java
+++ b/src/main/java/dev/railroadide/railroad/window/WindowManager.java
@@ -1,6 +1,7 @@
 package dev.railroadide.railroad.window;
 
 import dev.railroadide.railroad.AppResources;
+import dev.railroadide.railroad.Railroad;
 import dev.railroadide.railroad.theme.ThemeManager;
 import dev.railroadide.railroad.utility.MacUtils;
 import javafx.scene.Scene;
@@ -9,6 +10,8 @@
 import javafx.stage.Stage;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
+import org.joml.Matrix3x2d;
+import org.joml.Vector4d;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -57,19 +60,9 @@ public void setPrimaryStage(@NotNull Stage primaryStage) {
     public void showPrimary(Stage primaryStage, Scene scene, String title) {
         this.primaryScene = scene;
 
-        Screen screen = Screen.getPrimary();
-        double screenW = screen.getBounds().getWidth();
-        double screenH = screen.getBounds().getHeight();
-
-        double windowW = screenW * 0.75;
-        double windowH = screenH * 0.75;
-
         primaryStage.setScene(this.primaryScene);
         primaryStage.setTitle(title);
-        primaryStage.setWidth(windowW);
-        primaryStage.setHeight(windowH);
-        primaryStage.setMinWidth(windowW * 0.5);
-        primaryStage.setMinHeight(windowH * 0.5);
+        applyPreferredSize(primaryStage);
         setPrimaryStage(primaryStage);
 
         // Create a MacOS specific Menu Bar and Application Menu
@@ -81,6 +74,40 @@ public void showPrimary(Stage primaryStage, Scene scene, String title) {
         MacUtils.show(primaryStage);
     }
 
+    /**
+     * Apply the preferred window size to the given stage.
+     *
+     * @param stage Stage to apply sizes to
+     */
+    public void applyPreferredSize(Stage stage) {
+        Matrix3x2d windowSizes = calculatePreferredWindowSize();
+        stage.setMinWidth(windowSizes.m00());
+        stage.setMinHeight(windowSizes.m01());
+        stage.setWidth(windowSizes.m10());
+        stage.setHeight(windowSizes.m11());
+        stage.setMaxWidth(windowSizes.m20());
+        stage.setMaxHeight(windowSizes.m21());
+    }
+
+    /**
+     * Calculate the preferred window size based on 75% of the primary screen dimensions.
+     *
+     * @return {@link Matrix3x2d} containing (minWidth, minHeight, preferredWidth, preferredHeight, maxWidth, maxHeight)
+     */
+    public Matrix3x2d calculatePreferredWindowSize() {
+        Screen screen = Screen.getPrimary();
+        double screenW = screen.getBounds().getWidth();
+        double screenH = screen.getBounds().getHeight();
+
+        double windowW = screenW * 0.75;
+        double windowH = screenH * 0.75;
+
+        double minWindowW = windowW * 0.5;
+        double minWindowH = windowH * 0.5;
+
+        return new Matrix3x2d(minWindowW, minWindowH, windowW, windowH, screenW, screenH);
+    }
+
     /**
      * Get a list of currently open child windows.
      *
@@ -126,4 +153,9 @@ public void registerChildWindow(Stage stage) {
         childWindows.add(stage);
         stage.setOnCloseRequest(event -> childWindows.remove(stage));
     }
+
+    public static void toggleFullScreen() {
+        Stage primaryStage = Railroad.WINDOW_MANAGER.getPrimaryStage();
+        primaryStage.setFullScreen(!primaryStage.isFullScreen());
+    }
 }
diff --git a/src/main/resources/META-INF/services/org.kordamp.ikonli.IkonHandler b/src/main/resources/META-INF/services/org.kordamp.ikonli.IkonHandler
new file mode 100644
index 00000000..ec353ed9
--- /dev/null
+++ b/src/main/resources/META-INF/services/org.kordamp.ikonli.IkonHandler
@@ -0,0 +1,2 @@
+dev.railroadide.railroad.utility.icon.RailroadBrandsIkonHandler
+dev.railroadide.railroad.utility.icon.RailroadIkonHandler
diff --git a/src/main/resources/META-INF/services/org.kordamp.ikonli.IkonProvider b/src/main/resources/META-INF/services/org.kordamp.ikonli.IkonProvider
new file mode 100644
index 00000000..5b201f90
--- /dev/null
+++ b/src/main/resources/META-INF/services/org.kordamp.ikonli.IkonProvider
@@ -0,0 +1,2 @@
+dev.railroadide.railroad.utility.icon.RailroadBrandsIkonProvider
+dev.railroadide.railroad.utility.icon.RailroadIkonProvider
diff --git a/src/main/resources/assets/railroad/fonts/RailroadBrandIcons.ttf b/src/main/resources/assets/railroad/fonts/RailroadBrandIcons.ttf
new file mode 100644
index 00000000..c1518a12
Binary files /dev/null and b/src/main/resources/assets/railroad/fonts/RailroadBrandIcons.ttf differ
diff --git a/src/main/resources/assets/railroad/fonts/RailroadIcons.ttf b/src/main/resources/assets/railroad/fonts/RailroadIcons.ttf
new file mode 100644
index 00000000..a302d223
Binary files /dev/null and b/src/main/resources/assets/railroad/fonts/RailroadIcons.ttf differ
diff --git a/src/main/resources/assets/railroad/images/Adoptium-icon.svg b/src/main/resources/assets/railroad/images/Adoptium-icon.svg
new file mode 100644
index 00000000..af45a571
--- /dev/null
+++ b/src/main/resources/assets/railroad/images/Adoptium-icon.svg
@@ -0,0 +1,63 @@
+<svg viewBox="3.564 16.61721068249258 66.528 67.35905044510386" version="1.1" id="svg8" xmlns="http://www.w3.org/2000/svg" style="max-height: 500px" width="66.528" height="67.35905044510386">
+    <defs id="defs2">
+        <clipPath id="clipPath242" clipPathUnits="userSpaceOnUse">
+            <path id="path240" d="m 987.855,678.469 -0.019,-0.008 -107.453,233.098 -81.121,-175.989 235.718,-106.09 0.01,0.02 c -21.01,10.078 -37.838,27.52 -47.135,48.969 z"/>
+        </clipPath>
+        <linearGradient id="linearGradient248" spreadMethod="pad" gradientTransform="matrix(-481.882,253.823,253.823,481.882,1152.35,658.95)" gradientUnits="userSpaceOnUse" y2="0" x2="1" y1="0" x1="0">
+            <stop id="stop244" offset="0" style="stop-opacity: 1; stop-color: rgb(66, 22, 68);"/>
+            <stop id="stop246" offset="1" style="stop-opacity: 1; stop-color: rgb(21, 21, 48);"/>
+        </linearGradient>
+        <clipPath id="clipPath258" clipPathUnits="userSpaceOnUse">
+            <path id="path256" d="m 1164.62,758.102 0.08,0.039 -194.618,422.029 c -0.547,1.32 -1.184,2.59 -1.789,3.88 l -1.453,3.16 -0.059,-0.03 c -0.324,0.65 -0.703,1.27 -1.054,1.9 7.382,-13.68 11.589,-29.34 11.589,-45.98 0,-14.34 -3.191,-27.91 -8.777,-40.15 l 0.059,-0.03 -88.215,-191.361 107.453,-233.098 0.019,0.008 c 14.915,-34.387 49.125,-58.457 89.005,-58.457 53.57,0 96.99,43.429 96.99,97 0,14.707 -3.37,28.597 -9.23,41.09 z"/>
+        </clipPath>
+        <linearGradient id="linearGradient264" spreadMethod="pad" gradientTransform="matrix(265.274,-595.434,-595.434,-265.274,846.292,1230.46)" gradientUnits="userSpaceOnUse" y2="0" x2="1" y1="0" x1="0">
+            <stop id="stop260" offset="0" style="stop-opacity: 1; stop-color: rgb(162, 16, 88);"/>
+            <stop id="stop262" offset="1" style="stop-opacity: 1; stop-color: rgb(66, 22, 68);"/>
+        </linearGradient>
+        <clipPath id="clipPath274" clipPathUnits="userSpaceOnUse">
+            <path id="path272" d="m 880.316,1240.11 c -37.687,0 -70.273,-21.54 -86.328,-52.93 l -0.058,0.03 -1.457,-3.16 c -0.606,-1.29 -1.239,-2.56 -1.785,-3.88 l -194.622,-422.029 0.079,-0.039 c -5.86,-12.493 -9.227,-26.383 -9.227,-41.09 0,-53.571 43.418,-97 96.992,-97 39.871,0 74.09,24.07 89.004,58.457 l 0.02,-0.008 195.664,424.459 -0.059,0.03 c 5.586,12.24 8.777,25.81 8.777,40.15 0,53.58 -43.425,97.01 -97,97.01 z"/>
+        </clipPath>
+        <linearGradient id="linearGradient280" spreadMethod="pad" gradientTransform="matrix(259.548,595.434,595.434,-259.548,649.304,625.36)" gradientUnits="userSpaceOnUse" y2="0" x2="1" y1="0" x1="0">
+            <stop id="stop276" offset="0" style="stop-opacity: 1; stop-color: rgb(238, 26, 109);"/>
+            <stop id="stop278" offset="1" style="stop-opacity: 1; stop-color: rgb(162, 16, 88);"/>
+        </linearGradient>
+    </defs>
+
+    <metadata id="metadata5">
+
+
+        image/svg+xml
+
+
+
+
+    </metadata>
+    <g id="layer1">
+        <g id="g216" transform="matrix(0.0826697,0,0,-0.0826697,-36.864228,126.62103)">
+            <path d="m 1553.87,927.555 h 65.89 l -32.94,73.465 z m 153.53,-68.524 c 0,-7.25 -2.92,-13.41 -8.73,-18.461 -5.82,-5.039 -12.47,-7.558 -19.93,-7.558 -5.06,0 -9.68,1.297 -13.84,3.937 -4.17,2.641 -7.47,6.59 -9.89,11.871 l -14.82,33.27 h -106.74 l -15.16,-33.27 c -2.42,-5.281 -5.76,-9.23 -10.04,-11.871 -4.29,-2.64 -8.95,-3.937 -14,-3.937 -7.47,0 -14.23,2.519 -20.27,7.558 -6.04,5.051 -9.06,11.211 -9.06,18.461 0,3.953 0.99,8.016 2.97,12.188 l 86.98,178.561 c 2.85,5.93 7.08,10.48 12.68,13.67 5.6,3.19 11.8,4.78 18.6,4.78 6.6,0 12.75,-1.59 18.46,-4.78 5.7,-3.19 9.99,-7.74 12.84,-13.67 l 86.99,-178.561 c 1.97,-4.172 2.96,-8.235 2.96,-12.188" style="fill: rgb(238, 26, 109); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path218"/>
+            <path d="m 1972.6,899.383 c 11.31,11.094 16.96,28.055 16.96,50.898 0,22.84 -5.65,39.754 -16.96,50.739 -11.32,10.98 -28.28,16.48 -50.9,16.48 h -29.65 V 882.754 h 29.65 c 22.62,0 39.58,5.535 50.9,16.629 z m -133.93,-58.145 c -4.83,4.821 -7.24,11.75 -7.24,20.762 v 176.25 c 0,9 2.41,15.92 7.24,20.75 4.84,4.82 11.75,7.26 20.77,7.26 h 66.54 c 25.7,0 47.82,-4.67 66.39,-14.01 18.55,-9.33 32.78,-22.68 42.66,-40.03 9.88,-17.349 14.83,-37.993 14.83,-61.939 0,-24.16 -4.9,-44.972 -14.66,-62.422 -9.79,-17.461 -23.95,-30.808 -42.5,-40.031 -18.57,-9.226 -40.8,-13.84 -66.72,-13.84 h -66.54 c -9.02,0 -15.93,2.41 -20.77,7.25" style="fill: rgb(238, 26, 109); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path220"/>
+            <path d="m 2327.25,896.09 c 9.89,12.414 14.83,30.469 14.83,54.191 0,23.731 -5,41.739 -14.99,54.029 -10,12.3 -23.67,18.46 -41.01,18.46 -17.58,0 -31.31,-6.1 -41.18,-18.29 -9.9,-12.187 -14.84,-30.253 -14.84,-54.199 0,-23.937 4.94,-42.062 14.84,-54.355 9.87,-12.305 23.6,-18.449 41.18,-18.449 17.57,0 31.3,6.203 41.17,18.613 z M 2224.3,845.68 c -17.46,9.781 -30.92,23.617 -40.35,41.515 -9.46,17.899 -14.17,38.926 -14.17,63.086 0,24.16 4.71,45.184 14.17,63.099 9.43,17.89 22.89,31.67 40.35,41.34 17.46,9.66 38.06,14.49 61.78,14.49 23.71,0 44.3,-4.83 61.76,-14.49 17.47,-9.67 30.85,-23.45 40.19,-41.34 9.35,-17.915 14,-38.939 14,-63.099 0,-24.16 -4.71,-45.187 -14.16,-63.086 -9.45,-17.898 -22.9,-31.734 -40.35,-41.515 -17.46,-9.77 -37.95,-14.66 -61.44,-14.66 -23.72,0 -44.32,4.89 -61.78,14.66" style="fill: rgb(238, 26, 109); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path222"/>
+            <path d="m 2665.89,970.387 c 5.39,4.609 8.08,11.742 8.08,21.41 0,19.113 -10.99,28.663 -32.95,28.663 h -43.49 v -56.995 h 43.49 c 11.21,0 19.49,2.305 24.87,6.922 z M 2544.98,840.09 c -5.38,5.379 -8.06,12.68 -8.06,21.91 v 176.25 c 0,9 2.41,15.92 7.24,20.75 4.84,4.82 11.75,7.26 20.76,7.26 h 84.34 c 25.7,0 45.67,-6.55 59.96,-19.61 14.27,-13.07 21.42,-31.24 21.42,-54.521 0,-23.07 -7.21,-41.184 -21.58,-54.359 -14.39,-13.18 -34.32,-19.762 -59.8,-19.762 h -51.73 V 862 c 0,-9.23 -2.74,-16.531 -8.23,-21.91 -5.5,-5.399 -12.97,-8.078 -22.4,-8.078 -9.22,0 -16.53,2.679 -21.92,8.078" style="fill: rgb(238, 26, 109); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path224"/>
+            <path d="m 2925.36,840.41 c -5.6,5.391 -8.4,12.578 -8.4,21.59 v 155.16 h -46.45 c -9.67,0 -16.86,2.03 -21.58,6.1 -4.72,4.06 -7.08,10.26 -7.08,18.62 0,8.34 2.36,14.48 7.08,18.44 4.72,3.95 11.91,5.94 21.58,5.94 h 154.18 c 9.67,0 16.86,-1.99 21.58,-5.94 4.72,-3.96 7.08,-10.1 7.08,-18.44 0,-8.36 -2.36,-14.56 -7.08,-18.62 -4.72,-4.07 -11.91,-6.1 -21.58,-6.1 h -46.45 V 862 c 0,-9.012 -2.81,-16.199 -8.4,-21.59 -5.6,-5.379 -13.01,-8.07 -22.24,-8.07 -9.23,0 -16.64,2.691 -22.24,8.07" style="fill: rgb(238, 26, 109); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path226"/>
+            <path d="m 3189.24,840.09 c -5.37,5.379 -8.07,12.68 -8.07,21.91 v 176.25 c 0,9 2.7,16.19 8.07,21.57 5.39,5.39 12.7,8.08 21.92,8.08 9.44,0 16.9,-2.69 22.4,-8.08 5.49,-5.38 8.24,-12.57 8.24,-21.57 V 862 c 0,-9.23 -2.75,-16.531 -8.24,-21.91 -5.5,-5.399 -12.96,-8.078 -22.4,-8.078 -9.22,0 -16.53,2.679 -21.92,8.078" style="fill: rgb(238, 26, 109); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path228"/>
+            <path d="m 3410.64,856.73 c -17.46,17.125 -26.19,42.165 -26.19,75.106 v 106.414 c 0,9 2.68,16.19 8.07,21.57 5.38,5.39 12.57,8.08 21.57,8.08 9.01,0 16.2,-2.69 21.59,-8.08 5.38,-5.38 8.07,-12.57 8.07,-21.57 V 929.527 c 0,-16.687 3.73,-29.539 11.2,-38.543 7.45,-9.004 18.23,-13.507 32.29,-13.507 14.04,0 24.81,4.503 32.28,13.507 7.46,9.004 11.2,21.856 11.2,38.543 v 108.723 c 0,9 2.69,16.19 8.07,21.57 5.38,5.39 12.57,8.08 21.58,8.08 9,0 16.25,-2.69 21.74,-8.08 5.5,-5.38 8.24,-12.57 8.24,-21.57 V 931.836 c 0,-32.727 -8.84,-57.707 -26.52,-74.945 -17.69,-17.243 -43.21,-25.871 -76.59,-25.871 -33.61,0 -59.14,8.57 -76.6,25.71" style="fill: rgb(238, 26, 109); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path230"/>
+            <path d="m 3959.41,1059.67 c 5.26,-5.5 7.9,-12.64 7.9,-21.42 V 859.031 c 0,-8.359 -2.43,-14.941 -7.25,-19.761 -4.83,-4.84 -11.2,-7.258 -19.11,-7.258 -7.69,0 -14,2.418 -18.95,7.258 -4.93,4.82 -7.41,11.402 -7.41,19.761 v 96.856 l -37.56,-69.192 c -3.74,-7.031 -7.68,-12.019 -11.85,-14.988 -4.18,-2.961 -9.12,-4.445 -14.83,-4.445 -5.71,0 -10.66,1.484 -14.82,4.445 -4.17,2.969 -8.14,7.957 -11.87,14.988 l -37.22,67.219 v -94.883 c 0,-8.133 -2.47,-14.66 -7.41,-19.609 -4.95,-4.934 -11.36,-7.41 -19.27,-7.41 -7.7,0 -14.01,2.418 -18.96,7.258 -4.93,4.82 -7.4,11.402 -7.4,19.761 v 179.219 c 0,8.78 2.69,15.92 8.07,21.42 5.38,5.48 12.24,8.23 20.58,8.23 5.94,0 11.32,-1.7 16.15,-5.11 4.84,-3.41 8.89,-8.29 12.19,-14.66 l 60.62,-113.982 60.29,113.982 c 6.81,13.17 16.04,19.77 27.68,19.77 8.34,0 15.15,-2.75 20.43,-8.23" style="fill: rgb(238, 26, 109); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path232"/>
+            <path d="m 880.316,1310.11 c -62.961,0 -119.921,-34.89 -148.652,-91.03 l -0.644,-1.27 -0.606,-1.3 -197.922,-429.041 -1.445,-3.149 -1.133,-3.269 c -3.906,-11.301 -13.008,-40.129 -13.008,-64.039 0,-92.09 74.922,-167 167.004,-167 63.887,0 121.836,36.347 149.844,93.277 l 171.826,-77.328 c 22.4,-10.582 46.38,-15.949 71.28,-15.949 92.08,0 167,74.91 167,167 0,23.91 -9.1,52.738 -13.01,64.039 l -1.13,3.269 -1.46,3.16 c -191.33,414.51 -199.26,431.69 -200.89,434.78 v 0 c -29.202,54.18 -85.55,87.85 -147.054,87.85 v 0" style="fill: rgb(255, 255, 255); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path234"/>
+            <g id="g236">
+                <g id="g238" clip-path="url(#clipPath242)">
+                    <path d="m 987.855,678.469 -0.019,-0.008 -107.453,233.098 -81.121,-175.989 235.718,-106.09 0.01,0.02 c -21.01,10.078 -37.838,27.52 -47.135,48.969" style="fill: url(&quot;#linearGradient248&quot;); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path250"/>
+                </g>
+            </g>
+            <g id="g252">
+                <g id="g254" clip-path="url(#clipPath258)">
+                    <path d="m 1164.62,758.102 0.08,0.039 -194.618,422.029 c -0.547,1.32 -1.184,2.59 -1.789,3.88 l -1.453,3.16 -0.059,-0.03 c -0.324,0.65 -0.703,1.27 -1.054,1.9 7.382,-13.68 11.589,-29.34 11.589,-45.98 0,-14.34 -3.191,-27.91 -8.777,-40.15 l 0.059,-0.03 -88.215,-191.361 107.453,-233.098 0.019,0.008 c 14.915,-34.387 49.125,-58.457 89.005,-58.457 53.57,0 96.99,43.429 96.99,97 0,14.707 -3.37,28.597 -9.23,41.09" style="fill: url(&quot;#linearGradient264&quot;); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path266"/>
+                </g>
+            </g>
+            <g id="g268">
+                <g id="g270" clip-path="url(#clipPath274)">
+                    <path d="m 880.316,1240.11 c -37.687,0 -70.273,-21.54 -86.328,-52.93 l -0.058,0.03 -1.457,-3.16 c -0.606,-1.29 -1.239,-2.56 -1.785,-3.88 l -194.622,-422.029 0.079,-0.039 c -5.86,-12.493 -9.227,-26.383 -9.227,-41.09 0,-53.571 43.418,-97 96.992,-97 39.871,0 74.09,24.07 89.004,58.457 l 0.02,-0.008 195.664,424.459 -0.059,0.03 c 5.586,12.24 8.777,25.81 8.777,40.15 0,53.58 -43.425,97.01 -97,97.01" style="fill: url(&quot;#linearGradient280&quot;); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path282"/>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/main/resources/assets/railroad/images/Azul-icon.svg b/src/main/resources/assets/railroad/images/Azul-icon.svg
new file mode 100644
index 00000000..6b565063
--- /dev/null
+++ b/src/main/resources/assets/railroad/images/Azul-icon.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 449 187.1" xmlns="http://www.w3.org/2000/svg"><path d="m196.2 156.9-.8 1 22.1.6-23.3 1-1.2 1.5 24.5 1.1-26.1 1-1.1 1.4 27.2 1.1-28.9 1.2-1 1.3 29.9 1.1-31.7 1.2-1 1.2 32.7 1.2L183 174l-.9 1.1 35.4 1.2-37.3 1.3-.8 1 38.1 1.3-39.9 1-.7.9 40.6 1.6-42.2.5-.9 1.2h71.4v-28.2zm-1.6-7.4 46.1-60.9h-.7L192 147l44.1-58.4h-.8l-46.2 56.2 42.5-56.2h-.9l-44.4 53.9 40.8-53.9H226l-42.5 51.7 39-51.7h-1.2l-40.7 49.5L218 88.6h-1.4l-38.8 47.2 35.7-47.2H212l-37 45 34-45h-1.7l-35.2 42.8 32.4-42.8h-1.1l-59.8 75.9v20.6h25.8l76.5-96.5h-1.2zM131.3 185c-5 1.6-9.1 2-16.4 2-13.9 0-24.6-6.5-29-20.7h-.3c-4.2 7.9-14.9 20.7-42.1 20.7-28.3.1-43.5-13.8-43.5-35 0-31.4 32.2-40.6 67.2-40.6h16.5v-5.8c0-13.3-8.1-22.2-24.3-22.2-13.6 0-22.2 6.8-23.5 17.8H3.4c2.1-29 24.6-45 57.8-45 37.4 0 57.3 19.6 57.3 52.1v41.3c0 5.2 2.4 7.8 6 7.8 2.2 0 4.5-.4 6.5-1.3zm-47.6-45.8v-8.1H65.2c-19.1 0-30.3 5.5-30.3 16.7 0 8.4 6.3 13.1 18.6 13.1 18.7 0 30.2-11.5 30.2-21.7M449 184.6c-5.4 1.8-11.1 2.6-16.8 2.5-20.9 0-31.7-12.6-31.7-35.3V0h35.9v149.7c0 5 2.6 7.8 6.3 7.8 2.2 0 4.3-.4 6.3-1.3zm-57.7-28.4c-2 .9-4.1 1.3-6.3 1.3-3.7 0-6.3-2.9-6.3-7.8V57.6h-36.1v71.7c0 16-10.2 26.7-23.5 26.7-14.4 0-22-9.4-22-24.3v-74H261V140c0 26.4 14.9 47.1 44.2 47.1 15.8 0 30.6-7.9 39.4-21 3.8 13.7 13.9 21 29.9 21 5.7.2 11.4-.7 16.8-2.5zM143.6 56.9v.5l62.3 1.3-62.3 1.3v1l62.3 1.2-62.3 1.3v1l62.3 1.3-62.3 1.3v1l62.3 1.3-62.3 1.3v1l62.3 1.2-62.3 1.3v1l62.3 1.3-62.3 1.3v1l62.3 1.3-62.3 1.2v1.1l62.3 1.2-62.3 1.3v.5H246V56.9z" fill="#142241"/></svg>
diff --git a/src/main/resources/assets/railroad/images/GraalVM-icon.svg b/src/main/resources/assets/railroad/images/GraalVM-icon.svg
new file mode 100644
index 00000000..be4c8939
--- /dev/null
+++ b/src/main/resources/assets/railroad/images/GraalVM-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" viewBox="0 0 450.59 377" height="377pt" width="600.787"><path d="M129.121 297.836s15.758.035 15.781.016c12.325 0 13.703-6.485 19.024-13.157 5.312-6.672 8.12-9.832 11.383-7.355 11.46 9.183 21 16.164 29.347 9.879 15.121-11.582 21.797-39.969 35.95-56.29 3.304-4.222 10.68-10.488 14.187-14.534 1.644-1.735.7-3.38-.996-2.36-7.137 4.793-23.223 15.278-35.133 37.426-11.004 20.07-18.953 26.922-27.832 21.601-4.55-2.542-7.348-6.203-13.535-10.535-6.192-4.332-12.227 4.551-15.406 7.735-3.184 3.183-9.66 12.406-15.23 13.465-5.571 1.062-11.806-.528-15.65 7.164-2.253 4.375-1.89 6.945-1.89 6.945m145.75-154.453c6.488 8.734 6.008 16.187.762 23.258-3.735 5.648-6.012 10.367-6.735 18.015-.953 12.63 8.614 24.262 20.075 25.406 5.746.239 10.718-1.667 14.804-5.707 13.555-13.402 13.493-46.042 13.399-50.968l5.91-.075c.61 1.567 2.629 6.325 6.746 12.422 15.164 22.453 27.762 27.957 37.852 25.914 6.91-1.582-13.114-16.28-14.739-17.843-1.629-1.567-.574-2.868 2.332-1.23.93.523 39.477 20.562 27.961 28.984-9.66 6.59-26.05 4.82-38.437-5.73-12.516-11.032-23.106-32.4-23.207-32.614l-.688-1.39s-.094-.192-.101.019c.02.707.07 2.734.082 3.215.601 33.261-9.86 51.101-29.793 53.023-15.13 1.18-32.567-9.934-34.805-28.46-2.52-26.75 14.941-43.138 18.582-46.24M132.457 82.344s2.48-4.754 8.926-1.781c5.07 2.453 15.453 13.042 26.492 35.539 19.52 40.617 14.848 20.214 5.832-1.141-3.742-8.867-8.082-17.613-12.875-24.621-4.852-7.09-12.73-15.63-19.5-19.461-10.254-5.715-12.508-.117-11.793 5.203.399 3.32 2.918 6.262 2.918 6.262M68.125 301.89c3.645-4.433 6.969-6.074 15.352-6.074 8.48 0 11.218-2.359 18.308-15.765 7.836-14.82 15.344-19.719 21.985-24.051 6.066-3.402 14.62-7.73 18.804-18.035.899-1.985 2.067-5.23 3.414-8.988l.098-.27c1.496-4.172 3.25-9.05 5.09-13.465l.02.09s5.683-14.434 3.07 5.113c-1.176 8.797-.645 14.352.293 17.844a16.97 16.97 0 0 0 5.046 7.27c3.684 3.136-.984 1.566-7.261 4.058-1.457.574-2.922 1.606-4.422 2.863-3.664 3.801-8.414 7.836-14.067 10.735-14.73 7.543-22.554 22.45-27.523 28.82l-1.32 1.906c-6.934 10.024-10.75 15.54-18.348 15.54 0 0-21.043.019-21.059 0 .047-1.227.364-4.958 2.52-7.59" style="stroke:none;fill-rule:nonzero;fill:#2c7493;fill-opacity:1"/><path d="M211.336 138.336c9.055-14.629 27.941-30.856 52.453-30.856 1.55 0 3.133.067 4.73.204.024 0 .043.007.06.007 3.554-5.632 8.816-12.988 13.206-15.097 5.106-2.45 11.914-.524 14.16 6.492 1.532 4.781.332 13.805-1.02 12.836-1.722-1.234-1.53-17.11-10.054-11.75-3.293 2.078-5.785 7.656-6.59 9.64 9.098 2.82 15.977 7.696 20.528 14.555 2.918 4.621 7.675 15.078 4.546 27.746-1.382 5.602-2.199-1.34-3.703-8.629-1.398-6.136-3.199-12.964-10.297-18.828-7.097-5.863-17.59-9.535-30.023-8.164-12.043 1.356-22.84 7.297-30.824 16.738-1.977 2.333-6.727 9.38-7.613 10.747-5.317 8.207-8.36 12.886-18.856 12.78 1.676-4.452 4.516-10.698 9.297-18.421M113.242 74.05c5.672 3.477 12.64 9.138 20.098 17.868 8.144 9.547 17.469 22.914 27.71 39.738 5.966 9.793 7.7 15.473 7.38 16.145h-.008c-.164 0-2.332-.278-11.973-13.738-21.258-30.88-39.914-51.329-44.441-48.739l-.016.008c-.539.336-.824 1.031-.84 2.07.348 12.106 26.114 57.637 62.938 79.297-5.38 13.656-3.39 25.043 2.828 36.285 4.262 7.703 19.91 23.508 34.363 19.38 14.457-4.134 9.903-44.18-13.867-52.227-6.797-2.082-11.09 2.175-12.61 7.922-1.437 5.425-.769 12.09-.308 15.261.168 1.157-.367.828-.68.32-8.671-14.234-2.07-26.882 6.028-29.44 9.453-2.985 22.34 3.788 30.129 16.616 12.523 22.414 6.625 41.395-3.407 47.395-18.02 11.016-47.488-8.207-53.656-30.793-2.312-9.39-.887-19.11 2.598-27.016-52.254-36.336-63.98-70.418-66.301-87.566-1.258-11.246 6.473-13.418 14.035-8.785" style="stroke:none;fill-rule:nonzero;fill:#2c7493;fill-opacity:1"/></svg>
\ No newline at end of file
diff --git a/src/main/resources/assets/railroad/images/IBM-icon.svg b/src/main/resources/assets/railroad/images/IBM-icon.svg
new file mode 100644
index 00000000..b128ca0d
--- /dev/null
+++ b/src/main/resources/assets/railroad/images/IBM-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1075" height="401.15" viewBox="0 0 1075 401.15" xml:space="preserve"><title>Logo International Business Machines Corporation</title><path d="M0 373.17h194.43v27.932H0zm0-53.34h194.43v27.932H0zm55.468-53.29h83.399v27.932H55.468zm0-53.29h83.399v27.932H55.468zm0-53.29h83.399v27.932H55.468zm0-53.38h83.399v27.932H55.468zM0 53.288h194.43V81.22H0zM0 0h194.43v27.932H0zm222.17 400.85 207.11.297c27.734 0 52.793-10.697 71.513-27.932h-278.62zm0-53.09H521.2a99.2 99.2 0 0 0 11.094-27.932h-310.12zm55.56-81.22h83.3v27.932h-83.3zm166.7 0v27.932h90.927c0-9.608-1.288-19.017-3.764-27.932zm53.49-53.29H277.73v27.932h243.46c-6.34-10.698-14.165-20.107-23.277-27.932zm-220.19-53.29v27.932h220.19c9.311-7.825 17.135-17.235 23.277-27.932zm0-53.38h83.3v27.932h-83.3zm166.7 27.93h87.163c2.476-8.914 3.764-18.324 3.764-27.932H444.43zm76.77-81.222H222.17V81.22h310.12c-2.575-9.905-6.339-19.314-11.093-27.932zM429.28 0H222.17v27.932H500.7A105.15 105.15 0 0 0 429.286 0zm126.29 81.22h187.1l-9.61-27.932H555.57zm0-53.288h168.68L714.64 0H555.57zM861.03 401.17v-27.93H1000v27.93zm0-53.41v-27.93H1000v27.93zm-83.3-165.22-7.82-22.58H611.03v27.93h83.4v-25.65l8.82 25.65h148.97l8.81-25.65v25.65h83.4v-27.93H785.56zm166.7-75.96H803.98l-9.61 27.93h150.06zM1000 27.932V0H840.93l-9.61 27.932zM768.13 373.22l9.6 27.63 9.61-27.63zm-18.63-53.39 9.81 27.93h36.85l9.9-27.93zm-18.72-53.29 9.81 27.93h74.29l9.8-27.93zm-8.81-25.36H833.6l9.51-27.93H712.36zM611.03 134.51h150.06l-9.6-27.93H611.03zM1000 53.288H822.4l-9.5 27.932H1000zM555.57 373.22h138.97v27.932H555.57zm0-53.39h138.97v27.932H555.57zm55.46-53.29h83.399v27.932H611.03zm0-53.29h83.399v27.932H611.03zm250 0h83.399v27.932H861.03zm0 53.29h83.399v27.932H861.03zM1052 357.15a22 22 0 0 0-22 22 22 22 0 0 0 22 22 22 22 0 0 0 22-22 22 22 0 0 0-22-22m0 4a18 18 0 0 1 18 18 18 18 0 0 1-18 18 18 18 0 0 1-18-18 18 18 0 0 1 18-18m-9.348 6.793v22.414h5.453v-7.73h3.098l4.164 7.73h5.98l-5.023-8.582c2.462-.964 4.063-3.216 4.063-6.75 0-4.082-2.56-7.082-7.582-7.082zm5.453 4.29h4.055c1.712 0 2.668.75 2.668 2.355v1.613c0 1.605-.956 2.36-2.668 2.36h-4.055z" fill="#1f70c1"/></svg>
\ No newline at end of file
diff --git a/src/main/resources/assets/railroad/images/Liberica-icon.svg b/src/main/resources/assets/railroad/images/Liberica-icon.svg
new file mode 100644
index 00000000..d15d2a4b
--- /dev/null
+++ b/src/main/resources/assets/railroad/images/Liberica-icon.svg
@@ -0,0 +1 @@
+<svg width="53" height="60" viewBox="0 0 53 60" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><path d="M26.226.003 11.658 14.998v30.001l14.568 14.995.006.003.004-.003 14.568-14.995V14.998L26.236.003 26.232 0z" fill="#5bd5ef"/><path d="M10.144 45.604v-31.21l.424-.435L21.499 2.706 0 15v29.998l21.5 12.294-10.932-11.253zM52.463 15 30.964 2.706l10.93 11.253.424.435v31.21l-.424.435-10.93 11.253 21.498-12.294z" fill="#2fbedd"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h53v60H0z"/></clipPath></defs></svg>
diff --git a/src/main/resources/assets/railroad/images/Oracle-icon.svg b/src/main/resources/assets/railroad/images/Oracle-icon.svg
new file mode 100644
index 00000000..b18b2032
--- /dev/null
+++ b/src/main/resources/assets/railroad/images/Oracle-icon.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="red" fill-rule="evenodd" d="M7.957 18.912A6.953 6.953 0 0 1 1 11.962 6.963 6.963 0 0 1 7.957 5h8.087A6.96 6.96 0 0 1 23 11.962a6.95 6.95 0 0 1-6.956 6.95zm7.907-2.453a4.497 4.497 0 0 0 4.503-4.497 4.507 4.507 0 0 0-4.503-4.508H8.136a4.507 4.507 0 0 0-4.503 4.508 4.5 4.5 0 0 0 4.503 4.497z"/></svg>
diff --git a/src/main/resources/assets/railroad/images/SAP-icon.svg b/src/main/resources/assets/railroad/images/SAP-icon.svg
new file mode 100644
index 00000000..a63351ac
--- /dev/null
+++ b/src/main/resources/assets/railroad/images/SAP-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="2000" height="2000" viewBox="52.5 0 2000 2000"><defs><linearGradient id="linear-gradient" x1="117.969" y1="1949.56" x2="2033.405" y2="34.125" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#79dff2" stop-opacity=".6"/><stop offset=".5" stop-color="#d5edf2" stop-opacity=".702"/><stop offset="1" stop-color="#79dff2" stop-opacity=".6"/></linearGradient><linearGradient id="linear-gradient-2" x1="547.934" y1="1414.88" x2="486.754" y2="1067.91" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#937266"/><stop offset="1" stop-color="#dbbcb0"/></linearGradient><linearGradient id="linear-gradient-3" x1="486.594" y1="1231.326" x2="1755.59" y2="1231.326" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffa92f"/><stop offset=".004" stop-color="#ffa92f"/><stop offset="1" stop-color="#ffcc2f"/></linearGradient><linearGradient id="linear-gradient-4" x1="1065.561" y1="1376" x2="1065.561" y2="861.062" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fddc76"/><stop offset="1" stop-color="#ffe699"/></linearGradient><linearGradient id="linear-gradient-5" x1="486.594" y1="1262.061" x2="1689.81" y2="1262.061" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff782f"/><stop offset=".001" stop-color="#ff782f"/><stop offset="1" stop-color="#fb9c40"/></linearGradient><linearGradient id="linear-gradient-6" x1="1190.613" y1="771.938" x2="1518.267" y2="333.156" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0f738d"/><stop offset="1" stop-color="#05647c"/></linearGradient><linearGradient id="linear-gradient-7" x1="1491.825" y1="587.281" x2="1362.895" y2="363.969" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#16a6cb"/><stop offset="1" stop-color="#70d6f0"/></linearGradient><linearGradient id="linear-gradient-8" x1="1389.389" y1="1387.31" x2="1410.301" y2="1294.97" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c5224c"/><stop offset="1" stop-color="#ff0042"/></linearGradient><linearGradient id="linear-gradient-9" x1="1250.78" y1="1484.16" x2="1250.78" y2="1121.12" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#377798" stop-opacity=".631"/><stop offset="1" stop-color="#23b3fd" stop-opacity=".6"/></linearGradient><linearGradient id="linear-gradient-10" x1="1241.358" y1="1424.47" x2="1241.358" y2="1149.47" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b7d1da"/><stop offset="1" stop-color="#b7d1da" stop-opacity="0"/></linearGradient><style>.cls-13{fill-rule:evenodd;fill:#fff}</style></defs><path id="Gradient_Fill_1" data-name="Gradient Fill 1" d="m1103.02 34.13 27.36 1.578a878.7 878.7 0 0 1 202.08 32.879c153.38 43.72 285.14 117.4 402.06 226.336 160.44 149.489 262.84 357.98 291.08 574.551l5.72 50.526v18.947l2.1 21.053c1.51 128.96-14.43 242.51-59.04 364.21-95.55 260.65-305.52 470.64-566.14 566.2-121.68 44.62-235.22 60.56-364.16 59.06l-23.16-2.02c-85.411-3.72-169.387-20.76-250.49-47.8a952.6 952.6 0 0 1-275.755-145.72c-75.122-57.32-141.992-125.41-196.972-202.35C83.07 1251.22 58.809 857.142 234.3 532.632c119.044-220.123 320.98-382.711 559.285-456.79C840.494 61.26 894.342 49.107 943.04 42.7l61.04-6.721 27.37-1.845h71.57Z" style="fill-rule:evenodd;fill:url(#linear-gradient)"/><path id="Color_Fill_2" data-name="Color Fill 2" d="M472 422.321c8.057.14 22.865 3.594 28.809 9.144 6.944 6.483 5.235 16.954-3.67 20.952-11.258 4.118-29.566-5.366-48.294 0-5.186 2.015-20.091 8.8-17.76 15.935 2.283 6.993 13.885 7.82 19.865 8.047 15.949.605 37.326 2.517 50.379 12.228 20.977 15.506 19.9 50 0 65.844-19.658 15.57-45.464 16.96-69.324 16.679-15.08-.177-31.518-4.37-41.195-16.923-5.881-7.629-8.269-23.612 1.506-29.337 5.319-3.115 12.791-2.151 17.561 1.5 4.937 3.783 7.2 10.089 15.843 13.816 12.358 5.33 34.363.707 46.278-4.58 5.409-2.4 13.4-6.274 14.09-12.973 1.435-13.951-17.888-14.126-26.718-15.01-25.767-2.578-63.1-3.052-58.554-39.647a38.1 38.1 0 0 1 4.942-14.737 55.1 55.1 0 0 1 15.73-17.349c9.415-7.074 16.111-10.114 27.357-13.593a101.3 101.3 0 0 1 23.155.004m146.41 69.031c2.219 8.2-4.11 25.55-2.375 39.806 2.3 18.925 8.721 33.781 9.091 37.887.573 6.354-1.438 12.034-8.111 13.8-7.957 2.108-13.489-3.286-20.825-3.42-7.83-.144-38.2 13.976-58.723-6.387-13.551-13.442-13.051-26.433-12.839-43.986.324-26.86 18.309-47.58 44.2-53.756 14.359-2.005 44.781-1.676 49.582 16.056m48.983 156.8c-4.5 6.538-17.926 6.538-22.421 0-2.969-4.318-2.464-12.887-2.472-18.042v-46.321l-2.1-31.579v-37.894c.091-6.649.139-13.161 5.107-18.287 8.182-8.442 20.583-6.154 24.355 5.5 13.763-6.852 34.719-10.221 48.029 0 22.93 17.183 23.058 70.363 4.153 90.465-14.6 15.519-32.97 12.849-52.182 12.849.003 8.457 1.512 37.514-2.469 43.304Zm-79.625-133.83c-.018-3.053.177-9.045-1.2-11.7-4.436-8.518-18.445-.066-22.944 4.392-14.307 14.175-17.911 56.716 11.52 51.65 6.047-1.041 9.621-3.392 14.735-6.451-3.063-12.584-2.035-25.042-2.111-37.896Zm82.1 44.209c.067 9.873-.765 15.358 10.563 17.24 21.7 3.6 28.3-13.664 26.075-31.977-1.236-10.194-.8-15.741-11.47-19.223-24.936.364-25.303 14.09-25.17 33.955Zm-167.5 151.579c-2.262 8.019-5.145 27.933-9.011 33.378-5.863 8.259-20.6 10.646-21.318-8.116-.786-20.591 14.114-62.366 18.9-86.315 2.333-11.662 5-34.191 18.975-37.194 11.5-2.471 16.071 6.8 18.412 16.142 5.4 21.549 6.624 47.1 15.238 67.368 1.91-12.36 6.774-23.888 10.472-35.789l5.369-18.947c2.747-10.986 5.258-32.554 21.855-28.774 10.679 2.432 12.95 17.6 14.352 26.668l9.891 58.948 9.259 37.894c1.732 19.5-13.214 18.731-19.206 11.971-4.714-5.317-9.734-29.024-11.975-37.234l-8.442-35.789c-1.746 11.3-13.175 45.6-17.793 56.842-2.738 6.664-6.11 14.414-13.863 16.142-10.346 2.305-14.484-5.777-17.289-14.038-4.929-14.518-9.8-40.773-16.31-52.631-1.152 12.784-4.2 17.704-7.519 29.469ZM848.79 676c4.929-1.543 11.682-1.89 16.84-1.6 25.929 1.482 25.222 30.906 25.26 50.434l2.022 27.368c.364 9.866-1.336 21.19-14.563 18.248-13.1-2.914-12.151-24.57-12.9-35.09l-1.135-14.737c.265-5.52 2.789-15.141-2.659-19.157-5.824-4.292-14.636 4.59-17.9 8.722-5.533 7.008-9.068 14.112-9.608 23.067-.452 7.5 1.149 20.786-2.562 27.062-4.724 7.989-16.38 8.135-20.636 1.751-2.589-3.883-2.143-11.577-2.152-16.181l1.213-86.316c.845-6.411.233-22.5 3.044-26.708 4.261-6.378 15.38-6.075 19.45 3.67 2.582 6.184 1.553 39.378 1.553 48.3 5.131-4.079 8.289-6.812 14.733-8.833m80.54-44.345c4.722 4.756 5.018 17.062-6.954 18.993-14.771 2.384-22.547-12.008-9.961-21.1 5.536-1.398 12.357-2.481 16.915 2.11Zm153.11 74.432 21.05-6.028c5.31-.584 10.48.2 11.93 6.139 5.24 21.366-27.75 25.109-41.4 24.949-14.76-.173-29.3-4.149-38.2-16.917-13.35-19.171-6.57-63.545 21.36-75.232 14.92-6.241 51.84-4.709 54.45 18.474.46 4.1.04 8.887-1.87 12.6-6.45 12.583-38.91 26.293-52.58 29.5v4.21c8.32 1.518 16.78 3.555 25.26 2.308Zm-116.431 29.161c-1.831 6.689-7.431 9.281-14.036 7.841-11.4-2.484-10.545-13.335-10.47-22.458v-35.789L943.434 668c.357-8.135-1.919-20.034 8.614-22.458 9.815-2.259 12.856 3.913 14.622 11.932 8.224-6.657 12.25-9.868 23.155-10.436 28.755-1.5 29.435 17.43 29.465 39.909l2.11 33.684c.03 8.055 1.72 20.116-8.54 22.458-17.156 3.918-16.7-17.954-16.724-28.773v-25.263c-.11-8.873-.572-10.412-2.1-18.948-32.874 19.052-23.936 50.215-28.027 65.143m89.071-56.722c11.24-3.925 23.04-8.323 31.57-16.842-16.68-2.048-25.45-1.05-31.57 16.842m-128.736-6.195v67.248c.265 9.676-.792 21.329-14.285 18.247-9.768-2.231-8.524-12.58-8.539-20.352v-52.632c.017-8.619-1.241-12.349 4.871-18.9 7.485-2.742 15.089-2.883 17.953 6.389m-224.436 6.587c3.472 7.7.487 18.94 0 26.977-1.29 16.982 7.069 36.529 7.394 42.1.343 5.864-1.777 10.653-7.983 11.868-6.467 1.267-11.561-3.245-18.824-2.784-7.733.491-32.779 10.962-50.075-5.575-18.042-17.25-19.085-70.807 24.815-84.488 12.856-2.122 38.459-2.416 44.673 11.902m87.467 5.854c5.657 4.448 9.258 14.038 3.424 19.861-7.884 7.869-19.5-3.033-28.209-2.712-13.072.481-27.5 23.461-21.783 35.648 11.128 23.705 39.329-1.053 50.592 6.275 11.225 7.3-.257 19.463-7.768 23.475a46.4 46.4 0 0 1-21.041 5.861c-14.35.676-28.668-2.279-38.885-13.236-22.341-23.959-4.331-70.2 24.15-82.156 12.909-2.673 28.76-1.477 39.52 6.984M678.277 703.8c-.286-16.932-11.719-16.264-22.922-7.231-15.979 12.883-12.169 42.415 10.3 39.283 4.557-.635 10.394-3.024 14.735-4.691-2.898-11.922-1.915-15.652-2.113-27.361" style="fill-rule:evenodd;fill:#2c7491"/><path id="propeller" d="M522.909 1281.24c-70.7 154.4-178.686 166.59-135.969 79.61 27.437-57.31 78.33-96.47 82.63-98.46 48.107-17.58 9.913-31.25 2.965-34.99-96.053-31-162.813-171.77-74.658-129.01 55 26.2 83.377 44.97 106.436 83.6 24.716 45.98 26.541 9.77 35.689-4.31 5.359-21.03 54.224-78.38 77.707-91.55 92.9-49.86 50.766 18.3 50.766 18.3C652 1128 596 1206 522.909 1281.24" style="fill-rule:evenodd;fill:url(#linear-gradient-2)"/><path id="body" d="M1517.7 898.947c206.82 95.263 238.92 326.313 237.87 385.263 4.21 349.47-377.85 417.9-569.4 409.47-376.8-29.47-568.353-135.79-643.08-314.73-82.1-75.79-50.52-117.9-50.52-117.9s32.914 2.49 40-2.1c-4.019-16.27-2.679-50.53 2.488-62.97 1.913-6.89 5.741-10.91 13.395-14.74 33.489-13.01 95.682-31.06 173.567-40.19 13.288-5 35-22.23 37.89-27.37 108.753-149.47 280.15-191.38 279.96-191.575 2.3-25.837 31.77-47.464 31.57-47.081-.19-19.139 45.36-110.239 159.98-106.6 56.14 2.1 203.55 17.574 206.29 18.947.46 2.38 6.32 52.632 6.32 52.632l10.52 21.052s75.26.524 63.15 37.892" style="fill-rule:evenodd;fill:url(#linear-gradient-3)"/><path id="top_lights" data-name="top lights" d="M1351.41 938.947c224.53-13.333 263.12 74.383 267.33 101.053 2.11 33.68-43.5 34.39-59.64 12.63-37.19-61.051-189.45-101.051-207.69-113.683m166.29-40c-22.36-14.737-150.5-3.158-227.34-20.263 66.31-6.053 164.19-17.632 164.19-17.632s75.26.527 63.15 37.895M532.182 1259.11c-1.854 1.61-11.613 2.76-19.911 2.67C525.987 1328.29 722 1334 756 1326c96-18 128 50 128 50s-26-80-70-80c-26 2-288.516 1.22-281.435-37.05-.121.05-.248.11-.383.16" style="fill-rule:evenodd;fill:url(#linear-gradient-4)"/><path id="bottom_lights" data-name="bottom lights" d="M1039.87 922.105c3.11-26.636 31.84-47.105 31.77-47.081 34.01-21.077 114-41.866 141.54-44.849 135.07-2.807 230.85 10.088 230.85 10.088s10.66 20.921 10.52 20.921-380.47 40.395-380.47 40.395-31.46 1.945-34.21 20.526M912 1430c11.577 13.68 22.473 34.68 18 46-94.725 8.42-278.5-28.63-386.91-97.05-82.1-75.79-50.52-117.9-50.52-117.9C526.776 1408.42 798.33 1422.63 912 1430m777.8 74.56c-117.01 159.68-362.23 195.34-503.63 189.12-376.8-29.47-568.353-135.79-643.08-314.73 324.17 205.26 729.38 330.52 1146.71 125.61" style="fill-rule:evenodd;fill:url(#linear-gradient-5)"/><path id="roof_light" data-name="roof light" d="M1213.01 830.526c8.15-27.368 7.36-23.684 18.41-62.1 56.14 2.1 203.55 17.574 206.29 18.947.46 2.38 6.32 52.632 6.32 52.632s-148.93-14.742-231.02-9.479" style="fill-rule:evenodd;fill:#ffe698"/><path id="rescope" d="M1192.83 771.93C1239.67 700.351 1080 520 1310 388c62-36 142-64 170-52 84 40 71.26 364.268-170 260-76-40-48.12 138.005-40.69 175.93-5.78-4.737-65.69-5-76.48 0" style="fill-rule:evenodd;fill:url(#linear-gradient-6)"/><path id="recope_glass" data-name="recope glass" d="M1464 366c-116-28-144 242-52 220 102-14 104-206 52-220" style="fill-rule:evenodd;fill:url(#linear-gradient-7)"/><path id="rescope_glass_light" data-name="rescope glass light" d="M1454.98 382.316c43.68 53.158 30.91 115.789 13.02 143.684-26.84 34.737-33.58 25.474-22 6 18.42-35.263 49.5-46.526 8.98-149.684" style="fill-rule:evenodd;fill:#83dcf3"/><path id="window_background" data-name="window background" d="M834.7 1162.11c9.218 23.69 7.328 73.97-22.174 82.83-17.722 5.33-30.45-11.25-35.575-25.99-9.075-26.11-5.844-68.66 22.945-80.73 18.098-3.3 28.614 7.96 34.804 23.89m156.206 12.63c22.05 45.27 11.42 131.76-45.765 144.17-33.012 7.17-56.475-17.68-68.81-45.23-20.846-46.55-7.5-124.74 47.76-139.96 32.262-5.11 53.333 13.33 66.819 41.02Zm223.91 16.84c22.85 48.62 22.91 115.21-4.48 162.1-16.96 29.03-44.79 51.87-79.96 50.45-42.06-1.7-70.71-36.82-84.08-73.6-25.04-68.89-7.28-178.5 75.66-196.92 41.994-5.81 75.664 21.37 92.864 57.97Zm158.34-68.77c53.68-4.21 251.55 0 282.07 6.31 47.53 11.69 78.54 57.63 73.29 100.1-51.57 362.1-392.29 308.13-440.52 27.94-2.286-21.05-21.426-122.87 85.164-134.35Z" style="fill-rule:evenodd;fill:#959595;opacity:.8"/><path id="duke_top" data-name="duke top" d="M1443.26 1182.78c-81.52 43.25-122.09 155.78-122.85 171.86 69.27-23.35 155-4.21 171.08 8.42 5.74 4.21 8.04 20.29 8.8 24.12 8.42 0 13.01-20.29 13.01-20.29s32.32-38.56 34.45-39.43c6.01 1.6 23.77.87 26.41 0 17.22 11.3 25.26-6.12 15.31-8.42 16.45-.76 9.56-17.8 3.44-20.28 9.38-7.66 4.78-12.64-1.15-15.32 0 0-21.62.2-22-2.29.38-20.86 7.84-35.98-23.54-27.56 0 0 7.46 33.68 6.12 35.41-7.46.57-11.48 23.92-9.76 35.59 0 0-29.09 36.37-31.19 37.52-1.34-5.75-12.82-5.56-20.48-5.17 1.53-7.85-40.37-166.89-47.65-174.16" style="fill-rule:evenodd"/><path id="duke_bottom" data-name="duke bottom" class="cls-13" d="M1331 1373a282 282 0 0 1-10.59-18.36c69.27-23.35 155-4.21 171.08 8.42 4.43 3.49 6.12 13.94 8.8 24.12 14.01 53.22 16.27 85.44 5.71 92.82-5.15 3.6-11.45 3.09-22 1-20.29-4.03-42.38-10.74-51-15-24.4-12.06-44.1-26.08-60-41-14.56-13.67-28.51-30.51-42-52m-10-18"/><path id="duke_nose" data-name="duke nose" d="M1441.24 1311.77c21.43 24 12.37 66.81-30.89 74.62-16.18 2.92-35.81-1.24-48.22-12.34a44.2 44.2 0 0 1 1.99-67.67c8.06-6.45 15.39-8.49 25.18-10.67 18.76-2.59 38.82 1.38 51.94 16.06" style="fill-rule:evenodd;fill:url(#linear-gradient-8)"/><path id="duke_nose_light" data-name="duke nose light" class="cls-13" d="M1400.29 1332.63c-11.67 4.22-24.21-10-10.79-19.21 16.31-4.21 22.35 15.03 10.79 19.21"/><path id="window_glass" data-name="window glass" d="M834.7 1162.11c9.218 23.69 7.328 73.97-22.174 82.83-17.722 5.33-30.45-11.25-35.575-25.99-9.075-26.11-5.844-68.66 22.945-80.73 18.098-3.3 28.614 7.96 34.804 23.89m156.206 12.63c22.05 45.27 11.42 131.76-45.765 144.17-33.012 7.17-56.475-17.68-68.81-45.23-20.846-46.55-7.5-124.74 47.76-139.96 32.262-5.11 53.333 13.33 66.819 41.02Zm223.91 16.84c22.85 48.62 22.91 115.21-4.48 162.1-16.96 29.03-44.79 51.87-79.96 50.45-42.06-1.7-70.71-36.82-84.08-73.6-25.04-68.89-7.28-178.5 75.66-196.92 41.994-5.81 75.664 21.37 92.864 57.97Zm158.34-68.77c53.68-4.21 251.55 0 282.07 6.31 47.53 11.69 78.54 57.63 73.29 100.1-51.57 362.1-392.29 308.13-440.52 27.94-2.286-21.05-21.426-122.87 85.164-134.35Z" style="fill-rule:evenodd;opacity:.73;fill:url(#linear-gradient-9)"/><path id="window_glass_lights" data-name="window glass lights" d="M792.883 1149.47c-14.033 26.67-14.735 55.44-4.911 73.69 6.315 13.33 15.436 0 6.315-14.04-13.332-20.35-5.614-32.28-1.404-59.65m108.057 9.13c-35.785 33.68-22.453 109.47-4.912 125.61 18.244 15.44 16.84-.7 8.42-12.63-24.558-36.49-16.84-87.72-3.508-112.98m175.42 23.86s-65.26 73.68 2.8 181.75c16.84 25.97 28.07-16.84 14.04-32.28-65.96-65.97-16.84-149.47-16.84-149.47m592.9-28.78s95.43 81.41-42.8 262.46c-20.35 22.46-35.78-4.91-12.63-30.18 106.66-129.12 68.77-214.03 55.43-232.28" style="fill-rule:evenodd;fill:url(#linear-gradient-10)"/><path id="bubbles" d="M1670 814c12.27 5.271 19.12 16 22 25a40.18 40.18 0 0 1-1 28 39.53 39.53 0 0 1-29 23c-16.36 3.05-34.62-4.607-43-21a39.964 39.964 0 0 1 51-55m11-40a13.017 13.017 0 1 0-16-5 13.21 13.21 0 0 0 16 5m-81-53c9.21-1.62 17.72 5.272 19 14a16.307 16.307 0 1 1-19-14M507 1014a39.78 39.78 0 0 1 36 13 40.28 40.28 0 0 1 9 35 39.065 39.065 0 0 1-35 31c-10.149.9-21.587-2.1-30-10-15.284-14.35-15.764-40.58-3-56a37.97 37.97 0 0 1 23-13m-27-37c-7.839 1.979-16.26-5.01-16-13a12.775 12.775 0 0 1 25-3 13.04 13.04 0 0 1-9 16m68-23c-9.335.276-17-7.8-17-17s7.665-17.276 17-17c9 .266 16 8.193 16 17s-7 16.734-16 17m-76-81c1.455-5.475 8.655-8.84 14-6a9.78 9.78 0 0 1 4 13c-2.769 5.006-9.657 5.913-14 3a9.52 9.52 0 0 1-4-10" style="fill-rule:evenodd;fill:#08a4e4;opacity:.45"/><path id="bubbles_light" data-name="bubbles light" d="M529 1028a6.615 6.615 0 0 1 1 8c-2.241 3.64-8.323 4.19-11 1a6.634 6.634 0 0 1 0-8c2.3-3.04 7.216-3.66 10-1m-49-71a2 2 0 1 1-2 2 2.01 2.01 0 0 1 2-2m5-87a2.236 2.236 0 1 1-3 1 2.247 2.247 0 0 1 3-1m70 58a3.58 3.58 0 0 1 1 4 3.69 3.69 0 0 1-3 2 3.82 3.82 0 0 1-4-2 3.6 3.6 0 0 1 1-4 3.83 3.83 0 0 1 5 0m1115-100a7.71 7.71 0 0 1 6 5 8.27 8.27 0 0 1-1 7c-.72 1.158-2.76 3.823-6 4a7.77 7.77 0 0 1-7-4 8.07 8.07 0 0 1 0-8 7.945 7.945 0 0 1 8-4m12-72a2.74 2.74 0 0 1-1 3 2.65 2.65 0 0 1-3 0 2.76 2.76 0 0 1-1-3 2.7 2.7 0 0 1 2-2 2.77 2.77 0 0 1 3 2m-75-30a4.016 4.016 0 0 1 4 3 3.92 3.92 0 0 1-2 4 4.04 4.04 0 0 1-4 0 3.92 3.92 0 0 1-2-4 4.01 4.01 0 0 1 4-3" style="fill-rule:evenodd;fill:#fff;opacity:.5"/></svg>
diff --git a/src/main/resources/assets/railroad/lang/en_us.lang b/src/main/resources/assets/railroad/lang/en_us.lang
index c186886f..cb9cedbd 100644
--- a/src/main/resources/assets/railroad/lang/en_us.lang
+++ b/src/main/resources/assets/railroad/lang/en_us.lang
@@ -29,6 +29,137 @@ railroad.generic.browse=Browse
 railroad.generic.enable=Enable
 railroad.generic.disable=Disable
 railroad.generic.dismiss=Dismiss
+railroad.generic.unknown=Unknown
+
+# =============================================================================
+# RUN CONFIGURATIONS
+# =============================================================================
+railroad.ide.toolbar.edit_run_configurations=Edit Run/Debug Configurations
+railroad.ide.toolbar.run_configurations.tooltip=Select a run configuration
+railroad.ide.toolbar.run.tooltip=Run selected configuration
+railroad.ide.toolbar.debug.tooltip=Debug selected configuration
+railroad.ide.toolbar.debug.restart.tooltip=Restart running configuration in debug mode
+railroad.ide.toolbar.stop.tooltip=Stop running configuration
+railroad.ide.toolbar.stop.all=Stop All
+railroad.ide.toolbar.restart.tooltip=Restart running configuration
+railroad.ide.toolbar.run_configurations.more_actions.tooltip=Show more actions for the selected configuration
+railroad.ide.toolbar.no_run_configurations=No run configurations
+railroad.window.ide.toolbar.edit_run_configurations=Edit Run/Debug Configurations
+railroad.runconfig.tree.empty=No run configurations yet.
+railroad.runconfig.tree.empty_filtered=No matching run configurations.
+railroad.runconfig.tree.search_prompt=Search run configurations...
+railroad.runconfig.run.tooltip=Run configuration
+railroad.runconfig.debug.tooltip=Debug configuration
+railroad.runconfig.moreactions.tooltip=Show more actions for this configuration
+railroad.runconfig.action.run=Run
+railroad.runconfig.action.debug=Debug
+railroad.runconfig.details.empty.title=Create a run configuration
+railroad.runconfig.details.empty.description=Use the + button to add your first configuration.
+railroad.runconfig.gradle.configuration.task.invalid=Invalid Gradle task.
+railroad.run_configuration.edit=Edit configuration
+railroad.run_configuration.pin=Pin to toolbar
+railroad.run_configuration.delete=Delete configuration
+
+# Run configuration type names
+railroad.runconfig.shellscript=Shell Script
+railroad.runconfig.java_application=Java Application
+railroad.runconfig.jar_application=JAR Application
+railroad.runconfig.gradle=Gradle Task
+railroad.runconfig.compound=Compound
+
+# Generic configuration section
+railroad.runconfig.general.title=General Settings
+railroad.runconfig.general.name.label=Configuration name
+railroad.runconfig.general.name.prompt=Enter a unique configuration name
+railroad.runconfig.general.name.validation.required=A configuration name is required.
+railroad.runconfig.general.name.validation.duplicate=A configuration with this name already exists.
+railroad.runconfig.general.allowMultipleInstances.label=Allow multiple instances
+railroad.runconfig.general.showConsoleOnRun.label=Show console when running
+
+# Compound configurations
+railroad.runconfig.compound.configurations.title=Compound Settings
+railroad.runconfig.compound.configuration.runMode.label=Run mode
+railroad.runconfig.compound.runMode.=Compound run mode
+railroad.runconfig.compound.runMode.parallel=Parallel
+railroad.runconfig.compound.runMode.sequential=Sequential
+railroad.runconfig.compound.configuration.configurations.label=Included configurations
+railroad.runconfig.compound.configuration.configurations.combo.prompt=Select a configuration...
+railroad.runconfig.compound.configuration.configurations.add=Add
+railroad.runconfig.compound.configuration.configurations.remove=Remove
+railroad.runconfig.compound.configuration.configurations.move_up=Move up
+railroad.runconfig.compound.configuration.configurations.move_down=Move down
+railroad.runconfig.compound.configuration.configurations.empty=No configurations selected yet.
+railroad.runconfig.compound.configuration.configurations.validation.required=Select at least one configuration.
+railroad.runconfig.compound.configuration.configurations.entry_format=%s (%s)
+
+# Gradle configurations
+railroad.runconfig.gradle.configuration.title=Gradle Settings
+railroad.runconfig.gradle.configuration.task.label=Task
+railroad.runconfig.gradle.configuration.task.prompt=e.g. build
+railroad.runconfig.gradle.configuration.projectPath.label=Gradle project directory
+railroad.runconfig.gradle.configuration.envVariables.label=Environment variables
+railroad.runconfig.gradle.configuration.envVariables.prompt=KEY=VALUE;KEY2=VALUE2
+railroad.runconfig.gradle.configuration.envVariables.invalid=Environment variables must be KEY=VALUE pairs separated by semicolons.
+railroad.runconfig.gradle.configuration.vmOptions.label=VM options
+railroad.runconfig.gradle.configuration.vmOptions.prompt=e.g. -Xmx1G
+railroad.runconfig.gradle.configuration.javaHome.label=Java home (optional)
+
+# JAR application configurations
+railroad.runconfig.jar_application.configuration.section.title=JAR Settings
+railroad.runconfig.jar_application.configuration.jarPath.label=Executable JAR file
+railroad.runconfig.jar_application.configuration.vmOptions.label=VM options
+railroad.runconfig.jar_application.configuration.vmOptions.prompt=e.g. -Xmx1G
+railroad.runconfig.jar_application.configuration.programArguments.label=Program arguments
+railroad.runconfig.jar_application.configuration.programArguments.prompt=Arguments separated by spaces
+railroad.runconfig.jar_application.configuration.workingDirectory.label=Working directory
+railroad.runconfig.jar_application.configuration.envVariables.label=Environment variables
+railroad.runconfig.jar_application.configuration.envVariables.prompt=KEY=VALUE;KEY2=VALUE2
+railroad.runconfig.jar_application.configuration.envVariables.invalid=Environment variables must be KEY=VALUE pairs separated by semicolons.
+railroad.runconfig.jar_application.configuration.jre.label=Runtime (JRE/JDK)
+
+# Java application configurations
+railroad.runconfig.java_application.configuration.section.title=Java Application Settings
+railroad.runconfig.java_application.configuration.buildBeforeRun.label=Build before run
+railroad.runconfig.java_application.configuration.jdk.label=JDK
+railroad.runconfig.java_application.configuration.mainClass.label=Main class
+railroad.runconfig.java_application.configuration.mainClass.prompt=com.example.Main
+railroad.runconfig.java_application.configuration.classpathEntries.label=Classpath entries
+railroad.runconfig.java_application.configuration.classpathEntries.prompt=Path1;Path2;Path3
+railroad.runconfig.java_application.configuration.programArguments.label=Program arguments
+railroad.runconfig.java_application.configuration.programArguments.prompt=Arguments separated by spaces
+railroad.runconfig.java_application.configuration.vmOptions.label=VM options
+railroad.runconfig.java_application.configuration.vmOptions.prompt=e.g. -Xmx1G
+railroad.runconfig.java_application.configuration.envVariables.label=Environment variables
+railroad.runconfig.java_application.configuration.envVariables.prompt=KEY=VALUE;KEY2=VALUE2
+railroad.runconfig.java_application.configuration.envVariables.invalid=Environment variables must be KEY=VALUE pairs separated by semicolons.
+
+# Shell script configurations
+railroad.runconfig.shell_script.configuration.section.title=Shell Script Settings
+railroad.runconfig.shell_script.configuration.executeMode.label=Execution mode
+railroad.runconfig.shell_script.configuration.scriptPath.label=Script file
+railroad.runconfig.shell_script.configuration.scriptText.label=Inline script
+railroad.runconfig.shell_script.configuration.scriptText.prompt=Paste the script contents here
+railroad.runconfig.shell_script.configuration.scriptArgs.label=Script arguments
+railroad.runconfig.shell_script.configuration.scriptArgs.prompt=Arguments separated by spaces
+railroad.runconfig.shell_script.configuration.workingDirectory.label=Working directory
+railroad.runconfig.shell_script.configuration.envVariables.label=Environment variables
+railroad.runconfig.shell_script.configuration.envVariables.prompt=KEY=VALUE;KEY2=VALUE2
+railroad.runconfig.shell_script.configuration.envVariables.invalid=Environment variables must be KEY=VALUE pairs separated by semicolons.
+railroad.runconfig.shell_script.configuration.interpreterPath.label=Interpreter path
+railroad.runconfig.shell_script.configuration.interpreterArgs.label=Interpreter arguments
+railroad.runconfig.shell_script.configuration.interpreterArgs.prompt=Arguments separated by spaces
+railroad.runconfig.shell_script.configuration.executeInTerminal.label=Run in terminal
+
+# =============================================================================
+# Gradle Tools
+# =============================================================================
+railroad.gradle.tools.tasks=Tasks
+railroad.gradle.tools.dependencies=Dependencies
+railroad.gradle.tools.button.sync.tooltip=Sync Gradle Project
+railroad.gradle.tools.button.downloadsources.tooltip=Download Sources
+railroad.gradle.tools.button.toggleoffline.tooltip=Toggle Offline Mode
+railroad.gradle.tools.ctx_menu.open_gradle_config=Open Gradle Configuration
+railroad.gradle.tools.ctx_menu.sync=Sync Gradle Project
 
 # =============================================================================
 # HOME/WELCOME SCREEN
@@ -49,6 +180,14 @@ railroad.home.welcome.sort.none=None
 railroad.home.welcome.sort.name=Name
 railroad.home.welcome.sort.date=Date
 
+railroad.home.welcome.sort.none.description=Show projects in their natural order.
+railroad.home.welcome.sort.name.description=Arrange projects alphabetically.
+railroad.home.welcome.sort.date.description=Put the most recently opened projects first.
+railroad.home.welcome.sort.tooltip=Sorting projects by %s
+
+railroad.home.welcome.stats.projects=%d projects ready
+railroad.home.welcome.header.tip=Tip: Use search and sorting to jump back into work faster.
+
 # Project actions
 railroad.home.welcome.project.open=Open
 railroad.home.welcome.project.remove=Remove
@@ -73,8 +212,46 @@ settings.tree.keybinds=Keybinds
 railroad.settings.general.language.title=Language
 railroad.settings.general.language.description=Select the language for the Railroad interface.
 
+railroad.settings.directories.empty=No directories configured yet.
+railroad.settings.directories.add.tooltip=Add a directory to this list.
+railroad.settings.directories.add.title=Choose a Directory
+railroad.settings.directories.remove.tooltip=Remove the selected directory from this list.
+
+railroad.settings.files.empty=No files selected yet.
+railroad.settings.files.add.tooltip=Add a file to this list.
+railroad.settings.files.add.title=Choose a File
+railroad.settings.files.remove.tooltip=Remove the selected file from this list.
+
+railroad.settings.ide.jdk_management.title=JDK Management
+railroad.settings.ide.jdk_management.description=Control how Railroad discovers and manages installed JDKs.
+railroad.settings.ide.jdk_management.additional_jdk_scan_paths.title=Additional Scan Paths
+railroad.settings.ide.jdk_management.additional_jdk_scan_paths.description=Scan these directories in addition to the default locations when searching for JDKs.
+railroad.settings.ide.jdk_management.excluded_jdk_scan_paths.title=Excluded Scan Paths
+railroad.settings.ide.jdk_management.excluded_jdk_scan_paths.description=Never scan these directories when looking for JDK installations.
+railroad.settings.ide.jdk_management.additional_jdks.title=Additional JDKs
+railroad.settings.ide.jdk_management.additional_jdks.description=Always include these specific JDK installations even if they are not discovered automatically.
+railroad.settings.ide.jdk_management.java_version_detection_timeout_ms.title=Version detection timeout
+railroad.settings.ide.jdk_management.java_version_detection_timeout_ms.description=Maximum time in milliseconds to wait for java version detection before aborting the scan.
+railroad.settings.ide.jdk_management.detected.title=Detected JDKs
+railroad.settings.ide.jdk_management.detected.refresh.tooltip=Rescan your system for installed JDKs
+railroad.settings.ide.jdk_management.detected.empty=No JDKs detected yet.
+railroad.settings.ide.jdk_management.detected.count=Detected JDKs: %d
+railroad.settings.ide.jdk_management.detected.unknown_version=Unknown Version
+railroad.settings.ide.jdk_management.detected.version=Java %s
+railroad.settings.ide.jdk_management.detected.name=Distribution: %s
+railroad.settings.ide.jdk_management.detected.path=Path: %s
+
 # Keybind settings
 railroad.settings.keybinds.title=Keybinds
+railroad.settings.keybinds.subtitle=Fine-tune shortcuts to match your workflow.
+railroad.settings.keybinds.search=Search keybinds...
+railroad.settings.keybinds.filter.all=All categories
+railroad.settings.keybinds.empty.title=No keybinds match your filters
+railroad.settings.keybinds.empty.subtitle=Try adjusting your search or category filters to see more shortcuts.
+railroad.settings.keybinds.add_binding=Add shortcut
+railroad.settings.keybinds.no_shortcuts=No shortcuts assigned yet
+railroad.settings.keybinds.click_to_record=Click to record
+railroad.settings.keybinds.recording=Recording...
 
 # Keybinds categories
 railroad.settings.keybinds.category.general=General
@@ -82,6 +259,7 @@ railroad.settings.keybinds.category.general=General
 # Keybinds
 railroad.settings.keybinds.copy=Copy
 railroad.settings.keybinds.paste=Paste
+railroad.settings.keybinds.fullscreen=Fullscreen
 
 # Plugin settings
 railroad.window.plugins.title=Plugins
@@ -97,6 +275,18 @@ railroad.plugins.details.dependencies=Dependencies:
 railroad.plugins.placeholder.title=Select a plugin to view its details
 railroad.plugins.placeholder.subtitle=Choose a plugin from the list to learn more about what it provides.
 railroad.plugins.list.version=Version: %s
+railroad.plugins.list.author=Author: %s
+railroad.plugins.list.empty=No plugins available
+railroad.plugins.details.enable=Enable plugin
+railroad.plugins.details.no_description=No description provided.
+railroad.plugins.details.dependencies.none=No dependencies
+railroad.plugins.details.dependencies.count=%d repositories, %d artifacts
+railroad.plugins.details.label.identifier=Identifier
+railroad.plugins.details.label.version=Version
+railroad.plugins.details.label.author=Author
+railroad.plugins.details.label.license=License
+railroad.plugins.details.label.main_class=Main Class
+railroad.plugins.details.label.dependencies=Dependencies
 
 # Appearance settings
 railroad.settings.appearance.themes.title=Themes
@@ -139,13 +329,48 @@ railroad.home.settings.appearance.selecttheme=Select Theme
 # Theme preview
 railroad.home.settings.appearance.preview.title=Theme Preview
 railroad.home.settings.appearance.preview.subtitle=This preview shows how various UI components will look with the selected theme.
-railroad.home.settings.appearance.preview.form.components=Form Components
-railroad.home.settings.appearance.preview.list.components=List Components
-railroad.home.settings.appearance.preview.button.components=Button Components
 railroad.home.settings.appearance.preview.close=Close Preview
 railroad.home.settings.appearance.preview.apply=Apply Theme
 railroad.home.settings.appearance.preview.tooltip=Preview theme
 
+railroad.home.settings.appearance.preview.navigation.0=Home
+railroad.home.settings.appearance.preview.navigation.1=Projects
+railroad.home.settings.appearance.preview.navigation.2=Settings
+railroad.home.settings.appearance.preview.navigation.3=Help
+
+railroad.home.settings.appearance.preview.form.components=Form Components
+railroad.home.settings.appearance.preview.form.text_prompt=Enter text here...
+railroad.home.settings.appearance.preview.form.password_prompt=Password
+railroad.home.settings.appearance.preview.form.combo_box.items.0=Option 1
+railroad.home.settings.appearance.preview.form.combo_box.items.1=Option 2
+railroad.home.settings.appearance.preview.form.combo_box.items.2=Option 3
+railroad.home.settings.appearance.preview.form.check_box.label=Enable feature
+railroad.home.settings.appearance.preview.form.radio_button.label=Radio option
+railroad.home.settings.appearance.preview.form.toggle_button.label=Toggle things
+
+railroad.home.settings.appearance.preview.list.components=List Components
+railroad.home.settings.appearance.preview.list.items.0=Project 1 - Minecraft Mod
+railroad.home.settings.appearance.preview.list.items.1=Project 2 - Fabric Plugin
+railroad.home.settings.appearance.preview.list.items.2=Project 3 - Forge Extension
+railroad.home.settings.appearance.preview.list.items.3=Project 4 - Neoforge Addon
+railroad.home.settings.appearance.preview.list.items.4=Project 5 - Quilt Mod
+railroad.home.settings.appearance.preview.list.items.5=Project 6 - Bukkit Plugin
+railroad.home.settings.appearance.preview.list.items.6=Project 7 - Spigot Extension
+railroad.home.settings.appearance.preview.list.items.7=Project 8 - Paper Addon
+
+railroad.home.settings.appearance.preview.table.columns.0=Name
+railroad.home.settings.appearance.preview.table.columns.1=Type
+railroad.home.settings.appearance.preview.table.columns.2=Status
+
+railroad.home.settings.appearance.preview.button.components=Button Components
+railroad.home.settings.appearance.preview.button.primary=Primary Button
+railroad.home.settings.appearance.preview.button.secondary=Secondary Button
+railroad.home.settings.appearance.preview.button.danger=Danger Button
+railroad.home.settings.appearance.preview.button.success=Success Button
+railroad.home.settings.appearance.preview.button.ghost=Ghost Button
+railroad.home.settings.appearance.preview.button.small=Small Button
+railroad.home.settings.appearance.preview.button.large=Large Button
+
 # IDE settings
 railroad.settings.ide.code_style.title=Code Style
 railroad.settings.ide.code_style.description=Configure the code style settings for your projects, including indentation, line breaks, and formatting options.
@@ -421,10 +646,14 @@ railroad.project.creation.sources_url.info=Source code repository URL advertised
 railroad.project.creation.location.error.required=Project location is required.
 railroad.project.creation.location.error.cannot_create=Could not create the project directory.
 railroad.project.creation.location.error.not_directory=The selected path is not a directory.
+railroad.project.creation.location.error.is_directory=The selected path is not a file.
 railroad.project.creation.location.warning.not_empty=The selected directory is not empty.
 railroad.project.creation.location.error.not_readable=The selected directory is not readable.
 railroad.project.creation.location.error.invalid_path=The selected path is invalid.
 railroad.project.creation.location.warning.onedrive=Using OneDrive for projects is not recommended.
+railroad.project.creation.location.error.invalid_extension=The selected file has an invalid extension.
+railroad.project.creation.location.error.invalid_jar=The selected JAR file is not valid.
+railroad.project.creation.location.warning.not_gradle_project=The selected directory does not appear to be a Gradle project.
 railroad.project.creation.name.error.required=Project name is required.
 railroad.project.creation.name.error.length_long=Project name is too long (maximum 256 characters).
 railroad.project.creation.name.error.length_short=Project name is too short (minimum 3 characters).
@@ -440,6 +669,8 @@ railroad.project.creation.mod_name.error.length_long=Mod name is too long (maxim
 railroad.project.creation.mod_name.error.length_short=Mod name is too short (minimum 5 characters).
 railroad.project.creation.main_class.error.required=Main class is required.
 railroad.project.creation.main_class.error.invalid_characters=Main class contains invalid characters.
+railroad.project.creation.qualified_main_class.error.required=Qualified main class is required.
+railroad.project.creation.qualified_main_class.error.invalid_characters=Qualified main class contains invalid characters
 railroad.project.creation.author.error.length_long=Author is too long (maximum 256 characters).
 railroad.project.creation.author.error.length_short=Author is too short (minimum 3 characters).
 railroad.project.creation.credits.error.length_long=Credits is too long (maximum 256 characters).
diff --git a/src/main/resources/assets/railroad/lang/ru_ru.lang b/src/main/resources/assets/railroad/lang/ru_ru.lang
new file mode 100644
index 00000000..73c3dd89
--- /dev/null
+++ b/src/main/resources/assets/railroad/lang/ru_ru.lang
@@ -0,0 +1,662 @@
+# =============================================================================
+# Языковой файл Railroad - Русский (ru_ru)
+# =============================================================================
+
+# =============================================================================
+# ОБЩЕЕ
+# =============================================================================
+railroad.generic.apply=Принять
+railroad.generic.ok=Ок
+railroad.generic.cancel=Отмена
+railroad.generic.back=Назад
+railroad.generic.next=Далее
+railroad.generic.finish=Готово
+railroad.generic.close=Закрыть
+railroad.generic.confirm=Подтвердить
+railroad.generic.save=Сохранить
+railroad.generic.delete=Удалить
+railroad.generic.edit=Изменить
+railroad.generic.create=Создать
+railroad.generic.search=Поиск
+railroad.generic.select=Выбрать
+railroad.generic.load=Загрузить
+railroad.generic.refresh=Обновить
+railroad.generic.collapse=Свернуть
+railroad.generic.collapse_all=Свернуть всё
+railroad.generic.expand=Развернуть
+railroad.generic.expand_all=Развернуть всё
+railroad.generic.browse=Обзор
+railroad.generic.enable=Включить
+railroad.generic.disable=Выключить
+railroad.generic.dismiss=Отклонить
+railroad.generic.unknown=Неизвестно
+
+# =============================================================================
+# КОНФИГУРАЦИЯ ЗАПУСКА
+# =============================================================================
+railroad.ide.toolbar.edit_run_configurations=Редактировать конфигурации запуска/отладки
+railroad.ide.toolbar.run_configurations.tooltip=Выберите конфигурацию запуска
+railroad.ide.toolbar.run.tooltip=Запустить выбранную конфигурацию
+railroad.ide.toolbar.debug.tooltip=Отладить выбранную конфигурацию
+railroad.ide.toolbar.debug.restart.tooltip=Перезапустить конфигурацию в режиме отладки
+railroad.ide.toolbar.stop.tooltip=Остановить конфигурацию
+railroad.ide.toolbar.stop.all=Остановить всё
+railroad.ide.toolbar.restart.tooltip=Перезапустить конфигурацию
+railroad.ide.toolbar.run_configurations.more_actions.tooltip=Показать дополнительные действия для выбранной конфигурации
+railroad.ide.toolbar.no_run_configurations=Нет конфигураций запуска
+railroad.window.ide.toolbar.edit_run_configurations=Редактировать конфигурации запуска/отладки
+railroad.runconfig.tree.empty=Конфигураций запуска пока нет.
+railroad.runconfig.tree.empty_filtered=Нет конфигураций, соответствующих фильтру.
+railroad.runconfig.tree.search_prompt=Поиск конфигураций запуска...
+railroad.runconfig.run.tooltip=Запустить конфигурацию
+railroad.runconfig.debug.tooltip=Отладить конфигурацию
+railroad.runconfig.moreactions.tooltip=Показать дополнительные действия для этой конфигурации
+railroad.runconfig.action.run=Запустить
+railroad.runconfig.action.debug=Отладка
+railroad.runconfig.details.empty.title=Создать конфигурацию запуска
+railroad.runconfig.details.empty.description=Используйте кнопку +, чтобы добавить первую конфигурацию.
+railroad.runconfig.gradle.configuration.task.invalid=Неверная задача Gradle.
+railroad.run_configuration.edit=Редактировать конфигурацию
+railroad.run_configuration.pin=Закрепить на панели
+railroad.run_configuration.delete=Удалить конфигурацию
+
+# Типы конфигураций запуска
+railroad.runconfig.shellscript=Shell-скрипт
+railroad.runconfig.java_application=Java-приложение
+railroad.runconfig.jar_application=JAR-приложение
+railroad.runconfig.gradle=Задача Gradle
+railroad.runconfig.compound=Составная
+
+# Общие настройки конфигурации
+railroad.runconfig.general.title=Общие настройки
+railroad.runconfig.general.name.label=Название конфигурации
+railroad.runconfig.general.name.prompt=Введите уникальное название конфигурации
+railroad.runconfig.general.name.validation.required=Название конфигурации обязательно.
+railroad.runconfig.general.name.validation.duplicate=Конфигурация с таким названием уже существует.
+railroad.runconfig.general.allowMultipleInstances.label=Разрешить несколько экземпляров
+railroad.runconfig.general.showConsoleOnRun.label=Показывать консоль при запуске
+
+# Составные конфигурации
+railroad.runconfig.compound.configurations.title=Настройки составной конфигурации
+railroad.runconfig.compound.configuration.runMode.label=Режим запуска
+railroad.runconfig.compound.runMode.=Составной режим запуска
+railroad.runconfig.compound.runMode.parallel=Параллельный
+railroad.runconfig.compound.runMode.sequential=Последовательный
+railroad.runconfig.compound.configuration.configurations.label=Включённые конфигурации
+railroad.runconfig.compound.configuration.configurations.combo.prompt=Выберите конфигурацию...
+railroad.runconfig.compound.configuration.configurations.add=Добавить
+railroad.runconfig.compound.configuration.configurations.remove=Удалить
+railroad.runconfig.compound.configuration.configurations.move_up=Переместить вверх
+railroad.runconfig.compound.configuration.configurations.move_down=Переместить вниз
+railroad.runconfig.compound.configuration.configurations.empty=Конфигурации ещё не выбраны.
+railroad.runconfig.compound.configuration.configurations.validation.required=Выберите хотя бы одну конфигурацию.
+railroad.runconfig.compound.configuration.configurations.entry_format=%s (%s)
+
+# Настройки Gradle
+railroad.runconfig.gradle.configuration.title=Настройки Gradle
+railroad.runconfig.gradle.configuration.task.label=Задача
+railroad.runconfig.gradle.configuration.task.prompt=например, build
+railroad.runconfig.gradle.configuration.projectPath.label=Директория проекта Gradle
+railroad.runconfig.gradle.configuration.envVariables.label=Переменные среды
+railroad.runconfig.gradle.configuration.envVariables.prompt=KEY=VALUE;KEY2=VALUE2
+railroad.runconfig.gradle.configuration.envVariables.invalid=Переменные среды должны быть в формате KEY=VALUE, разделённые точкой с запятой.
+railroad.runconfig.gradle.configuration.vmOptions.label=Опции VM
+railroad.runconfig.gradle.configuration.vmOptions.prompt=например, -Xmx1G
+railroad.runconfig.gradle.configuration.javaHome.label=Java home (необязательно)
+
+# Настройки JAR-приложения
+railroad.runconfig.jar_application.configuration.section.title=Настройки JAR
+railroad.runconfig.jar_application.configuration.jarPath.label=Исполняемый JAR-файл
+railroad.runconfig.jar_application.configuration.vmOptions.label=Опции VM
+railroad.runconfig.jar_application.configuration.vmOptions.prompt=например, -Xmx1G
+railroad.runconfig.jar_application.configuration.programArguments.label=Аргументы программы
+railroad.runconfig.jar_application.configuration.programArguments.prompt=Аргументы через пробел
+railroad.runconfig.jar_application.configuration.workingDirectory.label=Рабочая директория
+railroad.runconfig.jar_application.configuration.envVariables.label=Переменные среды
+railroad.runconfig.jar_application.configuration.envVariables.prompt=KEY=VALUE;KEY2=VALUE2
+railroad.runconfig.jar_application.configuration.envVariables.invalid=Переменные среды должны быть в формате KEY=VALUE, разделённые точкой с запятой.
+railroad.runconfig.jar_application.configuration.jre.label=Среда выполнения (JRE/JDK)
+
+# Настройки Java-приложения
+railroad.runconfig.java_application.configuration.section.title=Настройки Java-приложения
+railroad.runconfig.java_application.configuration.buildBeforeRun.label=Собирать перед запуском
+railroad.runconfig.java_application.configuration.jdk.label=JDK
+railroad.runconfig.java_application.configuration.mainClass.label=Главный класс
+railroad.runconfig.java_application.configuration.mainClass.prompt=com.example.Main
+railroad.runconfig.java_application.configuration.classpathEntries.label=Элементы classpath
+railroad.runconfig.java_application.configuration.classpathEntries.prompt=Path1;Path2;Path3
+railroad.runconfig.java_application.configuration.programArguments.label=Аргументы программы
+railroad.runconfig.java_application.configuration.programArguments.prompt=Аргументы через пробел
+railroad.runconfig.java_application.configuration.vmOptions.label=Опции VM
+railroad.runconfig.java_application.configuration.vmOptions.prompt=например, -Xmx1G
+railroad.runconfig.java_application.configuration.envVariables.label=Переменные среды
+railroad.runconfig.java_application.configuration.envVariables.prompt=KEY=VALUE;KEY2=VALUE2
+railroad.runconfig.java_application.configuration.envVariables.invalid=Переменные среды должны быть в формате KEY=VALUE, разделённые точкой с запятой.
+
+# Настройки Shell-скрипта
+railroad.runconfig.shell_script.configuration.section.title=Настройки Shell-скрипта
+railroad.runconfig.shell_script.configuration.executeMode.label=Режим выполнения
+railroad.runconfig.shell_script.configuration.scriptPath.label=Файл скрипта
+railroad.runconfig.shell_script.configuration.scriptText.label=Встроенный скрипт
+railroad.runconfig.shell_script.configuration.scriptText.prompt=Вставьте содержимое скрипта здесь
+railroad.runconfig.shell_script.configuration.scriptArgs.label=Аргументы скрипта
+railroad.runconfig.shell_script.configuration.scriptArgs.prompt=Аргументы через пробел
+railroad.runconfig.shell_script.configuration.workingDirectory.label=Рабочая директория
+railroad.runconfig.shell_script.configuration.envVariables.label=Переменные среды
+railroad.runconfig.shell_script.configuration.envVariables.prompt=KEY=VALUE;KEY2=VALUE2
+railroad.runconfig.shell_script.configuration.envVariables.invalid=Переменные среды должны быть в формате KEY=VALUE, разделённые точкой с запятой.
+railroad.runconfig.shell_script.configuration.interpreterPath.label=Путь к интерпретатору
+railroad.runconfig.shell_script.configuration.interpreterArgs.label=Аргументы интерпретатора
+railroad.runconfig.shell_script.configuration.interpreterArgs.prompt=Аргументы через пробел
+railroad.runconfig.shell_script.configuration.executeInTerminal.label=Запустить в терминале
+
+
+# =============================================================================
+# ЭКРАН ПРИВЕТСТВИЯ
+# =============================================================================
+railroad.home.welcome.greeting=Добро пожаловать в Railroad!
+railroad.home.welcome.projects=Список проектов
+railroad.home.welcome.projects.subtitle=Легко управляйте своими проектами
+railroad.home.welcome.projects.empty=Пока проектов нет! Создайте свой первый.
+railroad.home.welcome.projectsearch=Искать проекты...
+railroad.home.welcome.home=Главная
+railroad.home.welcome.openproject=Открыть проект
+railroad.home.welcome.newproject=Новый проект
+railroad.home.welcome.importproject=Импорт проекта
+railroad.home.welcome.settings=Настройки
+
+# Сортировка проектов
+railroad.home.welcome.sort.none=Без сортировки
+railroad.home.welcome.sort.name=По имени
+railroad.home.welcome.sort.date=По дате
+
+railroad.home.welcome.sort.none.description=Показать проекты в исходном порядке.
+railroad.home.welcome.sort.name.description=Отсортировать проекты по алфавиту.
+railroad.home.welcome.sort.date.description=Показывать недавно открытые проекты первыми.
+railroad.home.welcome.sort.tooltip=Сортировка проектов по %s
+
+railroad.home.welcome.stats.projects=Проектов: %d
+railroad.home.welcome.header.tip=Совет: используйте поиск и сортировку, чтобы быстрее вернуться к работе.
+
+# Действия с проектами
+railroad.home.welcome.project.open=Открыть
+railroad.home.welcome.project.remove=Убрать
+railroad.home.welcome.project.searchtype=Искать типы проектов
+
+# =============================================================================
+# НАСТРОЙКИ
+# =============================================================================
+railroad.window.settings.title=Настройки
+railroad.home.settings.title=Настройки
+railroad.home.settings.search=Искать настройки...
+
+# Категории настроек
+settings.tree.general=Основное
+settings.tree.appearance=Внешний вид
+settings.tree.ide=IDE
+settings.tree.plugins=Плагины
+settings.tree.projects=Проекты
+settings.tree.keybinds=Горячие клавиши
+
+# Основные настройки
+railroad.settings.general.language.title=Язык
+railroad.settings.general.language.description=Выберите язык для интерфейса Railroad.
+
+railroad.settings.directories.empty=Папки ещё не настроены.
+railroad.settings.directories.add.tooltip=Добавить папку в список.
+railroad.settings.directories.add.title=Выберите папку
+railroad.settings.directories.remove.tooltip=Удалить выбранную папку из списка.
+
+railroad.settings.files.empty=Файлы ещё не выбраны.
+railroad.settings.files.add.tooltip=Добавить файл в список.
+railroad.settings.files.add.title=Выберите файл
+railroad.settings.files.remove.tooltip=Удалить выбранный файл из списка.
+
+railroad.settings.ide.jdk_management.title=Управление JDK
+railroad.settings.ide.jdk_management.description=Контролируйте, как Railroad обнаруживает и управляет установленными JDK.
+railroad.settings.ide.jdk_management.additional_jdk_scan_paths.title=Дополнительные пути сканирования
+railroad.settings.ide.jdk_management.additional_jdk_scan_paths.description=Сканировать эти директории вместе с обычными при поиске JDK.
+railroad.settings.ide.jdk_management.excluded_jdk_scan_paths.title=Исключённые пути сканирования
+railroad.settings.ide.jdk_management.excluded_jdk_scan_paths.description=Никогда не сканировать эти директории при поиске JDK.
+railroad.settings.ide.jdk_management.additional_jdks.title=Дополнительные JDK
+railroad.settings.ide.jdk_management.additional_jdks.description=Всегда включать эти JDK, даже если они не найдены автоматически.
+railroad.settings.ide.jdk_management.java_version_detection_timeout_ms.title=Таймаут определения версии
+railroad.settings.ide.jdk_management.java_version_detection_timeout_ms.description=Максимальное время в миллисекундах для определения версии Java перед отменой сканирования.
+railroad.settings.ide.jdk_management.detected.title=Обнаруженные JDK
+railroad.settings.ide.jdk_management.detected.refresh.tooltip=Пересканировать систему на наличие JDK
+railroad.settings.ide.jdk_management.detected.empty=JDK ещё не обнаружены.
+railroad.settings.ide.jdk_management.detected.count=Обнаружено JDK: %d
+railroad.settings.ide.jdk_management.detected.unknown_version=Неизвестная версия
+railroad.settings.ide.jdk_management.detected.version=Java %s
+railroad.settings.ide.jdk_management.detected.name=Дистрибутив: %s
+railroad.settings.ide.jdk_management.detected.path=Путь: %s
+
+# Настройки горячих клавиш
+railroad.settings.keybinds.title=Горячие клавиши
+railroad.settings.keybinds.subtitle=Настройте сочетания клавиш под свой стиль работы.
+railroad.settings.keybinds.search=Поиск по сочетаниям...
+railroad.settings.keybinds.filter.all=Все категории
+railroad.settings.keybinds.empty.title=Нет сочетаний, подходящих под фильтр
+railroad.settings.keybinds.empty.subtitle=Попробуйте изменить поиск или категорию, чтобы увидеть больше сочетаний.
+railroad.settings.keybinds.add_binding=Добавить сочетание
+railroad.settings.keybinds.no_shortcuts=Пока нет назначенных сочетаний
+railroad.settings.keybinds.click_to_record=Нажми, чтобы записать
+railroad.settings.keybinds.recording=Запись...
+
+# Категории горячих клавиш
+railroad.settings.keybinds.category.general=Основное
+
+# Горячие клавиши
+railroad.settings.keybinds.copy=Копировать
+railroad.settings.keybinds.paste=Вставить
+railroad.settings.keybinds.fullscreen=Полноэкранный режим
+
+# Настройки плагинов
+railroad.window.plugins.title=Плагины
+railroad.settings.plugins.title=Плагины
+railroad.plugins.search.placeholder=Искать плагины...
+railroad.plugins.details.version=Версия %s
+railroad.plugins.details.author=Автор:
+railroad.plugins.details.website=Сайт:
+railroad.plugins.details.license=Лицензия:
+railroad.plugins.details.id=ID плагина:
+railroad.plugins.details.main_class=Главный класс:
+railroad.plugins.details.dependencies=Зависимости:
+railroad.plugins.placeholder.title=Выберите плагин чтобы просмотреть его подробную информацию
+railroad.plugins.placeholder.subtitle=Выберите плагин из списка чтобы посмотреть, что он добавляет.
+railroad.plugins.list.version=Версия: %s
+railroad.plugins.list.author=Автор: %s
+railroad.plugins.list.empty=Нет доступных плагинов
+railroad.plugins.details.enable=Включить плагин
+railroad.plugins.details.no_description=Описание отсутствует.
+railroad.plugins.details.dependencies.none=Нет зависимостей
+railroad.plugins.details.dependencies.count=%d репозиториев, %d артефактов
+railroad.plugins.details.label.identifier=Идентификатор
+railroad.plugins.details.label.version=Версия
+railroad.plugins.details.label.author=Автор
+railroad.plugins.details.label.license=Лицензия
+railroad.plugins.details.label.main_class=Главный класс
+railroad.plugins.details.label.dependencies=Зависимости
+
+# Настройки внешнего вида
+railroad.settings.appearance.themes.title=Темы
+railroad.settings.appearance.themes.description=Настройте внешний вид Railroad, выбрав одну из доступных тем или загрузив новые из репозитория тем.
+
+# Настройки проектов
+railroad.settings.projects.import.title=Импортирование проектов
+railroad.settings.projects.import.description=Настройте способ импорта проектов в Railroad. Можно задать профили VCS и другие параметры импорта.
+railroad.settings.projects.import.switch_to_ide_after_import.title=Переключаться на IDE после импорта
+railroad.settings.projects.import.switch_to_ide_after_import.description=Автоматически переключаться на IDE после импорта проекта. Позволяет начать работу сразу, без лишних действий.
+
+railroad.settings.projects.defaults.group_id.title=ID группы по умолчанию
+railroad.settings.projects.defaults.group_id.description=Управляйте идентификатором Maven группы, присваиваемым новым проектам.
+railroad.settings.projects.defaults.group_id.default_group_id.title=Переопределять ID группы по умолчанию
+railroad.settings.projects.defaults.group_id.default_group_id.description=Задайте идентификатор группы Maven, который Railroad подставляет при создании проекта. Оставьте пустым для использования сгенерированного значения.
+railroad.settings.projects.defaults.version.title=Версия проекта по умолчанию
+railroad.settings.projects.defaults.version.description=Управляйте строкой версии, применяемой при создании проектов.
+railroad.settings.projects.defaults.version.default_version.title=Переопределять версию проекта по умолчанию
+railroad.settings.projects.defaults.version.default_version.description=Задайте номер версии, который Railroad подставляет при создании проекта. Оставьте пустым, чтобы использовать стандартное значение.
+railroad.settings.projects.defaults.author.title=Автор проекта по умолчанию
+railroad.settings.projects.defaults.author.description=Настройте автора, отображаемого для новых проектов.
+railroad.settings.projects.defaults.author.default_author.title=Переопределить автора проекта по умолчанию
+railroad.settings.projects.defaults.author.default_author.description=Укажите имя автора, которое Railroad будет подставлять при создании проекта. Оставьте пустым, чтобы использовать системное имя пользователя.
+
+# Управление темами
+railroad.home.settings.appearance.theme=Выбрать тему
+railroad.home.settings.appearance.downloadtheme=Скачать темы
+railroad.home.settings.appearance.downloadtheme.description=Просматривайте и загружайте темы из официального репозитория Railroad.
+railroad.home.settings.appearance.notfound=Темы не найдены
+railroad.home.settings.appearance.loading=Загрузка тем...
+railroad.home.settings.appearance.themes=Доступные темы
+railroad.home.settings.appearance.themes.found=Найдено %d тем
+railroad.home.settings.appearance.download=Скачать
+railroad.home.settings.appearance.installed=Установлено
+railroad.home.settings.appearance.preview=Предпросмотр
+railroad.home.settings.appearance.preview.error=Не удалось загрузить предпросмотр
+railroad.home.settings.appearance.preview.loaded=Предпросмотр загружен
+railroad.home.settings.appearance.selecttheme=Выбрать тему
+
+# Управление предпросмотров
+railroad.home.settings.appearance.preview.title=Предпросмотр темы
+railroad.home.settings.appearance.preview.subtitle=Этот предпросмотр показывает, как различные элементы интерфейса будут выглядеть с выбранной темой.
+railroad.home.settings.appearance.preview.form.components=Элементы формы
+railroad.home.settings.appearance.preview.list.components=Элементы списка
+railroad.home.settings.appearance.preview.button.components=Кнопки
+railroad.home.settings.appearance.preview.close=Закрыть предпросмотр
+railroad.home.settings.appearance.preview.apply=Применить тему
+railroad.home.settings.appearance.preview.tooltip=Предпросмотр темы
+
+# Настройки IDE
+railroad.settings.ide.code_style.title=Стиль кода
+railroad.settings.ide.code_style.description=Настройте стиль кода для проектов, включая отступы, переносы строк и параметры форматирования.
+railroad.settings.ide.code_style.auto_pair_inside_strings.title=Автовставка парных скобок внутри строк
+railroad.settings.ide.code_style.auto_pair_inside_strings.description=Включите или отключите автоматическую вставку парных скобок (фигурных, квадратных, круглых) и кавычек внутри строк.
+
+# =============================================================================
+# IDE
+# =============================================================================
+railroad.ide.welcome.message=Добро пожаловать в Railroad!
+railroad.ide.welcome.message.description=Чтобы начать, создайте новый файл или откройте уже существующий.
+railroad.ide.welcome.features=Функции
+
+railroad.ide.welcome.feature.model_viewer_editor=Просмотр и редактирование моделей
+railroad.ide.welcome.feature.structure_viewer_editor=Просмотр и редактирование структуры
+railroad.ide.welcome.feature.texture_viewer_editor=Просмотр и редактирование текстур
+railroad.ide.welcome.feature.sound_visualizer=Визуализатор звука
+railroad.ide.welcome.feature.mixin_support=Поддержка Mixin
+
+railroad.ide.welcome.getting_started=Начало работы
+railroad.ide.welcome.getting_started.description=Узнайте, как работать с Railroad, используя нашу вики и обучающие материалы.
+railroad.ide.welcome.getting_started.wiki=Вики
+railroad.ide.welcome.getting_started.tutorials=Обучения
+
+railroad.ide.project_explorer.search_field=Поиск файлов...
+
+# =============================================================================
+# ДИАЛОГОВЫЕ ОКНА
+# =============================================================================
+railroad.dialog.open_project.title=Открыть проект
+railroad.dialog.open_project.error.invalid_directory=Недействительная директория проекта
+railroad.dialog.open_project.error.invalid_directory.message=Выбранная директория, кажется, не является действительным проектом. Пожалуйста, выберите правильную директорию с проектом.
+
+# Диалоговые окна проводника проекта
+railroad.dialog.delete.title=Удалить файл
+railroad.dialog.delete.message=Вы уверены, что хотите удалить этот файл?
+railroad.dialog.copy.title=Файл уже существует
+railroad.dialog.copy.message=Элемент уже существует в этом месте. Хотите заменить его?
+railroad.dialog.create_file.title=Создать файл
+railroad.dialog.create_file.title.file=Создать новый файл
+railroad.dialog.create_file.title.folder=Создать новую папку
+railroad.dialog.create_file.title.java_class=Создать Java класс
+railroad.dialog.create_file.title.json=Создать JSON файл
+railroad.dialog.create_file.title.txt=Создать текстовый файл
+
+# Элементы предпросмотра темы
+railroad.theme.preview.text_field=Текстовое поле:
+railroad.theme.preview.password=Пароль:
+railroad.theme.preview.dropdown=Выпадающий список:
+
+# Диалог-окно "Не реализовано"
+not_implemented.title=Ещё не реализовано
+not_implemented.subtitle=Эта функция находится в разработке. Следите за обновлениями!
+
+# =============================================================================
+# ПАНЕЛЬ ИМПОРТА ПРОЕКТОВ
+# =============================================================================
+railroad.importprojects.title=Импорт проектов
+railroad.importprojects.search=Поиск репозиториев...
+railroad.importprojects.empty=Репозитории не найдены. Попробуйте добавить профиль VCS или проверьте своё соединение.
+railroad.importprojects.loading=Загрузка репозиториев...
+railroad.importprojects.error=Не удалось загрузить репозитории.
+railroad.importprojects.clone=Клонировать
+railroad.importprojects.clone.success=Репозиторий успешно клонирован!
+railroad.importprojects.clone.invalid_url=Недопустимый URL репозитория
+railroad.importprojects.clone.invalid_directory=Недопустимая директория
+railroad.importprojects.clone.invalid_selection=Недопустимый репозиторий
+railroad.importprojects.clone.directory_not_empty=Выбранная директория не пуста. Выберите пустую директорию или другое место.
+railroad.importprojects.clone.title=Клонировать репозиторий
+railroad.importprojects.clone.loading=Клонирование репозитория...
+railroad.importprojects.repositoryurl=URL репозитория
+railroad.importprojects.directory=Директория
+railroad.importprojects.choosedirectory=Выбрать директорию
+railroad.importprojects.repositoryurl.placeholder=Введите URL репозитория для клонирования.
+
+# =============================================================================
+# МЕНЮ IDE
+# =============================================================================
+railroad.menu.file=Файл
+railroad.menu.file.new_file=Новый файл
+railroad.menu.file.open_file=Открыть файл...
+railroad.menu.file.save=Сохранить
+railroad.menu.file.save_as=Сохранить как...
+railroad.menu.file.exit=Выход
+
+railroad.menu.edit=Изменить
+railroad.menu.edit.undo=Отменить
+railroad.menu.edit.redo=Повторить
+railroad.menu.edit.cut=Вырезать
+railroad.menu.edit.copy=Копировать
+railroad.menu.edit.paste=Вставить
+railroad.menu.edit.find=Найти...
+railroad.menu.edit.replace=Заменить...
+
+railroad.menu.view=Вид
+railroad.menu.view.project_explorer=Проводник проекта
+railroad.menu.view.properties=Свойства
+railroad.menu.view.console=Консоль
+railroad.menu.view.full_screen=Полноэкранный режим
+
+railroad.menu.run=Выполнить
+railroad.menu.run.run=Запуск
+railroad.menu.run.debug=Отладка
+railroad.menu.run.stop=Остановить
+
+railroad.menu.tools=Инструменты
+railroad.menu.tools.settings=Настройки
+railroad.menu.tools.plugins=Плагины
+railroad.menu.tools.terminal=Терминал
+
+railroad.menu.help=Справка
+railroad.menu.help.documentation=Документация
+railroad.menu.help.issues=Сообщить о проблеме
+railroad.menu.help.discord=Присоединиться к Discord
+
+# =============================================================================
+# СОЗДАНИЕ ПРОЕКТА
+# =============================================================================
+railroad.project.creation.onboarding.start_button=Начать создание проекта
+railroad.project.creation.onboarding.title=Создать новый проект
+railroad.onboarding.step_progress=Шаг %d из %d
+
+railroad.project.creation.project_details.title=Детали проекта
+railroad.project.creation.project_details.description=Введите название и расположение проекта.
+railroad.project.creation.section.project=Проект
+railroad.project.creation.name=Название проекта
+railroad.project.creation.name.prompt=My Awesome Mod
+railroad.project.creation.name.info=Отображаемое название проекта, используемое в метаданных и интерфейсе.
+railroad.project.creation.location=Расположение проекта
+railroad.project.creation.location.info=Папка, в которой Railroad создаст структуру проекта.
+
+railroad.project.creation.maven_coordinates.title=Координаты Maven
+railroad.project.creation.maven_coordinates.description=Введите координаты Maven для проекта.
+railroad.project.creation.section.maven_coordinates=Координаты Maven
+railroad.project.creation.group_id=Group ID
+railroad.project.creation.group_id.prompt=com.example
+railroad.project.creation.group_id.info=Базовый пакет и идентификатор Maven группы для сгенерированных исходников и публикации.
+railroad.project.creation.artifact_id=Artifact ID
+railroad.project.creation.artifact_id.prompt=my-awesome-mod
+railroad.project.creation.artifact_id.info=Имя артефакта для сгенерированных JAR и Gradle метаданных.
+railroad.project.creation.version=Версия
+railroad.project.creation.version.prompt=1.0.0
+railroad.project.creation.version.info=Начальная версия проекта, вставляемая в скрипты сборки и метаданные мода.
+
+railroad.project.creation.minecraft_version.title=Версия Minecraft
+railroad.project.creation.minecraft_version.description=Выберите версию Minecraft для проекта.
+railroad.project.creation.section.minecraft_version=Версия Minecraft
+railroad.project.creation.minecraft_version=Версия Minecraft
+railroad.project.creation.minecraft_version.info=Релиз Minecraft, на который ориентирован мод; определяет совместимые маппинги и зависимости.
+
+railroad.project.creation.mapping_channel.title=Канал маппинга
+railroad.project.creation.mapping_channel.description=Выберите канал маппинга для проекта.
+railroad.project.creation.section.mapping_channel=Канал маппинга
+railroad.project.creation.mapping_channel=Канал маппинга
+railroad.project.creation.mapping_channel.info=Распределение маппинга (Yarn, Mojmap, Parchment и др.) с читаемыми именами элементов игры.
+
+railroad.project.creation.mapping_version.title=Версия маппинга
+railroad.project.creation.mapping_version.description=Выберите версию маппинга для проекта.
+railroad.project.creation.section.mapping_version=Версия маппинга
+railroad.project.creation.mapping_version=Версия маппинга
+railroad.project.creation.mapping_version.info=Определённая сборка маппинга, разрешающая имена классов, методов и полей.
+
+railroad.project.creation.forge_version.title=Версия Forge
+railroad.project.creation.forge_version.description=Выберите версию Forge для проекта.
+railroad.project.creation.section.forge_version=Версия Forge
+railroad.project.creation.forge_version=Версия Forge
+railroad.project.creation.forge_version.info=Сборка загрузчика Forge, включённая в сгенерированный проект.
+
+railroad.project.creation.neoforge_version.title=Версия Neoforge
+railroad.project.creation.neoforge_version.description=Выберите версию Neoforge для проекта.
+railroad.project.creation.section.neoforge_version=Версия Neoforge
+railroad.project.creation.neoforge_version=Версия Neoforge
+railroad.project.creation.neoforge_version.info=Сборка загрузчика Neoforge, включённая в сгенерированный проект.
+
+railroad.project.creation.fabric_loader.title=Fabric Loader
+railroad.project.creation.fabric_loader.description=Выберите версию загрузчика Fabric для проекта.
+railroad.project.creation.section.fabric_loader=Fabric Loader
+railroad.project.creation.fabric_loader=Fabric Loader
+railroad.project.creation.fabric_loader.info=Версия загрузчика Fabric, включённая в сгенерированный проект.
+
+railroad.project.creation.fabric_api.title=Fabric API
+railroad.project.creation.fabric_api.description=Выберите версию Fabric API для проекта.
+railroad.project.creation.section.fabric_api=Fabric API
+railroad.project.creation.fabric_api=Fabric API
+railroad.project.creation.fabric_api.info=Зависимость Fabric API, которую Railroad добавляет в Gradle сборку.
+
+railroad.project.creation.mod_details.title=Подробности мода
+railroad.project.creation.mod_details.description=Введите подробности о моде.
+railroad.project.creation.section.mod_details=Подробности мода
+railroad.project.creation.mod_id=ID мода
+railroad.project.creation.mod_id.prompt=my-awesome-mod
+railroad.project.creation.mod_id.info=Уникальный идентификатор мода для имён файлов и регистрации во время выполнения.
+railroad.project.creation.mod_name=Название мода
+railroad.project.creation.mod_name.prompt=My Awesome Mod
+railroad.project.creation.mod_name.info=Читаемое название, отображаемое игрокам и в метаданных мода.
+railroad.project.creation.main_class=Главный класс
+railroad.project.creation.main_class.prompt=com.example.MyAwesomeMod
+railroad.project.creation.main_class.info=Класс точки входа, сгенерированный для инициализатора мода.
+
+railroad.project.creation.section.forge_options=Опции Forge
+railroad.project.creation.section.neoforge_options=Опции Forge
+railroad.project.creation.use_mixins=Включить Mixins
+railroad.project.creation.use_mixins.info=Добавляет поддержку mixin и настраивает (Neo)/Forge для их применения.
+railroad.project.creation.use_access_transformer=Включить Access Transformer
+railroad.project.creation.use_access_transformer.info=Генерирует файл access transformer и регистрирует его для проекта.
+railroad.project.creation.gen_run_folders=Создать папки для запуска
+railroad.project.creation.gen_run_folders.info=Создает отдельные конфигурации запуска и папки данных для разработки.
+
+railroad.project.creation.license.title=Лицензия
+railroad.project.creation.license.description=Выберите лицензию для вашего проекта.
+railroad.project.creation.section.license=Лицензия
+railroad.project.creation.license=Лицензия
+railroad.project.creation.license.custom=Своя лицензия
+railroad.project.creation.license.custom.prompt=https://example.com/LICENSE
+railroad.project.creation.license.info=Лицензия, применяемая к исходникам и включаемая в проект.
+railroad.project.creation.license.custom.info=Укажите свой идентификатор SPDX или ссылку при использовании кастомной лицензии.
+
+railroad.project.creation.git.title=Git
+railroad.project.creation.git.description=Инициализировать Git репозиторий для проекта.
+railroad.project.creation.section.git=Git
+railroad.project.creation.init_git=Инициализировать Git репозиторий
+railroad.project.creation.init_git.info=Создает Git репозиторий с начальным коммитом в папке проекта.
+
+railroad.project.creation.access_widener.title=Access Widener
+railroad.project.creation.access_widener.description=Использовать access widener для доступа к недоступным частям игры.
+railroad.project.creation.section.access_widener=Access Widener
+railroad.project.creation.use_access_widener=Использовать Access Widener
+railroad.project.creation.access_widener.path=Путь к Access Widener
+railroad.project.creation.access_widener.path.prompt=${modid}.accesswidener
+railroad.project.creation.access_widener.path.error.required=Путь к access widener обязателен при включении.
+railroad.project.creation.use_access_widener.info=Генерирует файл access widener и настраивает загрузчик Fabric для его применения
+railroad.project.creation.access_widener.path.info=Относительный путь к файлу access widener; ${modid} заменяется на ID мода при создании.
+
+railroad.project.creation.split_sources.title=Разделение исходников
+railroad.project.creation.split_sources.description=Разделить исходники на client и main.
+railroad.project.creation.section.split_sources=Разделение исходников
+railroad.project.creation.split_sources=Разделение исходников
+railroad.project.creation.split_sources.info=Создает отдельные наборы исходников для клиентского и общего кода.
+
+railroad.project.creation.optional_details.title=Дополнительно
+railroad.project.creation.optional_details.description=Введите дополнительные сведения о проекте.
+railroad.project.creation.section.optional_details=Дополнительно
+railroad.project.creation.author=Автор
+railroad.project.creation.author.prompt=Ваше имя
+railroad.project.creation.author.info=Автор, указанный в метаданных мода.
+railroad.project.creation.credits=Благодарности
+railroad.project.creation.credits.prompt=Дополнительные упоминания
+railroad.project.creation.credits.info=Опциональные благодарности в mods.toml.
+railroad.project.creation.description=Описание
+railroad.project.creation.description.prompt=Короткое описание проекта.
+railroad.project.creation.description.info=Краткое описание, отображаемое в лаунчерах и метаданных.
+railroad.project.creation.issues_url=Issues URL
+railroad.project.creation.issues_url.prompt=https://example.com/issues
+railroad.project.creation.issues_url.info=Ссылка на трекер проблем в метаданных мода.
+railroad.project.creation.update_json_url=URL обновлений JSON
+railroad.project.creation.update_json_url.prompt=https://example.com/updates.json
+railroad.project.creation.update_json_url.info=Удаленный JSON с информацией об обновлениях версий.
+railroad.project.creation.display_url=Промо-ссылка
+railroad.project.creation.display_url.prompt=https://example.com/promo
+railroad.project.creation.display_url.info=Ссылка, показываемая в лаунчерах, таких как CurseForge.
+railroad.project.creation.display_test=Проверка отображения
+railroad.project.creation.display_test.info=Определяет, как лаунчер предупреждает о несоответствии версий.
+railroad.project.creation.client_side_only=Только клиент
+railroad.project.creation.client_side_only.info=Отметить мод как клиентский в метаданных.
+railroad.project.creation.homepage_url=URL домашней страницы
+railroad.project.creation.homepage_url.prompt=https://example.com
+railroad.project.creation.homepage_url.info=Сайт проекта, показываемый игрокам в лаунчере.
+railroad.project.creation.sources_url=URL исходников
+railroad.project.creation.sources_url.prompt=https://example.com/sources
+railroad.project.creation.sources_url.info=Ссылка на репозиторий исходников в метаданных мода.
+
+# Ошибки валидации
+railroad.project.creation.location.error.required=Укажите расположение проекта.
+railroad.project.creation.location.error.cannot_create=Не удалось создать папку проекта.
+railroad.project.creation.location.error.not_directory=Выбранный путь не является директорией.
+railroad.project.creation.location.error.is_directory=Выбранный путь не является файлом.
+railroad.project.creation.location.warning.not_empty=Выбранная папка не пуста.
+railroad.project.creation.location.error.not_readable=Выбранная директория недоступна для чтения.
+railroad.project.creation.location.error.invalid_path=Выбранный путь недействителен.
+railroad.project.creation.location.warning.onedrive=Использование OneDrive для проектов не рекомендуется.
+railroad.project.creation.location.error.invalid_extension=Выбранный файл имеет недопустимое расширение.
+railroad.project.creation.location.error.invalid_jar=Выбранный JAR-файл недействителен.
+railroad.project.creation.location.warning.not_gradle_project=Выбранная директория, кажется, не является Gradle-проектом.
+railroad.project.creation.name.error.required=Укажите название проекта.
+railroad.project.creation.name.error.length_long=Название проекта слишком длинное (максимум 256 символов).
+railroad.project.creation.name.error.length_short=Название проекта слишком короткое (минимум 3 символа).
+railroad.project.creation.name.error.invalid_characters=Название проекта содержит недопустимые символы.
+railroad.project.creation.license.custom.error.required=Укажите URL кастомной лицензии.
+railroad.project.creation.license.custom.error.length_long=URL кастомной лицензии слишком длинный (максимум 2048 символов).
+railroad.project.creation.mod_id.error.required=Укажите Mod ID.
+railroad.project.creation.mod_id.error.length_short=Mod ID слишком короткий (минимум 3 символа).
+railroad.project.creation.mod_id.error.length_long=Mod ID слишком длинный (максимум 64 символа).
+railroad.project.creation.mod_id.error.invalid_characters=Mod ID содержит недопустимые символы.
+railroad.project.creation.mod_name.error.required=Укажите название мода.
+railroad.project.creation.mod_name.error.length_long=Название мода слишком длинное (максимум 256 символов).
+railroad.project.creation.mod_name.error.length_short=Название мода слишком короткое (минимум 5 символов).
+railroad.project.creation.main_class.error.required=Укажите главный класс.
+railroad.project.creation.main_class.error.invalid_characters=Главный класс содержит недопустимые символы.
+railroad.project.creation.qualified_main_class.error.required=Требуется указать полное имя главного класса.
+railroad.project.creation.qualified_main_class.error.invalid_characters=Полное имя главного класса содержит недопустимые символы.
+railroad.project.creation.author.error.length_long=Имя автора слишком длинное (максимум 256 символов).
+railroad.project.creation.author.error.length_short=Имя автора слишком короткое (минимум 3 символа).
+railroad.project.creation.credits.error.length_long=Слишком длинный список благодарностей (максимум 256 символов).
+railroad.project.creation.description.error.length_long=Описание слишком длинное (максимум 2048 символов).
+railroad.project.creation.description.error.length_short=Описание слишком короткое (минимум 10 символов).
+railroad.project.creation.issues.error.length_long=Issues ссылка слишком длинная (максимум 256 символов).
+railroad.project.creation.issues.error.invalid_url=Недействительная ссылка для Issues.
+railroad.project.creation.issues.error.no_issues=Issues ссылка не ведет на нужную страницу.
+railroad.project.creation.update_json.error.length_long=URL обновлений JSON слишком длинный (максимум 256 символов).
+railroad.project.creation.update_json.error.invalid_url=Недействительная ссылка для обновлений JSON.
+railroad.project.creation.update_json.error.invalid_extension=URL обновлений JSON должен оканчиваться на .json.
+railroad.project.creation.display_url.error.length_long=Промо-ссылка слишком длинная (максимум 256 символов).
+railroad.project.creation.display_url.error.invalid_url=Недействительная промо-ссылка.
+railroad.project.creation.group_id.error.required=Укажите Group ID.
+railroad.project.creation.group_id.error.length_long=Group ID слишком длинный (максимум 256 символов).
+railroad.project.creation.group_id.error.invalid_characters=Group ID содержит недопустимые символы.
+railroad.project.creation.artifact_id.error.required=Укажите Artifact ID.
+railroad.project.creation.artifact_id.error.length_long=Artifact ID слишком длинный (максимум 256 символов).
+railroad.project.creation.artifact_id.error.invalid_characters=Artifact ID содержит недопустимые символы.
+railroad.project.creation.version.error.required=Укажите версию.
+railroad.project.creation.version.error.length_long=Версия слишком длинная (максимум 256 символов).
+railroad.project.creation.version.error.invalid_characters=Версия содержит недопустимые символы.
+railroad.project.creation.homepage.error.length_long=URL домашней страницы слишком длинный (максимум 256 символов).
+railroad.project.creation.homepage.error.invalid_url=Недействительная ссылка на домашнюю страницу
+railroad.project.creation.sources.error.length_long=URL исходников слишком длинный (максимум 256 символов).
+railroad.project.creation.sources.error.invalid_url=Недействительная ссылка на исходники.
+
+railroad.project.creation.error.title=Ошибка создания проекта
+railroad.project.creation.error.header=Произошла ошибка при создании проекта.
+
+railroad.mapping_channel.mcp=MCP
+railroad.mapping_channel.yarn=Yarn
+railroad.mapping_channel.official=Официальные (Mojmaps)
+railroad.mapping_channel.parchment=Parchment
diff --git a/src/main/resources/assets/railroad/scripts/init-download-sources.gradle b/src/main/resources/assets/railroad/scripts/init-download-sources.gradle
new file mode 100644
index 00000000..e1c97444
--- /dev/null
+++ b/src/main/resources/assets/railroad/scripts/init-download-sources.gradle
@@ -0,0 +1,32 @@
+initscript {
+    repositories {
+        mavenLocal()
+        maven { url "https://maven.railroadide.dev/releases" }
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath "dev.railroadide:RailroadGradlePlugin:1.0.0"
+    }
+}
+
+beforeSettings { settings ->
+    // Apply to the actual Settings object so the plugin receives the expected target type.
+    settings.pluginManager.apply(dev.railroadide.railroadplugin.RailroadSettingsPlugin)
+}
+
+allprojects {
+    apply plugin: dev.railroadide.railroadplugin.RailroadProjectPlugin
+}
+
+// Aggregate a single root task that triggers downloads for all projects
+gradle.projectsLoaded { gradle ->
+    def root = gradle.rootProject
+    def aggregate = root.tasks.register("railroadDownloadAllSources") { task ->
+        task.group = "Documentation"
+        task.description = "Downloads sources for all projects using Railroad download-sources plugin."
+    }
+
+    root.allprojects { project ->
+        aggregate.configure { dependsOn(project.tasks.named("downloadDependencySources")) }
+    }
+}
diff --git a/src/main/resources/assets/railroad/scripts/init-fabric-extractor.gradle b/src/main/resources/assets/railroad/scripts/init-fabric-extractor.gradle
deleted file mode 100644
index 5ab49ec9..00000000
--- a/src/main/resources/assets/railroad/scripts/init-fabric-extractor.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-initscript {
-    repositories {
-        mavenLocal()
-    }
-    dependencies {
-        classpath "dev.railroadide.railroad:fabricextractor:1.0.0"
-    }
-}
-
-def capturedLoomVersion = null
-
-// 1) During settings evaluation, intercept plugin resolution
-gradle.settingsEvaluated { settings ->
-    settings.pluginManagement {
-        resolutionStrategy {
-            eachPlugin { details ->
-                if (details.requested.id.id == 'fabric-loom') {
-                    capturedLoomVersion = details.requested.version
-                }
-            }
-        }
-    }
-}
-
-// 2) Once all projects are loaded, stamp that version into each project
-gradle.projectsLoaded { rootProject ->
-    rootProject.allprojects { project ->
-        if (capturedLoomVersion) {
-            project.extensions.extraProperties.set('fabricLoomVersion', capturedLoomVersion)
-        }
-        // Apply your extractor plugin (on the initscript classpath)
-        project.plugins.apply dev.railroadide.railroad.fabricextractor.FabricExtractorPlugin
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/railroad/scripts/init-gradle-plugin.gradle b/src/main/resources/assets/railroad/scripts/init-gradle-plugin.gradle
new file mode 100644
index 00000000..455c9ea2
--- /dev/null
+++ b/src/main/resources/assets/railroad/scripts/init-gradle-plugin.gradle
@@ -0,0 +1,19 @@
+initscript {
+    repositories {
+        mavenLocal()
+        maven { url "https://maven.railroadide.dev/releases" }
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath "dev.railroadide:RailroadGradlePlugin:1.0.0"
+    }
+}
+
+beforeSettings { settings ->
+    // Apply to the actual Settings object so the plugin receives the expected target type.
+    settings.pluginManager.apply(dev.railroadide.railroadplugin.RailroadSettingsPlugin)
+}
+
+allprojects {
+    apply plugin: dev.railroadide.railroadplugin.RailroadProjectPlugin
+}
diff --git a/src/main/resources/assets/railroad/scripts/init-java-version.gradle b/src/main/resources/assets/railroad/scripts/init-java-version.gradle
deleted file mode 100644
index 6d5f9bf9..00000000
--- a/src/main/resources/assets/railroad/scripts/init-java-version.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-initscript {
-    repositories {
-        mavenLocal()
-    }
-
-    dependencies {
-        classpath "dev.railroadide.railroad:javaversion:1.0.0"
-    }
-}
-
-allprojects {
-    apply plugin: dev.railroadide.railroad.javaversion.JavaVersionModelPlugin
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/railroad/styles/base.css b/src/main/resources/assets/railroad/styles/base.css
index 14d5e28a..f7c24565 100644
--- a/src/main/resources/assets/railroad/styles/base.css
+++ b/src/main/resources/assets/railroad/styles/base.css
@@ -1,3 +1,4 @@
+@import "components/project-list.css";
 .Railroad, .split-pane, .scroll-pane {
     -fx-background-color: -color-bg-default;
     -fx-text-fill: -color-fg-default;
diff --git a/src/main/resources/assets/railroad/styles/components/button.css b/src/main/resources/assets/railroad/styles/components/button.css
index 29c9c6aa..fa89a8a9 100644
--- a/src/main/resources/assets/railroad/styles/components/button.css
+++ b/src/main/resources/assets/railroad/styles/components/button.css
@@ -23,6 +23,12 @@
     -fx-translate-y: 1px;
 }
 
+.rr-button.toggle:selected {
+    -fx-background-color: -color-accent-7;
+    -fx-text-fill: -color-fg-emphasis;
+    -fx-effect: dropshadow(gaussian, rgba(94, 129, 172, 0.35), 5, 0, 0, 2);
+}
+
 .rr-button:disabled {
     -fx-background-color: -color-neutral-muted;
     -fx-text-fill: -color-fg-muted;
@@ -47,6 +53,12 @@
     -fx-border-color: -color-accent-emphasis;
 }
 
+.rr-button.toggle:selected.secondary {
+    -fx-background-color: -color-bg-inset;
+    -fx-border-color: -color-accent-emphasis;
+    -fx-text-fill: -color-fg-default;
+}
+
 .rr-button.ghost {
     -fx-background-color: transparent;
     -fx-text-fill: -color-fg-default;
@@ -57,6 +69,11 @@
     -fx-background-color: -color-bg-subtle;
 }
 
+.rr-button.toggle:selected.ghost {
+    -fx-background-color: -color-bg-subtle;
+    -fx-text-fill: -color-fg-default;
+}
+
 .rr-button.danger {
     -fx-background-color: -color-danger-emphasis;
     -fx-text-fill: -color-fg-emphasis;
@@ -66,6 +83,10 @@
     -fx-background-color: -color-danger-6;
 }
 
+.rr-button.toggle:selected.danger {
+    -fx-background-color: -color-danger-6;
+}
+
 .rr-button.success {
     -fx-background-color: -color-success-emphasis;
     -fx-text-fill: -color-fg-emphasis;
@@ -75,6 +96,10 @@
     -fx-background-color: -color-success-6;
 }
 
+.rr-button.toggle:selected.success {
+    -fx-background-color: -color-success-6;
+}
+
 .rr-button.warning {
     -fx-background-color: -color-warning-emphasis;
     -fx-text-fill: -color-fg-emphasis;
@@ -84,6 +109,10 @@
     -fx-background-color: -color-warning-6;
 }
 
+.rr-button.toggle:selected.warning {
+    -fx-background-color: -color-warning-6;
+}
+
 /* Button sizes */
 .rr-button.small {
     -fx-min-height: 28px;
@@ -164,9 +193,19 @@
     -fx-min-height: 40px;
 }
 
+.rr-button.square,
 .square-button {
     -fx-min-width: 32px;
-    /*-fx-max-width: 40px;*/
+    -fx-pref-width: 32px;
+    -fx-max-width: 32px;
     -fx-min-height: 32px;
-    /*-fx-max-height: 40px;*/
+    -fx-pref-height: 32px;
+    -fx-max-height: 32px;
+    -fx-padding: 0;
+}
+
+/* Icon button */
+.rr-button > * {
+    -fx-background-color: transparent;
+    -fx-border-width: 0;
 }
diff --git a/src/main/resources/assets/railroad/styles/components/code-area.css b/src/main/resources/assets/railroad/styles/components/code-area.css
index 26d085b5..3beb23a6 100644
--- a/src/main/resources/assets/railroad/styles/components/code-area.css
+++ b/src/main/resources/assets/railroad/styles/components/code-area.css
@@ -158,4 +158,25 @@
 .diagnostic-pane {
     -fx-background-color: -color-bg-overlay;
     -fx-border-width: 0 0 1 0;
-}
\ No newline at end of file
+}
+
+.signature-help-container {
+    -fx-background-color: rgba(40, 40, 40, 0.95);
+    -fx-padding: 6px 8px;
+    -fx-background-radius: 6px;
+    -fx-border-radius: 6px;
+    -fx-border-color: rgba(255, 255, 255, 0.25);
+}
+
+.signature-help-text {
+    -fx-text-fill: white;
+}
+
+.signature-param {
+    -fx-text-fill: #d0d0d0;
+}
+
+.signature-param-active {
+    -fx-text-fill: #ffffff;
+    -fx-font-weight: bold;
+}
diff --git a/src/main/resources/assets/railroad/styles/components/combo-box.css b/src/main/resources/assets/railroad/styles/components/combo-box.css
index 5816d735..d0b206da 100644
--- a/src/main/resources/assets/railroad/styles/components/combo-box.css
+++ b/src/main/resources/assets/railroad/styles/components/combo-box.css
@@ -1,5 +1,6 @@
 /* ===== MODERN COMBO BOX ===== */
 .rr-combo-box {
+    -fx-cursor: hand;
     -fx-background-color: -color-bg-subtle;
     -fx-text-fill: -color-fg-default;
     -fx-background-radius: 8px;
@@ -46,6 +47,7 @@
 }
 
 .rr-combo-box .list-cell {
+    -fx-cursor: hand;
     -fx-background-color: transparent;
     -fx-text-fill: -color-fg-default;
     -fx-padding: 8px 12px;
diff --git a/src/main/resources/assets/railroad/styles/components/gradle-tools.css b/src/main/resources/assets/railroad/styles/components/gradle-tools.css
new file mode 100644
index 00000000..2c33c533
--- /dev/null
+++ b/src/main/resources/assets/railroad/styles/components/gradle-tools.css
@@ -0,0 +1,39 @@
+.gradle-tool-content-pane {
+    -fx-border-width: 0;
+}
+
+.gradle-project-element {
+    -fx-icon-color: #26c77c !important;
+}
+
+.gradle-tasks-group-element {
+    -fx-icon-color: #ddc03a !important;
+}
+
+.gradle-task-element {
+    -fx-icon-color: #3a7bdd !important;
+}
+
+.sync-button .ikonli-font-icon {
+    -fx-icon-color: #26c77c !important;
+}
+
+.sync-button:hover .ikonli-font-icon {
+    -fx-icon-color: #1ea66a !important;
+}
+
+.download-sources-button .ikonli-font-icon {
+    -fx-icon-color: #3a7bdd !important;
+}
+
+.download-sources-button:hover .ikonli-font-icon {
+    -fx-icon-color: #2e5fbf !important;
+}
+
+.toggle-offline-mode-button .stacked-ikonli-font-icon {
+    -fx-icon-color: #ddc03a !important;
+}
+
+.toggle-offline-mode-button:hover .stacked-ikonli-font-icon {
+    -fx-icon-color: #bfa831 !important;
+}
diff --git a/src/main/resources/assets/railroad/styles/components/keybinds.css b/src/main/resources/assets/railroad/styles/components/keybinds.css
new file mode 100644
index 00000000..7bc9c183
--- /dev/null
+++ b/src/main/resources/assets/railroad/styles/components/keybinds.css
@@ -0,0 +1,138 @@
+/* ===== KEYBINDS PANE ===== */
+.keybinds-pane {
+    -fx-spacing: 18px;
+}
+
+.keybinds-header {
+    -fx-spacing: 4px;
+}
+
+.keybinds-header-title {
+    -fx-font-size: 20px;
+    -fx-font-weight: 600;
+    -fx-text-fill: -color-fg-emphasis;
+}
+
+.keybinds-header-subtitle {
+    -fx-text-fill: -color-fg-muted;
+    -fx-font-size: 13px;
+}
+
+.keybinds-category-bar {
+    -fx-padding: 4px 0 0 0;
+}
+
+.keybinds-category-bar .keybinds-category-chip {
+    -fx-background-color: -color-bg-subtle;
+    -fx-border-color: -color-border-subtle;
+    -fx-border-width: 1px;
+    -fx-background-radius: 18px;
+    -fx-border-radius: 18px;
+    -fx-padding: 6px 14px;
+    -fx-text-fill: -color-fg-muted;
+    -fx-cursor: hand;
+}
+
+.keybinds-category-bar .keybinds-category-chip:hover {
+    -fx-background-color: -color-bg-inset;
+}
+
+.keybinds-category-chip:selected {
+    -fx-background-color: -color-accent-subtle;
+    -fx-border-color: -color-accent-emphasis;
+    -fx-text-fill: -color-accent-emphasis;
+    -fx-border-width: 1.5px;
+}
+
+.keybinds-scroll {
+    -fx-background-color: transparent;
+    -fx-padding: 0 4px 0 0;
+}
+
+.keybinds-card-container {
+    -fx-padding: 4px 0 20px 0;
+}
+
+.keybind-card {
+    -fx-padding: 0;
+    -fx-background-radius: 14px;
+    -fx-border-radius: 14px;
+}
+
+.keybind-card-header {
+    -fx-padding: 4px 4px 0 4px;
+}
+
+.keybind-card-title {
+    -fx-font-size: 15px;
+    -fx-font-weight: 600;
+    -fx-text-fill: -color-fg-emphasis;
+}
+
+.keybind-card-subtitle {
+    -fx-text-fill: -color-fg-muted;
+    -fx-font-size: 12px;
+}
+
+.keybind-card-add {
+    -fx-padding: 4px 10px;
+    -fx-background-color: -color-bg-subtle;
+}
+
+.keybind-card-add > * {
+    -fx-background-color: transparent;
+}
+
+.keybind-card-shortcuts {
+    -fx-padding: 8px 4px 4px 4px;
+}
+
+.keybind-card-shortcuts-empty {
+    -fx-text-fill: -color-fg-muted;
+    -fx-font-style: italic;
+}
+
+.keybind-shortcut-row {
+    -fx-padding: 0;
+}
+
+.keybind-shortcut-chip {
+    -fx-background-color: -color-bg-subtle;
+    -fx-border-color: -color-border-muted;
+    -fx-border-width: 1px;
+    -fx-border-radius: 8px;
+    -fx-background-radius: 8px;
+    -fx-text-fill: -color-fg-default;
+    -fx-padding: 6px 12px;
+}
+
+.keybind-shortcut-chip:hover {
+    -fx-border-color: -color-accent-emphasis;
+}
+
+.keybind-shortcut-chip.recording {
+    -fx-border-color: -color-warning-emphasis;
+    -fx-background-color: -color-warning-subtle;
+    -fx-text-fill: -color-warning-fg;
+}
+
+.keybind-shortcut-remove {
+    -fx-padding: 4px 8px;
+    -fx-text-fill: -color-danger-emphasis;
+}
+
+.keybind-shortcut-remove:hover {
+    -fx-background-color: -color-danger-subtle;
+    -fx-text-fill: -color-danger-fg;
+}
+
+.keybinds-empty-state {
+    -fx-alignment: center;
+    -fx-padding: 48px;
+}
+
+.keybinds-empty-state .label {
+    -fx-text-fill: -color-fg-muted;
+    -fx-font-size: 13px;
+    -fx-text-alignment: center;
+}
diff --git a/src/main/resources/assets/railroad/styles/components/markdown-preview.css b/src/main/resources/assets/railroad/styles/components/markdown-preview.css
new file mode 100644
index 00000000..2aa9c017
--- /dev/null
+++ b/src/main/resources/assets/railroad/styles/components/markdown-preview.css
@@ -0,0 +1,4 @@
+.markdown-preview-heading-label {
+    -fx-font-family: 'monospace';
+    -fx-padding: 6 12;
+}
diff --git a/src/main/resources/assets/railroad/styles/components/plugins.css b/src/main/resources/assets/railroad/styles/components/plugins.css
index 6540240a..d97f49b9 100644
--- a/src/main/resources/assets/railroad/styles/components/plugins.css
+++ b/src/main/resources/assets/railroad/styles/components/plugins.css
@@ -1,326 +1,117 @@
-/* Plugin styles */
-.plugin-name-label {
-    -fx-font-size: 16px;
-    -fx-text-fill: -color-fg-default;
-}
-
-/* Plugins Pane Layout */
+/* ===== PLUGINS PANE ===== */
 .plugins-pane {
     -fx-background-color: transparent;
-    -fx-padding: 16;
-}
-
-.plugins-pane .split-pane-divider {
-    -fx-background-color: transparent, -color-border-subtle;
-    -fx-background-insets: 0, 2;
-    -fx-padding: 0 6px 0 6px;
-}
-
-.plugins-pane .split-pane-divider:hover {
-    -fx-background-color: transparent, -color-border-default;
-}
-
-.plugins-left-pane {
-    -fx-background-color: -color-bg-elevated;
-    -fx-border-color: -color-border-subtle;
-    -fx-border-width: 1px;
-    -fx-border-radius: 18px;
-    -fx-background-radius: 18px;
-    -fx-spacing: 16px;
-    -fx-padding: 20 28 20 24;
-    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.06), 10, 0.18, 0, 4);
-}
-
-.plugins-search-field {
-    -fx-background-radius: 12px;
-    -fx-border-radius: 12px;
-}
-
-.plugins-list-scroll,
-.plugin-details-scroll {
-    -fx-padding: 0;
-    -fx-background-color: transparent;
-    -fx-border-color: transparent;
-}
-
-.plugins-list-scroll .viewport,
-.plugin-details-scroll .viewport {
-    -fx-background-color: transparent;
-}
-
-/* ListView look */
-.plugins-list {
-    -fx-background-color: transparent;
-    -fx-padding: 6 0 6 0;
-}
-
-.list-cell.plugin-item {
-    -fx-background-color: -color-bg-default;
-    -fx-border-color: -color-border-subtle;
-    -fx-border-width: 1px;
-    -fx-background-radius: 14px;
-    -fx-border-radius: 14px;
-    -fx-padding: 10 14;
-    -fx-cursor: hand;
-    -fx-effect: null;
-    -fx-spacing: 0;
-    -fx-alignment: CENTER_LEFT;
-    -fx-wrap-text: true;
-}
-
-.list-cell.plugin-item:selected,
-.list-cell.plugin-item:hover {
-    -fx-background-color: -color-bg-subtle;
-    -fx-border-color: -color-border-default;
-}
-
-.plugin-details-container {
-    -fx-spacing: 28px;
-    -fx-padding: 28 20 28 36;
-}
-
-/* Plugin Item Styles */
-.plugin-item {
-    -fx-background-color: -color-bg-default;
-    -fx-border-color: -color-border-subtle;
-    -fx-border-width: 1px;
-    -fx-border-radius: 14px;
-    -fx-background-radius: 14px;
-    -fx-cursor: hand;
-    -fx-max-width: 100%;
-}
-
-.plugin-item:hover {
-    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.08), 6, 0.12, 0, 2);
-}
-
-.plugin-item.selected {
-    -fx-background-color: -color-accent-subtle;
-    -fx-border-color: -color-accent-emphasis;
-    -fx-border-width: 2px;
-    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.12), 8, 0.18, 0, 3);
-}
-
-.plugin-item-content {
-    -fx-spacing: 16px;
-}
-
-.plugin-item-info {
-    -fx-spacing: 6px;
 }
 
-.plugin-item .plugin-name {
+.plugins-pane-title {
     -fx-font-size: 16px;
     -fx-font-weight: 600;
     -fx-text-fill: -color-fg-emphasis;
 }
 
-.plugin-item .plugin-version {
-    -fx-font-size: 13px;
-    -fx-text-fill: -color-fg-muted;
-}
-
-.plugin-item .plugin-author {
-    -fx-font-size: 13px;
-    -fx-text-fill: -color-fg-muted;
-}
-
-.plugin-item .plugin-summary {
-    -fx-font-size: 13px;
+.plugins-pane-placeholder {
     -fx-text-fill: -color-fg-muted;
-    -fx-line-spacing: 1.2;
-    -fx-padding: 4 0 0 0;
+    -fx-font-size: 14px;
+    -fx-padding: 32px;
 }
 
-.plugin-item .check-box,
-.plugin-item .plugin-toggle {
+/* ===== PLUGIN DETAIL VIEW ===== */
+.plugin-detail-scroll {
+    -fx-background-color: transparent;
     -fx-padding: 0;
 }
 
-.plugin-item .check-box .box {
-    -fx-background-color: -color-bg-inset;
-    -fx-border-color: -color-border-default;
+.plugin-detail-container {
+    -fx-background-color: -color-bg-elevated;
+    -fx-background-radius: 12px;
+    -fx-border-radius: 12px;
+    -fx-border-color: -color-border-subtle;
     -fx-border-width: 1px;
-    -fx-border-radius: 4px;
-    -fx-background-radius: 4px;
-    -fx-min-width: 18px;
-    -fx-min-height: 18px;
-    -fx-max-width: 18px;
-    -fx-max-height: 18px;
+    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.1), 12, 0, 0, 6);
 }
 
-.plugin-item .check-box:hover .box {
-    -fx-border-color: -color-accent-emphasis;
+.plugin-detail-icon {
     -fx-background-color: -color-bg-subtle;
+    -fx-background-radius: 50%;
+    -fx-padding: 16px;
 }
 
-.plugin-item .check-box:selected .box {
-    -fx-background-color: -color-accent-emphasis;
-    -fx-border-color: -color-accent-emphasis;
-}
-
-.plugin-item .check-box:selected .mark {
-    -fx-background-color: -color-fg-emphasis;
-    -fx-stroke: -color-fg-emphasis;
-    -fx-stroke-width: 2;
-    -fx-translate-x: 1;
-    -fx-translate-y: 1;
-}
-
-/* Plugin Details Styles */
-.plugin-details-card {
-    -fx-background-color: -color-bg-default;
-    -fx-border-color: -color-border-subtle;
-    -fx-border-width: 1px;
-    -fx-border-radius: 16px;
-    -fx-background-radius: 16px;
-    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.08), 8, 0.15, 0, 2);
-}
-
-.plugin-details-name {
-    -fx-font-size: 24px;
+.plugin-detail-name {
+    -fx-font-size: 22px;
     -fx-font-weight: 700;
     -fx-text-fill: -color-fg-emphasis;
 }
 
-.plugin-details-version {
-    -fx-font-size: 14px;
+.plugin-detail-meta {
     -fx-text-fill: -color-fg-muted;
-    -fx-font-weight: 500;
-}
-
-.plugin-icon {
-    -fx-text-fill: -color-accent-emphasis;
-    -fx-opacity: 0.9;
-}
-
-.plugin-info-box {
-    -fx-spacing: 16px;
+    -fx-font-size: 13px;
 }
 
-.plugin-description {
-    -fx-font-size: 15px;
+.plugin-detail-description {
     -fx-text-fill: -color-fg-default;
-    -fx-line-spacing: 1.4;
-    -fx-padding: 0 0 8 0;
-}
-
-.plugin-info-label {
-    -fx-font-size: 14px;
-    -fx-font-weight: 600;
-    -fx-text-fill: -color-fg-emphasis;
-    -fx-min-width: 100px;
+    -fx-line-spacing: 4px;
 }
 
-.plugin-info-value {
-    -fx-font-size: 14px;
-    -fx-text-fill: -color-fg-default;
-    -fx-line-spacing: 1.2;
+.plugin-detail-grid {
+    -fx-padding: 12px 0 0 0;
 }
 
-.plugin-dependency {
-    -fx-font-size: 13px;
+.plugin-detail-label {
+    -fx-font-size: 12px;
     -fx-text-fill: -color-fg-muted;
-    -fx-padding: 2 0 2 16;
-}
-
-.plugin-details-placeholder {
-    -fx-alignment: center;
-    -fx-padding: 24 0 24 0;
-}
-
-.plugin-details-placeholder-card {
-    -fx-background-color: -color-bg-default;
-    -fx-border-color: -color-border-subtle;
-    -fx-border-width: 1px;
-    -fx-border-radius: 18px;
-    -fx-background-radius: 18px;
-    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.06), 10, 0.18, 0, 3);
-}
-
-.plugin-placeholder-icon {
-    -fx-text-fill: -color-accent-emphasis;
-    -fx-opacity: 0.85;
-}
-
-.plugin-placeholder-title {
-    -fx-font-size: 18px;
     -fx-font-weight: 600;
-    -fx-text-fill: -color-fg-emphasis;
+    -fx-text-transform: uppercase;
 }
 
-.plugin-placeholder-subtitle {
-    -fx-font-size: 13px;
-    -fx-text-fill: -color-fg-muted;
-    -fx-alignment: center;
-    -fx-text-alignment: center;
-}
-
-/* Plugin Search Field */
-.plugins-pane .text-field {
-    -fx-background-color: -color-bg-inset;
-    -fx-border-color: -color-border-subtle;
-    -fx-border-width: 1px;
-    -fx-border-radius: 12px;
-    -fx-background-radius: 12px;
-    -fx-padding: 10 14;
-    -fx-font-size: 14px;
+.plugin-detail-value {
     -fx-text-fill: -color-fg-default;
+    -fx-font-size: 13px;
 }
 
-.plugins-pane .text-field:focused {
-    -fx-border-color: -color-accent-emphasis;
-    -fx-background-color: -color-bg-default;
+.plugin-detail-value Hyperlink,
+.plugin-detail-container Hyperlink {
+    -fx-text-fill: -color-accent-fg;
+    -fx-font-weight: 500;
 }
 
-.plugins-pane .text-field:hover {
-    -fx-border-color: -color-border-default;
+.plugin-detail-value Hyperlink:hover,
+.plugin-detail-container Hyperlink:hover {
+    -fx-text-fill: -color-accent-emphasis;
 }
 
-/* Scroll Pane Styles */
-.plugins-pane .scroll-pane {
+/* ===== PLUGIN LIST CELLS ===== */
+.plugin-cell-container {
     -fx-background-color: transparent;
-    -fx-background: transparent;
+    -fx-padding: 6px 10px;
+    -fx-background-radius: 10px;
+    -fx-border-radius: 10px;
     -fx-border-color: transparent;
-    -fx-border-width: 0;
-}
-
-.plugins-pane .scroll-pane .viewport {
-    -fx-background-color: transparent;
-    -fx-background: transparent;
-}
-
-.plugins-pane .scroll-pane .scroll-bar {
-    -fx-background-color: transparent;
-    -fx-background: transparent;
+    -fx-border-width: 1px;
+    -fx-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out,
+        -fx-effect 0.15s ease-in-out;
 }
 
-.plugins-pane .scroll-pane .scroll-bar .thumb {
-    -fx-background-color: -color-border-subtle;
-    -fx-background-radius: 4px;
-    -fx-background-insets: 2;
+.plugin-cell-container:hover {
+    -fx-background-color: -color-bg-subtle;
 }
 
-.plugins-pane .scroll-pane .scroll-bar .thumb:hover {
-    -fx-background-color: -color-border-default;
+.plugin-cell-container.plugin-cell-selected {
+    -fx-background-color: -color-accent-subtle;
+    -fx-border-color: -color-accent-emphasis;
+    -fx-effect: dropshadow(gaussian, rgba(94, 129, 172, 0.18), 8, 0, 0, 2);
 }
 
-.plugins-pane .scroll-pane .scroll-bar .track {
-    -fx-background-color: transparent;
-    -fx-background: transparent;
+.plugin-cell-title {
+    -fx-font-size: 14px;
+    -fx-font-weight: 600;
+    -fx-text-fill: -color-fg-default;
 }
 
-.plugins-pane .scroll-pane .scroll-bar .increment-button,
-.plugins-pane .scroll-pane .scroll-bar .decrement-button {
-    -fx-background-color: transparent;
-    -fx-background: transparent;
-    -fx-padding: 0;
-    -fx-shape: "";
+.plugin-cell-subtitle {
+    -fx-font-size: 12px;
+    -fx-text-fill: -color-fg-muted;
 }
 
-.plugins-pane .scroll-pane .scroll-bar .increment-arrow,
-.plugins-pane .scroll-pane .scroll-bar .decrement-arrow {
-    -fx-background-color: transparent;
-    -fx-background: transparent;
-    -fx-shape: "";
+.plugin-cell-icon {
+    -mfx-color: -color-fg-muted;
 }
diff --git a/src/main/resources/assets/railroad/styles/components/project-list.css b/src/main/resources/assets/railroad/styles/components/project-list.css
index 01af7c4e..df58b584 100644
--- a/src/main/resources/assets/railroad/styles/components/project-list.css
+++ b/src/main/resources/assets/railroad/styles/components/project-list.css
@@ -12,3 +12,29 @@
 .project-list-node, .project-list-node .Pane {
     -fx-background-color: -color-bg-subtle;
 }
+/* base tag style */
+.project-list-facet-tag {
+    -fx-font-size: 0.8em; 
+    -fx-font-weight: 500;
+    -fx-padding: 2px 6px;
+    -fx-border-radius: 4px;
+    -fx-background-radius: 4px;
+    -fx-background-color: -rr-base-color-level-3;
+    -fx-text-fill: -rr-text-color-level-2;
+}
+
+
+.facet-java {
+    -fx-background-color: #E89D42; /* Orange */
+    -fx-text-fill: #3D2D1A;
+}
+
+.facet-gradle, .facet-maven {
+    -fx-background-color: #38809A; /* Blue */
+    -fx-text-fill: #FFFFFF;
+}
+
+.facet-fabric {
+    -fx-background-color: #C3C3C3; /* Light Grey */
+    -fx-text-fill: #2B2B2B;
+}
diff --git a/src/main/resources/assets/railroad/styles/components/radio-button.css b/src/main/resources/assets/railroad/styles/components/radio-button.css
new file mode 100644
index 00000000..36c931f0
--- /dev/null
+++ b/src/main/resources/assets/railroad/styles/components/radio-button.css
@@ -0,0 +1,12 @@
+.rr-radio-button {
+    -fx-background-color: transparent;
+    -fx-cursor: hand;
+}
+
+.rr-radio-button:disabled {
+    -fx-cursor: default;
+}
+
+.rr-radio-button.loading {
+    -fx-cursor: wait;
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/railroad/styles/components/run-config.css b/src/main/resources/assets/railroad/styles/components/run-config.css
new file mode 100644
index 00000000..f8dd035e
--- /dev/null
+++ b/src/main/resources/assets/railroad/styles/components/run-config.css
@@ -0,0 +1,63 @@
+.run-button .ikonli-font-icon {
+    -fx-icon-color: #82a157 !important;
+}
+
+.run-button:hover .ikonli-font-icon {
+    -fx-icon-color: #a3c17f !important;
+}
+
+.stop-button .ikonli-font-icon {
+    -fx-icon-color: #cd4b55 !important;
+}
+
+.stop-button:hover .ikonli-font-icon{
+    -fx-icon-color: #e5737a !important;
+}
+
+.debug-button .ikonli-font-icon {
+    -fx-icon-color: #cd5268 !important;
+}
+
+.debug-button:hover .ikonli-font-icon {
+    -fx-icon-color: #e68a9a !important;
+}
+
+.more-actions-button .ikonli-font-icon {
+    -fx-icon-color: #ddc03a !important;
+}
+
+.more-actions-button:hover .ikonli-font-icon {
+    -fx-icon-color: #eed76a !important;
+}
+
+.runconfig-picker-toolbar {
+    -fx-alignment: center-left;
+}
+
+.runconfig-picker-toolbar .runconfig-picker-button {
+    -fx-padding: 4;
+}
+
+.runconfig-picker-button .ikonli-font-icon {
+    -fx-icon-color: #a0aec0 !important;
+}
+
+.runconfig-picker-button:hover .ikonli-font-icon {
+    -fx-icon-color: #cbd5f5 !important;
+}
+
+.runconfig-picker-button-add .ikonli-font-icon {
+    -fx-icon-color: #82a157 !important;
+}
+
+.runconfig-picker-button-add:hover .ikonli-font-icon {
+    -fx-icon-color: #a3c17f !important;
+}
+
+.runconfig-picker-button-remove .ikonli-font-icon {
+    -fx-icon-color: #e5737a !important;
+}
+
+.runconfig-picker-button-remove:hover .ikonli-font-icon {
+    -fx-icon-color: #f59aa4 !important;
+}
diff --git a/src/main/resources/assets/railroad/styles/components/table-view.css b/src/main/resources/assets/railroad/styles/components/table-view.css
new file mode 100644
index 00000000..12728e1c
--- /dev/null
+++ b/src/main/resources/assets/railroad/styles/components/table-view.css
@@ -0,0 +1,107 @@
+/* Modern Table View Styles */
+.rr-table-view {
+    -fx-background-color: -color-bg-default;
+    -fx-background-radius: 8px;
+    -fx-border-color: transparent;
+    -fx-border-radius: 8px;
+    -fx-border-insets: 0;
+}
+
+.rr-table-view.bordered {
+    -fx-border-width: 1.5px;
+    -fx-border-color: -color-border-subtle;
+    -fx-background-insets: 0;
+    -fx-border-radius: 8px;
+    -fx-border-insets: 0;
+}
+
+.rr-table-view:hover {
+    -fx-border-color: -color-border-default;
+}
+
+.rr-table-view:focused {
+    -fx-border-color: -color-accent-emphasis;
+    -fx-border-width: 2px;
+}
+
+/* Table rows */
+.rr-list-view .list-row-cell:hover {
+    -fx-background-color: -color-bg-subtle;
+}
+
+.rr-list-view .list-row-cell:selected {
+    -fx-background-color: -color-accent-subtle;
+    -fx-text-fill: -color-accent-emphasis;
+}
+
+.rr-list-view .list-row-cell:selected:hover {
+    -fx-background-color: -color-accent-muted;
+}
+
+/* Table cells */
+.rr-table-view > .virtual-flow > .clipped-container > .sheet .table-cell:filled:hover {
+    -fx-background-color: -color-bg-subtle;
+}
+
+.rr-table-view > .virtual-flow > .clipped-container > .sheet .table-cell:filled:selected {
+    -fx-background-color: -color-accent-subtle;
+    -fx-text-fill: -color-fg-default;
+}
+
+.rr-table-view > .virtual-flow > .clipped-container > .sheet .table-cell:filled:selected:hover {
+    -fx-background-color: -color-accent-muted;
+}
+
+/* File type icons in table cells */
+.rr-table-view .ikonli-font-icon {
+    -fx-icon-size: 14px;
+    -fx-fill: -color-fg-default;
+    -fx-opacity: 0.8;
+}
+
+.rr-table-view > .virtual-flow > .clipped-container > .sheet .table-cell:selected .ikonli-font-icon {
+    -fx-fill: -color-fg-default;
+    -fx-opacity: 1;
+}
+
+/* Scroll bar styling for table view */
+.rr-table-view > .virtual-flow > .scroll-bar {
+    -fx-background-color: transparent;
+    -fx-background: transparent;
+}
+
+.rr-table-view > .virtual-flow > .scroll-bar .thumb {
+    -fx-background-color: -color-border-subtle;
+    -fx-background-radius: 4;
+    -fx-background-insets: 2;
+}
+
+.rr-table-view > .virtual-flow > .scroll-bar .thumb:hover {
+    -fx-background-color: -color-border-default;
+}
+
+.rr-table-view > .virtual-flow > .scroll-bar .track {
+    -fx-background-color: transparent;
+    -fx-background: transparent;
+}
+
+.rr-table-view > .virtual-flow > .scroll-bar .increment-button,
+.rr-table-view > .virtual-flow > .scroll-bar .decrement-button {
+    -fx-background-color: transparent;
+    -fx-background: transparent;
+    -fx-padding: 0;
+    -fx-shape: "";
+}
+
+.rr-table-view > .virtual-flow > .scroll-bar .increment-arrow,
+.rr-table-view > .virtual-flow > .scroll-bar .decrement-arrow {
+    -fx-background-color: transparent;
+    -fx-background: transparent;
+    -fx-shape: "";
+}
+
+/* Table view variant */
+
+.rr-list-view.striped .table-cell:filled:odd {
+    -fx-background-color: -color-bg-subtle;
+}
diff --git a/src/main/resources/assets/railroad/styles/components/theme-responsive-design.css b/src/main/resources/assets/railroad/styles/components/theme-responsive-design.css
index 2412d54a..1fc60dbd 100644
--- a/src/main/resources/assets/railroad/styles/components/theme-responsive-design.css
+++ b/src/main/resources/assets/railroad/styles/components/theme-responsive-design.css
@@ -1,11 +1,8 @@
-/* Responsive design */
-@media (max-width: 768px) {
-    .theme-selector .combo-box {
-        -fx-min-height: 32px;
-        -fx-font-size: 13px;
-    }
+.theme-compact .theme-selector .combo-box {
+    -fx-min-height: 32px;
+    -fx-font-size: 13px;
+}
 
-    .theme-download-pane .list-cell {
-        -fx-padding: 2px 0px 2px 0px;
-    }
+.theme-compact .theme-download-pane .list-cell {
+    -fx-padding: 2px 0px 2px 0px;
 }
diff --git a/src/main/resources/assets/railroad/styles/components/theme.css b/src/main/resources/assets/railroad/styles/components/theme.css
index 5a751f07..373ca70a 100644
--- a/src/main/resources/assets/railroad/styles/components/theme.css
+++ b/src/main/resources/assets/railroad/styles/components/theme.css
@@ -37,6 +37,12 @@
     -fx-border-color: -color-border-subtle;
 }
 
+.theme-download-container {
+    -fx-background-radius: 0px;
+    -fx-background-color: -color-bg-default;
+    -fx-border-radius: 0px;
+}
+
 .theme-download-description {
     -fx-font-size: 14px;
     -fx-text-fill: -color-fg-muted;
@@ -58,10 +64,6 @@
     -fx-border-color: transparent;
 }
 
-.theme-download-card {
-    -fx-background-color: -color-bg-subtle;
-}
-
 .theme-download-name {
     -fx-font-size: 16px;
     -fx-font-weight: bold;
@@ -76,4 +78,8 @@
 /* Theme download cell styling */
 .theme-download-cell {
     -fx-background-color: transparent;
+
+    .card {
+        -fx-background-color: -color-bg-subtle;
+    }
 }
diff --git a/src/main/resources/assets/railroad/styles/components/toggle-button.css b/src/main/resources/assets/railroad/styles/components/toggle-button.css
new file mode 100644
index 00000000..ef4456d9
--- /dev/null
+++ b/src/main/resources/assets/railroad/styles/components/toggle-button.css
@@ -0,0 +1,7 @@
+.rr-toggle-button {
+    -fx-background-color: -color-neutral-emphasis;
+}
+
+.rr-toggle-button:selected {
+    -fx-background-color: -color-accent-emphasis;
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/railroad/styles/components/welcome.css b/src/main/resources/assets/railroad/styles/components/welcome.css
index 04995b09..9ce91262 100644
--- a/src/main/resources/assets/railroad/styles/components/welcome.css
+++ b/src/main/resources/assets/railroad/styles/components/welcome.css
@@ -252,4 +252,169 @@
     -fx-background-color: -color-bg-default;
     -fx-border-color: transparent;
     -fx-effect: none;
-}
\ No newline at end of file
+}
+
+.welcome-hero {
+    -fx-alignment: center-left;
+    -fx-spacing: 18px;
+}
+
+.welcome-hero-icon {
+    -fx-icon-size: 32px;
+    -fx-fill: -color-accent-emphasis;
+    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.1), 6, 0.3, 0, 1);
+}
+
+.welcome-hero-text {
+    -fx-spacing: 4px;
+}
+
+.welcome-stats-bar {
+    -fx-background-color: -color-bg-subtle;
+    -fx-border-color: -color-border-subtle;
+    -fx-border-radius: 12px;
+    -fx-background-radius: 12px;
+    -fx-padding: 10px 16px;
+    -fx-spacing: 20px;
+}
+
+.welcome-stat {
+    -fx-alignment: center-left;
+    -fx-spacing: 8px;
+}
+
+.welcome-stat-icon {
+    -fx-icon-size: 16px;
+    -fx-fill: -color-accent-emphasis;
+}
+
+.welcome-stat-label {
+    -fx-font-size: 13px;
+    -fx-font-weight: 600;
+    -fx-text-fill: -color-fg-default;
+}
+
+.welcome-tip {
+    -fx-alignment: center-left;
+    -fx-spacing: 6px;
+}
+
+.welcome-tip-icon {
+    -fx-icon-size: 14px;
+    -fx-fill: -color-accent-emphasis;
+}
+
+.welcome-tip-label {
+    -fx-font-size: 12px;
+    -fx-text-fill: -color-fg-muted;
+}
+
+.welcome-options-row {
+    -fx-spacing: 14px;
+}
+
+
+/* Project sort combo box */
+.project-sort-combo {
+    -fx-pref-width: 220px;
+}
+
+.project-sort-option {
+    -fx-alignment: center-left;
+    -fx-spacing: 12px;
+    -fx-padding: 4px 0;
+}
+
+.project-sort-option-icon {
+    -fx-icon-size: 16px;
+    -fx-fill: -color-accent-emphasis;
+}
+
+.project-sort-option-text {
+    -fx-spacing: 2px;
+}
+
+.project-sort-option-title {
+    -fx-font-size: 13px;
+    -fx-font-weight: 600;
+    -fx-text-fill: -color-fg-default;
+}
+
+.project-sort-option-description {
+    -fx-font-size: 11px;
+    -fx-text-fill: -color-fg-muted;
+}
+
+.project-sort-tooltip {
+    -fx-font-size: 12px;
+    -fx-background-color: -color-bg-subtle;
+    -fx-text-fill: -color-fg-default;
+    -fx-padding: 8px 12px;
+    -fx-background-radius: 6px;
+    -fx-border-radius: 6px;
+    -fx-border-color: -color-border-subtle;
+    -fx-border-width: 1px;
+}
+
+/* Welcome search bar */
+.welcome-search-container {
+    -fx-background-color: -color-bg-subtle;
+    -fx-border-color: -color-border-subtle;
+    -fx-border-radius: 999px;
+    -fx-background-radius: 999px;
+    -fx-padding: 6px 12px;
+    -fx-spacing: 10px;
+    -fx-min-height: 44px;
+    -fx-alignment: center-left;
+}
+
+.welcome-search-container:focused {
+    -fx-border-color: -color-accent-emphasis;
+    -fx-background-color: -color-bg-default;
+    -fx-effect: dropshadow(gaussian, rgba(94, 129, 172, 0.2), 8, 0.2, 0, 1);
+}
+
+.welcome-search-icon {
+    -fx-icon-size: 16px;
+    -fx-fill: -color-fg-muted;
+}
+
+.welcome-search-container:focused .welcome-search-icon {
+    -fx-fill: -color-accent-emphasis;
+}
+
+.welcome-search-input {
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+    -fx-text-fill: -color-fg-default;
+    -fx-prompt-text-fill: -color-fg-muted;
+    -fx-font-size: 14px;
+    -fx-padding: 0;
+}
+
+.welcome-search-input:focused {
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+}
+
+.welcome-search-clear {
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+    -fx-background-radius: 50%;
+    -fx-border-radius: 50%;
+    -fx-padding: 4px;
+    -fx-cursor: hand;
+}
+
+.welcome-search-clear:hover {
+    -fx-background-color: -color-bg-subtle;
+}
+
+.welcome-search-clear-icon {
+    -fx-icon-size: 12px;
+    -fx-fill: -color-fg-muted;
+}
+
+.welcome-search-container:focused .welcome-search-clear-icon {
+    -fx-fill: -color-accent-emphasis;
+}
diff --git a/src/main/resources/assets/railroad/styles/default-dark.css b/src/main/resources/assets/railroad/styles/default-dark.css
index b9693470..a5c08aa4 100644
--- a/src/main/resources/assets/railroad/styles/default-dark.css
+++ b/src/main/resources/assets/railroad/styles/default-dark.css
@@ -59,6 +59,8 @@
     -color-bg-overlay: #2E3440;
     -color-bg-subtle: #3B4252;
     -color-bg-inset: #232730;
+    -color-bg-elevated: #3B4252;
+    -color-border-emphasis: #788192;
     -color-border-default: rgb(94, 102, 117);
     -color-border-muted: #4C566A;
     -color-border-subtle: #3B4252;
diff --git a/src/main/resources/assets/railroad/styles/default-light.css b/src/main/resources/assets/railroad/styles/default-light.css
index 20348595..99f73766 100644
--- a/src/main/resources/assets/railroad/styles/default-light.css
+++ b/src/main/resources/assets/railroad/styles/default-light.css
@@ -59,6 +59,7 @@
     -color-bg-overlay: #fafafc;
     -color-bg-subtle: #eef1f5;
     -color-bg-inset: #E5E9F0;
+    -color-bg-elevated: #ffffff;
     -color-border-default: #c7ceda;
     -color-border-muted: #c7ceda;
     -color-border-subtle: rgb(218, 218, 221);
diff --git a/src/test/java/dev/railroadide/railroad/java/cli/CLIReflection.java b/src/test/java/dev/railroadide/railroad/java/cli/CLIReflection.java
new file mode 100644
index 00000000..251030c2
--- /dev/null
+++ b/src/test/java/dev/railroadide/railroad/java/cli/CLIReflection.java
@@ -0,0 +1,34 @@
+package dev.railroadide.railroad.java.cli;
+
+import java.lang.reflect.Field;
+
+/**
+ * Utility class for accessing private fields of CLI builder classes using reflection for testing purposes.
+ */
+final class CLIReflection {
+    private CLIReflection() {
+    }
+
+    static <T> T readField(Object target, String fieldName, Class<T> type) {
+        try {
+            Field field = findField(target.getClass(), fieldName);
+            field.setAccessible(true);
+            return type.cast(field.get(target));
+        } catch (ReflectiveOperationException exception) {
+            throw new AssertionError("Failed to access field " + fieldName, exception);
+        }
+    }
+
+    private static Field findField(Class<?> type, String fieldName) throws NoSuchFieldException {
+        Class<?> current = type;
+        while (current != null) {
+            try {
+                return current.getDeclaredField(fieldName);
+            } catch (NoSuchFieldException ignored) {
+                current = current.getSuperclass();
+            }
+        }
+
+        throw new NoSuchFieldException(fieldName);
+    }
+}
diff --git a/src/test/java/dev/railroadide/railroad/java/cli/JDKCLITest.java b/src/test/java/dev/railroadide/railroad/java/cli/JDKCLITest.java
new file mode 100644
index 00000000..b66f931e
--- /dev/null
+++ b/src/test/java/dev/railroadide/railroad/java/cli/JDKCLITest.java
@@ -0,0 +1,63 @@
+package dev.railroadide.railroad.java.cli;
+
+import dev.railroadide.railroad.java.JDK;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Path;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+/**
+ * Tests for the {@link JDKCLI} class, ensuring that CLI builders correctly reference the associated JDK.
+ */
+class JDKCLITest {
+    private final JDK jdk = TestJdks.create(21);
+
+    @Test
+    void launchBuildersReferenceProvidedJdk() {
+        JDKCLI cli = new JDKCLI(jdk);
+        assertBuilderHasJdk(cli.launchMainClass(Path.of("Main.class")), "launchMainClass");
+        assertBuilderHasJdk(cli.launchJar(Path.of("app.jar")), "launchJar");
+        assertBuilderHasJdk(cli.launchModule("module.name"), "launchModule");
+        assertBuilderHasJdk(cli.launchSourceFile(Path.of("Example.java")), "launchSourceFile");
+    }
+
+    @Test
+    void toolBuildersReferenceProvidedJdk() {
+        JDKCLI cli = new JDKCLI(jdk);
+        Map<String, Object> builders = new LinkedHashMap<>();
+        builders.put("jar", cli.jar());
+        builders.put("jarsigner", cli.jarsigner());
+        builders.put("javadoc", cli.javadoc());
+        builders.put("javap", cli.javap());
+        builders.put("jcmd", cli.jcmd());
+        builders.put("jdb", cli.jdb());
+        builders.put("jdeprscan", cli.jdeprscan());
+        builders.put("jdeps", cli.jdeps());
+        builders.put("jfr", cli.jfr());
+        builders.put("jinfo", cli.jinfo());
+        builders.put("jlink", cli.jlink());
+        builders.put("jmap", cli.jmap());
+        builders.put("jmod", cli.jmod());
+        builders.put("jpackage", cli.jpackage());
+        builders.put("jps", cli.jps());
+        builders.put("jshell", cli.jshell());
+        builders.put("jstack", cli.jstack());
+        builders.put("jstat", cli.jstat());
+        builders.put("jstatd", cli.jstatd());
+        builders.put("keytool", cli.keytool());
+        builders.put("rmic", cli.rmic());
+        builders.put("rmid", cli.rmid());
+        builders.put("rmiregistry", cli.rmiregistry());
+        builders.put("serialver", cli.serialver());
+
+        builders.forEach((name, builder) -> assertBuilderHasJdk(builder, name));
+    }
+
+    private void assertBuilderHasJdk(Object builder, String name) {
+        JDK stored = CLIReflection.readField(builder, "jdk", JDK.class);
+        assertSame(jdk, stored, () -> name + " should retain the original JDK reference");
+    }
+}
diff --git a/src/test/java/dev/railroadide/railroad/java/cli/JDKCliToolExecutionTest.java b/src/test/java/dev/railroadide/railroad/java/cli/JDKCliToolExecutionTest.java
new file mode 100644
index 00000000..1926252d
--- /dev/null
+++ b/src/test/java/dev/railroadide/railroad/java/cli/JDKCliToolExecutionTest.java
@@ -0,0 +1,65 @@
+package dev.railroadide.railroad.java.cli;
+
+import dev.railroadide.railroad.java.JDK;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Tests the execution of various CLI tools provided by a JDK, such as keytool and the Java launcher.
+ */
+class JDKCliToolExecutionTest {
+
+    @Test
+    void keytoolVersionCommandRunsOnCurrentJdk() throws IOException {
+        JDK jdk = TestJdks.currentRuntime();
+        Process process = jdk.cli().keytool()
+            .version()
+            .setTimeout(5, TimeUnit.SECONDS)
+            .run();
+
+        assertEquals(0, process.exitValue(), "keytool -version should exit successfully");
+
+        String stdout = readFully(process.getInputStream());
+        String stderr = readFully(process.getErrorStream());
+        String output = stdout.isBlank() ? stderr : stdout;
+
+        assertFalse(output.isBlank(), "keytool should report its version");
+        assertTrue(output.toLowerCase(Locale.ROOT).contains("keytool"),
+            "version output should mention keytool");
+    }
+
+    @Test
+    void javaLauncherRunsSourceFile() throws IOException {
+        JDK jdk = TestJdks.currentRuntime();
+        Path tempDir = Files.createTempDirectory("jdk-cli-src");
+        Path sourceFile = tempDir.resolve("CliHello.java");
+        Files.writeString(sourceFile, """
+            public class CliHello {
+                public static void main(String[] args) {
+                    System.out.print("hello from java");
+                }
+            }
+            """);
+
+        Process process = jdk.cli().launchSourceFile(sourceFile)
+            .setTimeout(5, TimeUnit.SECONDS)
+            .run();
+
+        assertEquals(0, process.exitValue(), "java should execute the generated source file");
+        String stdout = readFully(process.getInputStream()).trim();
+        assertEquals("hello from java", stdout);
+    }
+
+    private static String readFully(InputStream stream) throws IOException {
+        return new String(stream.readAllBytes(), StandardCharsets.UTF_8);
+    }
+}
diff --git a/src/test/java/dev/railroadide/railroad/java/cli/JarCLIBuilderTest.java b/src/test/java/dev/railroadide/railroad/java/cli/JarCLIBuilderTest.java
new file mode 100644
index 00000000..fb148860
--- /dev/null
+++ b/src/test/java/dev/railroadide/railroad/java/cli/JarCLIBuilderTest.java
@@ -0,0 +1,50 @@
+package dev.railroadide.railroad.java.cli;
+
+import dev.railroadide.railroad.java.cli.impl.JarCLIBuilder;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Tests for the {@link JarCLIBuilder} class, ensuring correct argument construction and behavior
+ * for the `jar` command-line tool.
+ */
+class JarCLIBuilderTest {
+
+    @Test
+    void releaseEntriesRejectsVersionsBelowNine() {
+        JarCLIBuilder builder = JarCLIBuilder.create(TestJdks.create(21));
+        assertThrows(IllegalArgumentException.class, () -> builder.releaseEntries(8));
+        assertDoesNotThrow(() -> builder.releaseEntries(9));
+    }
+
+    @Test
+    void generateIndexSetsModeAndTarget() {
+        JarCLIBuilder builder = JarCLIBuilder.create(TestJdks.create(21));
+        Path jarPath = Path.of("libs", "app.jar");
+        builder.generateIndex(jarPath);
+
+        assertEquals(JarCLIBuilder.OperationMode.GENERATE_INDEX,
+            CLIReflection.readField(builder, "operationMode", JarCLIBuilder.OperationMode.class));
+        assertEquals(jarPath.toString(), CLIReflection.readField(builder, "generateIndexTarget", String.class));
+    }
+
+    @Test
+    void modulePathUsesPlatformSeparator() {
+        JarCLIBuilder builder = JarCLIBuilder.create(TestJdks.create(21));
+        builder.modulePath("mods/one", "mods/two");
+
+        List<String> arguments = CLIReflection.readField(builder, "arguments", List.class);
+        assertTrue(arguments.contains("--module-path mods/one" + File.pathSeparator + "mods/two"));
+    }
+
+    @Test
+    void runRequiresOperationMode() {
+        JarCLIBuilder builder = JarCLIBuilder.create(TestJdks.create(21));
+        assertThrows(IllegalStateException.class, builder::run);
+    }
+}
diff --git a/src/test/java/dev/railroadide/railroad/java/cli/JarsignerCLIBuilderTest.java b/src/test/java/dev/railroadide/railroad/java/cli/JarsignerCLIBuilderTest.java
new file mode 100644
index 00000000..4861ec8a
--- /dev/null
+++ b/src/test/java/dev/railroadide/railroad/java/cli/JarsignerCLIBuilderTest.java
@@ -0,0 +1,52 @@
+package dev.railroadide.railroad.java.cli;
+
+import dev.railroadide.railroad.java.cli.impl.JarsignerCLIBuilder;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Tests for the {@link JarsignerCLIBuilder} class, ensuring correct argument construction and behavior
+ * for the `jarsigner` command-line tool.
+ */
+class JarsignerCLIBuilderTest {
+
+    @Test
+    void signConfiguresOperationAndClearsVerifyAliases() {
+        JarsignerCLIBuilder builder = JarsignerCLIBuilder.create(TestJdks.create(21));
+        builder.verify("old.jar", "alpha");
+        builder.sign("app.jar", "releaseAlias");
+
+        Enum<?> operation = CLIReflection.readField(builder, "operationMode", Enum.class);
+        assertEquals("SIGN", operation.name());
+        assertEquals("app.jar", CLIReflection.readField(builder, "jarFile", String.class));
+        assertEquals("releaseAlias", CLIReflection.readField(builder, "signingAlias", String.class));
+        List<String> verifyAliases = CLIReflection.readField(builder, "verifyAliases", List.class);
+        assertTrue(verifyAliases.isEmpty(), "Verify aliases should be cleared when switching to sign mode");
+    }
+
+    @Test
+    void verifyCollectsAliasesAndClearsSigningAlias() {
+        JarsignerCLIBuilder builder = JarsignerCLIBuilder.create(TestJdks.create(21));
+        builder.sign("app.jar", "releaseAlias");
+        builder.verify("bundle.jar", "alpha", "beta");
+
+        Enum<?> operation = CLIReflection.readField(builder, "operationMode", Enum.class);
+        assertEquals("VERIFY", operation.name());
+        assertEquals("bundle.jar", CLIReflection.readField(builder, "jarFile", String.class));
+        assertNull(CLIReflection.readField(builder, "signingAlias", String.class));
+        List<String> verifyAliases = CLIReflection.readField(builder, "verifyAliases", List.class);
+        assertEquals(List.of("alpha", "beta"), verifyAliases);
+    }
+
+    @Test
+    void storePasswordFromEnvironmentUsesExpectedSyntax() {
+        JarsignerCLIBuilder builder = JarsignerCLIBuilder.create(TestJdks.create(21));
+        builder.storePasswordFromEnv("STORE_PASS");
+
+        List<String> arguments = CLIReflection.readField(builder, "arguments", List.class);
+        assertEquals("-storepass:env STORE_PASS", arguments.getLast());
+    }
+}
diff --git a/src/test/java/dev/railroadide/railroad/java/cli/JavaExecutableCLIBuilderTest.java b/src/test/java/dev/railroadide/railroad/java/cli/JavaExecutableCLIBuilderTest.java
new file mode 100644
index 00000000..ab73ad30
--- /dev/null
+++ b/src/test/java/dev/railroadide/railroad/java/cli/JavaExecutableCLIBuilderTest.java
@@ -0,0 +1,94 @@
+package dev.railroadide.railroad.java.cli;
+
+import dev.railroadide.railroad.java.cli.impl.JavaExecutableCLIBuilder;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Path;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Tests for the {@link JavaExecutableCLIBuilder} class, ensuring correct argument construction and behavior
+ * for the `java` command-line executable.
+ */
+class JavaExecutableCLIBuilderTest {
+
+    @Test
+    void classFileRequiresClassExtension() {
+        assertThrows(IllegalArgumentException.class,
+            () -> JavaExecutableCLIBuilder.classFile(TestJdks.create(21), Path.of("Main.txt")));
+    }
+
+    @Test
+    void jarFileRequiresJarExtension() {
+        assertThrows(IllegalArgumentException.class,
+            () -> JavaExecutableCLIBuilder.jarFile(TestJdks.create(21), Path.of("launcher.zip")));
+    }
+
+    @Test
+    void sourceFileRequiresJavaExtension() {
+        assertThrows(IllegalArgumentException.class,
+            () -> JavaExecutableCLIBuilder.sourceFile(TestJdks.create(21), Path.of("Main.txt")));
+    }
+
+    @Test
+    void agentlibArgumentsInsertedAtBeginning() {
+        var builder = JavaExecutableCLIBuilder.module(TestJdks.create(21), "module");
+        builder.addArgument("--existing");
+        builder.agentlib("jdwp", "transport=dt_socket", "suspend=y");
+
+        List<String> arguments = CLIReflection.readField(builder, "arguments", List.class);
+        assertEquals("-agentlib:jdwp=transport=dt_socket,suspend=y", arguments.get(0));
+        assertEquals("--existing", arguments.get(1));
+    }
+
+    @Test
+    void enablePreviewFeaturesRequiresJdk12() {
+        var jdk11Builder = JavaExecutableCLIBuilder.module(TestJdks.create(11), "module");
+        assertThrows(UnsupportedOperationException.class, jdk11Builder::enablePreviewFeatures);
+
+        var jdk12Builder = JavaExecutableCLIBuilder.module(TestJdks.create(12), "module");
+        jdk12Builder.enablePreviewFeatures();
+        List<String> arguments = CLIReflection.readField(jdk12Builder, "arguments", List.class);
+        assertTrue(arguments.contains("--enable-preview"));
+    }
+
+    @Test
+    void enableNativeAccessRequiresJdk16() {
+        var jdk15Builder = JavaExecutableCLIBuilder.module(TestJdks.create(15), "module");
+        assertThrows(UnsupportedOperationException.class, () -> jdk15Builder.enableNativeAccess("mod"));
+
+        var jdk16Builder = JavaExecutableCLIBuilder.module(TestJdks.create(16), "module");
+        jdk16Builder.enableNativeAccess("com.example");
+        List<String> arguments = CLIReflection.readField(jdk16Builder, "arguments", List.class);
+        assertTrue(arguments.contains("--enable-native-access=com.example"));
+    }
+
+    @Test
+    void illegalNativeAccessValidatesVersionAndMode() {
+        var jdk23Builder = JavaExecutableCLIBuilder.module(TestJdks.create(23), "module");
+        assertThrows(UnsupportedOperationException.class,
+            () -> jdk23Builder.illegalNativeAccess(JavaExecutableCLIBuilder.AccessMode.ALLOW));
+
+        var jdk24Builder = JavaExecutableCLIBuilder.module(TestJdks.create(24), "module");
+        assertThrows(UnsupportedOperationException.class,
+            () -> jdk24Builder.illegalNativeAccess(JavaExecutableCLIBuilder.AccessMode.DEBUG));
+
+        jdk24Builder.illegalNativeAccess(JavaExecutableCLIBuilder.AccessMode.WARN);
+        List<String> arguments = CLIReflection.readField(jdk24Builder, "arguments", List.class);
+        assertTrue(arguments.contains("--illegal-native-access=warn"));
+    }
+
+    @Test
+    void finalizationRequiresJdk18() {
+        var jdk17Builder = JavaExecutableCLIBuilder.module(TestJdks.create(17), "module");
+        assertThrows(UnsupportedOperationException.class,
+            () -> jdk17Builder.finalization(JavaExecutableCLIBuilder.EnabledDisabled.ENABLED));
+
+        var jdk18Builder = JavaExecutableCLIBuilder.module(TestJdks.create(18), "module");
+        jdk18Builder.finalization(JavaExecutableCLIBuilder.EnabledDisabled.DISABLED);
+        List<String> arguments = CLIReflection.readField(jdk18Builder, "arguments", List.class);
+        assertTrue(arguments.contains("--finalization=disabled"));
+    }
+}
diff --git a/src/test/java/dev/railroadide/railroad/java/cli/KeytoolCLIBuilderTest.java b/src/test/java/dev/railroadide/railroad/java/cli/KeytoolCLIBuilderTest.java
new file mode 100644
index 00000000..b8e88e07
--- /dev/null
+++ b/src/test/java/dev/railroadide/railroad/java/cli/KeytoolCLIBuilderTest.java
@@ -0,0 +1,51 @@
+package dev.railroadide.railroad.java.cli;
+
+import dev.railroadide.railroad.java.cli.impl.KeytoolCLIBuilder;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Tests for the {@link KeytoolCLIBuilder} class, ensuring correct argument construction and behavior
+ * for the `keytool` command-line utility.
+ */
+class KeytoolCLIBuilderTest {
+
+    @Test
+    void commandSelectionIsExclusive() {
+        KeytoolCLIBuilder builder = KeytoolCLIBuilder.create(TestJdks.create(21));
+        builder.listEntries();
+        assertThrows(IllegalStateException.class, builder::generateKeyPair);
+    }
+
+    @Test
+    void keystorePathAddsExpectedArgument() {
+        KeytoolCLIBuilder builder = KeytoolCLIBuilder.create(TestJdks.create(21));
+        Path keystorePath = Path.of("certs", "keys.jks");
+        builder.keystore(keystorePath);
+
+        List<String> arguments = CLIReflection.readField(builder, "arguments", List.class);
+        assertTrue(arguments.contains("-keystore " + keystorePath));
+    }
+
+    @Test
+    void tlsInfoAndSslServerArgumentsAreFormatted() {
+        KeytoolCLIBuilder builder = KeytoolCLIBuilder.create(TestJdks.create(21));
+        builder.tlsInfo("TLSv1.3");
+        builder.sslServer("example.com:443");
+
+        List<String> arguments = CLIReflection.readField(builder, "arguments", List.class);
+        assertTrue(arguments.contains("-tls TLSv1.3"));
+        assertTrue(arguments.contains("-sslserver example.com:443"));
+    }
+
+    @Test
+    void timeoutCannotBeNegative() {
+        KeytoolCLIBuilder builder = KeytoolCLIBuilder.create(TestJdks.create(21));
+        assertThrows(IllegalArgumentException.class, () -> builder.setTimeout(-1, TimeUnit.SECONDS));
+    }
+}
diff --git a/src/test/java/dev/railroadide/railroad/java/cli/ProcessExecutionTest.java b/src/test/java/dev/railroadide/railroad/java/cli/ProcessExecutionTest.java
new file mode 100644
index 00000000..f7404710
--- /dev/null
+++ b/src/test/java/dev/railroadide/railroad/java/cli/ProcessExecutionTest.java
@@ -0,0 +1,168 @@
+package dev.railroadide.railroad.java.cli;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Tests for the {@link ProcessExecution} utility class, specifically focusing on its timeout
+ * and interruption handling during process execution.
+ */
+class ProcessExecutionTest {
+
+    @Test
+    void enforceTimeoutReturnsWhenProcessCompletesWithinLimit() {
+        var process = new StubProcess(true, false, true);
+        assertDoesNotThrow(() -> ProcessExecution.enforceTimeout(process, 1, TimeUnit.SECONDS, "java"));
+        assertTrue(process.isWaitForCalled(), "waitFor should be invoked when enforcing timeouts");
+        assertFalse(process.isDestroyCalled(), "completed processes should not be destroyed");
+    }
+
+    @Test
+    void enforceTimeoutDestroysHungProcess() {
+        var process = new StubProcess(false, false, false);
+        RuntimeException exception = assertThrows(RuntimeException.class,
+            () -> ProcessExecution.enforceTimeout(process, 1, TimeUnit.SECONDS, "jarsigner"));
+
+        assertTrue(exception.getMessage().contains("timed out"));
+        assertTrue(process.isDestroyCalled(), "hung process should be destroyed");
+        assertTrue(process.isDestroyForciblyCalled(), "hung process should be forcefully destroyed");
+    }
+
+    @Test
+    void enforceTimeoutHandlesInterruptions() {
+        var process = new StubProcess(true, true, true);
+        RuntimeException exception = assertThrows(RuntimeException.class,
+            () -> ProcessExecution.enforceTimeout(process, 1, TimeUnit.SECONDS, "keytool"));
+
+        assertTrue(exception.getMessage().contains("Interrupted while waiting"));
+        assertTrue(process.isDestroyCalled(), "interrupted wait should still destroy the process");
+        assertTrue(Thread.currentThread().isInterrupted(), "interrupt status should be restored");
+        Thread.interrupted(); // Clear for other tests
+    }
+
+    @Test
+    void enforceTimeoutSkipsWaitWhenDurationIsNonPositive() {
+        var process = new StubProcess(true, false, true);
+        assertDoesNotThrow(() -> ProcessExecution.enforceTimeout(process, 0, TimeUnit.SECONDS, "jar"));
+        assertFalse(process.isWaitForCalled(), "no wait should occur when timeout is disabled");
+    }
+
+    private static final class StubProcess extends Process {
+        private final boolean waitResult;
+        private final boolean interruptDuringWait;
+        private final boolean destroyStopsProcess;
+        private boolean waitForCalled;
+        private boolean destroyCalled;
+        private boolean destroyForciblyCalled;
+        private boolean alive = true;
+
+        private StubProcess(boolean waitResult, boolean interruptDuringWait, boolean destroyStopsProcess) {
+            this.waitResult = waitResult;
+            this.interruptDuringWait = interruptDuringWait;
+            this.destroyStopsProcess = destroyStopsProcess;
+        }
+
+        boolean isWaitForCalled() {
+            return waitForCalled;
+        }
+
+        boolean isDestroyCalled() {
+            return destroyCalled;
+        }
+
+        boolean isDestroyForciblyCalled() {
+            return destroyForciblyCalled;
+        }
+
+        @Override
+        public OutputStream getOutputStream() {
+            return OutputStream.nullOutputStream();
+        }
+
+        @Override
+        public InputStream getInputStream() {
+            return InputStream.nullInputStream();
+        }
+
+        @Override
+        public InputStream getErrorStream() {
+            return InputStream.nullInputStream();
+        }
+
+        @Override
+        public int waitFor() {
+            waitForCalled = true;
+            alive = false;
+            return 0;
+        }
+
+        @Override
+        public boolean waitFor(long timeout, TimeUnit unit) throws InterruptedException {
+            waitForCalled = true;
+            if (interruptDuringWait)
+                throw new InterruptedException("simulated interrupt");
+
+            if (waitResult) {
+                alive = false;
+            }
+
+            return waitResult;
+        }
+
+        @Override
+        public int exitValue() {
+            return 0;
+        }
+
+        @Override
+        public void destroy() {
+            destroyCalled = true;
+            if (destroyStopsProcess) {
+                alive = false;
+            }
+        }
+
+        @Override
+        public Process destroyForcibly() {
+            destroyForciblyCalled = true;
+            alive = false;
+            return this;
+        }
+
+        @Override
+        public boolean isAlive() {
+            return alive;
+        }
+
+        @Override
+        public long pid() {
+            return 0;
+        }
+
+        @Override
+        public ProcessHandle.Info info() {
+            return ProcessHandle.current().info();
+        }
+
+        @Override
+        public Stream<ProcessHandle> children() {
+            return Stream.empty();
+        }
+
+        @Override
+        public Stream<ProcessHandle> descendants() {
+            return Stream.empty();
+        }
+
+        @Override
+        public boolean supportsNormalTermination() {
+            return true;
+        }
+    }
+}
diff --git a/src/test/java/dev/railroadide/railroad/java/cli/TestJdks.java b/src/test/java/dev/railroadide/railroad/java/cli/TestJdks.java
new file mode 100644
index 00000000..a2a262b2
--- /dev/null
+++ b/src/test/java/dev/railroadide/railroad/java/cli/TestJdks.java
@@ -0,0 +1,33 @@
+package dev.railroadide.railroad.java.cli;
+
+import dev.railroadide.railroad.java.JDK;
+import dev.railroadide.railroad.java.JDKUtils;
+import dev.railroadide.railroad.utility.JavaVersion;
+
+import java.nio.file.Path;
+import java.util.UUID;
+
+/**
+ * Utility class for creating and retrieving JDK instances for testing purposes.
+ */
+final class TestJdks {
+    private TestJdks() {
+    }
+
+    static JDK create(int release) {
+        Path home = Path.of("build", "test-jdk-" + release + "-" + UUID.randomUUID());
+        return new JDK(home, "test-jdk-" + release, JavaVersion.fromMajor(release), JDK.Brand.UNKNOWN);
+    }
+
+    static JDK currentRuntime() {
+        String javaHome = System.getProperty("java.home");
+        if (javaHome == null || javaHome.isBlank())
+            throw new IllegalStateException("java.home property is not set");
+
+        JDK jdk = JDKUtils.createJDKFromAnyPath(javaHome);
+        if (jdk == null)
+            throw new IllegalStateException("Unable to resolve the running JDK at " + javaHome);
+
+        return jdk;
+    }
+}
diff --git a/templates/fabric/16/template_build.gradle b/templates/fabric/16/template_build.gradle
index aed467e5..987f2a80 100644
--- a/templates/fabric/16/template_build.gradle
+++ b/templates/fabric/16/template_build.gradle
@@ -17,35 +17,35 @@ repositories {
     // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
-    < % if (mappings.channel == 'parchment') {
+    <% if (mappings.channel == 'parchment') {
         out.print("\n    maven { url = 'https://maven.parchmentmc.org/' }")
-    } % >
+    } %>
 }
 
 loom {
-    < % if (props.splitSourceSets) {
+    <% if (props.splitSourceSets) {
         out.print("splitEnvironmentSourceSets()")
-    } % >
+    } %>
 
             mods {
-                < % out.print("""\"\${project.archives_base_name}\" {
+                <% out.print("""\"\${project.archives_base_name}\" {
             sourceSet sourceSets.main\n""")
                 if (props.splitSourceSets) {
                     out.print("\n            sourceSet sourceSets.client")
                 }
-                out.print("\n        }") % >
+                out.print("\n        }") %>
             }
 
-            < %
+            <%
     if (props.useAccessWidener) {
         out.print("\n    accessWidener = file(\"src/main/resources/${props.accessWidenerPath}\")")
-    } % >
+    } %>
 }
 
 dependencies {
     minecraft "com.mojang:minecraft:\${project.minecraft_version}"
 
-            < %
+            <%
     if (mappings.channel == 'yarn') {
         out.print("\n    mappings \"net.fabricmc:yarn:\${project.yarn_mappings}:v2\"")
     } else if (mappings.channel == 'mojmap') {
@@ -55,13 +55,13 @@ dependencies {
          officialMojangMappings()
          parchment(\"org.parchmentmc.data:parchment-\${project.minecraft_version}:\${project.parchment_version}@zip\")
      }""")
-    } % >
+    } %>
 
             modImplementation "net.fabricmc:fabric-loader:\${project.loader_version}"
-            < %
+            <%
     if (props.includeFabricApi) {
         out.print("\n    modImplementation \"net.fabricmc.fabric-api:fabric-api:\${project.fabric_version}\"")
-    } % >
+    } %>
 
             // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
             // You may need to force-disable transitiveness on them.
diff --git a/templates/fabric/17/template_build.gradle b/templates/fabric/17/template_build.gradle
index bd983ca4..248bd092 100644
--- a/templates/fabric/17/template_build.gradle
+++ b/templates/fabric/17/template_build.gradle
@@ -17,35 +17,35 @@ repositories {
     // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
-    < % if (mappings.channel == 'parchment') {
+    <% if (mappings.channel == 'parchment') {
         out.print("\n    maven { url = 'https://maven.parchmentmc.org/' }")
-    } % >
+    } %>
 }
 
 loom {
-    < % if (props.splitSourceSets) {
+    <% if (props.splitSourceSets) {
         out.print("splitEnvironmentSourceSets()")
-    } % >
+    } %>
 
             mods {
-                < % out.print("""\"\${project.archives_base_name}\" {
+                <% out.print("""\"\${project.archives_base_name}\" {
             sourceSet sourceSets.main\n""")
                 if (props.splitSourceSets) {
                     out.print("\n            sourceSet sourceSets.client")
                 }
-                out.print("\n        }") % >
+                out.print("\n        }") %>
             }
 
-            < %
+            <%
     if (props.useAccessWidener) {
         out.print("\n    accessWidenerPath = file(\"src/main/resources/${props.accessWidenerPath}\")")
-    } % >
+    } %>
 }
 
 dependencies {
     minecraft "com.mojang:minecraft:\${project.minecraft_version}"
 
-            < %
+            <%
     if (mappings.channel == 'yarn') {
         out.print("\n    mappings \"net.fabricmc:yarn:\${project.yarn_mappings}:v2\"")
     } else if (mappings.channel == 'mojmap') {
@@ -55,13 +55,13 @@ dependencies {
          officialMojangMappings()
          parchment(\"org.parchmentmc.data:parchment-\${project.minecraft_version}:\${project.parchment_version}@zip\")
      }""")
-    } % >
+    } %>
 
             modImplementation "net.fabricmc:fabric-loader:\${project.loader_version}"
-            < %
+            <%
     if (props.includeFabricApi) {
         out.print("\n    modImplementation \"net.fabricmc.fabric-api:fabric-api:\${project.fabric_version}\"")
-    } % >
+    } %>
 }
 
 processResources {
diff --git a/templates/fabric/18/template_build.gradle b/templates/fabric/18/template_build.gradle
index 2a9d7b3b..f62f8a77 100644
--- a/templates/fabric/18/template_build.gradle
+++ b/templates/fabric/18/template_build.gradle
@@ -17,35 +17,35 @@ repositories {
     // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
-    < % if (mappings.channel == 'parchment') {
+    <% if (mappings.channel == 'parchment') {
         out.print("\n    maven { url = 'https://maven.parchmentmc.org/' }")
-    } % >
+    } %>
 }
 
 loom {
-    < % if (props.splitSourceSets) {
+    <% if (props.splitSourceSets) {
         out.print("splitEnvironmentSourceSets()")
-    } % >
+    } %>
 
             mods {
-                < % out.print("""\"\${project.archives_base_name}\" {
+                <% out.print("""\"\${project.archives_base_name}\" {
             sourceSet sourceSets.main\n""")
                 if (props.splitSourceSets) {
                     out.print("\n            sourceSet sourceSets.client")
                 }
-                out.print("\n        }") % >
+                out.print("\n        }") %>
             }
 
-            < %
+            <%
     if (props.useAccessWidener) {
         out.print("\n    accessWidenerPath = file(\"src/main/resources/${props.accessWidenerPath}\")")
-    } % >
+    } %>
 }
 
 dependencies {
     minecraft "com.mojang:minecraft:\${project.minecraft_version}"
 
-            < %
+            <%
     if (mappings.channel == 'yarn') {
         out.print("\n    mappings \"net.fabricmc:yarn:\${project.yarn_mappings}:v2\"")
     } else if (mappings.channel == 'mojmap') {
@@ -55,13 +55,13 @@ dependencies {
          officialMojangMappings()
          parchment(\"org.parchmentmc.data:parchment-\${project.minecraft_version}:\${project.parchment_version}@zip\")
      }""")
-    } % >
+    } %>
 
             modImplementation "net.fabricmc:fabric-loader:\${project.loader_version}"
-            < %
+            <%
     if (props.includeFabricApi) {
         out.print("\n    modImplementation \"net.fabricmc.fabric-api:fabric-api:\${project.fabric_version}\"")
-    } % >
+    } %>
 }
 
 processResources {
diff --git a/templates/fabric/19/template_build.gradle b/templates/fabric/19/template_build.gradle
index 0d505392..a2cfeb97 100644
--- a/templates/fabric/19/template_build.gradle
+++ b/templates/fabric/19/template_build.gradle
@@ -17,35 +17,35 @@ repositories {
     // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
-    < % if (mappings.channel == 'parchment') {
+    <% if (mappings.channel == 'parchment') {
         out.print("\n    maven { url = 'https://maven.parchmentmc.org/' }")
-    } % >
+    } %>
 }
 
 loom {
-    < % if (props.splitSourceSets) {
+    <% if (props.splitSourceSets) {
         out.print("splitEnvironmentSourceSets()")
-    } % >
+    } %>
 
             mods {
-                < % out.print("""\"\${project.archives_base_name}\" {
+                <% out.print("""\"\${project.archives_base_name}\" {
             sourceSet sourceSets.main\n""")
                 if (props.splitSourceSets) {
                     out.print("\n            sourceSet sourceSets.client")
                 }
-                out.print("\n        }") % >
+                out.print("\n        }") %>
             }
 
-            < %
+            <%
     if (props.useAccessWidener) {
         out.print("\n    accessWidenerPath = file(\"src/main/resources/${props.accessWidenerPath}\")")
-    } % >
+    } %>
 }
 
 dependencies {
     minecraft "com.mojang:minecraft:\${project.minecraft_version}"
 
-            < %
+            <%
     if (mappings.channel == 'yarn') {
         out.print("\n    mappings \"net.fabricmc:yarn:\${project.yarn_mappings}:v2\"")
     } else if (mappings.channel == 'mojmap') {
@@ -55,13 +55,13 @@ dependencies {
          officialMojangMappings()
          parchment(\"org.parchmentmc.data:parchment-\${project.minecraft_version}:\${project.parchment_version}@zip\")
      }""")
-    } % >
+    } %>
 
             modImplementation "net.fabricmc:fabric-loader:\${project.loader_version}"
-            < %
+            <%
     if (props.includeFabricApi) {
         out.print("\n    modImplementation \"net.fabricmc.fabric-api:fabric-api:\${project.fabric_version}\"")
-    } % >
+    } %>
 }
 
 processResources {
diff --git a/templates/fabric/20.5/template_build.gradle b/templates/fabric/20.5/template_build.gradle
index e17eb40a..e7988cae 100644
--- a/templates/fabric/20.5/template_build.gradle
+++ b/templates/fabric/20.5/template_build.gradle
@@ -17,35 +17,35 @@ repositories {
     // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
-    < % if (mappings.channel == 'parchment') {
+    <% if (mappings.channel == 'parchment') {
         out.print("\n    maven { url = 'https://maven.parchmentmc.org/' }")
-    } % >
+    } %>
 }
 
 loom {
-    < % if (props.splitSourceSets) {
+    <% if (props.splitSourceSets) {
         out.print("splitEnvironmentSourceSets()")
-    } % >
+    } %>
 
             mods {
-                < % out.print("""\"\${project.archives_base_name}\" {
+                <% out.print("""\"\${project.archives_base_name}\" {
             sourceSet sourceSets.main\n""")
                 if (props.splitSourceSets) {
                     out.print("\n            sourceSet sourceSets.client")
                 }
-                out.print("\n        }") % >
+                out.print("\n        }") %>
             }
 
-            < %
+            <%
     if (props.useAccessWidener) {
         out.print("\n    accessWidenerPath = file(\"src/main/resources/${props.accessWidenerPath}\")")
-    } % >
+    } %>
 }
 
 dependencies {
     minecraft "com.mojang:minecraft:\${project.minecraft_version}"
 
-            < %
+            <%
     if (mappings.channel == 'yarn') {
         out.print("\n    mappings \"net.fabricmc:yarn:\${project.yarn_mappings}:v2\"")
     } else if (mappings.channel == 'mojmap') {
@@ -55,13 +55,13 @@ dependencies {
          officialMojangMappings()
          parchment(\"org.parchmentmc.data:parchment-\${project.minecraft_version}:\${project.parchment_version}@zip\")
      }""")
-    } % >
+    } %>
 
             modImplementation "net.fabricmc:fabric-loader:\${project.loader_version}"
-            < %
+            <%
     if (props.includeFabricApi) {
         out.print("\n    modImplementation \"net.fabricmc.fabric-api:fabric-api:\${project.fabric_version}\"")
-    } % >
+    } %>
 }
 
 processResources {
diff --git a/templates/fabric/20.6/template_build.gradle b/templates/fabric/20.6/template_build.gradle
index e17eb40a..db8a6bb2 100644
--- a/templates/fabric/20.6/template_build.gradle
+++ b/templates/fabric/20.6/template_build.gradle
@@ -17,36 +17,34 @@ repositories {
     // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
-    < % if (mappings.channel == 'parchment') {
+    <% if (mappings.channel == 'parchment') {
         out.print("\n    maven { url = 'https://maven.parchmentmc.org/' }")
-    } % >
+    } %>
 }
 
 loom {
-    < % if (props.splitSourceSets) {
+    <% if (props.splitSourceSets) {
         out.print("splitEnvironmentSourceSets()")
-    } % >
+    } %>
 
-            mods {
-                < % out.print("""\"\${project.archives_base_name}\" {
+    mods {
+        <% out.print("""\"\${project.archives_base_name}\" {
             sourceSet sourceSets.main\n""")
                 if (props.splitSourceSets) {
                     out.print("\n            sourceSet sourceSets.client")
                 }
-                out.print("\n        }") % >
-            }
+        out.print("\n        }") %>
+    }
 
-            < %
-    if (props.useAccessWidener) {
+    <% if (props.useAccessWidener) {
         out.print("\n    accessWidenerPath = file(\"src/main/resources/${props.accessWidenerPath}\")")
-    } % >
+    } %>
 }
 
 dependencies {
     minecraft "com.mojang:minecraft:\${project.minecraft_version}"
 
-            < %
-    if (mappings.channel == 'yarn') {
+    <% if(mappings.channel == 'yarn') {
         out.print("\n    mappings \"net.fabricmc:yarn:\${project.yarn_mappings}:v2\"")
     } else if (mappings.channel == 'mojmap') {
         out.print("\n    mappings loom.officialMojangMappings()")
@@ -55,13 +53,12 @@ dependencies {
          officialMojangMappings()
          parchment(\"org.parchmentmc.data:parchment-\${project.minecraft_version}:\${project.parchment_version}@zip\")
      }""")
-    } % >
+    } %>
 
-            modImplementation "net.fabricmc:fabric-loader:\${project.loader_version}"
-            < %
-    if (props.includeFabricApi) {
+    modImplementation "net.fabricmc:fabric-loader:\${project.loader_version}"
+    <% if (props.includeFabricApi) {
         out.print("\n    modImplementation \"net.fabricmc.fabric-api:fabric-api:\${project.fabric_version}\"")
-    } % >
+    } %>
 }
 
 processResources {
diff --git a/templates/fabric/20/template_build.gradle b/templates/fabric/20/template_build.gradle
index ab4720fc..5d3dd265 100644
--- a/templates/fabric/20/template_build.gradle
+++ b/templates/fabric/20/template_build.gradle
@@ -17,35 +17,35 @@ repositories {
     // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
-    < % if (mappings.channel == 'parchment') {
+    <% if (mappings.channel == 'parchment') {
         out.print("\n    maven { url = 'https://maven.parchmentmc.org/' }")
-    } % >
+    } %>
 }
 
 loom {
-    < % if (props.splitSourceSets) {
+    <% if (props.splitSourceSets) {
         out.print("splitEnvironmentSourceSets()")
-    } % >
+    } %>
 
             mods {
-                < % out.print("""\"\${project.archives_base_name}\" {
+                <% out.print("""\"\${project.archives_base_name}\" {
             sourceSet sourceSets.main\n""")
                 if (props.splitSourceSets) {
                     out.print("\n            sourceSet sourceSets.client")
                 }
-                out.print("\n        }") % >
+                out.print("\n        }") %>
             }
 
-            < %
+            <%
     if (props.useAccessWidener) {
         out.print("\n    accessWidenerPath = file(\"src/main/resources/${props.accessWidenerPath}\")")
-    } % >
+    } %>
 }
 
 dependencies {
     minecraft "com.mojang:minecraft:\${project.minecraft_version}"
 
-            < %
+            <%
     if (mappings.channel == 'yarn') {
         out.print("\n    mappings \"net.fabricmc:yarn:\${project.yarn_mappings}:v2\"")
     } else if (mappings.channel == 'mojmap') {
@@ -55,13 +55,13 @@ dependencies {
          officialMojangMappings()
          parchment(\"org.parchmentmc.data:parchment-\${project.minecraft_version}:\${project.parchment_version}@zip\")
      }""")
-    } % >
+    } %>
 
             modImplementation "net.fabricmc:fabric-loader:\${project.loader_version}"
-            < %
+            <%
     if (props.includeFabricApi) {
         out.print("\n    modImplementation \"net.fabricmc.fabric-api:fabric-api:\${project.fabric_version}\"")
-    } % >
+    } %>
 }
 
 processResources {
diff --git a/templates/fabric/21/template_build.gradle b/templates/fabric/21/template_build.gradle
index 4ca7a912..b7ccf7a5 100644
--- a/templates/fabric/21/template_build.gradle
+++ b/templates/fabric/21/template_build.gradle
@@ -17,36 +17,33 @@ repositories {
     // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
-    < % if (mappings.channel == 'parchment') {
+    <% if (mappings.channel == 'parchment') {
         out.print("\n    maven { url = 'https://maven.parchmentmc.org/' }")
-    } % >
+    } %>
 }
 
 loom {
-    < % if (props.splitSourceSets) {
+    <% if (props.splitSourceSets) {
         out.print("splitEnvironmentSourceSets()")
-    } % >
+    } %>
 
-            mods {
-                < % out.print("""\"\${project.archives_base_name}\" {
+    mods {
+        <% out.print("""\"\${project.archives_base_name}\" {
             sourceSet sourceSets.main\n""")
                 if (props.splitSourceSets) {
                     out.print("\n            sourceSet sourceSets.client")
                 }
-                out.print("\n        }") % >
-            }
+        out.print("\n        }") %>
+    }
 
-            < %
-    if (props.useAccessWidener) {
+    <% if (props.useAccessWidener) {
         out.print("\n    accessWidenerPath = file(\"src/main/resources/${props.accessWidenerPath}\")")
-    } % >
+    } %>
 }
 
 dependencies {
     minecraft "com.mojang:minecraft:\${project.minecraft_version}"
-
-            < %
-    if (mappings.channel == 'yarn') {
+    <% if (mappings.channel == 'yarn') {
         out.print("\n    mappings \"net.fabricmc:yarn:\${project.yarn_mappings}:v2\"")
     } else if (mappings.channel == 'mojmap') {
         out.print("\n    mappings loom.officialMojangMappings()")
@@ -55,13 +52,12 @@ dependencies {
          officialMojangMappings()
          parchment(\"org.parchmentmc.data:parchment-\${project.minecraft_version}:\${project.parchment_version}@zip\")
      }""")
-    } % >
+    } %>
 
-            modImplementation "net.fabricmc:fabric-loader:\${project.loader_version}"
-            < %
-    if (props.includeFabricApi) {
+    modImplementation "net.fabricmc:fabric-loader:\${project.loader_version}"
+    <% if (props.includeFabricApi) {
         out.print("\n    modImplementation \"net.fabricmc.fabric-api:fabric-api:\${project.fabric_version}\"")
-    } % >
+    } %>
 }
 
 processResources {
diff --git a/templates/forge/17/template_build.gradle b/templates/forge/17/template_build.gradle
index ef378a1e..8b678b77 100644
--- a/templates/forge/17/template_build.gradle
+++ b/templates/forge/17/template_build.gradle
@@ -4,21 +4,21 @@ buildscript {
         // These repositories are only for Gradle plugins, put any other repositories in the repository block further below
         maven { url = 'https://maven.minecraftforge.net' }
         mavenCentral()
-                < %
+                <%
         if (props.useMixins) {
             out.print("\n        maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }")
-        } % >
-                < %
+        } %>
+                <%
         if (mappings.channel == 'parchment') {
             out.print("\n    maven { url = 'https://maven.parchmentmc.org' }")
-        } % >
+        } %>
     }
     dependencies {
-        < % if (props.useMixins) {
+        <% if (props.useMixins) {
             out.print("\n        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'")
-        } % >
+        } %>
                 classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-                < %
+                <%
         if (mappings.channel == 'parchment') {
             out.print("\n        classpath 'org.parchmentmc:librarian:1.+'")
         }
@@ -28,7 +28,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
-        < %
+        <%
 if (mappings.channel == 'parchment') {
     out.print("\napply plugin: 'org.parchmentmc.librarian.forgegradle'")
 }
@@ -44,23 +44,23 @@ println "Java: \${System.getProperty 'java.version'}, JVM: \${System.getProperty
 minecraft {
     mappings channel: mapping_channel, version: mapping_version
 
-            < %
+            <%
     if (props.genRunFolders) {
         out.print("\n    generateRunFolders = true")
-    } % >
+    } %>
 
-            < %
+            <%
     if (props.useAccessTransformer) {
         out.print("\n    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')")
-    } % >
+    } %>
 
             runs {
                 client {
-                    < % if (props.useMixins) {
+                    <% if (props.useMixins) {
                         out.print("\n        properties 'mixin.env.remapRefMap': 'true'")
                         out.print("\n        property 'mixin.env.refMapRemappingFile', \"\${project.projectDir}/build/createSrgToMcp/output.srg\"")
                         out.print("\n        arg \"-mixin.config=\"+archivesBaseName+\".mixins.json\"")
-                    } % >
+                    } %>
 
                             workingDirectory project.file('run')
 
@@ -75,11 +75,11 @@ minecraft {
                 }
 
                 client {
-                    < % if (props.useMixins) {
+                    <% if (props.useMixins) {
                         out.print("\n        properties 'mixin.env.remapRefMap': 'true'")
                         out.print("\n        property 'mixin.env.refMapRemappingFile', \"\${project.projectDir}/build/createSrgToMcp/output.srg\"")
                         out.print("\n        arg \"-mixin.config=\"+archivesBaseName+\".mixins.json\"")
-                    } % >
+                    } %>
 
                             workingDirectory project.file('run')
 
@@ -150,10 +150,10 @@ dependencies {
             // This maps to ./libs/coolmod-\${minecraft_version}-\${coolmod_version}.jar
             // The group id is ignored when searching -- in this case, it is "blank"
             // implementation fg.deobf("blank:coolmod-\${minecraft_version}:\${coolmod_version}")
-            < %
+            <%
     if (props.useMixins) {
         out.print("\n    annotationProcessor 'org.spongepowered:mixin:0.8.4:processor'")
-    } % >
+    } %>
 
             // For more info:
             // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
@@ -171,10 +171,10 @@ jar {
             'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
     ]
 
-            < %
+            <%
     if (props.useMixins) {
         out.println("manifestAttributes.put('MixinConfigs', '\${mod_id}.mixins.json')")
-    } % >
+    } %>
 
             manifest {
                 attributes(manifestAttributes)
@@ -200,10 +200,10 @@ publishing {
     }
 }
 
-        < %
+        <%
 if (props.useMixins) {
     out.print("\napply plugin: 'org.spongepowered.mixin'")
     out.print("\nmixin {\n" +
             "    add sourceSets.main, \"\${mod_id}.refmap.json\"\n" +
             "}")
-} % >
+} %>
diff --git a/templates/forge/18/template_build.gradle b/templates/forge/18/template_build.gradle
index 939cfab3..86b5ef98 100644
--- a/templates/forge/18/template_build.gradle
+++ b/templates/forge/18/template_build.gradle
@@ -4,21 +4,21 @@ buildscript {
         // These repositories are only for Gradle plugins, put any other repositories in the repository block further below
         maven { url = 'https://maven.minecraftforge.net' }
         mavenCentral()
-                < %
+                <%
         if (props.useMixins) {
             out.print("\n        maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }")
-        } % >
-                < %
+        } %>
+                <%
         if (mappings.channel == 'parchment') {
             out.print("\n    maven { url = 'https://maven.parchmentmc.org' }")
-        } % >
+        } %>
     }
     dependencies {
-        < % if (props.useMixins) {
+        <% if (props.useMixins) {
             out.print("\n        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'")
-        } % >
+        } %>
                 classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-                < %
+                <%
         if (mappings.channel == 'parchment') {
             out.print("\n        classpath 'org.parchmentmc:librarian:1.+'")
         }
@@ -30,7 +30,7 @@ plugins {
     id 'maven-publish'
 }
 apply plugin: 'net.minecraftforge.gradle'
-        < %
+        <%
 if (mappings.channel == 'parchment') {
     out.print("\napply plugin: 'org.parchmentmc.librarian.forgegradle'")
 }
@@ -45,23 +45,23 @@ println "Java: \${System.getProperty 'java.version'}, JVM: \${System.getProperty
 minecraft {
     mappings channel: mapping_channel, version: mapping_version
 
-            < %
+            <%
     if (props.genRunFolders) {
         out.print("\n    generateRunFolders = true")
-    } % >
+    } %>
 
-            < %
+            <%
     if (props.useAccessTransformer) {
         out.print("\n    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')")
-    } % >
+    } %>
 
             runs {
                 client {
-                    < % if (props.useMixins) {
+                    <% if (props.useMixins) {
                         out.print("\n        properties 'mixin.env.remapRefMap': 'true'")
                         out.print("\n        property 'mixin.env.refMapRemappingFile', \"\${project.projectDir}/build/createSrgToMcp/output.srg\"")
                         out.print("\n        arg \"-mixin.config=\"+archivesBaseName+\".mixins.json\"")
-                    } % >
+                    } %>
 
                             workingDirectory project.file('run')
 
@@ -77,11 +77,11 @@ minecraft {
                 }
 
                 client {
-                    < % if (props.useMixins) {
+                    <% if (props.useMixins) {
                         out.print("\n        properties 'mixin.env.remapRefMap': 'true'")
                         out.print("\n        property 'mixin.env.refMapRemappingFile', \"\${project.projectDir}/build/createSrgToMcp/output.srg\"")
                         out.print("\n        arg \"-mixin.config=\"+archivesBaseName+\".mixins.json\"")
-                    } % >
+                    } %>
 
                             workingDirectory project.file('run')
 
@@ -154,10 +154,10 @@ dependencies {
             // This maps to ./libs/coolmod-\${minecraft_version}-\${coolmod_version}.jar
             // The group id is ignored when searching -- in this case, it is "blank"
             // implementation fg.deobf("blank:coolmod-\${minecraft_version}:\${coolmod_version}")
-            < %
+            <%
     if (props.useMixins) {
         out.print("\n    annotationProcessor 'org.spongepowered:mixin:0.8.4:processor'")
-    } % >
+    } %>
 
             // For more info:
             // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
@@ -175,10 +175,10 @@ jar {
             'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
     ]
 
-            < %
+            <%
     if (props.useMixins) {
         out.println("manifestAttributes.put('MixinConfigs', '\${mod_id}.mixins.json')")
-    } % >
+    } %>
 
             manifest {
                 attributes(manifestAttributes)
@@ -204,10 +204,10 @@ publishing {
     }
 }
 
-        < %
+        <%
 if (props.useMixins) {
     out.print("\napply plugin: 'org.spongepowered.mixin'")
     out.print("\nmixin {\n" +
             "    add sourceSets.main, \"\${mod_id}.refmap.json\"\n" +
             "}")
-} % >
+} %>
diff --git a/templates/forge/19/template_build.gradle b/templates/forge/19/template_build.gradle
index c9c48e95..a9a0cae6 100644
--- a/templates/forge/19/template_build.gradle
+++ b/templates/forge/19/template_build.gradle
@@ -4,23 +4,23 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'net.minecraftforge.gradle' version '[6.0,6.2)'
-            < %
+            <%
     if (mappings.channel == 'parchment') {
         out.print("\n    id 'org.parchmentmc.librarian.forgegradle' version '1.+'")
     }
 
     if (props.useMixins) {
         out.print("\n    id 'org.spongepowered.mixin' version '0.7.+'")
-    } % >
+    } %>
 }
 
-        < %
+        <%
 if (props.useMixins)
     out.println("""\nmixin {
     add sourceSets.main, '\${archivesName}.refmap.json'
     config '\${archivesName}.mixins.json'
     debug.export = true
-}""") % >
+}""") %>
 
             version = mod_version
 group = mod_group_id
@@ -37,15 +37,15 @@ minecraft {
 
     copyIdeResources = true
 
-            < %
+            <%
     if (props.genRunFolders) {
         out.print("\n    generateRunFolders = true")
-    } % >
+    } %>
 
-            < %
+            <%
     if (props.useAccessTransformer) {
         out.print("\n    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')")
-    } % >
+    } %>
 
             runs {
                 configureEach {
@@ -139,10 +139,10 @@ tasks.named('jar', Jar).configure {
             'Implementation-Vendor' : mod_authors
     ]
 
-            < %
+            <%
     if (props.useMixins) {
         out.println("manifestAttributes.put('MixinConfigs', '\${archivesName}.mixins.json')")
-    } % >
+    } %>
 
             manifest {
                 attributes(manifestAttributes)
diff --git a/templates/forge/19/template_settings.gradle b/templates/forge/19/template_settings.gradle
index 20bc0c59..d4a60f16 100644
--- a/templates/forge/19/template_settings.gradle
+++ b/templates/forge/19/template_settings.gradle
@@ -7,10 +7,10 @@ pluginManagement {
             url = 'https://maven.minecraftforge.net/'
         }
 
-                < %
+                <%
         if (mappings.channel == 'parchment') {
             out.print("\n    maven { url = 'https://maven.parchmentmc.org' }")
-        } % >
+        } %>
     }
 }
 
diff --git a/templates/forge/20.1/template_build.gradle b/templates/forge/20.1/template_build.gradle
index c9c48e95..a9a0cae6 100644
--- a/templates/forge/20.1/template_build.gradle
+++ b/templates/forge/20.1/template_build.gradle
@@ -4,23 +4,23 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'net.minecraftforge.gradle' version '[6.0,6.2)'
-            < %
+            <%
     if (mappings.channel == 'parchment') {
         out.print("\n    id 'org.parchmentmc.librarian.forgegradle' version '1.+'")
     }
 
     if (props.useMixins) {
         out.print("\n    id 'org.spongepowered.mixin' version '0.7.+'")
-    } % >
+    } %>
 }
 
-        < %
+        <%
 if (props.useMixins)
     out.println("""\nmixin {
     add sourceSets.main, '\${archivesName}.refmap.json'
     config '\${archivesName}.mixins.json'
     debug.export = true
-}""") % >
+}""") %>
 
             version = mod_version
 group = mod_group_id
@@ -37,15 +37,15 @@ minecraft {
 
     copyIdeResources = true
 
-            < %
+            <%
     if (props.genRunFolders) {
         out.print("\n    generateRunFolders = true")
-    } % >
+    } %>
 
-            < %
+            <%
     if (props.useAccessTransformer) {
         out.print("\n    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')")
-    } % >
+    } %>
 
             runs {
                 configureEach {
@@ -139,10 +139,10 @@ tasks.named('jar', Jar).configure {
             'Implementation-Vendor' : mod_authors
     ]
 
-            < %
+            <%
     if (props.useMixins) {
         out.println("manifestAttributes.put('MixinConfigs', '\${archivesName}.mixins.json')")
-    } % >
+    } %>
 
             manifest {
                 attributes(manifestAttributes)
diff --git a/templates/forge/20.4/template_build.gradle b/templates/forge/20.4/template_build.gradle
index 93564ad6..0d004a99 100644
--- a/templates/forge/20.4/template_build.gradle
+++ b/templates/forge/20.4/template_build.gradle
@@ -4,23 +4,23 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
-            < %
+            <%
     if (mappings.channel == 'parchment') {
         out.print("\n    id 'org.parchmentmc.librarian.forgegradle' version '1.+'")
     }
 
     if (props.useMixins) {
         out.print("\n    id 'org.spongepowered.mixin' version '0.7.+'")
-    } % >
+    } %>
 }
 
-        < %
+        <%
 if (props.useMixins)
     out.println("""\nmixin {
     add sourceSets.main, '\${archivesName}.refmap.json'
     config '\${archivesName}.mixins.json'
     debug.export = true
-}""") % >
+}""") %>
 
             version = mod_version
 group = mod_group_id
@@ -37,15 +37,15 @@ minecraft {
 
     copyIdeResources = true
 
-            < %
+            <%
     if (props.genRunFolders) {
         out.print("\n    generateRunFolders = true")
-    } % >
+    } %>
 
-            < %
+            <%
     if (props.useAccessTransformer) {
         out.print("\n    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')")
-    } % >
+    } %>
 
             runs {
                 configureEach {
@@ -133,10 +133,10 @@ tasks.named('jar', Jar).configure {
             'Implementation-Vendor' : mod_authors
     ]
 
-            < %
+            <%
     if (props.useMixins) {
         out.println("manifestAttributes.put('MixinConfigs', '\${archivesName}.mixins.json')")
-    } % >
+    } %>
 
             manifest {
                 attributes(manifestAttributes)
diff --git a/templates/forge/20.5/template_build.gradle b/templates/forge/20.5/template_build.gradle
index 93564ad6..0d004a99 100644
--- a/templates/forge/20.5/template_build.gradle
+++ b/templates/forge/20.5/template_build.gradle
@@ -4,23 +4,23 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
-            < %
+            <%
     if (mappings.channel == 'parchment') {
         out.print("\n    id 'org.parchmentmc.librarian.forgegradle' version '1.+'")
     }
 
     if (props.useMixins) {
         out.print("\n    id 'org.spongepowered.mixin' version '0.7.+'")
-    } % >
+    } %>
 }
 
-        < %
+        <%
 if (props.useMixins)
     out.println("""\nmixin {
     add sourceSets.main, '\${archivesName}.refmap.json'
     config '\${archivesName}.mixins.json'
     debug.export = true
-}""") % >
+}""") %>
 
             version = mod_version
 group = mod_group_id
@@ -37,15 +37,15 @@ minecraft {
 
     copyIdeResources = true
 
-            < %
+            <%
     if (props.genRunFolders) {
         out.print("\n    generateRunFolders = true")
-    } % >
+    } %>
 
-            < %
+            <%
     if (props.useAccessTransformer) {
         out.print("\n    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')")
-    } % >
+    } %>
 
             runs {
                 configureEach {
@@ -133,10 +133,10 @@ tasks.named('jar', Jar).configure {
             'Implementation-Vendor' : mod_authors
     ]
 
-            < %
+            <%
     if (props.useMixins) {
         out.println("manifestAttributes.put('MixinConfigs', '\${archivesName}.mixins.json')")
-    } % >
+    } %>
 
             manifest {
                 attributes(manifestAttributes)
diff --git a/templates/forge/20.6/template_build.gradle b/templates/forge/20.6/template_build.gradle
index fead74b5..dfb5bef4 100644
--- a/templates/forge/20.6/template_build.gradle
+++ b/templates/forge/20.6/template_build.gradle
@@ -4,23 +4,23 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
-            < %
+            <%
     if (mappings.channel == 'parchment') {
         out.print("\n    id 'org.parchmentmc.librarian.forgegradle' version '1.+'")
     }
 
     if (props.useMixins) {
         out.print("\n    id 'org.spongepowered.mixin' version '0.7.+'")
-    } % >
+    } %>
 }
 
-        < %
+        <%
 if (props.useMixins)
     out.println("""\nmixin {
     add sourceSets.main, '\${archivesName}.refmap.json'
     config '\${archivesName}.mixins.json'
     debug.export = true
-}""") % >
+}""") %>
 
             version = mod_version
 group = mod_group_id
@@ -38,15 +38,15 @@ minecraft {
     reobf = false
     copyIdeResources = true
 
-            < %
+            <%
     if (props.genRunFolders) {
         out.print("\n    generateRunFolders = true")
-    } % >
+    } %>
 
-            < %
+            <%
     if (props.useAccessTransformer) {
         out.print("\n    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')")
-    } % >
+    } %>
 
             runs {
                 configureEach {
@@ -137,10 +137,10 @@ tasks.named('jar', Jar).configure {
             'Implementation-Vendor' : mod_authors
     ]
 
-            < %
+            <%
     if (props.useMixins) {
         out.println("manifestAttributes.put('MixinConfigs', '\${archivesName}.mixins.json')")
-    } % >
+    } %>
 
             manifest {
                 attributes(manifestAttributes)
diff --git a/templates/forge/20/template_settings.gradle b/templates/forge/20/template_settings.gradle
index 20bc0c59..d4a60f16 100644
--- a/templates/forge/20/template_settings.gradle
+++ b/templates/forge/20/template_settings.gradle
@@ -7,10 +7,10 @@ pluginManagement {
             url = 'https://maven.minecraftforge.net/'
         }
 
-                < %
+                <%
         if (mappings.channel == 'parchment') {
             out.print("\n    maven { url = 'https://maven.parchmentmc.org' }")
-        } % >
+        } %>
     }
 }
 
diff --git a/templates/forge/21/template_build.gradle b/templates/forge/21/template_build.gradle
index f963c857..da786b5a 100644
--- a/templates/forge/21/template_build.gradle
+++ b/templates/forge/21/template_build.gradle
@@ -4,23 +4,23 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'net.minecraftforge.gradle' version '[6.0.36,6.2)'
-            < %
+            <%
     if (mappings.channel == 'parchment') {
         out.print("\n    id 'org.parchmentmc.librarian.forgegradle' version '1.+'")
     }
 
     if (props.useMixins) {
         out.print("\n    id 'org.spongepowered.mixin' version '0.7.+'")
-    } % >
+    } %>
 }
 
-        < %
+        <%
 if (props.useMixins)
     out.println("""\nmixin {
     add sourceSets.main, '\${archivesName}.refmap.json'
     config '\${archivesName}.mixins.json'
     debug.export = true
-}""") % >
+}""") %>
 
             version = mod_version
 group = mod_group_id
@@ -38,15 +38,15 @@ minecraft {
     reobf = false
     copyIdeResources = true
 
-            < %
+            <%
     if (props.genRunFolders) {
         out.print("\n    generateRunFolders = true")
-    } % >
+    } %>
 
-            < %
+            <%
     if (props.useAccessTransformer) {
         out.print("\n    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')")
-    } % >
+    } %>
 
             runs {
                 configureEach {
@@ -134,10 +134,10 @@ tasks.named('jar', Jar).configure {
             'Implementation-Vendor' : mod_authors
     ]
 
-            < %
+            <%
     if (props.useMixins) {
         out.println("manifestAttributes.put('MixinConfigs', '\${archivesName}.mixins.json')")
-    } % >
+    } %>
 
             manifest {
                 attributes(manifestAttributes)
diff --git a/templates/forge/21/template_settings.gradle b/templates/forge/21/template_settings.gradle
index 20bc0c59..d4a60f16 100644
--- a/templates/forge/21/template_settings.gradle
+++ b/templates/forge/21/template_settings.gradle
@@ -7,10 +7,10 @@ pluginManagement {
             url = 'https://maven.minecraftforge.net/'
         }
 
-                < %
+                <%
         if (mappings.channel == 'parchment') {
             out.print("\n    maven { url = 'https://maven.parchmentmc.org' }")
-        } % >
+        } %>
     }
 }