diff --git a/invui-core/src/main/java/xyz/xenondevs/invui/gui/AbstractGui.java b/invui-core/src/main/java/xyz/xenondevs/invui/gui/AbstractGui.java
index 1ea758f..cc8c219 100644
--- a/invui-core/src/main/java/xyz/xenondevs/invui/gui/AbstractGui.java
+++ b/invui-core/src/main/java/xyz/xenondevs/invui/gui/AbstractGui.java
@@ -710,7 +710,7 @@ public abstract class AbstractGui implements Gui, GuiParent {
         
         protected Structure structure;
         protected ItemProvider background;
-        protected List<Consumer<Gui>> modifiers;
+        protected List<Consumer<G>> modifiers;
         protected boolean frozen;
         
         @Override
@@ -804,7 +804,7 @@ public abstract class AbstractGui implements Gui, GuiParent {
         }
         
         @Override
-        public @NotNull S addModifier(@NotNull Consumer<@NotNull Gui> modifier) {
+        public @NotNull S addModifier(@NotNull Consumer<@NotNull G> modifier) {
             if (modifiers == null)
                 modifiers = new ArrayList<>();
             
@@ -813,7 +813,7 @@ public abstract class AbstractGui implements Gui, GuiParent {
         }
         
         @Override
-        public @NotNull S setModifiers(@NotNull List<@NotNull Consumer<@NotNull Gui>> modifiers) {
+        public @NotNull S setModifiers(@NotNull List<@NotNull Consumer<@NotNull G>> modifiers) {
             this.modifiers = modifiers;
             return (S) this;
         }
diff --git a/invui-core/src/main/java/xyz/xenondevs/invui/gui/Gui.java b/invui-core/src/main/java/xyz/xenondevs/invui/gui/Gui.java
index e49db97..348d76c 100644
--- a/invui-core/src/main/java/xyz/xenondevs/invui/gui/Gui.java
+++ b/invui-core/src/main/java/xyz/xenondevs/invui/gui/Gui.java
@@ -554,7 +554,7 @@ public interface Gui {
          * @return This {@link Builder Gui Builder}
          */
         @Contract("_ -> this")
-        @NotNull S addModifier(@NotNull Consumer<@NotNull Gui> modifier);
+        @NotNull S addModifier(@NotNull Consumer<@NotNull G> modifier);
         
         /**
          * Sets the background of the {@link Gui}.
@@ -563,7 +563,7 @@ public interface Gui {
          * @return This {@link Builder Gui Builder}
          */
         @Contract("_ -> this")
-        @NotNull S setModifiers(@NotNull List<@NotNull Consumer<@NotNull Gui>> modifiers);
+        @NotNull S setModifiers(@NotNull List<@NotNull Consumer<@NotNull G>> modifiers);
         
         /**
          * Builds the {@link Gui}.
diff --git a/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java b/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java
index 5a43984..6def161 100644
--- a/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java
+++ b/invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java
@@ -453,7 +453,7 @@ public abstract class AbstractWindow implements Window, GuiParent {
         protected List<Runnable> openHandlers;
         protected List<Runnable> closeHandlers;
         protected List<Consumer<InventoryClickEvent>> outsideClickHandlers;
-        protected List<Consumer<Window>> modifiers;
+        protected List<Consumer<W>> modifiers;
         
         @Override
         public @NotNull S setViewer(@NotNull Player viewer) {
@@ -531,13 +531,13 @@ public abstract class AbstractWindow implements Window, GuiParent {
         }
         
         @Override
-        public @NotNull S setModifiers(@Nullable List<@NotNull Consumer<@NotNull Window>> modifiers) {
+        public @NotNull S setModifiers(@Nullable List<@NotNull Consumer<@NotNull W>> modifiers) {
             this.modifiers = modifiers;
             return (S) this;
         }
         
         @Override
-        public @NotNull S addModifier(@NotNull Consumer<@NotNull Window> modifier) {
+        public @NotNull S addModifier(@NotNull Consumer<@NotNull W> modifier) {
             if (modifiers == null)
                 modifiers = new ArrayList<>();
             
diff --git a/invui-core/src/main/java/xyz/xenondevs/invui/window/Window.java b/invui-core/src/main/java/xyz/xenondevs/invui/window/Window.java
index f66a14b..e9549ca 100644
--- a/invui-core/src/main/java/xyz/xenondevs/invui/window/Window.java
+++ b/invui-core/src/main/java/xyz/xenondevs/invui/window/Window.java
@@ -343,7 +343,7 @@ public interface Window {
          * @return This {@link Builder Window Builder}
          */
         @Contract("_ -> this")
-        @NotNull S setModifiers(@Nullable List<@NotNull Consumer<@NotNull Window>> modifiers);
+        @NotNull S setModifiers(@Nullable List<@NotNull Consumer<@NotNull W>> modifiers);
         
         /**
          * Adds a modifier to the {@link Window}.
@@ -352,7 +352,7 @@ public interface Window {
          * @return This {@link Builder Window Builder}
          */
         @Contract("_ -> this")
-        @NotNull S addModifier(@NotNull Consumer<@NotNull Window> modifier);
+        @NotNull S addModifier(@NotNull Consumer<@NotNull W> modifier);
         
         /**
          * Builds the {@link Window}.