diff --git a/src/main/java/com/tanishisherewith/dynamichud/DynamicHUD.java b/src/main/java/com/tanishisherewith/dynamichud/DynamicHUD.java
index 45cc39a..6790c1b 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/DynamicHUD.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/DynamicHUD.java
@@ -86,7 +86,7 @@ public void checkToEnableTestIntegration(){
 
     @Override
     public void onInitializeClient() {
-        printInfo("Initialising DynamicHud");
+        printInfo("Initialising DynamicHUD");
 
         // Add WidgetData of included widgets
         WidgetManager.registerCustomWidgets(
diff --git a/src/main/java/com/tanishisherewith/dynamichud/config/GlobalConfig.java b/src/main/java/com/tanishisherewith/dynamichud/config/GlobalConfig.java
index 23da97e..d67ae80 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/config/GlobalConfig.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/config/GlobalConfig.java
@@ -16,6 +16,7 @@
 import net.minecraft.util.Identifier;
 
 import java.awt.*;
+import java.util.LinkedList;
 
 public final class GlobalConfig {
     public static final ConfigClassHandler<GlobalConfig> HANDLER = ConfigClassHandler.createBuilder(GlobalConfig.class)
@@ -28,7 +29,7 @@ public final class GlobalConfig {
 
     private static final GlobalConfig INSTANCE = new GlobalConfig();
     /**
-     * Common scale for all widgets. Set by the user using YACL.
+     * Common scale for all widgets.
      */
     @SerialEntry
     private float scale = 1.0f;
@@ -92,11 +93,11 @@ public Screen createYACLGUI() {
                                         .binding(new Color(0, 0, 0, 128), () -> this.hudActiveColor, newVal -> this.hudActiveColor = newVal)
                                         .controller(ColorControllerBuilder::create)
                                 .build())
-                        .option(Option.<Color>createBuilder()
-                                .name(Text.literal("Widget HUD Inactive Background Color"))
-                                .description(OptionDescription.of(Text.literal("Color of the background of the widget when it will NOT be rendered")))
-                                .binding(new Color(255, 0, 0, 128), () -> this.hudInactiveColor, newVal -> this.hudInactiveColor = newVal)
-                                .controller(ColorControllerBuilder::create)
+                                .option(Option.<Color>createBuilder()
+                                        .name(Text.literal("Widget HUD Inactive Background Color"))
+                                        .description(OptionDescription.of(Text.literal("Color of the background of the widget when it will NOT be rendered")))
+                                        .binding(new Color(255, 0, 0, 128), () -> this.hudInactiveColor, newVal -> this.hudInactiveColor = newVal)
+                                        .controller(ColorControllerBuilder::create)
                                 .build())
                         .build())
                 .save(HANDLER::save)
diff --git a/src/main/java/com/tanishisherewith/dynamichud/helpers/DrawHelper.java b/src/main/java/com/tanishisherewith/dynamichud/helpers/DrawHelper.java
index bab2136..d59ac29 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/helpers/DrawHelper.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/helpers/DrawHelper.java
@@ -2,6 +2,7 @@
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.systems.VertexSorter;
 import com.tanishisherewith.dynamichud.DynamicHUD;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.*;
@@ -12,10 +13,13 @@
 
 import java.awt.*;
 
+import static com.tanishisherewith.dynamichud.helpers.TextureHelper.mc;
+
 /**
  * Credits: <a href="https://github.com/HeliosMinecraft/HeliosClient/blob/main/src/main/java/dev/heliosclient/util/ColorUtils.java">HeliosClient</a>
  */
 public class DrawHelper {
+    public static VertexSorter vertexSorter;
 
     /**
      * Draws a singular gradient rectangle  on screen with the given parameters
@@ -792,6 +796,21 @@ public static void drawOutlinedBox(DrawContext drawContext, int x1, int y1, int
         drawContext.fill(x2 - 1, y1 + 1, x2, y2 - 1, color);
     }
 
+    public static void unscaledProjection() {
+        vertexSorter = RenderSystem.getVertexSorting();
+        RenderSystem.setProjectionMatrix(new Matrix4f().setOrtho(0, mc.getWindow().getFramebufferWidth(), mc.getWindow().getFramebufferHeight(), 0, 1000, 21000), VertexSorter.BY_Z);
+    }
+
+    public static void scaledProjection() {
+        RenderSystem.setProjectionMatrix(new Matrix4f().setOrtho(0, (float) (mc.getWindow().getFramebufferWidth() / mc.getWindow().getScaleFactor()), (float) (mc.getWindow().getFramebufferHeight() / mc.getWindow().getScaleFactor()), 0, 1000, 21000), vertexSorter);
+    }
+
+    public static void customScaledProjection(float scale) {
+        vertexSorter = RenderSystem.getVertexSorting();
+        RenderSystem.setProjectionMatrix(new Matrix4f().setOrtho(0, mc.getWindow().getFramebufferWidth() / scale, mc.getWindow().getFramebufferHeight() / scale, 0, 1000, 21000), VertexSorter.BY_Z);
+    }
+
+
     /**
      * This method assumes that the x, y coords are the origin of a widget.
      *
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/ContextMenu.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/ContextMenu.java
index b56a408..c47d690 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/ContextMenu.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/ContextMenu.java
@@ -16,7 +16,6 @@
 import java.util.List;
 
 public class ContextMenu implements Input {
-
     public final Color darkerBackgroundColor;
     //The properties of a context menu
     protected final ContextMenuProperties properties;
@@ -26,7 +25,6 @@ public class ContextMenu implements Input {
     // Width is counted while the options are being rendered.
     // FinalWidth is the width at the end of the count.
     protected int width = 0;
-    protected int finalWidth = 0;
     protected int height = 0, widgetHeight = 0;
     protected boolean shouldDisplay = false;
     protected float scale = 0.0f;
@@ -116,8 +114,8 @@ public void toggleDisplay() {
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
         if (!shouldDisplay) return false;
-        for (Option<?> option : options) {
-            option.mouseClicked(mouseX, mouseY, button);
+        for (Option option : options) {
+            option.getRenderer().mouseClicked(option, mouseX, mouseY, button);
         }
         return properties.getSkin().mouseClicked(this, mouseX, mouseY, button);
     }
@@ -125,8 +123,8 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
     @Override
     public boolean mouseReleased(double mouseX, double mouseY, int button) {
         if (!shouldDisplay) return false;
-        for (Option<?> option : options) {
-            option.mouseReleased(mouseX, mouseY, button);
+        for (Option option : options) {
+            option.getRenderer().mouseReleased(option,mouseX, mouseY, button);
         }
         return properties.getSkin().mouseReleased(this, mouseX, mouseY, button);
     }
@@ -134,8 +132,8 @@ public boolean mouseReleased(double mouseX, double mouseY, int button) {
     @Override
     public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
         if (!shouldDisplay) return false;
-        for (Option<?> option : options) {
-            option.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
+        for (Option option : options) {
+            option.getRenderer().mouseDragged(option,mouseX, mouseY, button, deltaX, deltaY);
         }
         return properties.getSkin().mouseDragged(this, mouseX, mouseY, button, deltaX, deltaY);
     }
@@ -143,8 +141,8 @@ public boolean mouseDragged(double mouseX, double mouseY, int button, double del
     @Override
     public void keyPressed(int key, int scanCode, int modifiers) {
         if (!shouldDisplay) return;
-        for (Option<?> option : options) {
-            option.keyPressed(key, scanCode, modifiers);
+        for (Option option : options) {
+            option.getRenderer().keyPressed(option,key, scanCode, modifiers);
         }
 
         properties.getSkin().keyPressed(this, key, scanCode, modifiers);
@@ -153,8 +151,8 @@ public void keyPressed(int key, int scanCode, int modifiers) {
     @Override
     public void keyReleased(int key, int scanCode, int modifiers) {
         if (!shouldDisplay) return;
-        for (Option<?> option : options) {
-            option.keyReleased(key, scanCode, modifiers);
+        for (Option option : options) {
+            option.getRenderer().keyReleased(option,key, scanCode, modifiers);
         }
         properties.getSkin().keyReleased(this, key, scanCode, modifiers);
 
@@ -162,15 +160,17 @@ public void keyReleased(int key, int scanCode, int modifiers) {
 
     @Override
     public void mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
-        for (Option<?> option : options) {
-            option.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount);
+        for (Option option : options) {
+            option.getRenderer().mouseScrolled(option,mouseX, mouseY, horizontalAmount, verticalAmount);
         }
         properties.getSkin().mouseScrolled(this, mouseX, mouseY, horizontalAmount, verticalAmount);
     }
 
     @Override
     public void charTyped(char c) {
-
+        for (Option<?> option : options) {
+            option.charTyped(c);
+        }
     }
 
     public void set(int x, int y, int widgetHeight) {
@@ -199,14 +199,6 @@ public void setHeight(int height) {
         this.height = height;
     }
 
-    public int getFinalWidth() {
-        return finalWidth;
-    }
-
-    public void setFinalWidth(int finalWidth) {
-        this.finalWidth = finalWidth;
-    }
-
     public int getWidth() {
         return width;
     }
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/ContextMenuProperties.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/ContextMenuProperties.java
index 84538b6..85a8657 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/ContextMenuProperties.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/ContextMenuProperties.java
@@ -14,7 +14,7 @@ public class ContextMenuProperties {
     private int padding = 5;  // The amount of padding around the rectangle
     private int heightOffset = 4; // Height offset from the widget
     private boolean drawBorder = true;
-    private boolean shadow = false;
+    private boolean shadow = true;
     private boolean roundedCorners = true;
     private int cornerRadius = 3;
     private boolean hoverEffect = true;
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/layout/LayoutContext.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/layout/LayoutContext.java
new file mode 100644
index 0000000..62e3f0c
--- /dev/null
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/layout/LayoutContext.java
@@ -0,0 +1,83 @@
+package com.tanishisherewith.dynamichud.utils.contextmenu.layout;
+
+import com.tanishisherewith.dynamichud.utils.contextmenu.options.Option;
+
+public class LayoutContext {
+    private final Offset indent;
+    private final Option<?> parentOption;
+
+    public LayoutContext() {
+        this(Offset.zero(), null);
+    }
+
+    public LayoutContext(Offset margin, Option<?> parentOption) {
+        this.indent = margin;
+        this.parentOption = parentOption;
+    }
+
+    public Offset getIndent() {
+        return indent;
+    }
+
+    public Option<?> getParentOption() {
+        return parentOption;
+    }
+
+    // Builder-style methods for creating new contexts
+    public LayoutContext withIndent(Offset indent) {
+        return new LayoutContext(indent, this.parentOption);
+    }
+
+    public LayoutContext withParent(Option<?> parent) {
+        return new LayoutContext(this.indent, parent);
+    }
+
+    public LayoutContext addIndent(Offset additionalIndent) {
+        return new LayoutContext(
+                this.indent.add(additionalIndent),
+                this.parentOption
+        );
+    }
+
+    // Utility methods for calculating positions
+    public int getEffectiveX(int baseX) {
+        return baseX + indent.left;
+    }
+
+    public int getEffectiveY(int baseY) {
+        return baseY + indent.top;
+    }
+
+    public int getEffectiveWidth(int baseWidth) {
+        return baseWidth + indent.left;
+    }
+
+    public int getEffectiveHeight(int baseHeight) {
+        return baseHeight + indent.top;
+    }
+
+    public static class Offset {
+        public final int left;
+        public final int top;
+
+        public Offset(int all) {
+            this(all, all);
+        }
+
+        public Offset(int horizontal, int vertical) {
+            this.left = horizontal;
+            this.top = vertical;
+        }
+
+        public static Offset zero() {
+            return new Offset(0);
+        }
+
+        public Offset add(Offset other) {
+            return new Offset(
+                    this.left + other.left,
+                    this.top + other.top
+            );
+        }
+    }
+}
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/BooleanOption.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/BooleanOption.java
index 9b68f63..ee382a7 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/BooleanOption.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/BooleanOption.java
@@ -10,12 +10,10 @@
 import java.util.function.Supplier;
 
 public class BooleanOption extends Option<Boolean> {
-    public String name = "Empty";
     private final BooleanType booleanType;
 
     public BooleanOption(String name, Supplier<Boolean> getter, Consumer<Boolean> setter, BooleanType booleanType) {
-        super(getter, setter);
-        this.name = name;
+        super(name,getter, setter);
         this.booleanType = booleanType;
         this.renderer.init(this);
     }
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/ColorOption.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/ColorOption.java
index f7c41fe..41a932d 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/ColorOption.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/ColorOption.java
@@ -8,16 +8,14 @@
 import java.util.function.Supplier;
 
 public class ColorOption extends Option<Color> {
-    public String name = "Empty";
     public boolean isVisible = false;
     private ContextMenu parentMenu = null;
     private ColorGradient colorGradient = null;
 
     public ColorOption(String name, ContextMenu parentMenu, Supplier<Color> getter, Consumer<Color> setter) {
-        super(getter, setter);
-        this.name = name;
+        super(name,getter, setter);
         this.parentMenu = parentMenu;
-        colorGradient = new ColorGradient(x + this.parentMenu.getFinalWidth(), y - 10, get(), this::set, 50, 100);
+        colorGradient = new ColorGradient(x + this.parentMenu.getWidth(), y - 10, get(), this::set, 50, 100);
         this.renderer.init(this);
     }
 
@@ -26,7 +24,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
         if (isMouseOver(mouseX, mouseY)) {
             isVisible = !isVisible;
             if (isVisible) {
-                colorGradient.setPos(this.x + parentMenu.getFinalWidth() + 7, y - 10);
+                colorGradient.setPos(this.x + parentMenu.getWidth() + 7, y - 10);
                 colorGradient.display();
             } else {
                 colorGradient.close();
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/DoubleOption.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/DoubleOption.java
index 8848cf9..0e470a1 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/DoubleOption.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/DoubleOption.java
@@ -11,16 +11,14 @@
 import java.util.function.Supplier;
 
 public class DoubleOption extends Option<Double> {
-    public String name = "Empty";
     public double minValue = 0.0;
     public double maxValue = 0.0;
-    float step = 0.1f;
+    public float step = 0.1f;
     ContextMenu parentMenu;
     private boolean isDragging = false;
 
     public DoubleOption(String name, double minValue, double maxValue, float step, Supplier<Double> getter, Consumer<Double> setter, ContextMenu parentMenu) {
-        super(getter, setter);
-        this.name = name;
+        super(name,getter, setter);
         this.value = get();
         this.minValue = minValue;
         this.maxValue = maxValue;
@@ -54,13 +52,19 @@ public boolean mouseReleased(double mouseX, double mouseY, int button) {
         return super.mouseReleased(mouseX, mouseY, button);
     }
 
-    public void step(double mouseX) {
+    private void step(double mouseX) {
+       this.step(mouseX,x);
+    }
+
+    public void step(double mouseX,double x) {
         double newValue = minValue + (float) (mouseX - x) / width * (maxValue - minValue);
         // Round the new value to the nearest step
         newValue = Math.round(newValue / step) * step;
+        newValue = Math.clamp(newValue,minValue,maxValue);
         set(newValue);
     }
 
+
     @Override
     public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
         if (isMouseOver(mouseX, mouseY) && isDragging) {
@@ -68,4 +72,12 @@ public boolean mouseDragged(double mouseX, double mouseY, int button, double del
         }
         return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
     }
+
+    public void setDragging(boolean dragging) {
+        isDragging = dragging;
+    }
+
+    public boolean isDragging() {
+        return isDragging;
+    }
 }
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/EnumOption.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/EnumOption.java
index f2031e5..f28db96 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/EnumOption.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/EnumOption.java
@@ -5,12 +5,10 @@
 
 public class EnumOption<E extends Enum<E>> extends Option<E> {
     private final E[] values;
-    public String name = "Empty";
     private int currentIndex = 0;
 
     public EnumOption(String name, Supplier<E> getter, Consumer<E> setter, E[] values) {
-        super(getter, setter);
-        this.name = name;
+        super(name,getter, setter);
         this.values = values;
         this.value = get();
         for (int i = 0; i < values.length; i++) {
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/ListOption.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/ListOption.java
index 624ebd9..5622356 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/ListOption.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/ListOption.java
@@ -6,12 +6,10 @@
 
 public class ListOption<T> extends Option<T> {
     private final List<T> values;
-    public String name = "Empty";
     private int currentIndex = 0;
 
     public ListOption(String name, Supplier<T> getter, Consumer<T> setter, List<T> values) {
-        super(getter, setter);
-        this.name = name;
+        super(name,getter, setter);
         this.values = values;
         this.value = getter.get();
         for (int i = 0; i < values.size(); i++) {
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/Option.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/Option.java
index 1c295b3..5273ec6 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/Option.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/Option.java
@@ -3,7 +3,7 @@
 import com.tanishisherewith.dynamichud.DynamicHUD;
 import com.tanishisherewith.dynamichud.utils.Input;
 import com.tanishisherewith.dynamichud.utils.contextmenu.ContextMenuProperties;
-import com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.SkinRenderer;
+import com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.interfaces.SkinRenderer;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 
@@ -11,6 +11,7 @@
 import java.util.function.Supplier;
 
 public abstract class Option<T> implements Input {
+    public String name = "Empty", description = "";
     public T value = null;
     protected int x, y;
     protected int width = 0;
@@ -23,11 +24,12 @@ public abstract class Option<T> implements Input {
     protected ContextMenuProperties properties;
     protected SkinRenderer<Option<T>> renderer;
 
-    public Option(Supplier<T> getter, Consumer<T> setter) {
-        this(getter, setter, () -> true);
+    public Option(String name,Supplier<T> getter, Consumer<T> setter) {
+        this(name,getter, setter, () -> true);
     }
 
-    public Option(Supplier<T> getter, Consumer<T> setter, Supplier<Boolean> shouldRender, ContextMenuProperties properties) {
+    public Option(String name,Supplier<T> getter, Consumer<T> setter, Supplier<Boolean> shouldRender, ContextMenuProperties properties) {
+        this.name = name;
         this.getter = getter;
         this.setter = setter;
         this.shouldRender = shouldRender;
@@ -36,8 +38,8 @@ public Option(Supplier<T> getter, Consumer<T> setter, Supplier<Boolean> shouldRe
         updateProperties(properties);
     }
 
-    public Option(Supplier<T> getter, Consumer<T> setter, Supplier<Boolean> shouldRender) {
-        this(getter, setter, shouldRender, ContextMenuProperties.createGenericSimplified());
+    public Option(String name,Supplier<T> getter, Consumer<T> setter, Supplier<Boolean> shouldRender) {
+        this(name,getter, setter, shouldRender, ContextMenuProperties.createGenericSimplified());
     }
 
     public T get() {
@@ -68,41 +70,32 @@ public void render(DrawContext drawContext, int x, int y, int mouseX, int mouseY
     }
 
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        return isMouseOver(mouseX, mouseY) || renderer.mouseClicked(this, mouseX, mouseY, button);
+        return isMouseOver(mouseX, mouseY);
     }
 
     public boolean mouseReleased(double mouseX, double mouseY, int button) {
-        return isMouseOver(mouseX, mouseY) || renderer.mouseReleased(this, mouseX, mouseY, button);
+        return isMouseOver(mouseX, mouseY);
     }
 
     public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-        return isMouseOver(mouseX, mouseY) || renderer.mouseDragged(this, mouseX, mouseY, button, deltaX, deltaY);
+        return isMouseOver(mouseX, mouseY);
     }
 
-    public void mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
-        renderer.mouseScrolled(this, mouseX, mouseY, horizontalAmount, verticalAmount);
-    }
+    public void mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {}
 
     @Override
-    public void keyPressed(int key, int scanCode, int modifiers) {
-        renderer.keyPressed(this, key, scanCode, modifiers);
-    }
+    public void keyPressed(int key, int scanCode, int modifiers) {}
 
     @Override
-    public void charTyped(char c) {
-
-    }
+    public void charTyped(char c) {}
 
     @Override
-    public void keyReleased(int key, int scanCode, int modifiers) {
-        renderer.keyReleased(this, key, scanCode, modifiers);
-    }
+    public void keyReleased(int key, int scanCode, int modifiers) {}
 
     /**
      * Called when the context menu closes
      */
-    public void onClose() {
-    }
+    public void onClose() {}
 
     public boolean isMouseOver(double mouseX, double mouseY) {
         return mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + height;
@@ -157,4 +150,12 @@ public void set(int x, int y) {
         this.x = x;
         this.y = y;
     }
+    public Option<T> description(String description){
+        this.description = description;
+        return this;
+    }
+
+    public SkinRenderer<Option<T>> getRenderer() {
+        return renderer;
+    }
 }
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/OptionGroup.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/OptionGroup.java
new file mode 100644
index 0000000..36a0b75
--- /dev/null
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/OptionGroup.java
@@ -0,0 +1,114 @@
+package com.tanishisherewith.dynamichud.utils.contextmenu.options;
+
+import com.tanishisherewith.dynamichud.utils.contextmenu.ContextMenuProperties;
+import com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.interfaces.SkinRenderer;
+import net.minecraft.client.gui.DrawContext;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+// A group is just another type of Option that contains other options
+public class OptionGroup extends Option<OptionGroup> {
+    private final List<Option> groupOptions = new ArrayList<>();
+    protected boolean expanded = false; // Skins can choose to use this or ignore it
+
+    public OptionGroup(String name) {
+        super(name, () -> null, (v) -> {}, () -> true);
+    }
+
+    public void addOption(Option option) {
+        groupOptions.add(option);
+    }
+
+    public List<Option> getGroupOptions() {
+        return Collections.unmodifiableList(groupOptions);
+    }
+
+    @Override
+    public void updateProperties(ContextMenuProperties properties) {
+        this.renderer = new OptionGroupRenderer(); // Set renderer as OptionGroupRenderer
+
+        if(groupOptions == null) return;
+
+        for(Option option: groupOptions){
+            option.updateProperties(properties);
+        }
+    }
+
+    @Override
+    public void render(DrawContext drawContext, int x, int y, int mouseX, int mouseY) {}
+
+    public boolean isExpanded() {
+        return expanded;
+    }
+
+    public void setExpanded(boolean expanded) {
+        this.expanded = expanded;
+    }
+    public class OptionGroupRenderer implements SkinRenderer<Option<OptionGroup>> {
+
+        @Override
+        public void render(DrawContext drawContext, Option<OptionGroup> option, int x, int y, int mouseX, int mouseY) {}
+
+        @Override
+        public boolean mouseClicked(Option<OptionGroup> option2, double mouseX, double mouseY, int button) {
+            OptionGroup option = (OptionGroup) option2;
+
+            for (Option subOption : option.getGroupOptions()) {
+                subOption.getRenderer().mouseClicked(subOption,mouseX, mouseY, button);
+            }
+            return SkinRenderer.super.mouseClicked(option, mouseX, mouseY, button);
+        }
+
+        @Override
+        public boolean mouseReleased(Option<OptionGroup> option2, double mouseX, double mouseY, int button) {
+            OptionGroup option = (OptionGroup) option2;
+
+            for (Option subOption : option.getGroupOptions()) {
+                subOption.getRenderer().mouseReleased(subOption,mouseX, mouseY, button);
+            }
+            return SkinRenderer.super.mouseReleased(option, mouseX, mouseY, button);
+        }
+
+        @Override
+        public boolean mouseDragged(Option<OptionGroup> option2, double mouseX, double mouseY, int button, double deltaX, double deltaY) {
+            OptionGroup option = (OptionGroup) option2;
+
+            for (Option subOption : option.getGroupOptions()) {
+                subOption.getRenderer().mouseDragged(subOption,mouseX, mouseY, button, deltaX, deltaY);
+            }
+            return SkinRenderer.super.mouseDragged(option, mouseX, mouseY, button, deltaX, deltaY);
+        }
+
+        @Override
+        public void keyPressed(Option<OptionGroup> option2, int key, int scanCode, int modifiers) {
+            OptionGroup option = (OptionGroup) option2;
+
+            for (Option subOption : option.getGroupOptions()) {
+                subOption.getRenderer().keyPressed(subOption,key, scanCode, modifiers);
+            }
+            SkinRenderer.super.keyPressed(option, key, scanCode, modifiers);
+        }
+
+        @Override
+        public void keyReleased(Option<OptionGroup> option2, int key, int scanCode, int modifiers) {
+            OptionGroup option = (OptionGroup) option2;
+
+            for (Option subOption : option.getGroupOptions()) {
+                subOption.getRenderer().keyReleased(subOption,key, scanCode, modifiers);
+            }
+            SkinRenderer.super.keyReleased(option, key, scanCode, modifiers);
+        }
+
+        @Override
+        public void mouseScrolled(Option<OptionGroup> option2, double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
+            OptionGroup option = (OptionGroup) option2;
+
+            for (Option subOption : option.getGroupOptions()) {
+                subOption.getRenderer().mouseScrolled(subOption,mouseX, mouseY, horizontalAmount, verticalAmount);
+            }
+            SkinRenderer.super.mouseScrolled(option, mouseX, mouseY, horizontalAmount, verticalAmount);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/RunnableOption.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/RunnableOption.java
index 28cac3e..136ea88 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/RunnableOption.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/RunnableOption.java
@@ -7,7 +7,6 @@
 
 public class RunnableOption extends Option<Boolean> {
     private final Runnable task;
-    public String name = "Empty";
 
     /**
      * Runnable option which runs a task when clicked on it.
@@ -18,7 +17,7 @@ public class RunnableOption extends Option<Boolean> {
      * @param task   The task to run
      */
     public RunnableOption(String name, Supplier<Boolean> getter, Consumer<Boolean> setter, Runnable task) {
-        super(getter, setter);
+        super(name,getter, setter);
         this.name = "Run: " + name; // prepend the "run" symbol to the name
         this.task = task;
         this.renderer.init(this);
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/SubMenuOption.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/SubMenuOption.java
index 16928c2..03b6b6e 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/SubMenuOption.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/SubMenuOption.java
@@ -18,14 +18,12 @@
 public class SubMenuOption extends Option<Boolean> {
     private final ContextMenu subMenu;
     private final ContextMenu parentMenu;
-    public String name = "Empty";
 
     public SubMenuOption(String name, ContextMenu parentMenu, Supplier<Boolean> getter, Consumer<Boolean> setter, ContextMenuProperties properties) {
-        super(getter, setter);
+        super(name,getter, setter);
         Objects.requireNonNull(parentMenu, "Parent Menu cannot be null");
-        this.name = name;
         this.parentMenu = parentMenu;
-        this.subMenu = new ContextMenu(parentMenu.x + parentMenu.getFinalWidth(), this.y, properties);
+        this.subMenu = new ContextMenu(parentMenu.x + parentMenu.getWidth(), this.y, properties);
         this.subMenu.getProperties().setHeightOffset(0);
         this.subMenu.setVisible(get());
         this.renderer.init(this);
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/coloroption/ColorGradient.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/coloroption/ColorGradient.java
index 2dc749b..f0c53d2 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/coloroption/ColorGradient.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/coloroption/ColorGradient.java
@@ -19,14 +19,12 @@ public class ColorGradient {
     private final ColorPickerButton colorPickerButton;
     private final AlphaSlider alphaSlider;
     private final int boxSize;
-    private final Color initialColor;
     private int x, y;
     private boolean display = false;
 
     public ColorGradient(int x, int y, Color initialColor, Consumer<Color> onColorSelected, int boxSize, int colors) {
         this.x = x;
         this.y = y;
-        this.initialColor = initialColor;
         this.onColorSelected = onColorSelected;
         this.gradientSlider = new HueSlider(x, y, colors, 10);
         this.gradientBox = new SaturationHueBox(x, y + 20, boxSize);
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/ClassicSkin.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/ClassicSkin.java
index d810e29..51770a3 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/ClassicSkin.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/ClassicSkin.java
@@ -5,7 +5,7 @@
 import com.tanishisherewith.dynamichud.utils.contextmenu.ContextMenuProperties;
 import com.tanishisherewith.dynamichud.utils.contextmenu.options.Option;
 import com.tanishisherewith.dynamichud.utils.contextmenu.options.*;
-import net.minecraft.client.MinecraftClient;
+import com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.interfaces.SkinRenderer;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.util.math.MatrixStack;
@@ -18,18 +18,16 @@
  * which should be used when you have a low amount of settings and want quicker way of changing the settings.
  */
 public class ClassicSkin extends Skin {
-    public static MinecraftClient mc = MinecraftClient.getInstance();
-
     public ClassicSkin() {
         super();
 
-        addRenderer(BooleanOption.class, new ClassicBooleanRenderer());
-        addRenderer(DoubleOption.class, new ClassicDoubleRenderer());
-        addRenderer(EnumOption.class, new ClassicEnumRenderer());
-        addRenderer(ListOption.class, new ClassicListRenderer());
-        addRenderer(SubMenuOption.class, new ClassicSubMenuRenderer());
-        addRenderer(RunnableOption.class, new ClassicRunnableRenderer());
-        addRenderer(ColorOption.class, new ClassicColorOptionRenderer());
+        addRenderer(BooleanOption.class, ClassicBooleanRenderer::new);
+        addRenderer(DoubleOption.class, ClassicDoubleRenderer::new);
+        addRenderer(EnumOption.class, ClassicEnumRenderer::new);
+        addRenderer(ListOption.class, ClassicListRenderer::new);
+        addRenderer(SubMenuOption.class, ClassicSubMenuRenderer::new);
+        addRenderer(RunnableOption.class, ClassicRunnableRenderer::new);
+        addRenderer(ColorOption.class, ClassicColorOptionRenderer::new);
 
         setCreateNewScreen(false);
     }
@@ -45,21 +43,20 @@ public void renderContextMenu(DrawContext drawContext, ContextMenu contextMenu,
         drawBackground(matrices, contextMenu, properties);
 
         int yOffset = contextMenu.y + 3;
-        contextMenu.setWidth(10);
-        for (Option<?> option : contextMenu.getOptions()) {
+        int width = 10;
+        for (Option<?> option : getOptions(contextMenu)) {
             if (!option.shouldRender()) continue;
 
             // Adjust mouse coordinates based on the scale
-            if (contextMenu.getProperties().hoverEffect() && contextMenu.isMouseOver(mouseX, mouseY, contextMenu.x + 1, yOffset - 1, contextMenu.getFinalWidth() - 2, option.getHeight())) {
-                drawBackground(matrices, contextMenu, properties, yOffset - 1, contextMenu.getFinalWidth(), option.getHeight() + 1, contextMenu.getProperties().getHoverColor().getRGB(), false);
+            if (contextMenu.getProperties().hoverEffect() && contextMenu.isMouseOver(mouseX, mouseY, contextMenu.x + 1, yOffset - 1, contextMenu.getWidth() - 2, option.getHeight())) {
+                drawBackground(matrices, contextMenu, properties, yOffset - 1, contextMenu.getWidth(), option.getHeight() + 1, contextMenu.getProperties().getHoverColor().getRGB(), false);
             }
 
             option.render(drawContext, contextMenu.x + 4, yOffset, mouseX, mouseY);
-            contextMenu.setWidth(Math.max(contextMenu.getWidth(), option.getWidth()));
+            width = Math.max(width, option.getWidth());
             yOffset += option.getHeight() + 1;
         }
-        contextMenu.setWidth(contextMenu.getWidth() + properties.getPadding());
-        contextMenu.setFinalWidth(contextMenu.getWidth());
+        contextMenu.setWidth(width + properties.getPadding());
         contextMenu.setHeight(yOffset - contextMenu.y);
 
         // Draw the border if needed
@@ -174,7 +171,7 @@ public void render(DrawContext drawContext, ColorOption option, int x, int y, in
                     1,
                     1);
 
-            option.getColorGradient().render(drawContext, x + option.getParentMenu().getFinalWidth() + 7, y - 10);
+            option.getColorGradient().render(drawContext, x + option.getParentMenu().getWidth() + 7, y - 10);
         }
     }
 
@@ -197,7 +194,7 @@ public void render(DrawContext drawContext, SubMenuOption option, int x, int y,
             option.setHeight(mc.textRenderer.fontHeight);
             option.setWidth(mc.textRenderer.getWidth(option.name) + 1);
 
-            option.getSubMenu().render(drawContext, x + option.getParentMenu().getFinalWidth(), y, mouseX, mouseY);
+            option.getSubMenu().render(drawContext, x + option.getParentMenu().getWidth(), y, mouseX, mouseY);
         }
     }
 
@@ -217,7 +214,7 @@ public void render(DrawContext drawContext, RunnableOption option, int x, int y,
     public class ClassicDoubleRenderer implements SkinRenderer<DoubleOption> {
         @Override
         public void render(DrawContext drawContext, DoubleOption option, int x, int y, int mouseX, int mouseY) {
-            option.setWidth(Math.max(35, contextMenu != null ? contextMenu.getFinalWidth() - option.getProperties().getPadding() - 2 : 0));
+            option.setWidth(Math.max(35, contextMenu != null ? contextMenu.getWidth() - option.getProperties().getPadding() - 2 : 0));
             option.setHeight(16);
 
             // Draw the label
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/MinecraftSkin.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/MinecraftSkin.java
index 12c9d6e..4c7f345 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/MinecraftSkin.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/MinecraftSkin.java
@@ -5,9 +5,11 @@
 import com.tanishisherewith.dynamichud.utils.contextmenu.ContextMenu;
 import com.tanishisherewith.dynamichud.utils.contextmenu.options.Option;
 import com.tanishisherewith.dynamichud.utils.contextmenu.options.*;
-import net.minecraft.client.MinecraftClient;
+import com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.interfaces.SkinRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ButtonTextures;
+import net.minecraft.client.sound.PositionedSoundInstance;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
@@ -26,7 +28,6 @@ public class MinecraftSkin extends Skin {
             Identifier.ofVanilla("widget/button_disabled"),
             Identifier.ofVanilla("widget/button_highlighted")
     );
-    private static final MinecraftClient mc = MinecraftClient.getInstance();
     private static final int DEFAULT_SCROLLBAR_WIDTH = 10;
     private static final int DEFAULT_PANEL_WIDTH = 248;
     private static final int DEFAULT_PANEL_HEIGHT = 165;
@@ -47,13 +48,13 @@ public class MinecraftSkin extends Skin {
     public MinecraftSkin(PanelColor color, Identifier backgroundPanel, int panelWidth, int panelHeight) {
         super();
         this.panelColor = color;
-        addRenderer(BooleanOption.class, new MinecraftBooleanRenderer());
-        addRenderer(DoubleOption.class, new MinecraftDoubleRenderer());
-        addRenderer(EnumOption.class, new MinecraftEnumRenderer());
-        addRenderer(ListOption.class, new MinecraftListRenderer());
-        addRenderer(SubMenuOption.class, new MinecraftSubMenuRenderer());
-        addRenderer(RunnableOption.class, new MinecraftRunnableRenderer());
-        addRenderer(ColorOption.class, new MinecraftColorOptionRenderer());
+        addRenderer(BooleanOption.class, MinecraftBooleanRenderer::new);
+        addRenderer(DoubleOption.class, MinecraftDoubleRenderer::new);
+        addRenderer(EnumOption.class, MinecraftEnumRenderer::new);
+        addRenderer(ListOption.class, MinecraftListRenderer::new);
+        addRenderer(SubMenuOption.class, MinecraftSubMenuRenderer::new);
+        addRenderer(RunnableOption.class, MinecraftRunnableRenderer::new);
+        addRenderer(ColorOption.class, MinecraftColorOptionRenderer::new);
 
         this.panelHeight = panelHeight;
         this.panelWidth = panelWidth;
@@ -94,11 +95,10 @@ public void renderContextMenu(DrawContext drawContext, ContextMenu contextMenu,
         DrawHelper.enableScissor(imageX, imageY + 2, screenWidth, panelHeight - 4);
         int yOffset = imageY + 10 - scrollOffset;
         contextMenu.setWidth(panelWidth - 4);
-        contextMenu.setFinalWidth(panelWidth - 4);
         contextMenu.y = imageY;
         int maxYOffset = imageY + panelHeight - 4;
 
-        for (Option<?> option : contextMenu.getOptions()) {
+        for (Option<?> option : getOptions(contextMenu)) {
             if (!option.shouldRender()) continue;
 
             if (yOffset >= imageY && yOffset <= maxYOffset - option.getHeight() + 4) {
@@ -142,10 +142,6 @@ private void drawScrollbar(DrawContext context) {
         }
     }
 
-    private boolean isMouseOver(double mouseX, double mouseY, double x, double y, double width, double height) {
-        return mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + height;
-    }
-
     private void applyMomentum() {
         if (scrollVelocity != 0) {
             scrollOffset += (int) scrollVelocity;
@@ -169,6 +165,9 @@ public void mouseScrolled(ContextMenu menu, double mouseX, double mouseY, double
     @Override
     public boolean mouseClicked(ContextMenu menu, double mouseX, double mouseY, int button) {
         if (button == GLFW.GLFW_MOUSE_BUTTON_LEFT && isMouseOver(mouseX, mouseY, imageX + 3, imageY + 3, 14, 14)) {
+            mc.getSoundManager().play(PositionedSoundInstance.master(
+                    SoundEvents.UI_BUTTON_CLICK, 1.0F));
+
             contextMenu.close();
         }
 
@@ -180,7 +179,6 @@ public boolean mouseDragged(ContextMenu menu, double mouseX, double mouseY, int
         if (button == 0 && mouseX >= imageX + panelWidth + 5 && mouseX <= imageX + panelWidth + 20) {
             if (mouseY >= imageY && mouseY <= imageY + panelHeight) {
                 float scrollPercentage = (float) (mouseY - imageY) / panelHeight;
-                int handleY = imageY + (int) ((panelHeight - 15) * scrollPercentage);
 
                 // Draw scrollbar handle
                 scrollOffset = (int) (maxScrollOffset * scrollPercentage);
@@ -437,7 +435,7 @@ public void render(DrawContext drawContext, SubMenuOption option, int x, int y,
             String text = "Open";
             drawContext.drawText(mc.textRenderer, text, option.getX() + option.getWidth() / 2 - mc.textRenderer.getWidth(text) / 2, y + 5, Color.YELLOW.getRGB(), true);
 
-            option.getSubMenu().render(drawContext, x + option.getParentMenu().getFinalWidth(), y, mouseX, mouseY);
+            option.getSubMenu().render(drawContext, x + option.getParentMenu().getWidth(), y, mouseX, mouseY);
         }
     }
 
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/ModernSkin.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/ModernSkin.java
index 0792408..72b8aaf 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/ModernSkin.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/ModernSkin.java
@@ -1,13 +1,675 @@
 package com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem;
 
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.tanishisherewith.dynamichud.helpers.ColorHelper;
+import com.tanishisherewith.dynamichud.helpers.DrawHelper;
 import com.tanishisherewith.dynamichud.utils.contextmenu.ContextMenu;
+import com.tanishisherewith.dynamichud.utils.contextmenu.layout.LayoutContext;
+import com.tanishisherewith.dynamichud.utils.contextmenu.options.*;
+import com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.interfaces.GroupableSkin;
+import com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.interfaces.SkinRenderer;
 import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.sound.PositionedSoundInstance;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.text.OrderedText;
+import net.minecraft.text.StringVisitable;
+import net.minecraft.util.math.MathHelper;
+import org.lwjgl.glfw.GLFW;
 
+import java.awt.*;
+import java.util.List;
 
 //TODO: Complete this
-public class ModernSkin extends Skin{
+public class ModernSkin extends Skin implements GroupableSkin {
+    private final Color themeColor;
+    private final float radius;
+    private final String defaultToolTipHeader;
+    private final String defaultToolTipText;
+    Color DARK_GRAY = new Color(20, 20, 20, 229);
+    Color DARKER_GRAY_2 = new Color(12,12,12,246);
+    Color DARKER_GRAY = new Color(10, 10, 10, 243);
+    private int contextMenuX = 0, contextMenuY = 0;
+    private int width = 0, height = 0;
+    private float scaledWidth = 0, scaledHeight = 0;
+    private String TOOLTIP_TEXT;
+    private String TOOLTIP_HEAD;
+    private static int SCALE_FACTOR = 4;
+
+    public ModernSkin(Color themeColor, float radius, String defaultToolTipHeader, String defaultToolTipText) {
+        this.themeColor = themeColor;
+        this.radius = radius;
+        TOOLTIP_TEXT = defaultToolTipText;
+        TOOLTIP_HEAD = defaultToolTipHeader;
+        this.defaultToolTipText = defaultToolTipText;
+        this.defaultToolTipHeader = defaultToolTipHeader;
+
+        addRenderer(BooleanOption.class, ModernBooleanRenderer::new);
+        addRenderer(DoubleOption.class, ModernDoubleRenderer::new);
+        addRenderer(EnumOption.class, ModernEnumRenderer::new);
+        addRenderer(ListOption.class, ModernListRenderer::new);
+        addRenderer(SubMenuOption.class, ModernSubMenuRenderer::new);
+        addRenderer(RunnableOption.class, ModernRunnableRenderer::new);
+        addRenderer(ColorOption.class, ModernColorOptionRenderer::new);
+
+        setCreateNewScreen(true);
+    }
+
+    public ModernSkin(Color themeColor, float radius) {
+        this(themeColor, radius, "Example Tip", "Hover over a setting to see its tool-tip (if present) here!");
+    }
+
+    public ModernSkin(Color themeColor) {
+        this(themeColor, 4);
+    }
+
+    public ModernSkin() {
+        this(Color.CYAN.darker().darker());
+    }
+
+    @Override
+    public LayoutContext.Offset getGroupIndent() {
+        return new LayoutContext.Offset(2, 2);
+    }
+
+    @Override
+    public void renderGroup(DrawContext drawContext, OptionGroup group, int groupX, int groupY, int mouseX, int mouseY) {
+        mouseX = (int) (mc.mouse.getX()/SCALE_FACTOR);
+        mouseY = (int) (mc.mouse.getY()/SCALE_FACTOR);
+
+        if(group.isExpanded()) {
+            DrawHelper.drawRoundedRectangle(drawContext.getMatrices().peek().getPositionMatrix(),
+                    groupX + 1, groupY + 14, width - groupX - 8 + contextMenuX, group.getHeight(), radius, DARKER_GRAY_2.getRGB());
+        }
+
+        String groupText = group.name + " " + (group.isExpanded() ? "-" : "+");
+
+        DrawHelper.drawRoundedRectangle(drawContext.getMatrices().peek().getPositionMatrix(),
+                groupX + 1, groupY + 1,true,true, !group.isExpanded(),!group.isExpanded(), mc.textRenderer.getWidth(groupText) + 6, 16, radius, DARKER_GRAY_2.getRGB());
+
+        drawContext.drawText(mc.textRenderer, groupText, groupX + 4, groupY + 4, -1, true);
+
+        if(group.isExpanded()) {
+            int yOffset = groupY + 16 + getGroupIndent().top;
+            for (Option<?> option : group.getGroupOptions()) {
+                if (!option.shouldRender()) continue;
+                option.render(drawContext, groupX + getGroupIndent().left, yOffset, mouseX, mouseY);
+                yOffset += option.getHeight() + 1;
+            }
+
+            group.setHeight(yOffset - groupY - 16);
+        } else{
+            group.setHeight(16);
+        }
+    }
+
     @Override
     public void renderContextMenu(DrawContext drawContext, ContextMenu contextMenu, int mouseX, int mouseY) {
+        //This is equivalent to "Auto" GUI scale in minecraft options
+        SCALE_FACTOR = mc.getWindow().calculateScaleFactor(0, mc.forcesUnicodeFont());
+
+        mouseX = (int) (mc.mouse.getX()/SCALE_FACTOR);
+        mouseY = (int) (mc.mouse.getY()/SCALE_FACTOR);
+
+        // Apply custom scaling to counteract Minecraft's default scaling
+        DrawHelper.customScaledProjection(SCALE_FACTOR);
+
+        updateContextDimensions();
+        contextMenu.set(contextMenuX, contextMenuY, 0);
+
+        //Background
+        DrawHelper.drawRoundedRectangle(drawContext.getMatrices().peek().getPositionMatrix(),
+                contextMenuX, contextMenuY, width, height, radius, DARKER_GRAY.getRGB());
+
+        drawBackButton(drawContext, mouseX, mouseY);
+
+        //Tool-Tip width + padding
+        int optionStartX = contextMenu.x + (int) (width * 0.2f) + 10;
+
+        //Background behind the options
+        DrawHelper.drawRoundedRectangle(drawContext.getMatrices().peek().getPositionMatrix(),
+                optionStartX, contextMenuY + 19, width * 0.8f - 14, height - 23, radius, DARK_GRAY.getRGB());
+
+        int yOffset = contextMenu.y + 19 + 3;
+        for (Option<?> option : getOptions(contextMenu)) {
+            if (!option.shouldRender()) continue;
+
+            if (option.isMouseOver(mouseX, mouseY)) {
+                setTooltipText(option.name, option.description);
+            }
+
+            if (option instanceof OptionGroup group) {
+                renderGroup(drawContext, group, optionStartX + 2, yOffset, mouseX, mouseY);
+            } else {
+                option.render(drawContext, optionStartX + 2, yOffset, mouseX, mouseY);
+            }
+
+            yOffset += option.getHeight() + 1;
+        }
+
+        contextMenu.setWidth(width);
+        contextMenu.setHeight(height);
+
+        renderToolTipText(drawContext, mouseX, mouseY);
+
+        //Reset our scaling so minecraft runs normally
+        DrawHelper.scaledProjection();
+    }
+
+    private void updateContextDimensions() {
+        scaledWidth = (float) mc.getWindow().getFramebufferWidth() / SCALE_FACTOR;
+        scaledHeight = (float) mc.getWindow().getFramebufferHeight() / SCALE_FACTOR;
+        contextMenuX = (int) (scaledWidth * 0.1f);
+        contextMenuY = (int) (scaledHeight * 0.1f);
+        width = (int) (scaledWidth * 0.8f);
+        height = (int) (scaledHeight * 0.8f);
+    }
+
+    public void drawBackButton(DrawContext drawContext, int mouseX, int mouseY) {
+        String backText = "< Back";
+        int textWidth = mc.textRenderer.getWidth(backText);
+
+        boolean isHoveringOver = isMouseOver(mouseX, mouseY, contextMenuX + 2, contextMenuY + 2, textWidth + 8, 14);
+        int color = isHoveringOver ? themeColor.darker().getRGB() : themeColor.getRGB();
+
+        DrawHelper.drawRoundedRectangleWithShadowBadWay(drawContext.getMatrices().peek().getPositionMatrix(),
+                contextMenuX + 2, contextMenuY + 2, textWidth + 8, 14, radius, color, 125, 2, 2);
+
+        drawContext.drawText(mc.textRenderer, backText, contextMenuX + 6, contextMenuY + 5, -1, true);
+    }
+
+    public void renderToolTipText(DrawContext drawContext, int mouseX, int mouseY) {
+        int tooltipY = contextMenuY + 19;
+        int toolTipWidth = (int) (width * 0.2f) + 4;
+        int toolTipHeight = (int) (height * 0.16f);
+
+        if (!TOOLTIP_TEXT.isEmpty()) {
+            toolTipHeight = Math.max(toolTipHeight, mc.textRenderer.getWrappedLinesHeight(TOOLTIP_TEXT, toolTipWidth)) + 18;
+            toolTipHeight = Math.min(height - 23, toolTipHeight);
+        }
+
+        float textScale = 0.8f;
+
+        // Draw background
+        DrawHelper.drawRoundedRectangle(
+                drawContext.getMatrices().peek().getPositionMatrix(),
+                contextMenuX + 2,
+                tooltipY,
+                toolTipWidth,
+                toolTipHeight,
+                radius,
+                DARK_GRAY.getRGB()
+        );
+        DrawHelper.drawHorizontalLine(
+                drawContext.getMatrices().peek().getPositionMatrix(),
+                contextMenuX + 2,
+                toolTipWidth,
+                tooltipY + 16,
+                0.7f,
+                ColorHelper.changeAlpha(Color.WHITE, 175).getRGB()
+        );
+
+        if (TOOLTIP_TEXT.isEmpty() || TOOLTIP_HEAD.isEmpty()) {
+            return;
+        }
+
+        //Draw the head text
+        drawContext.drawText(
+                mc.textRenderer,
+                TOOLTIP_HEAD,
+                contextMenuX + 4,
+                tooltipY + 4,
+                -1,
+                true
+        );
+
+        List<OrderedText> wrappedText = mc.textRenderer.wrapLines(StringVisitable.plain(TOOLTIP_TEXT), toolTipWidth);
+
+        DrawHelper.scaleAndPosition(drawContext.getMatrices(), contextMenuX + 4, tooltipY + 19, textScale);
+
+        // Draw text
+        int textY = tooltipY + 19;
+        for (OrderedText line : wrappedText) {
+            drawContext.drawText(
+                    mc.textRenderer,
+                    line,
+                    contextMenuX + 2 + 2,
+                    textY,
+                    -1,
+                    false
+            );
+            textY += mc.textRenderer.fontHeight;
+        }
+
+        DrawHelper.stopScaling(drawContext.getMatrices());
+
+        setTooltipText(defaultToolTipHeader, defaultToolTipText);
+    }
+
+    public void setTooltipText(String head_text, String tooltip_text) {
+        TOOLTIP_TEXT = tooltip_text;
+        TOOLTIP_HEAD = head_text;
+    }
+
+    @Override
+    public boolean mouseClicked(ContextMenu menu, double mouseX, double mouseY, int button) {
+        mouseX = mc.mouse.getX()/SCALE_FACTOR;
+        mouseY = mc.mouse.getY()/SCALE_FACTOR;
+
+        if(button == GLFW.GLFW_MOUSE_BUTTON_RIGHT) {
+            int optionStartX = contextMenuX + (int) (width * 0.2f) + 10;
+            int yOffset = contextMenuY + 22;
+            for (Option<?> option : getOptions(contextMenu)) {
+                if (!option.shouldRender()) continue;
+
+                if (option instanceof OptionGroup group) {
+                    if (isMouseOver(mouseX, mouseY, optionStartX + 2, yOffset,
+                            mc.textRenderer.getWidth(group.name + " " + (group.isExpanded() ? "-" : "+")) + 6,
+                            16)) {
+                        group.setExpanded(!group.isExpanded());
+                    }
+                }
+
+                yOffset += option.getHeight() + 1;
+            }
+        }
+        if (button == GLFW.GLFW_MOUSE_BUTTON_LEFT && isMouseOver(mouseX, mouseY, contextMenuX + 2, contextMenuY + 2, mc.textRenderer.getWidth("< Back") + 8, 14)) {
+            mc.getSoundManager().play(PositionedSoundInstance.master(
+                    SoundEvents.UI_BUTTON_CLICK, 1.0F));
+            contextMenu.close();
+        }
+        return super.mouseClicked(menu, mouseX, mouseY, button);
+    }
+
+    public Color getThemeColor() {
+        return themeColor;
+    }
+
+    public class ModernBooleanRenderer implements SkinRenderer<BooleanOption> {
+        private float animationProgress = 0f;
+        private boolean animating = false;
+
+        @Override
+        public void render(DrawContext drawContext, BooleanOption option, int x, int y, int mouseX, int mouseY) {
+            int backgroundWidth = (int) (width * 0.8f - 14);
+
+            option.setHeight(14);
+            option.set(x,y);
+            option.setWidth(backgroundWidth);
+
+            MatrixStack matrices = drawContext.getMatrices();
+
+            // Animate the toggle
+            if (animating) {
+                animationProgress += 0.1f; // Adjust speed as needed
+                if (animationProgress >= 1f) {
+                    animationProgress = 0f;
+                    animating = false;
+                }
+            }
+
+            int toggleBgX = x + backgroundWidth - 30;
+            // Background
+            boolean active = option.get();
+            Color backgroundColor = active ? getThemeColor() : DARKER_GRAY;
+
+            DrawHelper.drawRoundedRectangleWithShadowBadWay(
+                    matrices.peek().getPositionMatrix(),
+                    toggleBgX, y + 2, 14, 7,
+                    3,
+                    backgroundColor.getRGB(),
+                    125, 1, 1
+            );
+
+            // Draw toggle circle
+            float toggleX = active ? toggleBgX + 10 : toggleBgX + 4;
+            if (animating) {
+                toggleX = MathHelper.lerp(animationProgress, active ? toggleBgX + 4 : toggleBgX + 10, toggleX);
+            }
+
+            DrawHelper.drawFilledCircle(matrices.peek().getPositionMatrix(), toggleX, y + 2 + 3.3f, 2.8f, Color.WHITE.getRGB());
+
+            // Draw option name
+            drawContext.drawText(
+                    mc.textRenderer,
+                    option.name,
+                    x + 2,
+                    y + 4,
+                    -1,
+                    false
+            );
+        }
+
+        @Override
+        public boolean mouseClicked(BooleanOption option, double mouseX, double mouseY, int button) {
+            mouseX = mc.mouse.getX()/SCALE_FACTOR;
+            mouseY = mc.mouse.getY()/SCALE_FACTOR;
+
+            int backgroundWidth = (int) (width * 0.8f - 14);
+            int toggleBgX = option.getX() + backgroundWidth - 30;
+
+            if(isMouseOver(mouseX,mouseY,toggleBgX,option.getY(),14,option.getHeight())){
+                option.set(!option.get());
+                animating = true;
+                return true;
+            }
+            return SkinRenderer.super.mouseClicked(option, mouseX, mouseY, button);
+        }
+    }
+
+    public class ModernColorOptionRenderer implements SkinRenderer<ColorOption> {
+        private static final float ANIMATION_SPEED = 0.1f;
+        private float scale = 0f;
+        private boolean display = false;
+
+        public void update(ColorOption option){
+            if(option.getColorGradient().isDisplay() && display){
+                scale += ANIMATION_SPEED;
+            }
+            if(!display){
+                scale -= ANIMATION_SPEED;
+            }
+            scale = MathHelper.clamp(scale,0,1.0f);
+            if(scale <= 0){
+                option.getColorGradient().close();
+            }
+        }
+
+        @Override
+        public void render(DrawContext drawContext, ColorOption option, int x, int y, int mouseX, int mouseY) {
+            update(option);
+
+            int backgroundWidth = (int) (width * 0.8f - 14);
+
+            // Draw option name
+            drawContext.drawText(
+                    mc.textRenderer,
+                    option.name,
+                    x + 2,
+                    y + 5,
+                    -1,
+                    false
+            );
+
+            option.set(x, y);
+
+            int width = 20;
+            int shadowOpacity = Math.min(option.value.getAlpha(), 45);
+
+            //The shape behind the preview
+            DrawHelper.drawRoundedRectangleWithShadowBadWay(drawContext.getMatrices().peek().getPositionMatrix(),
+                    x + backgroundWidth - width - 17,
+                    y + 1,
+                    width + 2,
+                    14,
+                    2,
+                    getThemeColor().getRGB(),
+                    shadowOpacity,
+                    1,
+                    1);
+
+            //The letter above the shape behind the preview
+            drawContext.drawText(
+                    mc.textRenderer,
+                    option.getColorGradient().isDisplay() ? "^" : "v",
+                    x + backgroundWidth - 21,
+                    y + 4,
+                    -1,
+                    false
+            );
+
+            //Preview
+            DrawHelper.drawRoundedRectangleWithShadowBadWay(drawContext.getMatrices().peek().getPositionMatrix(),
+                    x + backgroundWidth - width - 15,
+                    y + 2,
+                    width - 8,
+                    12,
+                    1,
+                    option.value.getRGB(),
+                    shadowOpacity,
+                    1,
+                    1);
+
+            int targetHeight = option.getColorGradient().isDisplay() ? (int) (option.getColorGradient().getBoxSize() + option.getColorGradient().getGradientBox().getSize() * scale) : 25;
+            option.setHeight(targetHeight);
+            option.setWidth(width);
+
+            DrawHelper.scaleAndPosition(drawContext.getMatrices(),x + backgroundWidth/2.0f,y, scale);
+
+            option.getColorGradient().render(drawContext, x + backgroundWidth/2 - 50, y + 6);
+
+            DrawHelper.stopScaling(drawContext.getMatrices());
+        }
+
+        @Override
+        public boolean mouseClicked(ColorOption option, double mouseX, double mouseY, int button) {
+            mouseX = mc.mouse.getX()/SCALE_FACTOR;
+            mouseY = mc.mouse.getY()/SCALE_FACTOR;
+            if (button == GLFW.GLFW_MOUSE_BUTTON_LEFT && isMouseOver(mouseX, mouseY, option.getX() + (int) (width * 0.8f - 14) - 37, option.getY(), 30, 23)) {
+                option.isVisible = !option.isVisible;
+                if (option.isVisible) {
+                    option.getColorGradient().display();
+                    display = true;
+                } else {
+                    display = false;
+                }
+                return true;
+            }
+            option.getColorGradient().mouseClicked(mouseX,mouseY,button);
+            return SkinRenderer.super.mouseClicked(option, mouseX, mouseY, button);
+        }
+
+        @Override
+        public boolean mouseDragged(ColorOption option, double mouseX, double mouseY, int button, double deltaX, double deltaY) {
+            mouseX = mc.mouse.getX()/SCALE_FACTOR;
+            mouseY = mc.mouse.getY()/SCALE_FACTOR;
+            option.getColorGradient().mouseDragged(mouseX,mouseY,button);
+            return SkinRenderer.super.mouseDragged(option, mouseX, mouseY, button, deltaX, deltaY);
+        }
+
+        @Override
+        public boolean mouseReleased(ColorOption option, double mouseX, double mouseY, int button) {
+            mouseX = mc.mouse.getX()/SCALE_FACTOR;
+            mouseY = mc.mouse.getY()/SCALE_FACTOR;
+            option.getColorGradient().mouseReleased(mouseX,mouseY,button);
+
+            return SkinRenderer.super.mouseReleased(option, mouseX, mouseY, button);
+        }
+    }
+
+    public class ModernDoubleRenderer implements SkinRenderer<DoubleOption> {
+        private double displayValue;
+        private static final float ANIMATION_SPEED = 0.1f;
+        @Override
+        public void render(DrawContext drawContext, DoubleOption option, int x, int y, int mouseX, int mouseY) {
+            // Draw option name
+            drawContext.drawText(
+                    mc.textRenderer,
+                    option.name,
+                    x + 2,
+                    y,
+                    -1,
+                    false
+            );
+
+            int backgroundWidth = (int) (width * 0.8f - 14);
+            int sliderBackgroundWidth = 120;
+            int sliderBackgroundHeight = 2;
+            int sliderX = x + backgroundWidth - sliderBackgroundWidth - 10;
+
+            option.set(x,y);
+            option.setWidth(sliderBackgroundWidth);
+            option.setHeight(14);
+
+            // Smoothly interpolate to the new value
+            displayValue = MathHelper.lerp(ANIMATION_SPEED, displayValue, option.get());
+
+            // Background
+            DrawHelper.drawRoundedRectangle(
+                    drawContext.getMatrices().peek().getPositionMatrix(),
+                    sliderX, y, sliderBackgroundWidth, sliderBackgroundHeight,1, DARKER_GRAY.getRGB()
+            );
+
+            // Active fill
+            int activeFillWidth = (int) ((displayValue - option.minValue) / (option.maxValue - option.minValue) * option.getWidth());
+            Color activeColor = getThemeColor();
+            DrawHelper.drawRoundedRectangle(
+                    drawContext.getMatrices().peek().getPositionMatrix(),
+                    sliderX, y, activeFillWidth, sliderBackgroundHeight,1, activeColor.getRGB()
+            );
+
+            // Draw slider handle
+            float sliderHandleX = sliderX + activeFillWidth - 5;
+            DrawHelper.drawFilledCircle(drawContext.getMatrices().peek().getPositionMatrix(), sliderHandleX + 5, y + 1, 2, Color.WHITE.getRGB());
+
+            // Draw value text
+            String text = String.format("%.2f", displayValue);
+            DrawHelper.scaleAndPosition(drawContext.getMatrices(),sliderX + 120 - mc.textRenderer.getWidth(text),y + 7,0.6f);
+            drawContext.drawText(
+                    mc.textRenderer,
+                    text,
+                    sliderX + sliderBackgroundWidth + 10 - mc.textRenderer.getWidth(text),
+                    y + 2,
+                    -1,
+                    true
+            );
+            drawContext.getMatrices().pop();
+        }
+
+        @Override
+        public boolean mouseClicked(DoubleOption option, double mouseX, double mouseY, int button) {
+            mouseX = mc.mouse.getX()/SCALE_FACTOR;
+            mouseY = mc.mouse.getY()/SCALE_FACTOR;
+            if (button == GLFW.GLFW_MOUSE_BUTTON_LEFT && isMouseOver(mouseX, mouseY, option.getX() + (int) (width * 0.8f - 14) - 125, option.getY() - 1, option.getWidth() + 2, option.getHeight() + 1)) {
+                option.setDragging(true);
+                return true;
+            }
+            return false;
+        }
+
+        @Override
+        public boolean mouseDragged(DoubleOption option, double mouseX, double mouseY, int button, double deltaX, double deltaY) {
+            if (option.isDragging()) {
+                mouseX = mc.mouse.getX()/SCALE_FACTOR;
+                int backgroundWidth = (int) (width * 0.8f - 14);
+                int sliderBackgroundWidth = 120;
+                int sliderX = option.getX() + backgroundWidth - sliderBackgroundWidth - 10;
+                option.step(mouseX, sliderX);
+                return true;
+            }
+            return false;
+        }
+
+        @Override
+        public boolean mouseReleased(DoubleOption option, double mouseX, double mouseY, int button) {
+            if (button == GLFW.GLFW_MOUSE_BUTTON_LEFT) {
+                option.setDragging(false);
+                return true;
+            }
+            return false;
+        }
+    }
+    public class ModernEnumRenderer<E extends Enum<E>> implements SkinRenderer<EnumOption<E>> {
+        private int maxWidth = 50;
+
+        private void calculateMaxWidth(EnumOption<E> option) {
+            for (E listValues : option.getValues()) {
+                int width = mc.textRenderer.getWidth(listValues.toString()) + 5;
+                if (width > maxWidth) {
+                    maxWidth = width;
+                }
+            }
+        }
+
+        @Override
+        public void render(DrawContext drawContext, EnumOption<E> option, int x, int y, int mouseX, int mouseY) {
+            calculateMaxWidth(option);
+            option.setHeight(25);
+            option.setWidth(maxWidth);
+
+            drawContext.drawText(mc.textRenderer, option.name + ": ", x + 15, y + 25 / 2 - 5, -1, true);
+
+            option.set(x + width - maxWidth - 25, y);
+
+            drawContext.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+            RenderSystem.enableBlend();
+            RenderSystem.enableDepthTest();
+            drawContext.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+            String text = option.get().toString();
+            drawContext.drawText(mc.textRenderer, text, option.getX() + maxWidth / 2 - mc.textRenderer.getWidth(text) / 2, y + 5, Color.CYAN.getRGB(), true);
+        }
+    }
+
+    public class ModernListRenderer<E> implements SkinRenderer<ListOption<E>> {
+        private int maxWidth = 50;
+
+        private void calculateMaxWidth(ListOption<E> option) {
+            for (E listValues : option.getValues()) {
+                int width = mc.textRenderer.getWidth(listValues.toString()) + 5;
+                if (width > maxWidth) {
+                    maxWidth = width;
+                }
+            }
+        }
+
+        @Override
+        public void render(DrawContext drawContext, ListOption<E> option, int x, int y, int mouseX, int mouseY) {
+            calculateMaxWidth(option);
+            option.setHeight(25);
+            option.setWidth(maxWidth);
+
+            drawContext.drawText(mc.textRenderer, option.name + ": ", x + 15, y + 25 / 2 - 5, -1, true);
+
+            option.set(x + width - maxWidth - 25, y);
+
+            drawContext.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+            RenderSystem.enableBlend();
+            RenderSystem.enableDepthTest();
+            drawContext.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+            String text = option.get().toString();
+            drawContext.drawText(mc.textRenderer, text, option.getX() + maxWidth / 2 - mc.textRenderer.getWidth(text) / 2, y + 5, Color.CYAN.getRGB(), true);
+        }
+    }
+
+    public class ModernSubMenuRenderer implements SkinRenderer<SubMenuOption> {
+        @Override
+        public void render(DrawContext drawContext, SubMenuOption option, int x, int y, int mouseX, int mouseY) {
+            option.setHeight(20);
+            option.setWidth(30);
+
+            drawContext.drawText(mc.textRenderer, option.name, x + 15, y + 25 / 2 - 5, -1, true);
+
+            option.set(x + width - 75, y);
+
+            drawContext.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+            RenderSystem.enableBlend();
+            RenderSystem.enableDepthTest();
+            drawContext.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+            String text = "Open";
+            drawContext.drawText(mc.textRenderer, text, option.getX() + option.getWidth() / 2 - mc.textRenderer.getWidth(text) / 2, y + 5, Color.YELLOW.getRGB(), true);
+
+            option.getSubMenu().render(drawContext, x + option.getParentMenu().getWidth(), y, mouseX, mouseY);
+        }
+    }
+
+    public class ModernRunnableRenderer implements SkinRenderer<RunnableOption> {
+        Color DARK_RED = new Color(116, 0, 0);
+        Color DARK_GREEN = new Color(24, 132, 0, 226);
+
+        @Override
+        public void render(DrawContext drawContext, RunnableOption option, int x, int y, int mouseX, int mouseY) {
+            option.setHeight(25);
+            option.setWidth(26);
+
+            drawContext.drawText(mc.textRenderer, option.name.replaceFirst("Run: ", "") + ": ", x + 15, y + 25 / 2 - 5, -1, true);
+
+            option.set(x + width - 75, y);
 
+            drawContext.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+            RenderSystem.enableBlend();
+            RenderSystem.enableDepthTest();
+            drawContext.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+            drawContext.drawText(mc.textRenderer, "Run", option.getX() + option.getWidth() / 2 - mc.textRenderer.getWidth("Run") / 2, y + 5, option.value ? DARK_GREEN.getRGB() : DARK_RED.getRGB(), true);
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/Skin.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/Skin.java
index fd4dbc7..1d7eda0 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/Skin.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/Skin.java
@@ -2,14 +2,22 @@
 
 import com.tanishisherewith.dynamichud.utils.contextmenu.ContextMenu;
 import com.tanishisherewith.dynamichud.utils.contextmenu.options.Option;
+import com.tanishisherewith.dynamichud.utils.contextmenu.options.OptionGroup;
+import com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.interfaces.GroupableSkin;
+import com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.interfaces.SkinRenderer;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.function.Supplier;
 
 public abstract class Skin {
+    protected static final MinecraftClient mc = MinecraftClient.getInstance();
     protected ContextMenu contextMenu;
-    protected Map<Class<? extends Option<?>>, SkinRenderer<? extends Option<?>>> renderers = new HashMap<>();
+    protected Map<Class<? extends Option<?>>, Supplier<SkinRenderer<? extends Option<?>>>> renderers = new HashMap<>();
     private boolean createNewScreen;
 
     public Skin(ContextMenu menu) {
@@ -19,20 +27,56 @@ public Skin(ContextMenu menu) {
     public Skin() {
     }
 
-    public <T extends Option<?>> void addRenderer(Class<T> optionClass, SkinRenderer<? super T> renderer) {
+    public <T extends Option<?>> void addRenderer(Class<T> optionClass, Supplier<SkinRenderer<?>> renderer) {
         renderers.put(optionClass, renderer);
     }
 
     @SuppressWarnings("unchecked")
     public <T extends Option<?>> SkinRenderer<T> getRenderer(Class<T> optionClass) {
-        return (SkinRenderer<T>) renderers.get(optionClass);
+        Supplier<SkinRenderer<? extends Option<?>>> supplier = renderers.get(optionClass);
+        if (supplier != null) {
+            return (SkinRenderer<T>) supplier.get();
+        }
+        return null;
+    }
+
+    /**
+     * Whether this skin supports rendering option groups.
+     * If false, groups should be flattened before rendering.
+     */
+    public boolean supportsGroups() {
+        return this instanceof GroupableSkin; // Check if the skin supports groups
+    }
+
+    /**
+     * Flatten a list of options, expanding any groups into their constituent options.
+     * Used by skins that don't support group rendering.
+     */
+    protected List<Option<?>> flattenOptions(List<Option<?>> options) {
+        List<Option<?>> flattened = new ArrayList<>();
+
+        for (Option<?> option : options) {
+            if (option instanceof OptionGroup group) {
+                // Create a new list with type List<Option<?>>
+                ArrayList groupOptions = new ArrayList<>(group.getGroupOptions());
+                flattened.addAll(flattenOptions(groupOptions));
+            } else {
+                flattened.add(option);
+            }
+        }
+
+        return flattened;
+    }
+
+    protected List<Option<?>> getOptions(ContextMenu menu){
+        return supportsGroups() ? menu.getOptions() : flattenOptions(menu.getOptions());
     }
 
     public void setContextMenu(ContextMenu contextMenu) {
         this.contextMenu = contextMenu;
     }
 
-    public void setRenderers(Map<Class<? extends Option<?>>, SkinRenderer<? extends Option<?>>> renderers) {
+    public void setRenderers(Map<Class<? extends Option<?>>, Supplier<SkinRenderer<? extends Option<?>>>> renderers) {
         this.renderers = renderers;
     }
 
@@ -66,4 +110,8 @@ public boolean shouldCreateNewScreen() {
     public void setCreateNewScreen(boolean createNewScreen) {
         this.createNewScreen = createNewScreen;
     }
+
+    protected boolean isMouseOver(double mouseX, double mouseY, double x, double y, double width, double height) {
+        return mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + height;
+    }
 }
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/interfaces/GroupableSkin.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/interfaces/GroupableSkin.java
new file mode 100644
index 0000000..f41c5a0
--- /dev/null
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/interfaces/GroupableSkin.java
@@ -0,0 +1,11 @@
+package com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.interfaces;
+
+import com.tanishisherewith.dynamichud.utils.contextmenu.layout.LayoutContext;
+import com.tanishisherewith.dynamichud.utils.contextmenu.options.OptionGroup;
+import net.minecraft.client.gui.DrawContext;
+
+public interface GroupableSkin {
+    LayoutContext.Offset getGroupIndent();
+    void renderGroup(DrawContext drawContext, OptionGroup group,int groupX, int groupY, int mouseX, int mouseY);
+}
+
diff --git a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/SkinRenderer.java b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/interfaces/SkinRenderer.java
similarity index 71%
rename from src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/SkinRenderer.java
rename to src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/interfaces/SkinRenderer.java
index bf03311..aeeab58 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/SkinRenderer.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/skinsystem/interfaces/SkinRenderer.java
@@ -1,4 +1,4 @@
-package com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem;
+package com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.interfaces;
 
 import com.tanishisherewith.dynamichud.utils.contextmenu.options.Option;
 import net.minecraft.client.gui.DrawContext;
@@ -7,24 +7,27 @@ public interface SkinRenderer<T extends Option<?>>  {
     void render(DrawContext drawContext, T option, int x, int y, int mouseX, int mouseY);
 
     default boolean mouseClicked(T option, double mouseX, double mouseY, int button) {
-        return option.isMouseOver(mouseX, mouseY);
+        return option.mouseClicked(mouseX, mouseY,button);
     }
 
     default boolean mouseReleased(T option, double mouseX, double mouseY, int button) {
-        return option.isMouseOver(mouseX, mouseY);
+        return option.mouseReleased(mouseX, mouseY,button);
     }
 
     default boolean mouseDragged(T option, double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-        return option.isMouseOver(mouseX, mouseY);
+        return option.mouseDragged(mouseX, mouseY,button,deltaX,deltaY);
     }
 
     default void keyPressed(T option, int key, int scanCode, int modifiers) {
+        option.keyPressed(key, scanCode,modifiers);
     }
 
     default void keyReleased(T option, int key, int scanCode, int modifiers) {
+        option.keyReleased(key, scanCode,modifiers);
     }
 
     default void mouseScrolled(T option, double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
+        option.mouseScrolled(mouseX, mouseY,horizontalAmount,verticalAmount);
     }
 
     default void init(T option) {
diff --git a/src/main/java/com/tanishisherewith/dynamichud/widgets/ItemWidget.java b/src/main/java/com/tanishisherewith/dynamichud/widgets/ItemWidget.java
index 11d46e4..bf8c2b9 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/widgets/ItemWidget.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/widgets/ItemWidget.java
@@ -12,7 +12,9 @@
  * This is just an example widget, not supposed to be used.
  */
 public class ItemWidget extends Widget {
-    public ItemStack item;    public static WidgetData<?> DATA = new WidgetData<>("ItemWidget", "Displays item texture", ItemWidget::new);
+    public ItemStack item;
+    public static WidgetData<?> DATA = new WidgetData<>("ItemWidget", "Displays item texture", ItemWidget::new);
+
     public ItemWidget(ItemStack itemStack, String modId) {
         super(DATA, modId);
         this.item = itemStack;
@@ -62,6 +64,4 @@ public ItemWidget build() {
             return new ItemWidget(itemStack, modID);
         }
     }
-
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/tanishisherewith/dynamichud/widgets/TextWidget.java b/src/main/java/com/tanishisherewith/dynamichud/widgets/TextWidget.java
index 7fd5f8d..e14ba61 100644
--- a/src/main/java/com/tanishisherewith/dynamichud/widgets/TextWidget.java
+++ b/src/main/java/com/tanishisherewith/dynamichud/widgets/TextWidget.java
@@ -10,7 +10,10 @@
 import com.tanishisherewith.dynamichud.utils.contextmenu.options.BooleanOption;
 import com.tanishisherewith.dynamichud.utils.contextmenu.options.ColorOption;
 import com.tanishisherewith.dynamichud.utils.contextmenu.options.DoubleOption;
+import com.tanishisherewith.dynamichud.utils.contextmenu.options.OptionGroup;
+import com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.ClassicSkin;
 import com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.MinecraftSkin;
+import com.tanishisherewith.dynamichud.utils.contextmenu.skinsystem.ModernSkin;
 import com.tanishisherewith.dynamichud.widget.Widget;
 import com.tanishisherewith.dynamichud.widget.WidgetData;
 import net.minecraft.client.gui.DrawContext;
@@ -74,14 +77,41 @@ public TextWidget(DynamicValueRegistry dynamicValueRegistry, String dynamicRegis
     }
 
     public void createMenu() {
-        ContextMenuProperties properties = ContextMenuProperties.builder().skin(new MinecraftSkin(MinecraftSkin.PanelColor.COFFEE_BROWN)).build();
+        ContextMenuProperties properties = ContextMenuProperties.builder().skin(new ModernSkin()).build();
 
         menu = new ContextMenu(getX(), getY(), properties);
         menu.getProperties().getSkin().setContextMenu(menu);
-        menu.addOption(new BooleanOption("Shadow", () -> this.shadow, value -> this.shadow = value, BooleanOption.BooleanType.ON_OFF));
-        menu.addOption(new BooleanOption("Rainbow", () -> this.rainbow, value -> this.rainbow = value, BooleanOption.BooleanType.ON_OFF));
-        menu.addOption(new ColorOption("TextColor", menu, () -> this.textColor, value -> this.textColor = value));
-        menu.addOption(new DoubleOption("RainbowSpeed", 1, 5.0f, 1, () -> (double) this.rainbowSpeed, value -> this.rainbowSpeed = value.intValue(), menu));
+        menu.addOption(new BooleanOption("Shadow", () -> this.shadow, value -> this.shadow = value, BooleanOption.BooleanType.ON_OFF)
+                .description("Adds shadow to your text")
+        );
+        menu.addOption(new BooleanOption("Rainbow",
+                () -> this.rainbow, value -> this.rainbow = value, BooleanOption.BooleanType.ON_OFF)
+                .description("Adds rainbow effect to your text")
+        );
+
+        OptionGroup group = new OptionGroup("Color");
+        group.addOption(new ColorOption("TextColor", menu,
+                () -> this.textColor, value -> this.textColor = value)
+                .description("Specify the color you want to add to your text")
+        );
+        group.addOption(new DoubleOption(
+                "RainbowSpeed",
+                1, 5.0f, 1,
+                () -> (double) this.rainbowSpeed, value -> this.rainbowSpeed = value.intValue(), menu)
+                .setShouldRender( ()-> this.rainbow)
+        );
+        menu.addOption(group);
+
+        /*
+        menu.addOption(new ColorOption("TextColor", menu, () -> this.textColor, value -> this.textColor = value).description("Specify the color you want to add to your text"));
+        menu.addOption(new DoubleOption(
+                "RainbowSpeed",
+                1, 5.0f, 1,
+                () -> (double) this.rainbowSpeed, value -> this.rainbowSpeed = value.intValue(), menu)
+                .setShouldRender( ()-> this.rainbow)
+        );
+
+         */
 
         /* TEST
         AtomicReference<String> option = new AtomicReference<>("Enum1");
@@ -228,6 +258,4 @@ public TextWidget build() {
             return widget;
         }
     }
-
-
 }