diff --git a/build.gradle b/build.gradle
index 3e2f3c9..c14518a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,9 +52,7 @@ dependencies {
 
 sourceSets {
 	main {
-		def generatedJava = layout.buildDirectory.dir("generated/reglass/main/java")
 		def generatedResources = layout.buildDirectory.dir("generated/reglass/main/resources")
-		java.setSrcDirs(files(generatedJava))
 		resources.setSrcDirs(files(generatedResources))
 		if (!project.minecraft_version.startsWith("1.")) {
 			java {
@@ -163,18 +161,12 @@ def preprocessReglassTree = { File input, File output, String minecraftVersion -
 }
 
 def preprocessReglassSources = tasks.register('preprocessReglassSources') {
-	def generatedJava = layout.buildDirectory.dir("generated/reglass/main/java")
 	def generatedResources = layout.buildDirectory.dir("generated/reglass/main/resources")
-	inputs.dir(rootProject.file('src/main/java'))
 	inputs.dir(rootProject.file('src/main/resources'))
-	outputs.dir(generatedJava)
 	outputs.dir(generatedResources)
 	doLast {
-		def javaOutput = generatedJava.get().asFile
 		def resourcesOutput = generatedResources.get().asFile
-		javaOutput.deleteDir()
 		resourcesOutput.deleteDir()
-		preprocessReglassTree(rootProject.file('src/main/java'), javaOutput, project.minecraft_version)
 		preprocessReglassTree(rootProject.file('src/main/resources'), resourcesOutput, project.minecraft_version)
 	}
 }
diff --git a/gradle.properties b/gradle.properties
index 4830eae..6dfe06b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,7 @@ org.gradle.configuration-cache=false
 dev.kikugie.stonecutter.hard_mode=true
 
 # Build Plugins
-stonecutter_version=0.9.3
+stonecutter_version=0.9.6
 
 # Mod Properties
 mod_version=2.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 8bdaf60..b1b8ef5 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1a70468..b52fb7e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,6 +2,8 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index adff685..b9bb139 100755
--- a/gradlew
+++ b/gradlew
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
diff --git a/gradlew.bat b/gradlew.bat
index c4bdd3a..24c62d5 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -23,8 +23,8 @@
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,7 +65,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
@@ -73,21 +73,10 @@ goto fail
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%
diff --git a/settings.gradle b/settings.gradle
index 3806737..943c648 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,6 +6,10 @@ pluginManagement {
 		}
 		mavenCentral()
 		gradlePluginPortal()
+		maven {
+			url = "https://maven.kikugie.dev/snapshots"
+			name = "KikuGie Snapshots"
+		}
 	}
 }
 
@@ -16,7 +20,11 @@ plugins {
 rootProject.name = 'ReGlass'
 
 stonecutter {
+	// Enable Groovy DSL, as Stonecutter uses Kotlin by default
+	kotlinController = false
+	centralScript = "build.gradle"
+
 	create(getRootProject()) {
 		versions '26.2', '26.1', '1.21.11'
 	}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/restudio/reglass/client/ContainerColorContext.java b/src/main/java/restudio/reglass/client/ContainerColorContext.java
index 62e39d4..bd7b4cf 100644
--- a/src/main/java/restudio/reglass/client/ContainerColorContext.java
+++ b/src/main/java/restudio/reglass/client/ContainerColorContext.java
@@ -1,10 +1,10 @@
 package restudio.reglass.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.world.item.DyeColor;
-//#else
-import net.minecraft.util.DyeColor;
-//#endif
+//? } else {
+/*import net.minecraft.util.DyeColor;
+*///? }
 
 public final class ContainerColorContext {
     private static DyeColor lastShulkerColor;
diff --git a/src/main/java/restudio/reglass/client/LiquidGlassPipelines.java b/src/main/java/restudio/reglass/client/LiquidGlassPipelines.java
index e2f5fe9..f815235 100644
--- a/src/main/java/restudio/reglass/client/LiquidGlassPipelines.java
+++ b/src/main/java/restudio/reglass/client/LiquidGlassPipelines.java
@@ -1,27 +1,27 @@
 package restudio.reglass.client;
 
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-//#if MC >= 26.2
+//? if >= 26.2 {
 import com.mojang.blaze3d.PrimitiveTopology;
 import com.mojang.blaze3d.pipeline.BindGroupLayout;
 import com.mojang.blaze3d.pipeline.ColorTargetState;
-//#elseif MC >= 26
-import com.mojang.blaze3d.pipeline.DepthStencilState;
+//? } elif >= 26 {
+/*import com.mojang.blaze3d.pipeline.DepthStencilState;
 import com.mojang.blaze3d.platform.CompareOp;
-//#else
-import com.mojang.blaze3d.platform.DepthTestFunction;
-//#endif
+*///? } else {
+/*import com.mojang.blaze3d.platform.DepthTestFunction;
+*///? }
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.VertexFormat;
-//#if MC >= 26
+//? if >= 26 {
 import com.mojang.blaze3d.shaders.UniformType;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import net.minecraft.resources.Identifier;
-//#else
-import net.minecraft.client.gl.UniformType;
+//? } else {
+/*import net.minecraft.client.gl.UniformType;
 import net.minecraft.client.render.VertexFormats;
 import net.minecraft.util.Identifier;
-//#endif
+*///? }
 
 public final class LiquidGlassPipelines {
     private static RenderPipeline LIQUID_GLASS_GUI;
@@ -31,16 +31,16 @@ private LiquidGlassPipelines() {}
     public static synchronized RenderPipeline getGuiPipeline() {
         if (LIQUID_GLASS_GUI == null) {
             RenderPipeline.Builder b = RenderPipeline.builder()
-//#if MC >= 26
+//? if >= 26 {
                     .withLocation(Identifier.fromNamespaceAndPath("reglass", "pipeline/liquid_glass_gui"))
                     .withVertexShader(Identifier.fromNamespaceAndPath("reglass", "core/blit_fullscreen"))
                     .withFragmentShader(Identifier.fromNamespaceAndPath("reglass", "program/liquid_glass_gui"))
-//#else
-                    .withLocation(Identifier.of("reglass", "pipeline/liquid_glass_gui"))
+//? } else {
+                    /*.withLocation(Identifier.of("reglass", "pipeline/liquid_glass_gui"))
                     .withVertexShader(Identifier.of("reglass", "core/blit_fullscreen"))
                     .withFragmentShader(Identifier.of("reglass", "program/liquid_glass_gui"))
-//#endif
-//#if MC >= 26.2
+*///? }
+//? if >= 26.2 {
                     //Vulkan requires pipeline layouts to match actual shader bindings
                     //unused entries can break pipeline creation
                     .withBindGroupLayout(
@@ -62,8 +62,8 @@ public static synchronized RenderPipeline getGuiPipeline() {
                     //Minecraft leaves the no-depth Vulkan pipeline variant invalid, which can crash when bound.
                     //the blend attachment still has to match the color target format
                     .withColorTargetState(ColorTargetState.DEFAULT);
-//#else
-                    .withUniform("Projection", UniformType.UNIFORM_BUFFER)
+//? } else {
+                    /*.withUniform("Projection", UniformType.UNIFORM_BUFFER)
                     .withUniform("SamplerInfo", UniformType.UNIFORM_BUFFER)
                     .withUniform("CustomUniforms", UniformType.UNIFORM_BUFFER)
                     .withUniform("WidgetInfo", UniformType.UNIFORM_BUFFER)
@@ -74,22 +74,22 @@ public static synchronized RenderPipeline getGuiPipeline() {
                     .withSampler("Sampler3")
                     .withSampler("Sampler4")
                     .withSampler("Sampler5")
-//#if MC >= 26
+//? if >= 26 {
                     .withDepthStencilState(new DepthStencilState(CompareOp.ALWAYS_PASS, false))
                     .withVertexFormat(DefaultVertexFormat.POSITION, VertexFormat.Mode.QUADS);
-//#else
-                    .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
+//? } else {
+                    /^.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
                     .withDepthWrite(false)
                     .withVertexFormat(VertexFormats.POSITION, VertexFormat.DrawMode.QUADS);
-//#endif
-//#endif
+^///? }
+*///? }
 
             LIQUID_GLASS_GUI = b.build();
-//#if MC >= 26.2
+//? if >= 26.2 {
             RenderSystem.getDevice().precompilePipeline(LIQUID_GLASS_GUI);
-//#else
-            RenderSystem.getDevice().precompilePipeline(LIQUID_GLASS_GUI, null);
-//#endif
+//? } else {
+            /*RenderSystem.getDevice().precompilePipeline(LIQUID_GLASS_GUI, null);
+*///? }
         }
         return LIQUID_GLASS_GUI;
     }
diff --git a/src/main/java/restudio/reglass/client/LiquidGlassPrecomputeRuntime.java b/src/main/java/restudio/reglass/client/LiquidGlassPrecomputeRuntime.java
index 3a0471b..db986b3 100644
--- a/src/main/java/restudio/reglass/client/LiquidGlassPrecomputeRuntime.java
+++ b/src/main/java/restudio/reglass/client/LiquidGlassPrecomputeRuntime.java
@@ -2,53 +2,53 @@
 
 import com.mojang.blaze3d.buffers.GpuBuffer;
 import com.mojang.blaze3d.buffers.Std140Builder;
-//#if MC >= 26.2
+//? if >= 26.2 {
 import com.mojang.blaze3d.GpuFormat;
 import com.mojang.blaze3d.PrimitiveTopology;
 import com.mojang.blaze3d.pipeline.BindGroupLayout;
 import com.mojang.blaze3d.pipeline.ColorTargetState;
-//#elseif MC >= 26
-import com.mojang.blaze3d.pipeline.DepthStencilState;
+//? } elif >= 26 {
+/*import com.mojang.blaze3d.pipeline.DepthStencilState;
 import com.mojang.blaze3d.platform.CompareOp;
-//#endif
+*///? }
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-//#if MC < 26
-import com.mojang.blaze3d.platform.DepthTestFunction;
-//#endif
+//? if < 26 {
+/*import com.mojang.blaze3d.platform.DepthTestFunction;
+*///? }
 import com.mojang.blaze3d.systems.RenderPass;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.textures.FilterMode;
 import com.mojang.blaze3d.textures.GpuTexture;
 import com.mojang.blaze3d.textures.GpuTextureView;
-//#if MC < 26.2
-import com.mojang.blaze3d.textures.TextureFormat;
-//#endif
+//? if < 26.2 {
+/*import com.mojang.blaze3d.textures.TextureFormat;
+*///? }
 import com.mojang.blaze3d.vertex.VertexFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-//#if MC >= 26.2
+//? if >= 26.2 {
 import java.util.Optional;
-//#else
-import java.util.OptionalInt;
-//#endif
-//#if MC >= 26
+//? } else {
+/*import java.util.OptionalInt;
+*///? }
+//? if >= 26 {
 import net.minecraft.client.Minecraft;
 import com.mojang.blaze3d.shaders.UniformType;
-//#else
-import net.minecraft.client.MinecraftClient;
+//? } else {
+/*import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gl.UniformType;
-//#endif
+*///? }
 import net.minecraft.client.gui.render.GuiRenderer;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.renderer.GameRenderer;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import net.minecraft.resources.Identifier;
-//#else
-import net.minecraft.client.render.GameRenderer;
+//? } else {
+/*import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.VertexFormats;
 import net.minecraft.util.Identifier;
-//#endif
+*///? }
 import restudio.reglass.client.api.ReGlassConfig;
 import restudio.reglass.client.gui.QuadVertexBufferProvider;
 import restudio.reglass.mixin.accessor.GameRendererAccessor;
@@ -77,27 +77,27 @@ public static LiquidGlassPrecomputeRuntime get() {
 
     private List<Integer> requestedRadii = new ArrayList<>();
 
-//#if MC >= 26
+//? if >= 26 {
     private static final Identifier VS_ID = Identifier.fromNamespaceAndPath("reglass", "core/blit_fullscreen");
     private static final Identifier BLUR_ID = Identifier.fromNamespaceAndPath("reglass", "program/blur");
-//#else
-    private static final Identifier VS_ID = Identifier.of("reglass", "core/blit_fullscreen");
+//? } else {
+    /*private static final Identifier VS_ID = Identifier.of("reglass", "core/blit_fullscreen");
     private static final Identifier BLUR_ID = Identifier.of("reglass", "program/blur");
-//#endif
+*///? }
 
     private LiquidGlassPrecomputeRuntime() {}
 
     private void ensurePipelines() {
         if (blurPipeline == null) {
             blurPipeline = RenderPipeline.builder()
-//#if MC >= 26
+//? if >= 26 {
                     .withLocation(Identifier.fromNamespaceAndPath("reglass", "pipeline/blur"))
-//#else
-                    .withLocation(Identifier.of("reglass", "pipeline/blur"))
-//#endif
+//? } else {
+                    /*.withLocation(Identifier.of("reglass", "pipeline/blur"))
+*///? }
                     .withVertexShader(VS_ID)
                     .withFragmentShader(BLUR_ID)
-//#if MC >= 26.2
+//? if >= 26.2 {
                     .withBindGroupLayout(
                             BindGroupLayout.builder()
                                     .withUniform("SamplerInfo", UniformType.UNIFORM_BUFFER)
@@ -108,26 +108,26 @@ private void ensurePipelines() {
                     .withVertexBinding(0, DefaultVertexFormat.POSITION)
                     .withPrimitiveTopology(PrimitiveTopology.QUADS)
                     .withColorTargetState(ColorTargetState.DEFAULT)
-//#else
-                    .withUniform("Projection", UniformType.UNIFORM_BUFFER)
+//? } else {
+                    /*.withUniform("Projection", UniformType.UNIFORM_BUFFER)
                     .withUniform("SamplerInfo", UniformType.UNIFORM_BUFFER)
                     .withUniform("Config", UniformType.UNIFORM_BUFFER)
                     .withSampler("DiffuseSampler")
-//#if MC >= 26
+//? if >= 26 {
                     .withDepthStencilState(new DepthStencilState(CompareOp.ALWAYS_PASS, false))
                     .withVertexFormat(DefaultVertexFormat.POSITION, VertexFormat.Mode.QUADS)
-//#else
-                    .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
+//? } else {
+                    /^.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
                     .withDepthWrite(false)
                     .withVertexFormat(VertexFormats.POSITION, VertexFormat.DrawMode.QUADS)
-//#endif
-//#endif
+^///? }
+*///? }
                     .build();
-//#if MC >= 26.2
+//? if >= 26.2 {
             RenderSystem.getDevice().precompilePipeline(blurPipeline);
-//#else
-            RenderSystem.getDevice().precompilePipeline(blurPipeline, null);
-//#endif
+//? } else {
+            /*RenderSystem.getDevice().precompilePipeline(blurPipeline, null);
+*///? }
         }
 
         if (samplerInfoUbo == null) {
@@ -149,11 +149,11 @@ private void ensureTempTarget(int w, int h) {
                 if (blurTempView != null) blurTempView.close();
                 blurTempTex.close();
             }
-//#if MC >= 26.2
+//? if >= 26.2 {
             blurTempTex = RenderSystem.getDevice().createTexture("reglass blurTemp", 12, GpuFormat.RGBA8_UNORM, w, h, 1, 1);
-//#else
-            blurTempTex = RenderSystem.getDevice().createTexture("reglass blurTemp", 12, TextureFormat.RGBA8, w, h, 1, 1);
-//#endif
+//? } else {
+            /*blurTempTex = RenderSystem.getDevice().createTexture("reglass blurTemp", 12, TextureFormat.RGBA8, w, h, 1, 1);
+*///? }
             blurTempView = RenderSystem.getDevice().createTextureView(blurTempTex);
         }
     }
@@ -166,11 +166,11 @@ private void ensureOutputForRadius(int w, int h, int radius) {
                 if (old != null) old.close();
                 tex.close();
             }
-//#if MC >= 26.2
+//? if >= 26.2 {
             GpuTexture newTex = RenderSystem.getDevice().createTexture("reglass blurred r=" + radius, 12, GpuFormat.RGBA8_UNORM, w, h, 1, 1);
-//#else
-            GpuTexture newTex = RenderSystem.getDevice().createTexture("reglass blurred r=" + radius, 12, TextureFormat.RGBA8, w, h, 1, 1);
-//#endif
+//? } else {
+            /*GpuTexture newTex = RenderSystem.getDevice().createTexture("reglass blurred r=" + radius, 12, TextureFormat.RGBA8, w, h, 1, 1);
+*///? }
             GpuTextureView newView = RenderSystem.getDevice().createTextureView(newTex);
             blurredByRadius.put(radius, newTex);
             blurredViewByRadius.put(radius, newView);
@@ -195,11 +195,11 @@ private static float[] gaussian(int radius) {
     private void uploadBlur(GpuBuffer ubo, float dx, float dy, int radius) {
         radius = Math.max(0, Math.min(radius, MAX_RADIUS));
         float[] weights = gaussian(radius);
-//#if MC >= 26.2
+//? if >= 26.2 {
         try (var map = ubo.map(false, true)) {
-//#else
-        try (var map = RenderSystem.getDevice().createCommandEncoder().mapBuffer(ubo, false, true)) {
-//#endif
+//? } else {
+        /*try (var map = RenderSystem.getDevice().createCommandEncoder().mapBuffer(ubo, false, true)) {
+*///? }
             Std140Builder b = Std140Builder.intoBuffer(map.data());
             b.putVec4(dx, dy, (float) radius, 0f);
             for (int i = 0; i <= MAX_RADIUS; i++) {
@@ -217,30 +217,30 @@ public void setRequestedRadii(List<Integer> ordered) {
     public void run() {
         ensurePipelines();
 
-//#if MC >= 26.2
+//? if >= 26.2 {
         var mc = Minecraft.getInstance();
         var main = mc.gameRenderer.mainRenderTarget();
         int w = main.width;
         int h = main.height;
-//#elseif MC >= 26
-        var mc = Minecraft.getInstance();
+//? } elif >= 26 {
+        /*var mc = Minecraft.getInstance();
         var main = mc.getMainRenderTarget();
         int w = main.width;
         int h = main.height;
-//#else
-        var mc = MinecraftClient.getInstance();
+*///? } else {
+        /*var mc = MinecraftClient.getInstance();
         var main = mc.getFramebuffer();
         int w = main.textureWidth;
         int h = main.textureHeight;
-//#endif
+*///? }
 
         ensureTempTarget(w, h);
 
-//#if MC >= 26.2
+//? if >= 26.2 {
         try (var map = samplerInfoUbo.map(false, true)) {
-//#else
-        try (var map = RenderSystem.getDevice().createCommandEncoder().mapBuffer(samplerInfoUbo, false, true)) {
-//#endif
+//? } else {
+        /*try (var map = RenderSystem.getDevice().createCommandEncoder().mapBuffer(samplerInfoUbo, false, true)) {
+*///? }
             Std140Builder.intoBuffer(map.data()).putVec2((float) w, (float) h).putVec2((float) w, (float) h);
         }
 
@@ -248,98 +248,98 @@ public void run() {
         GameRenderer gameRenderer = mc.gameRenderer;
         GuiRenderer guiRenderer = ((GameRendererAccessor) gameRenderer).getGuiRenderer();
         var quadVB = ((QuadVertexBufferProvider) guiRenderer).getQuadVertexBuffer();
-//#if MC >= 26.2
+//? if >= 26.2 {
         var idxInfo = RenderSystem.getSequentialBuffer(PrimitiveTopology.QUADS);
         var ib = idxInfo.getBuffer(6);
         var it = idxInfo.type();
-//#elseif MC >= 26
-        var idxInfo = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS);
+//? } elif >= 26 {
+        /*var idxInfo = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS);
         var ib = idxInfo.getBuffer(6);
         var it = idxInfo.type();
-//#else
-        var idxInfo = RenderSystem.getSequentialBuffer(VertexFormat.DrawMode.QUADS);
+*///? } else {
+        /*var idxInfo = RenderSystem.getSequentialBuffer(VertexFormat.DrawMode.QUADS);
         var ib = idxInfo.getIndexBuffer(6);
         var it = idxInfo.getIndexType();
-//#endif
+*///? }
 
         int max = Math.min(LiquidGlassUniforms.MAX_BLUR_LEVELS, requestedRadii == null ? 0 : requestedRadii.size());
         if (max == 0) {
-//#if MC >= 26
+//? if >= 26 {
             int r = Math.max(1, ReGlassConfig.INSTANCE.defaultBlurRadius);
-//#else
-            int r = ReGlassConfig.INSTANCE.defaultBlurRadius;
-//#endif
+//? } else {
+            /*int r = ReGlassConfig.INSTANCE.defaultBlurRadius;
+*///? }
             requestedRadii = List.of(r);
             max = 1;
         }
 
         for (int k = 0; k < max; k++) {
-//#if MC >= 26
+//? if >= 26 {
             int radius = Math.max(1, requestedRadii.get(k));
-//#else
-            int radius = requestedRadii.get(k);
+//? } else {
+            /*int radius = requestedRadii.get(k);
             if (radius <= 0) {
                 continue;
             }
-//#endif
+*///? }
 
             ensureOutputForRadius(w, h, radius);
 
             uploadBlur(blurConfigUboX, 1f, 0f, radius);
             uploadBlur(blurConfigUboY, 0f, 1f, radius);
 
-//#if MC >= 26.2
+//? if >= 26.2 {
             try (RenderPass pass = ce.createRenderPass(() -> "reglass blur X r=" + radius, blurTempView, Optional.empty())) {
-//#else
-            try (RenderPass pass = ce.createRenderPass(() -> "reglass blur X r=" + radius, blurTempView, OptionalInt.empty())) {
-//#endif
+//? } else {
+            /*try (RenderPass pass = ce.createRenderPass(() -> "reglass blur X r=" + radius, blurTempView, OptionalInt.empty())) {
+*///? }
                 pass.setPipeline(blurPipeline);
-//#if MC < 26.2
-                RenderSystem.bindDefaultUniforms(pass);
-//#endif
+//? if < 26.2 {
+                /*RenderSystem.bindDefaultUniforms(pass);
+*///? }
                 pass.setUniform("SamplerInfo", samplerInfoUbo);
                 pass.setUniform("Config", blurConfigUboX);
-//#if MC >= 26
+//? if >= 26 {
                 pass.bindTexture("DiffuseSampler", main.getColorTextureView(), RenderSystem.getSamplerCache().getClampToEdge(FilterMode.LINEAR));
-//#else
-                pass.bindTexture("DiffuseSampler", main.getColorAttachmentView(), RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
-//#endif
-//#if MC >= 26.2
+//? } else {
+                /*pass.bindTexture("DiffuseSampler", main.getColorAttachmentView(), RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
+*///? }
+//? if >= 26.2 {
                 pass.setVertexBuffer(0, quadVB.slice());
                 pass.setIndexBuffer(ib, it);
                 pass.drawIndexed(6, 1, 0, 0, 0);
-//#else
-                pass.setVertexBuffer(0, quadVB);
+//? } else {
+                /*pass.setVertexBuffer(0, quadVB);
                 pass.setIndexBuffer(ib, it);
                 pass.drawIndexed(0, 0, 6, 1);
-//#endif
+*///? }
             }
 
-//#if MC >= 26.2
+//? if >= 26.2 {
             try (RenderPass pass = ce.createRenderPass(() -> "reglass blur Y r=" + radius, blurredViewByRadius.get(radius), Optional.empty())) {
-//#else
-            try (RenderPass pass = ce.createRenderPass(() -> "reglass blur Y r=" + radius, blurredViewByRadius.get(radius), OptionalInt.empty())) {
-//#endif
+//? } else {
+            /*try (RenderPass pass = ce.createRenderPass(() -> "reglass blur Y r=" + radius, blurredViewByRadius.get(radius), OptionalInt.empty())) {
+*///? }
                 pass.setPipeline(blurPipeline);
-//#if MC < 26.2
-                RenderSystem.bindDefaultUniforms(pass);
-//#endif
+//? if < 26.2 {
+                /*RenderSystem.bindDefaultUniforms(pass);
+*///? }
                 pass.setUniform("SamplerInfo", samplerInfoUbo);
                 pass.setUniform("Config", blurConfigUboY);
-//#if MC >= 26
+//? if >= 26 {
                 pass.bindTexture("DiffuseSampler", blurTempView, RenderSystem.getSamplerCache().getClampToEdge(FilterMode.LINEAR));
-//#else
-                pass.bindTexture("DiffuseSampler", blurTempView, RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
-//#endif
-//#if MC >= 26.2
+//? } else {
+                /*pass.bindTexture("DiffuseSampler", blurTempView, RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
+*///? }
+//? if >= 26.2 {
                 pass.setVertexBuffer(0, quadVB.slice());
                 pass.setIndexBuffer(ib, it);
                 pass.drawIndexed(6, 1, 0, 0, 0);
-//#else
-                pass.setVertexBuffer(0, quadVB);
+//? } else {
+                /*pass.setVertexBuffer(0, quadVB);
                 pass.setIndexBuffer(ib, it);
                 pass.drawIndexed(0, 0, 6, 1);
-//#endif
+*///? }
             }
         }
     }
diff --git a/src/main/java/restudio/reglass/client/LiquidGlassUniforms.java b/src/main/java/restudio/reglass/client/LiquidGlassUniforms.java
index bc6835d..86161ff 100644
--- a/src/main/java/restudio/reglass/client/LiquidGlassUniforms.java
+++ b/src/main/java/restudio/reglass/client/LiquidGlassUniforms.java
@@ -8,18 +8,18 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
 import net.minecraft.util.ARGB;
-//#else
-import net.minecraft.client.MinecraftClient;
+//? } else {
+/*import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.ScreenRect;
 import net.minecraft.client.gui.render.state.GuiRenderState;
 import net.minecraft.util.math.ColorHelper;
-//#endif
+*///? }
 import org.joml.Vector3f;
 import org.joml.Vector4f;
 import org.lwjgl.glfw.GLFW;
@@ -27,17 +27,17 @@
 import restudio.reglass.client.api.WidgetStyle;
 import restudio.reglass.client.gui.LiquidGlassGuiElementRenderState;
 import restudio.reglass.client.runtime.ReGlassAnim;
-//#if MC < 26
-import restudio.reglass.mixin.accessor.GuiRenderStateAccessor;
-//#endif
+//? if < 26 {
+/*import restudio.reglass.mixin.accessor.GuiRenderStateAccessor;
+*///? }
 
 public final class LiquidGlassUniforms {
 
     private static final LiquidGlassUniforms INSTANCE = new LiquidGlassUniforms();
     public static final int MAX_WIDGETS = 64;
-//#if MC < 26
-    public static final int MAX_LAYERS = 16;
-//#endif
+//? if < 26 {
+    /*public static final int MAX_LAYERS = 16;
+*///? }
     public static final int MAX_BLUR_LEVELS = 5;
 
     public static LiquidGlassUniforms get() { return INSTANCE; }
@@ -52,9 +52,9 @@ public final class LiquidGlassUniforms {
 
     private List<Integer> usedBlurRadiiOrdered = new ArrayList<>();
     private final HashMap<Integer, Integer> blurRadiusToIndex = new HashMap<>();
-//#if MC >= 26
+//? if >= 26 {
     private static final int MAX_LAYERS = 16;
-//#endif
+//? }
 
     private static final class FadeState {
         float hover;
@@ -107,33 +107,33 @@ public void beginFrame(double dtSeconds) {
         this.dtSeconds = Math.max(0.0, dtSeconds);
     }
 
-//#if MC >= 26
+//? if >= 26 {
     public boolean screenWantsBlur() { return this.screenWantsBlur; }
 
-//#endif
+//? }
     public void setScreenWantsBlur(boolean wantsBlur) { this.screenWantsBlur = wantsBlur; }
 
     public void uploadSharedUniforms() {
-//#if MC >= 26
+//? if >= 26 {
         Minecraft mc = Minecraft.getInstance();
-//#if MC >= 26.2
+//? if >= 26.2 {
         int outW = mc.gameRenderer.mainRenderTarget().width;
         int outH = mc.gameRenderer.mainRenderTarget().height;
-//#else
-        int outW = mc.getMainRenderTarget().width;
+//? } else {
+        /*int outW = mc.getMainRenderTarget().width;
         int outH = mc.getMainRenderTarget().height;
-//#endif
-//#else
-        MinecraftClient mc = MinecraftClient.getInstance();
+*///? }
+//? } else {
+        /*MinecraftClient mc = MinecraftClient.getInstance();
         int outW = mc.getFramebuffer().textureWidth;
         int outH = mc.getFramebuffer().textureHeight;
-//#endif
+*///? }
 
-//#if MC >= 26.2
+//? if >= 26.2 {
         try (var map = samplerInfo.map(false, true)) {
-//#else
-        try (var map = RenderSystem.getDevice().createCommandEncoder().mapBuffer(samplerInfo, false, true)) {
-//#endif
+//? } else {
+        /*try (var map = RenderSystem.getDevice().createCommandEncoder().mapBuffer(samplerInfo, false, true)) {
+*///? }
             Std140Builder b = Std140Builder.intoBuffer(map.data());
             b.putVec2((float) outW, (float) outH);
             b.putVec2((float) outW, (float) outH);
@@ -141,28 +141,28 @@ public void uploadSharedUniforms() {
 
         double[] mx = new double[1];
         double[] my = new double[1];
-//#if MC >= 26
+//? if >= 26 {
         GLFW.glfwGetCursorPos(mc.getWindow().handle(), mx, my);
         float scale = (float) mc.getWindow().getGuiScale();
-//#if MC >= 26.2
+//? if >= 26.2 {
         int fbH = mc.gameRenderer.mainRenderTarget().height;
-//#else
-        int fbH = mc.getMainRenderTarget().height;
-//#endif
-//#else
-        GLFW.glfwGetCursorPos(mc.getWindow().getHandle(), mx, my);
+//? } else {
+        /*int fbH = mc.getMainRenderTarget().height;
+*///? }
+//? } else {
+        /*GLFW.glfwGetCursorPos(mc.getWindow().getHandle(), mx, my);
         float scale = (float) mc.getWindow().getScaleFactor();
         int fbH = mc.getFramebuffer().textureHeight;
-//#endif
+*///? }
 
         float time = (float) GLFW.glfwGetTime();
         ReGlassConfig config = ReGlassConfig.INSTANCE;
 
-//#if MC >= 26.2
+//? if >= 26.2 {
         try (var map = customUniforms.map(false, true)) {
-//#else
-        try (var map = RenderSystem.getDevice().createCommandEncoder().mapBuffer(customUniforms, false, true)) {
-//#endif
+//? } else {
+        /*try (var map = RenderSystem.getDevice().createCommandEncoder().mapBuffer(customUniforms, false, true)) {
+*///? }
             Std140Builder b = Std140Builder.intoBuffer(map.data());
             b.putFloat(time);
             b.align(16);
@@ -175,11 +175,11 @@ public void uploadSharedUniforms() {
             b.putVec3(new Vector3f(dir2.x, dir2.y, 0.0f));
             b.align(16);
             int rc = config.rimLight.color();
-//#if MC >= 26
+//? if >= 26 {
             b.putVec4(ARGB.red(rc) / 255f, ARGB.green(rc) / 255f, ARGB.blue(rc) / 255f, config.rimLight.intensity());
-//#else
-            b.putVec4(ColorHelper.getRed(rc) / 255f, ColorHelper.getGreen(rc) / 255f, ColorHelper.getBlue(rc) / 255f, config.rimLight.intensity());
-//#endif
+//? } else {
+            /*b.putVec4(ColorHelper.getRed(rc) / 255f, ColorHelper.getGreen(rc) / 255f, ColorHelper.getBlue(rc) / 255f, config.rimLight.intensity());
+*///? }
             b.putFloat(config.pixelEpsilon);
             b.putFloat(ReGlassAnim.INSTANCE.debugStep());
             b.putFloat(config.features.pixelatedGrid ? 1.0f : 0.0f);
@@ -191,35 +191,35 @@ public void uploadSharedUniforms() {
             b.putFloat(ReGlassAnim.INSTANCE.focusBorderSpeed());
         }
 
-//#if MC >= 26.2
+//? if >= 26.2 {
         try (var map = bgConfig.map(false, true)) {
-//#else
-        try (var map = RenderSystem.getDevice().createCommandEncoder().mapBuffer(bgConfig, false, true)) {
-//#endif
+//? } else {
+        /*try (var map = RenderSystem.getDevice().createCommandEncoder().mapBuffer(bgConfig, false, true)) {
+*///? }
             Std140Builder b = Std140Builder.intoBuffer(map.data());
             b.putFloat(ReGlassAnim.INSTANCE.shadowExpand());
             b.putFloat(ReGlassAnim.INSTANCE.shadowFactor());
-//#if MC >= 26
+//? if >= 26 {
             float s = (float) mc.getWindow().getGuiScale();
-//#else
-            float s = (float) mc.getWindow().getScaleFactor();
-//#endif
+//? } else {
+            /*float s = (float) mc.getWindow().getScaleFactor();
+*///? }
             b.putVec2(ReGlassAnim.INSTANCE.shadowOffsetX() * s, ReGlassAnim.INSTANCE.shadowOffsetY() * s);
         }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     public void tryApplyBlur(GuiGraphicsExtractor context) {
         if (!screenWantsBlur) {
             context.blurBeforeThisStratum();
             screenWantsBlur = true;
         }
-//#else
-    public void tryApplyBlur(DrawContext context) {
+//? } else {
+    /*public void tryApplyBlur(DrawContext context) {
         GuiRenderState state = context.state;
         int blurLayer = ((GuiRenderStateAccessor) state).getBlurLayer();
         if (blurLayer == Integer.MAX_VALUE) state.applyBlur();
-//#endif
+*///? }
     }
 
     public void addWidget(LiquidGlassGuiElementRenderState element) {
@@ -245,13 +245,13 @@ private float smoothToward(float current, float target, double dt, float tau) {
     }
 
     public void uploadWidgetInfo() {
-//#if MC >= 26
+//? if >= 26 {
         Minecraft mc = Minecraft.getInstance();
-//#if MC >= 26.2
+//? if >= 26.2 {
         int fbH = mc.gameRenderer.mainRenderTarget().height;
-//#else
-        int fbH = mc.getMainRenderTarget().height;
-//#endif
+//? } else {
+        /*int fbH = mc.getMainRenderTarget().height;
+*///? }
         float scale = (float) mc.getWindow().getGuiScale();
         List<LiquidGlassGuiElementRenderState> renderWidgets = new ArrayList<>(widgets);
         renderWidgets.sort((a, b) -> Integer.compare(a.style().getLayer(), b.style().getLayer()));
@@ -271,24 +271,24 @@ public void uploadWidgetInfo() {
             }
             layerCounts[layer]++;
         }
-//#else
-        MinecraftClient mc = MinecraftClient.getInstance();
+//? } else {
+        /*MinecraftClient mc = MinecraftClient.getInstance();
         int fbH = mc.getFramebuffer().textureHeight;
         float scale = (float) mc.getWindow().getScaleFactor();
-//#endif
+*///? }
 
         HashSet<Integer> requested = new HashSet<>();
-//#if MC >= 26
+//? if >= 26 {
         for (LiquidGlassGuiElementRenderState w : renderWidgets) {
-//#else
-        for (LiquidGlassGuiElementRenderState w : widgets) {
-//#endif
+//? } else {
+        /*for (LiquidGlassGuiElementRenderState w : widgets) {
+*///? }
             WidgetStyle s = w.style();
-//#if MC >= 26
+//? if >= 26 {
             requested.add(Math.max(1, s.getBlurRadius()));
-//#else
-            requested.add(Math.max(0, s.getBlurRadius()));
-//#endif
+//? } else {
+            /*requested.add(Math.max(0, s.getBlurRadius()));
+*///? }
         }
         List<Integer> sorted = requested.stream().sorted().toList();
         usedBlurRadiiOrdered = new ArrayList<>();
@@ -297,8 +297,8 @@ public void uploadWidgetInfo() {
         blurRadiusToIndex.clear();
         for (int i = 0; i < usedBlurRadiiOrdered.size(); i++) blurRadiusToIndex.put(usedBlurRadiiOrdered.get(i), i);
 
-//#if MC < 26
-        List<LiquidGlassGuiElementRenderState> renderWidgets = new ArrayList<>(widgets);
+//? if < 26 {
+        /*List<LiquidGlassGuiElementRenderState> renderWidgets = new ArrayList<>(widgets);
         renderWidgets.sort((a, b0) -> Integer.compare(a.style().getLayer(), b0.style().getLayer()));
 
         int[] layerStarts = new int[MAX_LAYERS];
@@ -314,23 +314,23 @@ public void uploadWidgetInfo() {
             layerCounts[layer]++;
         }
 
-//#endif
-//#if MC >= 26.2
+*///? }
+//? if >= 26.2 {
         try (var map = widgetInfo.map(false, true)) {
-//#else
-        try (var map = RenderSystem.getDevice().createCommandEncoder().mapBuffer(widgetInfo, false, true)) {
-//#endif
+//? } else {
+        /*try (var map = RenderSystem.getDevice().createCommandEncoder().mapBuffer(widgetInfo, false, true)) {
+*///? }
             Std140Builder b = Std140Builder.intoBuffer(map.data());
             b.putFloat((float) renderWidgets.size());
             b.align(16);
 
             for (int i = 0; i < MAX_LAYERS; i++) {
-//#if MC >= 26
+//? if >= 26 {
                 int start = layerStarts[i] < 0 ? 0 : layerStarts[i];
                 b.putVec4((float) start, (float) layerCounts[i], 0f, 0f);
-//#else
-                b.putVec4((float) layerStarts[i], (float) layerCounts[i], 0f, 0f);
-//#endif
+//? } else {
+                /*b.putVec4((float) layerStarts[i], (float) layerCounts[i], 0f, 0f);
+*///? }
             }
 
             for (int i = 0; i < MAX_WIDGETS; i++) {
@@ -363,11 +363,11 @@ public void uploadWidgetInfo() {
                 if (i < renderWidgets.size()) {
                     var style = renderWidgets.get(i).style();
                     int c = style.getTintColor();
-//#if MC >= 26
+//? if >= 26 {
                     b.putVec4(ARGB.red(c) / 255f, ARGB.green(c) / 255f, ARGB.blue(c) / 255f, style.getTintAlpha());
-//#else
-                    b.putVec4(ColorHelper.getRed(c) / 255f, ColorHelper.getGreen(c) / 255f, ColorHelper.getBlue(c) / 255f, style.getTintAlpha());
-//#endif
+//? } else {
+                    /*b.putVec4(ColorHelper.getRed(c) / 255f, ColorHelper.getGreen(c) / 255f, ColorHelper.getBlue(c) / 255f, style.getTintAlpha());
+*///? }
                 } else b.putVec4(0f, 0f, 0f, 0f);
             }
 
@@ -400,31 +400,31 @@ public void uploadWidgetInfo() {
             for (int i = 0; i < MAX_WIDGETS; i++) {
                 if (i < renderWidgets.size()) {
                     var w = renderWidgets.get(i);
-//#if MC >= 26
+//? if >= 26 {
                     ScreenRectangle sc = w.scissorArea();
-//#else
-                    ScreenRect sc = w.scissorArea();
-//#endif
+//? } else {
+                    /*ScreenRect sc = w.scissorArea();
+*///? }
                     if (sc != null) {
-//#if MC >= 26
+//? if >= 26 {
                         float sL = sc.left() * scale;
                         float sR = sc.right() * scale;
                         float sT = sc.top() * scale;
                         float sB = sc.bottom() * scale;
-//#else
-                        float sL = sc.getLeft() * scale;
+//? } else {
+                        /*float sL = sc.getLeft() * scale;
                         float sR = sc.getRight() * scale;
                         float sT = sc.getTop() * scale;
                         float sB = sc.getBottom() * scale;
-//#endif
+*///? }
                         b.putVec4(sL, fbH - sB, sR, fbH - sT);
-//#if MC >= 26.2
+//? if >= 26.2 {
                     } else b.putVec4(0f, 0f, (float) mc.gameRenderer.mainRenderTarget().width, (float) mc.gameRenderer.mainRenderTarget().height);
-//#elseif MC >= 26
-                    } else b.putVec4(0f, 0f, (float) mc.getMainRenderTarget().width, (float) mc.getMainRenderTarget().height);
-//#else
-                    } else b.putVec4(0f, 0f, (float) mc.getFramebuffer().textureWidth, (float) mc.getFramebuffer().textureHeight);
-//#endif
+//? } elif >= 26 {
+                    /*} else b.putVec4(0f, 0f, (float) mc.getMainRenderTarget().width, (float) mc.getMainRenderTarget().height);
+*///? } else {
+                    /*} else b.putVec4(0f, 0f, (float) mc.getFramebuffer().textureWidth, (float) mc.getFramebuffer().textureHeight);
+*///? }
                 } else b.putVec4(0f, 0f, 0f, 0f);
             }
 
@@ -441,22 +441,22 @@ public void uploadWidgetInfo() {
                 if (i < renderWidgets.size()) {
                     WidgetStyle s = renderWidgets.get(i).style();
                     int col = s.getShadowColor();
-//#if MC >= 26
+//? if >= 26 {
                     b.putVec4(ARGB.red(col) / 255f, ARGB.green(col) / 255f, ARGB.blue(col) / 255f, s.getShadowColorAlpha());
-//#else
-                    b.putVec4(ColorHelper.getRed(col) / 255f, ColorHelper.getGreen(col) / 255f, ColorHelper.getBlue(col) / 255f, s.getShadowColorAlpha());
-//#endif
+//? } else {
+                    /*b.putVec4(ColorHelper.getRed(col) / 255f, ColorHelper.getGreen(col) / 255f, ColorHelper.getBlue(col) / 255f, s.getShadowColorAlpha());
+*///? }
                 } else b.putVec4(0f, 0f, 0f, 0f);
             }
 
             for (int i = 0; i < MAX_WIDGETS; i++) {
                 if (i < renderWidgets.size()) {
                     WidgetStyle s = renderWidgets.get(i).style();
-//#if MC >= 26
+//? if >= 26 {
                     int radius = Math.max(1, s.getBlurRadius());
-//#else
-                    int radius = Math.max(0, s.getBlurRadius());
-//#endif
+//? } else {
+                    /*int radius = Math.max(0, s.getBlurRadius());
+*///? }
                     Integer idx = blurRadiusToIndex.get(radius);
                     if (idx == null) idx = 0;
                     var w = renderWidgets.get(i);
@@ -464,13 +464,13 @@ public void uploadWidgetInfo() {
                     FadeState fs = fades.computeIfAbsent(key, k -> new FadeState());
                     fs.hover = smoothToward(fs.hover, Math.max(0f, Math.min(1f, w.hover())), dtSeconds, 0.12f);
                     fs.focus = smoothToward(fs.focus, Math.max(0f, Math.min(1f, w.focus())), dtSeconds, 0.18f);
-//#if MC >= 26
+//? if >= 26 {
                     b.putVec4((float) idx, fs.hover, fs.focus, (float) s.getLayer());
-//#else
-                    double h = Math.sin(w.x1() * 12.9898 + w.y1() * 78.233 + i * 37.719);
+//? } else {
+                    /*double h = Math.sin(w.x1() * 12.9898 + w.y1() * 78.233 + i * 37.719);
                     float seed = (float) (h - Math.floor(h));
                     b.putVec4((float) idx, fs.hover, fs.focus, seed);
-//#endif
+*///? }
                 } else b.putVec4(0f, 0f, 0f, 0f);
             }
         }
diff --git a/src/main/java/restudio/reglass/client/LiquidGlassWidget.java b/src/main/java/restudio/reglass/client/LiquidGlassWidget.java
index f554027..9497b02 100644
--- a/src/main/java/restudio/reglass/client/LiquidGlassWidget.java
+++ b/src/main/java/restudio/reglass/client/LiquidGlassWidget.java
@@ -1,26 +1,26 @@
 package restudio.reglass.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.network.chat.Component;
-//#else
-import net.minecraft.client.gui.Click;
+//? } else {
+/*import net.minecraft.client.gui.Click;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.text.Text;
-//#endif
+*///? }
 import restudio.reglass.client.api.ReGlassApi;
 import restudio.reglass.client.api.WidgetStyle;
 
-//#if MC >= 26
+//? if >= 26 {
 public class LiquidGlassWidget extends AbstractWidget {
-//#else
-public class LiquidGlassWidget extends ClickableWidget {
-//#endif
+//? } else {
+/*public class LiquidGlassWidget extends ClickableWidget {
+*///? }
     private float cornerRadiusPx;
     private boolean moveable;
     private boolean dragging;
@@ -29,11 +29,11 @@ public class LiquidGlassWidget extends ClickableWidget {
     public WidgetStyle style = new WidgetStyle();
 
     public LiquidGlassWidget(int x, int y, int width, int height, WidgetStyle style) {
-//#if MC >= 26
+//? if >= 26 {
         super(x, y, width, height, Component.empty());
-//#else
-        super(x, y, width, height, Text.empty());
-//#endif
+//? } else {
+        /*super(x, y, width, height, Text.empty());
+*///? }
         this.cornerRadiusPx = 0.5f * Math.min(width, height);
         if (style != null) this.style = style;
     }
@@ -49,21 +49,21 @@ public LiquidGlassWidget setMoveable(boolean moveable) {
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public void extractWidgetRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
-//#else
-    public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
-//#endif
+//? } else {
+    /*public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+*///? }
         ReGlassApi.create(context).fromWidget(this).cornerRadius(cornerRadiusPx).style(this.style).render();
         LiquidGlassUniforms.get().tryApplyBlur(context);
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public boolean mouseClicked(MouseButtonEvent click, boolean isDouble) {
-//#else
-    public boolean mouseClicked(Click click, boolean isDouble) {
-//#endif
+//? } else {
+    /*public boolean mouseClicked(Click click, boolean isDouble) {
+*///? }
         if (!this.moveable) return super.mouseClicked(click, isDouble);
         if (click.button() == 0 && click.x() >= this.getX() && click.x() < this.getX() + this.getWidth() && click.y() >= this.getY() && click.y() < this.getY() + this.getHeight()) {
             this.dragging = true;
@@ -75,11 +75,11 @@ public boolean mouseClicked(Click click, boolean isDouble) {
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public boolean mouseDragged(MouseButtonEvent click, double offsetX, double offsetY) {
-//#else
-    public boolean mouseDragged(Click click, double offsetX, double offsetY) {
-//#endif
+//? } else {
+    /*public boolean mouseDragged(Click click, double offsetX, double offsetY) {
+*///? }
         if (this.dragging && click.button() == 0) {
             int newX = (int) (click.x() - this.dragOffsetX);
             int newY = (int) (click.y() - this.dragOffsetY);
@@ -91,11 +91,11 @@ public boolean mouseDragged(Click click, double offsetX, double offsetY) {
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public boolean mouseReleased(MouseButtonEvent click) {
-//#else
-    public boolean mouseReleased(Click click) {
-//#endif
+//? } else {
+    /*public boolean mouseReleased(Click click) {
+*///? }
         if (this.dragging && click.button() == 0) {
             this.dragging = false;
         }
@@ -103,9 +103,9 @@ public boolean mouseReleased(Click click) {
         return super.mouseReleased(click);
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Override protected void updateWidgetNarration(NarrationElementOutput builder) {}
-//#else
-    @Override protected void appendClickableNarrations(NarrationMessageBuilder builder) {}
-//#endif
+//? } else {
+    /*@Override protected void appendClickableNarrations(NarrationMessageBuilder builder) {}
+*///? }
 }
diff --git a/src/main/java/restudio/reglass/client/ReGlassClient.java b/src/main/java/restudio/reglass/client/ReGlassClient.java
index aa1e374..5b55c31 100644
--- a/src/main/java/restudio/reglass/client/ReGlassClient.java
+++ b/src/main/java/restudio/reglass/client/ReGlassClient.java
@@ -1,11 +1,11 @@
 package restudio.reglass.client;
 
-//#if MC < 26
-import java.util.Arrays;
-//#endif
+//? if < 26 {
+/*import java.util.Arrays;
+*///? }
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.input.MouseButtonEvent;
@@ -14,12 +14,12 @@
 import net.minecraft.client.gui.components.Button;
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.network.chat.Component;
-//#if MC < 26.2
-import net.minecraft.ChatFormatting;
-//#endif
+//? if < 26.2 {
+/*import net.minecraft.ChatFormatting;
+*///? }
 import net.minecraft.resources.Identifier;
-//#else
-import net.minecraft.client.MinecraftClient;
+//? } else {
+/*import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Click;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
@@ -29,49 +29,49 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
-//#endif
+*///? }
 import org.lwjgl.glfw.GLFW;
 import restudio.reglass.client.api.ReGlassConfig;
 import restudio.reglass.client.api.WidgetStyle;
 import restudio.reglass.client.config.ReGlassSettingsIO;
-//#if MC < 26
-import restudio.reglass.client.screen.config.ReGlassConfigScreen;
-//#endif
+//? if < 26 {
+/*import restudio.reglass.client.screen.config.ReGlassConfigScreen;
+*///? }
 import restudio.reglass.mixin.accessor.OptionsAccessor;
-//#if MC >= 26
+//? if >= 26 {
 import restudio.reglass.client.screen.config.ReGlassConfigScreen;
 
 import java.util.Arrays;
-//#endif
+//? }
 
 public class ReGlassClient implements ClientModInitializer {
-//#if MC >= 26
+//? if >= 26 {
     private static final KeyMapping.Category KEY_CATEGORY = KeyMapping.Category.register(Identifier.fromNamespaceAndPath("reglass", "main"));
     private static final KeyMapping CONFIG_KEY = new KeyMapping("key.reglass.config", InputConstants.UNKNOWN.getValue(), KEY_CATEGORY);
     private static final KeyMapping PLAYGROUND_KEY = new KeyMapping("key.reglass.playground", InputConstants.UNKNOWN.getValue(), KEY_CATEGORY);
     private static final KeyMapping TOGGLE_REDESIGN_KEY = new KeyMapping("key.reglass.toggle_redesign", InputConstants.UNKNOWN.getValue(), KEY_CATEGORY);
-//#else
-    private static final KeyBinding.Category KEY_CATEGORY = KeyBinding.Category.create(Identifier.of("reglass", "main"));
+//? } else {
+    /*private static final KeyBinding.Category KEY_CATEGORY = KeyBinding.Category.create(Identifier.of("reglass", "main"));
     private static final KeyBinding CONFIG_KEY = new KeyBinding("key.reglass.config", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_UNKNOWN, KEY_CATEGORY);
     private static final KeyBinding PLAYGROUND_KEY = new KeyBinding("key.reglass.playground", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_UNKNOWN, KEY_CATEGORY);
     private static final KeyBinding TOGGLE_REDESIGN_KEY = new KeyBinding("key.reglass.toggle_redesign", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_UNKNOWN, KEY_CATEGORY);
-//#endif
+*///? }
     private static boolean keyMappingsRegistered;
     private static boolean toggleRedesignWasDown;
 
-//#if MC >= 26
+//? if >= 26 {
     public static Minecraft minecraftClient;
-//#else
-    public static MinecraftClient minecraftClient;
-//#endif
+//? } else {
+    /*public static MinecraftClient minecraftClient;
+*///? }
 
     @Override
     public void onInitializeClient() {
-//#if MC >= 26
+//? if >= 26 {
         minecraftClient = Minecraft.getInstance();
-//#else
-        minecraftClient = MinecraftClient.getInstance();
-//#endif
+//? } else {
+        /*minecraftClient = MinecraftClient.getInstance();
+*///? }
 
         ReGlassSettingsIO.loadIntoMemory();
 
@@ -83,70 +83,70 @@ public void onInitializeClient() {
                 registerKeyMappings(client);
             }
             handleGlobalToggleRedesignKey(client);
-//#if MC >= 26.2
+//? if >= 26.2 {
             while (CONFIG_KEY.consumeClick()) {
                 if (client.gui.screen() == null) {
-//#elseif MC >= 26
-            while (CONFIG_KEY.consumeClick()) {
+//? } elif >= 26 {
+            /*while (CONFIG_KEY.consumeClick()) {
                 if (client.screen == null) {
-//#else
-            while (CONFIG_KEY.wasPressed()) {
+*///? } else {
+            /*while (CONFIG_KEY.wasPressed()) {
                 if (client.currentScreen == null) {
-//#endif
-//#if MC >= 26.2
+*///? }
+//? if >= 26.2 {
                     client.gui.setScreen(new ReGlassConfigScreen(null));
-//#else
-                    client.setScreen(new ReGlassConfigScreen(null));
-//#endif
+//? } else {
+                    /*client.setScreen(new ReGlassConfigScreen(null));
+*///? }
                 }
             }
-//#if MC >= 26.2
+//? if >= 26.2 {
             while (PLAYGROUND_KEY.consumeClick()) {
                 if (client.gui.screen() == null) {
-//#elseif MC >= 26
-            while (PLAYGROUND_KEY.consumeClick()) {
+//? } elif >= 26 {
+            /*while (PLAYGROUND_KEY.consumeClick()) {
                 if (client.screen == null) {
-//#else
-            while (PLAYGROUND_KEY.wasPressed()) {
+*///? } else {
+            /*while (PLAYGROUND_KEY.wasPressed()) {
                 if (client.currentScreen == null) {
-//#endif
-//#if MC >= 26.2
+*///? }
+//? if >= 26.2 {
                     client.gui.setScreen(new PlaygroundScreen());
-//#else
-                    client.setScreen(new PlaygroundScreen());
-//#endif
+//? } else {
+                    /*client.setScreen(new PlaygroundScreen());
+*///? }
                 }
             }
         });
     }
 
-//#if MC >= 26
+//? if >= 26 {
     private static void registerKeyMappings(Minecraft client) {
         KeyMapping[] existingMappings = client.options.keyMappings;
         KeyMapping[] mappings = Arrays.copyOf(existingMappings, existingMappings.length + 3);
-//#else
-    private static void registerKeyMappings(MinecraftClient client) {
+//? } else {
+    /*private static void registerKeyMappings(MinecraftClient client) {
         KeyBinding[] existingMappings = client.options.allKeys;
         KeyBinding[] mappings = Arrays.copyOf(existingMappings, existingMappings.length + 3);
-//#endif
+*///? }
         mappings[existingMappings.length] = CONFIG_KEY;
         mappings[existingMappings.length + 1] = PLAYGROUND_KEY;
         mappings[existingMappings.length + 2] = TOGGLE_REDESIGN_KEY;
         ((OptionsAccessor) client.options).setKeyMappings(mappings);
-//#if MC >= 26
+//? if >= 26 {
         KeyMapping.resetMapping();
-//#else
-        KeyBinding.updateKeysByCode();
-//#endif
+//? } else {
+        /*KeyBinding.updateKeysByCode();
+*///? }
         client.options.load();
         keyMappingsRegistered = true;
     }
 
-//#if MC >= 26
+//? if >= 26 {
     private static void handleGlobalToggleRedesignKey(Minecraft client) {
-//#else
-    private static void handleGlobalToggleRedesignKey(MinecraftClient client) {
-//#endif
+//? } else {
+    /*private static void handleGlobalToggleRedesignKey(MinecraftClient client) {
+*///? }
         boolean down = isGlobalKeyDown(client, TOGGLE_REDESIGN_KEY);
         if (down && !toggleRedesignWasDown) {
             ReGlassConfig.INSTANCE.features.enableRedesign = !ReGlassConfig.INSTANCE.features.enableRedesign;
@@ -155,95 +155,95 @@ private static void handleGlobalToggleRedesignKey(MinecraftClient client) {
         toggleRedesignWasDown = down;
     }
 
-//#if MC >= 26
+//? if >= 26 {
     private static boolean isGlobalKeyDown(Minecraft client, KeyMapping keyMapping) {
         if (keyMapping.isUnbound()) {
-//#else
-    private static boolean isGlobalKeyDown(MinecraftClient client, KeyBinding keyBinding) {
+//? } else {
+    /*private static boolean isGlobalKeyDown(MinecraftClient client, KeyBinding keyBinding) {
         if (keyBinding.isUnbound()) {
-//#endif
+*///? }
             return false;
         }
-//#if MC >= 26
+//? if >= 26 {
         InputConstants.Key key = InputConstants.getKey(keyMapping.saveString());
         if (key.getType() == InputConstants.Type.MOUSE) {
             return GLFW.glfwGetMouseButton(client.getWindow().handle(), key.getValue()) == GLFW.GLFW_PRESS;
-//#else
-        InputUtil.Key key = InputUtil.fromTranslationKey(keyBinding.getBoundKeyTranslationKey());
+//? } else {
+        /*InputUtil.Key key = InputUtil.fromTranslationKey(keyBinding.getBoundKeyTranslationKey());
         if (key.getCategory() == InputUtil.Type.MOUSE) {
             return GLFW.glfwGetMouseButton(client.getWindow().getHandle(), key.getCode()) == GLFW.GLFW_PRESS;
-//#endif
+*///? }
         }
-//#if MC >= 26
+//? if >= 26 {
         return InputConstants.isKeyDown(client.getWindow(), key.getValue());
-//#else
-        return InputUtil.isKeyPressed(client.getWindow(), key.getCode());
-//#endif
+//? } else {
+        /*return InputUtil.isKeyPressed(client.getWindow(), key.getCode());
+*///? }
     }
 
     public static class PlaygroundScreen extends Screen {
         private boolean blur;
 
         public PlaygroundScreen() {
-//#if MC >= 26
+//? if >= 26 {
             super(Component.literal("ReGlass Playground"));
-//#else
-            super(Text.literal("ReGlass Playground"));
-//#endif
+//? } else {
+            /*super(Text.literal("ReGlass Playground"));
+*///? }
         }
 
         @Override
         protected void init() {
             super.init();
 
-//#if MC >= 26.2
+//? if >= 26.2 {
             WidgetStyle customStyle = WidgetStyle.create().tint(0xFFAA00, 0.4f).blurRadius(0).shadow(25f, 0.2f, 0f, 3f).smoothing(.05f).shadowColor(0x000000, 1.0f);
             addRenderableWidget(new LiquidGlassWidget(width / 2 - 75, height / 2 - 25, 150, 50, customStyle).setMoveable(true));
-//#elseif MC >= 26
-            WidgetStyle customStyle = WidgetStyle.create().tint(ChatFormatting.GOLD.getColor(), 0.4f).blurRadius(0).shadow(25f, 0.2f, 0f, 3f).smoothing(.05f).shadowColor(0x000000, 1.0f);
+//? } elif >= 26 {
+            /*WidgetStyle customStyle = WidgetStyle.create().tint(ChatFormatting.GOLD.getColor(), 0.4f).blurRadius(0).shadow(25f, 0.2f, 0f, 3f).smoothing(.05f).shadowColor(0x000000, 1.0f);
             addRenderableWidget(new LiquidGlassWidget(width / 2 - 75, height / 2 - 25, 150, 50, customStyle).setMoveable(true));
             addRenderableWidget(Button.builder(Component.literal("Toggle BG Blur"), b -> blur = !blur).bounds(10, 10, 120, 20).build());
-//#else
-            WidgetStyle customStyle = WidgetStyle.create().tint(Formatting.GOLD.getColorValue(), 0.4f).blurRadius(0).shadow(25f, 0.2f, 0f, 3f).smoothing(.05f).shadowColor(0x000000, 1.0f);
+*///? } else {
+            /*WidgetStyle customStyle = WidgetStyle.create().tint(Formatting.GOLD.getColorValue(), 0.4f).blurRadius(0).shadow(25f, 0.2f, 0f, 3f).smoothing(.05f).shadowColor(0x000000, 1.0f);
             addDrawableChild(new LiquidGlassWidget(width / 2 - 75, height / 2 - 25, 150, 50, customStyle).setMoveable(true));
             addDrawableChild(ButtonWidget.builder(Text.literal("Toggle BG Blur"), b -> blur = !blur).dimensions(10, 10, 120, 20).build());
-//#endif
+*///? }
         }
 
         @Override
-//#if MC >= 26
+//? if >= 26 {
         public void extractRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
             context.text(minecraftClient.font, Component.literal("This is a Minecraft Screen"), width / 2 - 70, 10, 0xFFFFFFFF, true);
             super.extractRenderState(context, mouseX, mouseY, delta);
-//#else
-        public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+//? } else {
+        /*public void render(DrawContext context, int mouseX, int mouseY, float delta) {
             context.drawText(minecraftClient.textRenderer, Text.literal("This is a Minecraft Screen"), width / 2 - 70, 10, 0xFFFFFFFF, true);
             super.render(context, mouseX, mouseY, delta);
-//#endif
+*///? }
         }
 
         @Override
-//#if MC >= 26
+//? if >= 26 {
         public void extractBackground(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
             if (blur) super.extractBackground(context, mouseX, mouseY, delta);
-//#else
-        public void renderBackground(DrawContext context, int mouseX, int mouseY, float delta) {
+//? } else {
+        /*public void renderBackground(DrawContext context, int mouseX, int mouseY, float delta) {
             if (blur) super.renderBackground(context, mouseX, mouseY, delta);
-//#endif
+*///? }
         }
 
         @Override
-//#if MC >= 26
+//? if >= 26 {
         public boolean mouseClicked(MouseButtonEvent click, boolean isDouble) {
-//#else
-        public boolean mouseClicked(Click click, boolean isDouble) {
-//#endif
+//? } else {
+        /*public boolean mouseClicked(Click click, boolean isDouble) {
+*///? }
             if (click.button() == 1) {
-//#if MC >= 26
+//? if >= 26 {
                 addRenderableWidget(new LiquidGlassWidget((int) click.x() - 50, (int) click.y() - 50, 100, 100, WidgetStyle.create().smoothing(.05f))).setMoveable(true);
-//#else
-                addDrawableChild(new LiquidGlassWidget((int) click.x() - 50, (int) click.y() - 50, 100, 100, WidgetStyle.create().smoothing(.05f))).setMoveable(true);
-//#endif
+//? } else {
+                /*addDrawableChild(new LiquidGlassWidget((int) click.x() - 50, (int) click.y() - 50, 100, 100, WidgetStyle.create().smoothing(.05f))).setMoveable(true);
+*///? }
                 return true;
             }
             return super.mouseClicked(click, isDouble);
diff --git a/src/main/java/restudio/reglass/client/api/ReGlassApi.java b/src/main/java/restudio/reglass/client/api/ReGlassApi.java
index c4a74cc..e3b95e3 100644
--- a/src/main/java/restudio/reglass/client/api/ReGlassApi.java
+++ b/src/main/java/restudio/reglass/client/api/ReGlassApi.java
@@ -1,26 +1,26 @@
 package restudio.reglass.client.api;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.network.chat.Component;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.ScreenRect;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.text.Text;
-//#endif
+*///? }
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix3x2f;
-//#if MC >= 26
+//? if >= 26 {
 import restudio.reglass.client.LiquidGlassUniforms;
-//#endif
+//? }
 import restudio.reglass.client.gui.LiquidGlassGuiElementRenderState;
 import restudio.reglass.mixin.accessor.DrawContextAccessor;
-//#if MC >= 26
+//? if >= 26 {
 import restudio.reglass.mixin.accessor.ScissorStackAccessor;
-//#endif
+//? }
 
 public final class ReGlassApi {
     private ReGlassApi() {}
@@ -30,47 +30,47 @@ public static ReGlassConfig getGlobalConfig() {
         return ReGlassConfig.INSTANCE;
     }
 
-//#if MC >= 26
+//? if >= 26 {
     public static Builder create(GuiGraphicsExtractor context) {
-//#else
-    public static Builder create(DrawContext context) {
-//#endif
+//? } else {
+    /*public static Builder create(DrawContext context) {
+*///? }
         return new Builder(context);
     }
 
     public static class Builder {
-//#if MC >= 26
+//? if >= 26 {
         private final GuiGraphicsExtractor context;
-//#else
-        private final DrawContext context;
-//#endif
+//? } else {
+        /*private final DrawContext context;
+*///? }
         private int x, y, width, height;
         private float cornerRadius = -1f;
-//#if MC >= 26
+//? if >= 26 {
         @Nullable private Component text = null;
-//#else
-        @Nullable private Text text = null;
-//#endif
+//? } else {
+        /*@Nullable private Text text = null;
+*///? }
         private WidgetStyle style = new WidgetStyle();
         private float hoverAmount = 0f;
         private float focusAmount = 0f;
-//#if MC >= 26
+//? if >= 26 {
         private boolean screenSpace = false;
-//#endif
+//? }
 
-//#if MC >= 26
+//? if >= 26 {
         private Builder(GuiGraphicsExtractor context) {
-//#else
-        private Builder(DrawContext context) {
-//#endif
+//? } else {
+        /*private Builder(DrawContext context) {
+*///? }
             this.context = context;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         public Builder fromWidget(AbstractWidget widget) {
-//#else
-        public Builder fromWidget(ClickableWidget widget) {
-//#endif
+//? } else {
+        /*public Builder fromWidget(ClickableWidget widget) {
+*///? }
             this.position(widget.getX(), widget.getY());
             this.size(widget.getWidth(), widget.getHeight());
             this.text(widget.getMessage());
@@ -98,11 +98,11 @@ public Builder cornerRadius(float radius) {
             return this;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         public Builder text(Component text) {
-//#else
-        public Builder text(Text text) {
-//#endif
+//? } else {
+        /*public Builder text(Text text) {
+*///? }
             this.text = text;
             return this;
         }
@@ -128,35 +128,35 @@ public Builder selected(float amount) {
             return this.focus(amount);
         }
 
-//#if MC >= 26
+//? if >= 26 {
         public Builder screenSpace() {
             this.screenSpace = true;
             return this;
         }
 
-//#endif
+//? }
         public void render() {
             float finalCornerRadius = this.cornerRadius < 0 ? 0.5f * Math.min(this.width, this.height) : this.cornerRadius;
-//#if MC >= 26
+//? if >= 26 {
             Matrix3x2f pose = this.screenSpace ? new Matrix3x2f() : new Matrix3x2f(context.pose());
             ScreenRectangle scissorRect = ((ScissorStackAccessor) ((DrawContextAccessor) context).getScissorStack()).reglass$peek();
             LiquidGlassUniforms.get().tryApplyBlur(context);
             LiquidGlassGuiElementRenderState element = new LiquidGlassGuiElementRenderState(
-//#else
-            Matrix3x2f pose = new Matrix3x2f(context.getMatrices());
+//? } else {
+            /*Matrix3x2f pose = new Matrix3x2f(context.getMatrices());
             ScreenRect scissorRect = ((DrawContextAccessor) context).getScissorStack().peekLast();
             context.state.addSpecialElement(new LiquidGlassGuiElementRenderState(
-//#endif
+*///? }
                     this.x, this.y, this.x + this.width, this.y + this.height,
                     finalCornerRadius, this.text, this.style, pose, scissorRect,
                     this.hoverAmount, this.focusAmount
-//#if MC >= 26
+//? if >= 26 {
             );
             LiquidGlassUniforms.get().addWidget(element);
             ((DrawContextAccessor) context).getGuiRenderState().addGuiElement(element);
-//#else
-            ));
-//#endif
+//? } else {
+            /*));
+*///? }
         }
     }
 }
diff --git a/src/main/java/restudio/reglass/client/gui/LiquidGlassGuiElementRenderState.java b/src/main/java/restudio/reglass/client/gui/LiquidGlassGuiElementRenderState.java
index 2c4508e..23effa6 100644
--- a/src/main/java/restudio/reglass/client/gui/LiquidGlassGuiElementRenderState.java
+++ b/src/main/java/restudio/reglass/client/gui/LiquidGlassGuiElementRenderState.java
@@ -1,6 +1,6 @@
 package restudio.reglass.client.gui;
 
-//#if MC >= 26
+//? if >= 26 {
 import com.mojang.blaze3d.pipeline.RenderPipeline;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
@@ -8,23 +8,23 @@
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.client.renderer.state.gui.GuiElementRenderState;
 import net.minecraft.network.chat.Component;
-//#else
-import net.minecraft.client.gui.ScreenRect;
+//? } else {
+/*import net.minecraft.client.gui.ScreenRect;
 import net.minecraft.client.gui.render.state.special.SpecialGuiElementRenderState;
 import net.minecraft.text.Text;
-//#endif
+*///? }
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix3x2f;
 import restudio.reglass.client.api.WidgetStyle;
 
-//#if MC >= 26
+//? if >= 26 {
 public record LiquidGlassGuiElementRenderState(int x1, int y1, int x2, int y2, float cornerRadius, @Nullable Component text, WidgetStyle style, Matrix3x2f pose, @Nullable ScreenRectangle scissorArea, float hover, float focus) implements GuiElementRenderState {
-//#else
-public record LiquidGlassGuiElementRenderState(int x1, int y1, int x2, int y2, float cornerRadius, @Nullable Text text, WidgetStyle style, Matrix3x2f pose, @Nullable ScreenRect scissorArea, float hover, float focus) implements SpecialGuiElementRenderState {
-//#endif
+//? } else {
+/*public record LiquidGlassGuiElementRenderState(int x1, int y1, int x2, int y2, float cornerRadius, @Nullable Text text, WidgetStyle style, Matrix3x2f pose, @Nullable ScreenRect scissorArea, float hover, float focus) implements SpecialGuiElementRenderState {
+*///? }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public void buildVertices(VertexConsumer vertexConsumer) {
         vertexConsumer.addVertexWith2DPose(pose, x1, y1).setColor(0);
         vertexConsumer.addVertexWith2DPose(pose, x1, y2).setColor(0);
@@ -40,30 +40,30 @@ public RenderPipeline pipeline() {
     @Override
     public TextureSetup textureSetup() {
         return TextureSetup.noTexture();
-//#else
-    public float scale() {
+//? } else {
+    /*public float scale() {
         return 1.0f;
-//#endif
+*///? }
     }
 
     @Nullable
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public ScreenRectangle scissorArea() {
-//#else
-    public ScreenRect scissorArea() {
-//#endif
+//? } else {
+    /*public ScreenRect scissorArea() {
+*///? }
         return this.scissorArea;
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public @Nullable ScreenRectangle bounds() {
         ScreenRectangle ownBounds = new ScreenRectangle(x1, y1, x2 - x1, y2 - y1).transformMaxBounds(pose);
-//#else
-    public @Nullable ScreenRect bounds() {
+//? } else {
+    /*public @Nullable ScreenRect bounds() {
         ScreenRect ownBounds = new ScreenRect(x1, y1, x2 - x1, y2 - y1).transformEachVertex(pose);
-//#endif
+*///? }
         return scissorArea != null ? scissorArea.intersection(ownBounds) : ownBounds;
     }
 }
diff --git a/src/main/java/restudio/reglass/client/gui/LiquidGlassGuiElementRenderer.java b/src/main/java/restudio/reglass/client/gui/LiquidGlassGuiElementRenderer.java
index 289d196..0405958 100644
--- a/src/main/java/restudio/reglass/client/gui/LiquidGlassGuiElementRenderer.java
+++ b/src/main/java/restudio/reglass/client/gui/LiquidGlassGuiElementRenderer.java
@@ -1,33 +1,33 @@
 package restudio.reglass.client.gui;
 
 import net.minecraft.client.gui.render.SpecialGuiElementRenderer;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.renderer.state.gui.GuiRenderState;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.PoseStack;
-//#else
-import net.minecraft.client.gui.render.state.GuiRenderState;
+//? } else {
+/*import net.minecraft.client.gui.render.state.GuiRenderState;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
-//#endif
+*///? }
 import restudio.reglass.client.LiquidGlassUniforms;
 
 public class LiquidGlassGuiElementRenderer extends SpecialGuiElementRenderer<LiquidGlassGuiElementRenderState> {
 
-//#if MC >= 26
+//? if >= 26 {
     public LiquidGlassGuiElementRenderer(MultiBufferSource.BufferSource vertexConsumers) {
-//#else
-    public LiquidGlassGuiElementRenderer(VertexConsumerProvider.Immediate vertexConsumers) {
-//#endif
+//? } else {
+    /*public LiquidGlassGuiElementRenderer(VertexConsumerProvider.Immediate vertexConsumers) {
+*///? }
         super(vertexConsumers);
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public void extractRenderState(LiquidGlassGuiElementRenderState element, GuiRenderState state, int scale) {
-//#else
-    public void render(LiquidGlassGuiElementRenderState element, GuiRenderState state, int scale) {
-//#endif
+//? } else {
+    /*public void render(LiquidGlassGuiElementRenderState element, GuiRenderState state, int scale) {
+*///? }
         LiquidGlassUniforms.get().addWidget(element);
     }
 
@@ -37,11 +37,11 @@ public Class<LiquidGlassGuiElementRenderState> getElementClass() {
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     protected void render(LiquidGlassGuiElementRenderState element, PoseStack matrices) {
-//#else
-    protected void render(LiquidGlassGuiElementRenderState element, MatrixStack matrices) {
-//#endif
+//? } else {
+    /*protected void render(LiquidGlassGuiElementRenderState element, MatrixStack matrices) {
+*///? }
     }
 
     @Override
diff --git a/src/main/java/restudio/reglass/client/screen/config/ReGlassConfigScreen.java b/src/main/java/restudio/reglass/client/screen/config/ReGlassConfigScreen.java
index 56454f1..024bae9 100644
--- a/src/main/java/restudio/reglass/client/screen/config/ReGlassConfigScreen.java
+++ b/src/main/java/restudio/reglass/client/screen/config/ReGlassConfigScreen.java
@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
@@ -10,15 +10,15 @@
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.MathHelper;
-//#endif
+*///? }
 import restudio.reglass.client.LiquidGlassWidget;
 import restudio.reglass.client.api.ReGlassConfig;
 import restudio.reglass.client.api.WidgetStyle;
@@ -33,18 +33,18 @@ public class ReGlassConfigScreen extends Screen {
     private double scrollPosition;
     private int totalListHeight;
 
-//#if MC >= 26
+//? if >= 26 {
     private record PositionedWidget(AbstractWidget widget, int y) {}
-//#else
-    private record PositionedWidget(ClickableWidget widget, int y) {}
-//#endif
+//? } else {
+    /*private record PositionedWidget(ClickableWidget widget, int y) {}
+*///? }
 
     public ReGlassConfigScreen(Screen parent) {
-//#if MC >= 26
+//? if >= 26 {
         super(Component.literal("ReGlass Configuration"));
-//#else
-        super(Text.literal("ReGlass Configuration"));
-//#endif
+//? } else {
+        /*super(Text.literal("ReGlass Configuration"));
+*///? }
         this.parent = parent;
     }
 
@@ -66,74 +66,74 @@ protected void init() {
         addTitle("General", widgetX, y, widgetWidth);
         y += widgetHeight;
 
-//#if MC >= 26
+//? if >= 26 {
         Button enableRedesignButton = Button.builder(getEnableRedesignText(), button -> {
-//#else
-        ButtonWidget enableRedesignButton = ButtonWidget.builder(getEnableRedesignText(), button -> {
-//#endif
+//? } else {
+        /*ButtonWidget enableRedesignButton = ButtonWidget.builder(getEnableRedesignText(), button -> {
+*///? }
             cfg.features.enableRedesign = !cfg.features.enableRedesign;
             button.setMessage(getEnableRedesignText());
-//#if MC >= 26.2
+//? if >= 26.2 {
             this.minecraft.gui.setScreen(new ReGlassConfigScreen(this.parent));
-//#elseif MC >= 26
-            this.minecraft.setScreen(new ReGlassConfigScreen(this.parent));
-//#else
-            this.client.setScreen(new ReGlassConfigScreen(this.parent));
-//#endif
-//#if MC >= 26
+//? } elif >= 26 {
+            /*this.minecraft.setScreen(new ReGlassConfigScreen(this.parent));
+*///? } else {
+            /*this.client.setScreen(new ReGlassConfigScreen(this.parent));
+*///? }
+//? if >= 26 {
         }).bounds(widgetX, y, widgetWidth, widgetHeight).build();
-//#else
-        }).dimensions(widgetX, y, widgetWidth, widgetHeight).build();
-//#endif
+//? } else {
+        /*}).dimensions(widgetX, y, widgetWidth, widgetHeight).build();
+*///? }
         addPositionedWidget(enableRedesignButton, y);
         y += widgetHeight + gap;
 
-//#if MC >= 26
+//? if >= 26 {
         Button enableButtonsButton = Button.builder(getFeatureText("Buttons", cfg.features.buttons), button -> {
-//#else
-        ButtonWidget enableButtonsButton = ButtonWidget.builder(getFeatureText("Buttons", cfg.features.buttons), button -> {
-//#endif
+//? } else {
+        /*ButtonWidget enableButtonsButton = ButtonWidget.builder(getFeatureText("Buttons", cfg.features.buttons), button -> {
+*///? }
             cfg.features.buttons = !cfg.features.buttons;
             button.setMessage(getFeatureText("Buttons", cfg.features.buttons));
-//#if MC >= 26
+//? if >= 26 {
         }).bounds(widgetX, y, widgetWidth, widgetHeight).build();
-//#else
-        }).dimensions(widgetX, y, widgetWidth, widgetHeight).build();
-//#endif
+//? } else {
+        /*}).dimensions(widgetX, y, widgetWidth, widgetHeight).build();
+*///? }
         addPositionedWidget(enableButtonsButton, y).active = cfg.features.enableRedesign;
         y += widgetHeight + gap;
 
-//#if MC >= 26
+//? if >= 26 {
         Button enableSlidersButton = Button.builder(getFeatureText("Sliders", cfg.features.sliders), button -> {
-//#else
-        ButtonWidget enableSlidersButton = ButtonWidget.builder(getFeatureText("Sliders", cfg.features.sliders), button -> {
-//#endif
+//? } else {
+        /*ButtonWidget enableSlidersButton = ButtonWidget.builder(getFeatureText("Sliders", cfg.features.sliders), button -> {
+*///? }
             cfg.features.sliders = !cfg.features.sliders;
             button.setMessage(getFeatureText("Sliders", cfg.features.sliders));
-//#if MC >= 26
+//? if >= 26 {
         }).bounds(widgetX, y, widgetWidth, widgetHeight).build();
-//#else
-        }).dimensions(widgetX, y, widgetWidth, widgetHeight).build();
-//#endif
+//? } else {
+        /*}).dimensions(widgetX, y, widgetWidth, widgetHeight).build();
+*///? }
         addPositionedWidget(enableSlidersButton, y).active = cfg.features.enableRedesign;
         y += widgetHeight + gap;
 
-//#if MC >= 26
+//? if >= 26 {
         Button enableHotbarButton = Button.builder(getFeatureText("Hotbar", cfg.features.hotbar), button -> {
-//#else
-        ButtonWidget enableHotbarButton = ButtonWidget.builder(getFeatureText("Hotbar", cfg.features.hotbar), button -> {
-//#endif
+//? } else {
+        /*ButtonWidget enableHotbarButton = ButtonWidget.builder(getFeatureText("Hotbar", cfg.features.hotbar), button -> {
+*///? }
             cfg.features.hotbar = !cfg.features.hotbar;
             button.setMessage(getFeatureText("Hotbar", cfg.features.hotbar));
-//#if MC >= 26
+//? if >= 26 {
         }).bounds(widgetX, y, widgetWidth, widgetHeight).build();
-//#else
-        }).dimensions(widgetX, y, widgetWidth, widgetHeight).build();
-//#endif
+//? } else {
+        /*}).dimensions(widgetX, y, widgetWidth, widgetHeight).build();
+*///? }
         addPositionedWidget(enableHotbarButton, y).active = cfg.features.enableRedesign;
         y += widgetHeight + gap;
 
-//#if MC >= 26
+//? if >= 26 {
         Button enableContainersButton = Button.builder(getFeatureText("Containers", cfg.features.containers), button -> {
             cfg.features.containers = !cfg.features.containers;
             button.setMessage(getFeatureText("Containers", cfg.features.containers));
@@ -149,210 +149,210 @@ protected void init() {
         y += widgetHeight + gap;
 
         Button cancelDarkeningButton = Button.builder(getFeatureText("Cancel Screen Darkening", cfg.features.cancelScreenDarkening), button -> {
-//#else
-        ButtonWidget cancelDarkeningButton = ButtonWidget.builder(getFeatureText("Cancel Screen Darkening", cfg.features.cancelScreenDarkening), button -> {
-//#endif
+//? } else {
+        /*ButtonWidget cancelDarkeningButton = ButtonWidget.builder(getFeatureText("Cancel Screen Darkening", cfg.features.cancelScreenDarkening), button -> {
+*///? }
             cfg.features.cancelScreenDarkening = !cfg.features.cancelScreenDarkening;
             button.setMessage(getFeatureText("Cancel Screen Darkening", cfg.features.cancelScreenDarkening));
-//#if MC >= 26
+//? if >= 26 {
         }).bounds(widgetX, y, widgetWidth, widgetHeight).build();
-//#else
-        }).dimensions(widgetX, y, widgetWidth, widgetHeight).build();
-//#endif
+//? } else {
+        /*}).dimensions(widgetX, y, widgetWidth, widgetHeight).build();
+*///? }
         addPositionedWidget(cancelDarkeningButton, y).active = cfg.features.enableRedesign;
         y += widgetHeight + gap * 2;
 
         addTitle("Appearance", widgetX, y, widgetWidth);
         y += widgetHeight;
 
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Tint Alpha"), 0f, 1f, cfg.defaultTintAlpha, v -> cfg.defaultTintAlpha = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Tint Alpha"), 0f, 1f, cfg.defaultTintAlpha, v -> cfg.defaultTintAlpha = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Tint Alpha"), 0f, 1f, cfg.defaultTintAlpha, v -> cfg.defaultTintAlpha = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.intSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Blur Radius"), 0, 32, cfg.defaultBlurRadius, v -> cfg.defaultBlurRadius = v), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.intSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Blur Radius"), 0, 32, cfg.defaultBlurRadius, v -> cfg.defaultBlurRadius = v), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.intSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Blur Radius"), 0, 32, cfg.defaultBlurRadius, v -> cfg.defaultBlurRadius = v), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Smoothing"), -0.02f, 0.02f, cfg.defaultSmoothing, v -> cfg.defaultSmoothing = v.floatValue()), y).active = cfg.features.enableRedesign;
         y += widgetHeight + gap;
         addSlider(MappedSlider.intSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Default Layer"), 0, 15, cfg.defaultLayer, v -> cfg.defaultLayer = v), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Smoothing"), -0.02f, 0.02f, cfg.defaultSmoothing, v -> cfg.defaultSmoothing = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Smoothing"), -0.02f, 0.02f, cfg.defaultSmoothing, v -> cfg.defaultSmoothing = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap * 2;
 
         addTitle("Shadow", widgetX, y, widgetWidth);
         y += widgetHeight;
 
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Shadow Expand"), 0f, 100f, cfg.defaultShadowExpand, v -> cfg.defaultShadowExpand = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Shadow Expand"), 0f, 100f, cfg.defaultShadowExpand, v -> cfg.defaultShadowExpand = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Shadow Expand"), 0f, 100f, cfg.defaultShadowExpand, v -> cfg.defaultShadowExpand = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Shadow Factor"), 0f, 1f, cfg.defaultShadowFactor, v -> cfg.defaultShadowFactor = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Shadow Factor"), 0f, 1f, cfg.defaultShadowFactor, v -> cfg.defaultShadowFactor = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Shadow Factor"), 0f, 1f, cfg.defaultShadowFactor, v -> cfg.defaultShadowFactor = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Shadow Offset Y"), -10f, 10f, cfg.defaultShadowOffsetY, v -> cfg.defaultShadowOffsetY = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Shadow Offset Y"), -10f, 10f, cfg.defaultShadowOffsetY, v -> cfg.defaultShadowOffsetY = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Shadow Offset Y"), -10f, 10f, cfg.defaultShadowOffsetY, v -> cfg.defaultShadowOffsetY = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap * 2;
 
         addTitle("Refraction", widgetX, y, widgetWidth);
         y += widgetHeight;
 
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Refraction Thickness"), 1f, 60f, cfg.defaultRefThickness, v -> cfg.defaultRefThickness = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Refraction Thickness"), 1f, 60f, cfg.defaultRefThickness, v -> cfg.defaultRefThickness = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Refraction Thickness"), 1f, 60f, cfg.defaultRefThickness, v -> cfg.defaultRefThickness = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Refraction Factor"), 1.0f, 2.5f, cfg.defaultRefFactor, v -> cfg.defaultRefFactor = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Refraction Factor"), 1.0f, 2.5f, cfg.defaultRefFactor, v -> cfg.defaultRefFactor = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Refraction Factor"), 1.0f, 2.5f, cfg.defaultRefFactor, v -> cfg.defaultRefFactor = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Fresnel Range"), 0f, 60f, cfg.defaultRefFresnelRange, v -> cfg.defaultRefFresnelRange = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Fresnel Range"), 0f, 60f, cfg.defaultRefFresnelRange, v -> cfg.defaultRefFresnelRange = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Fresnel Range"), 0f, 60f, cfg.defaultRefFresnelRange, v -> cfg.defaultRefFresnelRange = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Fresnel Hardness"), 0f, 100f, cfg.defaultRefFresnelHardness, v -> cfg.defaultRefFresnelHardness = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Fresnel Hardness"), 0f, 100f, cfg.defaultRefFresnelHardness, v -> cfg.defaultRefFresnelHardness = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Fresnel Hardness"), 0f, 100f, cfg.defaultRefFresnelHardness, v -> cfg.defaultRefFresnelHardness = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Fresnel Factor"), 0f, 100f, cfg.defaultRefFresnelFactor, v -> cfg.defaultRefFresnelFactor = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Fresnel Factor"), 0f, 100f, cfg.defaultRefFresnelFactor, v -> cfg.defaultRefFresnelFactor = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Fresnel Factor"), 0f, 100f, cfg.defaultRefFresnelFactor, v -> cfg.defaultRefFresnelFactor = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap * 2;
 
         addTitle("Glare", widgetX, y, widgetWidth);
         y += widgetHeight;
 
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Glare Range"), 0f, 60f, cfg.defaultGlareRange, v -> cfg.defaultGlareRange = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Glare Range"), 0f, 60f, cfg.defaultGlareRange, v -> cfg.defaultGlareRange = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Glare Range"), 0f, 60f, cfg.defaultGlareRange, v -> cfg.defaultGlareRange = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Glare Factor"), 0f, 100f, cfg.defaultGlareFactor, v -> cfg.defaultGlareFactor = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Glare Factor"), 0f, 100f, cfg.defaultGlareFactor, v -> cfg.defaultGlareFactor = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Glare Factor"), 0f, 100f, cfg.defaultGlareFactor, v -> cfg.defaultGlareFactor = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap * 2;
 
         addTitle("Interactions", widgetX, y, widgetWidth);
         y += widgetHeight;
 
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Hover Scale (px)"), 0f, 6f, cfg.hoverScalePx, v -> cfg.hoverScalePx = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Hover Scale (px)"), 0f, 6f, cfg.hoverScalePx, v -> cfg.hoverScalePx = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Hover Scale (px)"), 0f, 6f, cfg.hoverScalePx, v -> cfg.hoverScalePx = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Focus Scale (px)"), 0f, 8f, cfg.focusScalePx, v -> cfg.focusScalePx = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Focus Scale (px)"), 0f, 8f, cfg.focusScalePx, v -> cfg.focusScalePx = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Focus Scale (px)"), 0f, 8f, cfg.focusScalePx, v -> cfg.focusScalePx = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Focus Border Width (px)"), 0f, 6f, cfg.focusBorderWidthPx, v -> cfg.focusBorderWidthPx = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Focus Border Width (px)"), 0f, 6f, cfg.focusBorderWidthPx, v -> cfg.focusBorderWidthPx = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Focus Border Width (px)"), 0f, 6f, cfg.focusBorderWidthPx, v -> cfg.focusBorderWidthPx = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Focus Border Intensity"), 0f, 1f, cfg.focusBorderIntensity, v -> cfg.focusBorderIntensity = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Focus Border Intensity"), 0f, 1f, cfg.focusBorderIntensity, v -> cfg.focusBorderIntensity = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Focus Border Intensity"), 0f, 1f, cfg.focusBorderIntensity, v -> cfg.focusBorderIntensity = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Focus Border Speed"), 0f, 4f, cfg.focusBorderSpeed, v -> cfg.focusBorderSpeed = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Focus Border Speed"), 0f, 4f, cfg.focusBorderSpeed, v -> cfg.focusBorderSpeed = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Focus Border Speed"), 0f, 4f, cfg.focusBorderSpeed, v -> cfg.focusBorderSpeed = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap * 2;
 
         addTitle("Debug", widgetX, y, widgetWidth);
         y += widgetHeight;
 
-//#if MC >= 26
+//? if >= 26 {
         Button pixelatedGridButton = Button.builder(getFeatureText("Pixelated Grid", cfg.features.pixelatedGrid), button -> {
-//#else
-        ButtonWidget pixelatedGridButton = ButtonWidget.builder(getFeatureText("Pixelated Grid", cfg.features.pixelatedGrid), button -> {
-//#endif
+//? } else {
+        /*ButtonWidget pixelatedGridButton = ButtonWidget.builder(getFeatureText("Pixelated Grid", cfg.features.pixelatedGrid), button -> {
+*///? }
             cfg.features.pixelatedGrid = !cfg.features.pixelatedGrid;
             button.setMessage(getFeatureText("Pixelated Grid", cfg.features.pixelatedGrid));
-//#if MC >= 26
+//? if >= 26 {
         }).bounds(widgetX, y, widgetWidth, widgetHeight).build();
-//#else
-        }).dimensions(widgetX, y, widgetWidth, widgetHeight).build();
-//#endif
+//? } else {
+        /*}).dimensions(widgetX, y, widgetWidth, widgetHeight).build();
+*///? }
         addPositionedWidget(pixelatedGridButton, y).active = cfg.features.enableRedesign;
         y += widgetHeight + gap;
 
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Grid Size"), 1f, 32f, cfg.pixelatedGridSize, v -> cfg.pixelatedGridSize = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Grid Size"), 1f, 32f, cfg.pixelatedGridSize, v -> cfg.pixelatedGridSize = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.floatSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Grid Size"), 1f, 32f, cfg.pixelatedGridSize, v -> cfg.pixelatedGridSize = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
-//#if MC >= 26
+//? if >= 26 {
         addSlider(MappedSlider.intSlider(widgetX, y, widgetWidth, widgetHeight, Component.literal("Debug Step"), 0, 9, Math.round(cfg.debugStep), v -> cfg.debugStep = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#else
-        addSlider(MappedSlider.intSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Debug Step"), 0, 9, Math.round(cfg.debugStep), v -> cfg.debugStep = v.floatValue()), y).active = cfg.features.enableRedesign;
-//#endif
+//? } else {
+        /*addSlider(MappedSlider.intSlider(widgetX, y, widgetWidth, widgetHeight, Text.literal("Debug Step"), 0, 9, Math.round(cfg.debugStep), v -> cfg.debugStep = v.floatValue()), y).active = cfg.features.enableRedesign;
+*///? }
         y += widgetHeight + gap;
 
         this.totalListHeight = y;
 
-//#if MC >= 26
+//? if >= 26 {
         addRenderableWidget(Button.builder(Component.translatable("controls.reset"), b -> {
-//#else
-        addDrawableChild(ButtonWidget.builder(Text.translatable("controls.reset"), b -> {
-//#endif
+//? } else {
+        /*addDrawableChild(ButtonWidget.builder(Text.translatable("controls.reset"), b -> {
+*///? }
             ReGlassSettingsIO.apply(new ReGlassSettingsIO.Data());
-//#if MC >= 26.2
+//? if >= 26.2 {
             if (this.minecraft != null) {
                 this.minecraft.gui.setScreen(new ReGlassConfigScreen(this.parent));
-//#elseif MC >= 26
-            if (this.minecraft != null) {
+//? } elif >= 26 {
+            /*if (this.minecraft != null) {
                 this.minecraft.setScreen(new ReGlassConfigScreen(this.parent));
-//#else
-            if (this.client != null) {
+*///? } else {
+            /*if (this.client != null) {
                 this.client.setScreen(new ReGlassConfigScreen(this.parent));
-//#endif
+*///? }
             }
-//#if MC >= 26
+//? if >= 26 {
         }).bounds(this.width / 2 - 100, this.height - 28, 98, 20).build());
-//#else
-        }).dimensions(this.width / 2 - 100, this.height - 28, 98, 20).build());
-//#endif
+//? } else {
+        /*}).dimensions(this.width / 2 - 100, this.height - 28, 98, 20).build());
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
         addRenderableWidget(Button.builder(Component.translatable("gui.done"), b -> onClose()).bounds(this.width / 2 + 2, this.height - 28, 98, 20).build());
-//#else
-        addDrawableChild(ButtonWidget.builder(Text.translatable("gui.done"), b -> close()).dimensions(this.width / 2 + 2, this.height - 28, 98, 20).build());
-//#endif
+//? } else {
+        /*addDrawableChild(ButtonWidget.builder(Text.translatable("gui.done"), b -> close()).dimensions(this.width / 2 + 2, this.height - 28, 98, 20).build());
+*///? }
 
         int previewX = this.width / 2 + 20;
         int previewY = this.height / 2 - 50;
@@ -363,64 +363,64 @@ protected void init() {
                 .refractionThickness(cfg.defaultRefThickness).refractionFactor(cfg.defaultRefFactor).refractionDispersion(cfg.defaultRefDispersion)
                 .fresnelRange(cfg.defaultRefFresnelRange).fresnelHardness(cfg.defaultRefFresnelHardness).fresnelFactor(cfg.defaultRefFresnelFactor)
                 .glareRange(cfg.defaultGlareRange).glareHardness(cfg.defaultGlareHardness).glareConvergence(cfg.defaultGlareConvergence)
-//#if MC >= 26
+//? if >= 26 {
                 .glareOppositeFactor(cfg.defaultGlareOppositeFactor).glareFactor(cfg.defaultGlareFactor).glareAngleRad(cfg.defaultGlareAngleRad)
                 .layer(1);
-//#else
-                .glareOppositeFactor(cfg.defaultGlareOppositeFactor).glareFactor(cfg.defaultGlareFactor).glareAngleRad(cfg.defaultGlareAngleRad);
-//#endif
+//? } else {
+                /*.glareOppositeFactor(cfg.defaultGlareOppositeFactor).glareFactor(cfg.defaultGlareFactor).glareAngleRad(cfg.defaultGlareAngleRad);
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
         previewCircle = addRenderableWidget(new LiquidGlassWidget(previewX + 40, previewY, 100, 100, s1).setCornerRadiusPx(50f));
-//#else
-        previewCircle = addDrawableChild(new LiquidGlassWidget(previewX, previewY, 100, 100, s1).setCornerRadiusPx(50f));
-//#endif
+//? } else {
+        /*previewCircle = addDrawableChild(new LiquidGlassWidget(previewX, previewY, 100, 100, s1).setCornerRadiusPx(50f));
+*///? }
 
         WidgetStyle s2 = WidgetStyle.create().tint(cfg.defaultTintColor, cfg.defaultTintAlpha).blurRadius(cfg.defaultBlurRadius)
                 .shadow(cfg.defaultShadowExpand, cfg.defaultShadowFactor, cfg.defaultShadowOffsetX, cfg.defaultShadowOffsetY)
-//#if MC >= 26
+//? if >= 26 {
                 .shadowColor(cfg.defaultShadowColor, cfg.defaultShadowColorAlpha)
                 .layer(0);
-//#else
-                .shadowColor(cfg.defaultShadowColor, cfg.defaultShadowColorAlpha);
-//#endif
+//? } else {
+                /*.shadowColor(cfg.defaultShadowColor, cfg.defaultShadowColorAlpha);
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
         previewRounded = addRenderableWidget(new LiquidGlassWidget(previewX + 20, previewY + 120, 140, 60, s2).setCornerRadiusPx(16f));
-//#else
-        previewRounded = addDrawableChild(new LiquidGlassWidget(previewX + 110, previewY + 20, 140, 60, s2).setCornerRadiusPx(16f));
-//#endif
+//? } else {
+        /*previewRounded = addDrawableChild(new LiquidGlassWidget(previewX + 110, previewY + 20, 140, 60, s2).setCornerRadiusPx(16f));
+*///? }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     private Component getEnableRedesignText() {
         return Component.literal("ReGlass Redesign: ").append(ReGlassConfig.INSTANCE.features.enableRedesign ? Component.translatable("options.on") : Component.translatable("options.off"));
-//#else
-    private Text getEnableRedesignText() {
+//? } else {
+    /*private Text getEnableRedesignText() {
         return Text.literal("ReGlass Redesign: ").append(ReGlassConfig.INSTANCE.features.enableRedesign ? Text.translatable("options.on") : Text.translatable("options.off"));
-//#endif
+*///? }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     private Component getFeatureText(String feature, boolean enabled) {
         return Component.literal(feature + ": ").append(enabled ? Component.translatable("options.on") : Component.translatable("options.off"));
-//#else
-    private Text getFeatureText(String feature, boolean enabled) {
+//? } else {
+    /*private Text getFeatureText(String feature, boolean enabled) {
         return Text.literal(feature + ": ").append(enabled ? Text.translatable("options.on") : Text.translatable("options.off"));
-//#endif
+*///? }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     private <T extends AbstractWidget> T addPositionedWidget(T widget, int y) {
-//#else
-    private <T extends ClickableWidget> T addPositionedWidget(T widget, int y) {
-//#endif
+//? } else {
+    /*private <T extends ClickableWidget> T addPositionedWidget(T widget, int y) {
+*///? }
         positionedWidgets.add(new PositionedWidget(widget, y));
-//#if MC >= 26
+//? if >= 26 {
         return addRenderableWidget(widget);
-//#else
-        return addDrawableChild(widget);
-//#endif
+//? } else {
+        /*return addDrawableChild(widget);
+*///? }
     }
 
     private MappedSlider addSlider(MappedSlider slider, int y) {
@@ -428,21 +428,21 @@ private MappedSlider addSlider(MappedSlider slider, int y) {
     }
 
     private void addTitle(String title, int x, int y, int width) {
-//#if MC >= 26
+//? if >= 26 {
         addPositionedWidget(new TitleWidget(x, y, width, 20, Component.literal(title)), y);
-//#else
-        addPositionedWidget(new TitleWidget(x, y, width, 20, Text.literal(title)), y);
-//#endif
+//? } else {
+        /*addPositionedWidget(new TitleWidget(x, y, width, 20, Text.literal(title)), y);
+*///? }
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public void extractRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
-//#else
-    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+//? } else {
+    /*public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         this.renderBackground(context, mouseX, mouseY, delta);
 
-//#endif
+*///? }
         int listTop = 32;
         int listBottom = this.height - 32;
 
@@ -455,17 +455,17 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
             }
         }
 
-//#if MC >= 26
+//? if >= 26 {
         super.extractRenderState(context, mouseX, mouseY, delta);
-//#else
-        super.render(context, mouseX, mouseY, delta);
-//#endif
+//? } else {
+        /*super.render(context, mouseX, mouseY, delta);
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
         context.centeredText(this.font, Component.literal("ReGlass Config (Scrollable)"), this.width / 2, 15, 0xFFFFFFFF);
-//#else
-        context.drawCenteredTextWithShadow(this.textRenderer, Text.of("ReGlass Config (Scrollable)"), this.width / 2, 15, 0xFFFFFFFF);
-//#endif
+//? } else {
+        /*context.drawCenteredTextWithShadow(this.textRenderer, Text.of("ReGlass Config (Scrollable)"), this.width / 2, 15, 0xFFFFFFFF);
+*///? }
     }
 
     @Override
@@ -474,58 +474,58 @@ public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmou
         int maxScroll = Math.max(0, this.totalListHeight - listHeight);
         if (maxScroll > 0) {
             this.scrollPosition -= verticalAmount * 10;
-//#if MC >= 26
+//? if >= 26 {
             this.scrollPosition = Mth.clamp(this.scrollPosition, 0, maxScroll);
-//#else
-            this.scrollPosition = MathHelper.clamp(this.scrollPosition, 0, maxScroll);
-//#endif
+//? } else {
+            /*this.scrollPosition = MathHelper.clamp(this.scrollPosition, 0, maxScroll);
+*///? }
             return true;
         }
         return false;
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public void onClose() {
-//#else
-    public void close() {
-//#endif
+//? } else {
+    /*public void close() {
+*///? }
         ReGlassSettingsIO.saveFromMemory();
-//#if MC >= 26.2
+//? if >= 26.2 {
         if (this.minecraft != null) {
             this.minecraft.gui.setScreen(this.parent);
-//#elseif MC >= 26
-        if (this.minecraft != null) {
+//? } elif >= 26 {
+        /*if (this.minecraft != null) {
             this.minecraft.setScreen(this.parent);
-//#else
-        if (this.client != null) {
+*///? } else {
+        /*if (this.client != null) {
             this.client.setScreen(this.parent);
-//#endif
+*///? }
         }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     private class TitleWidget extends AbstractWidget {
         public TitleWidget(int x, int y, int width, int height, Component message) {
-//#else
-    private class TitleWidget extends ClickableWidget {
+//? } else {
+    /*private class TitleWidget extends ClickableWidget {
         public TitleWidget(int x, int y, int width, int height, Text message) {
-//#endif
+*///? }
             super(x, y, width, height, message);
         }
 
         @Override
-//#if MC >= 26
+//? if >= 26 {
         public void extractWidgetRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
-//#else
-        public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
-//#endif
+//? } else {
+        /*public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+*///? }
             if (this.visible) {
-//#if MC >= 26
+//? if >= 26 {
                 context.centeredText(ReGlassConfigScreen.this.font, this.getMessage(), this.getX() + this.getWidth() / 2, this.getY() + (this.getHeight() - 8) / 2, 0xFFFFFF);
-//#else
-                context.drawCenteredTextWithShadow(ReGlassConfigScreen.this.textRenderer, this.getMessage(), this.getX() + this.getWidth() / 2, this.getY() + (this.getHeight() - 8) / 2, 0xFFFFFF);
-//#endif
+//? } else {
+                /*context.drawCenteredTextWithShadow(ReGlassConfigScreen.this.textRenderer, this.getMessage(), this.getX() + this.getWidth() / 2, this.getY() + (this.getHeight() - 8) / 2, 0xFFFFFF);
+*///? }
             }
         }
 
@@ -535,10 +535,10 @@ public boolean isMouseOver(double mouseX, double mouseY) {
         }
 
         @Override
-//#if MC >= 26
+//? if >= 26 {
         protected void updateWidgetNarration(NarrationElementOutput builder) {}
-//#else
-        protected void appendClickableNarrations(NarrationMessageBuilder builder) {}
-//#endif
+//? } else {
+        /*protected void appendClickableNarrations(NarrationMessageBuilder builder) {}
+*///? }
     }
 }
diff --git a/src/main/java/restudio/reglass/client/screen/widget/ClickableEntryWidget.java b/src/main/java/restudio/reglass/client/screen/widget/ClickableEntryWidget.java
index 5b82155..345c5a8 100644
--- a/src/main/java/restudio/reglass/client/screen/widget/ClickableEntryWidget.java
+++ b/src/main/java/restudio/reglass/client/screen/widget/ClickableEntryWidget.java
@@ -1,25 +1,25 @@
 package restudio.reglass.client.screen.widget;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.network.chat.Component;
-//#else
-import net.minecraft.client.gui.widget.ClickableWidget;
+//? } else {
+/*import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.text.Text;
-//#endif
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
 public abstract class ClickableEntryWidget<P> extends AbstractWidget {
-//#else
-public abstract class ClickableEntryWidget<P> extends ClickableWidget {
-//#endif
+//? } else {
+/*public abstract class ClickableEntryWidget<P> extends ClickableWidget {
+*///? }
     protected final P parent;
 
-//#if MC >= 26
+//? if >= 26 {
     public ClickableEntryWidget(P parent, int x, int y, int width, int height, Component message) {
-//#else
-    public ClickableEntryWidget(P parent, int x, int y, int width, int height, Text message) {
-//#endif
+//? } else {
+    /*public ClickableEntryWidget(P parent, int x, int y, int width, int height, Text message) {
+*///? }
         super(x, y, width, height, message);
         this.parent = parent;
     }
diff --git a/src/main/java/restudio/reglass/client/screen/widget/ScrollableListWidget.java b/src/main/java/restudio/reglass/client/screen/widget/ScrollableListWidget.java
index ffd21c9..35b8188 100644
--- a/src/main/java/restudio/reglass/client/screen/widget/ScrollableListWidget.java
+++ b/src/main/java/restudio/reglass/client/screen/widget/ScrollableListWidget.java
@@ -2,7 +2,7 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
@@ -11,8 +11,8 @@
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
-//#else
-import net.minecraft.client.MinecraftClient;
+//? } else {
+/*import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Click;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
@@ -20,7 +20,7 @@
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.MathHelper;
-//#endif
+*///? }
 
 import java.util.List;
 import java.util.Set;
@@ -33,11 +33,11 @@ public class ScrollableListWidget<E extends ScrollableListWidget.Entry<E>> exten
     private double scrollAmount;
 
     public ScrollableListWidget(Screen screen, int x, int y, int width, int height, int itemHeight) {
-//#if MC >= 26
+//? if >= 26 {
         super(screen, x, y, width, height, Component.empty());
-//#else
-        super(screen, x, y, width, height, Text.empty());
-//#endif
+//? } else {
+        /*super(screen, x, y, width, height, Text.empty());
+*///? }
         this.itemHeight = itemHeight;
     }
 
@@ -68,11 +68,11 @@ public Set<E> getSelectedEntries() {
     }
 
     public void setSelected(E entry) {
-//#if MC >= 26
+//? if >= 26 {
         if (!InputConstants.isKeyDown(Minecraft.getInstance().getWindow(), InputConstants.KEY_LCONTROL)) {
-//#else
-        if (!InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow(), InputUtil.GLFW_KEY_LEFT_CONTROL)) {
-//#endif
+//? } else {
+        /*if (!InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow(), InputUtil.GLFW_KEY_LEFT_CONTROL)) {
+*///? }
             this.selectedEntries.clear();
         }
 
@@ -84,11 +84,11 @@ public void setSelected(E entry) {
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public void extractWidgetRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
-//#else
-    public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
-//#endif
+//? } else {
+    /*public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+*///? }
         context.enableScissor(getX(), getY(), getX() + width, getY() + height);
 
         int top = getY() - (int) this.scrollAmount + verticalPadding;
@@ -97,11 +97,11 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt
             int entryY = top + i * (this.itemHeight + verticalPadding);
             if (entryY + this.itemHeight >= this.getY() && entryY <= this.getY() + this.height) {
                 boolean isHovered = isMouseOver(mouseX, mouseY) && mouseY >= entryY && mouseY < entryY + this.itemHeight;
-//#if MC >= 26
+//? if >= 26 {
                 entry.extractRenderState(context, i, getX(), entryY, width, this.itemHeight, mouseX, mouseY, isHovered, delta);
-//#else
-                entry.render(context, i, getX(), entryY, width, this.itemHeight, mouseX, mouseY, isHovered, delta);
-//#endif
+//? } else {
+                /*entry.render(context, i, getX(), entryY, width, this.itemHeight, mouseX, mouseY, isHovered, delta);
+*///? }
             }
         }
 
@@ -109,11 +109,11 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public boolean mouseClicked(MouseButtonEvent button, boolean isDouble) {
-//#else
-    public boolean mouseClicked(Click button, boolean isDouble) {
-//#endif
+//? } else {
+    /*public boolean mouseClicked(Click button, boolean isDouble) {
+*///? }
         if (isMouseOver(button.y(), button.y())) {
             int top = getY() - (int) this.scrollAmount + verticalPadding;
             for (int i = 0; i < this.entries.size(); i++) {
@@ -135,11 +135,11 @@ public boolean mouseClicked(Click button, boolean isDouble) {
     public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
         if (isMouseOver(mouseX, mouseY)) {
             this.scrollAmount -= verticalAmount * (this.itemHeight / 2.0);
-//#if MC >= 26
+//? if >= 26 {
             this.scrollAmount = Mth.clamp(this.scrollAmount, 0, Math.max(0, this.getMaxScroll()));
-//#else
-            this.scrollAmount = MathHelper.clamp(this.scrollAmount, 0, Math.max(0, this.getMaxScroll()));
-//#endif
+//? } else {
+            /*this.scrollAmount = MathHelper.clamp(this.scrollAmount, 0, Math.max(0, this.getMaxScroll()));
+*///? }
             return true;
         }
         return false;
@@ -158,11 +158,11 @@ public boolean isFocused() {
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     protected void updateWidgetNarration(NarrationElementOutput builder) {
-//#else
-    protected void appendClickableNarrations(NarrationMessageBuilder builder) {
-//#endif
+//? } else {
+    /*protected void appendClickableNarrations(NarrationMessageBuilder builder) {
+*///? }
     }
 
     public static abstract class Entry<E extends Entry<E>> {
@@ -175,22 +175,22 @@ public Entry(int x, int y, int width, int height) {
             this.height = height;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         public void extractRenderState(GuiGraphicsExtractor context, int index, int x, int y, int width, int height, int mouseX, int mouseY, boolean hovered, float delta) {
-//#else
-        public void render(DrawContext context, int index, int x, int y, int width, int height, int mouseX, int mouseY, boolean hovered, float delta) {
-//#endif
+//? } else {
+        /*public void render(DrawContext context, int index, int x, int y, int width, int height, int mouseX, int mouseY, boolean hovered, float delta) {
+*///? }
             this.x = x;
             this.y = y;
             this.width = width;
             this.height = height;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         public abstract boolean mouseClicked(MouseButtonEvent button);
-//#else
-        public abstract boolean mouseClicked(Click button);
-//#endif
+//? } else {
+        /*public abstract boolean mouseClicked(Click button);
+*///? }
 
         public boolean isMouseOver(double mouseX, double mouseY) {
             return mouseX >= this.x && mouseX < this.x + this.width &&
diff --git a/src/main/java/restudio/reglass/client/screen/widget/world/WorldListEntryWidget.java b/src/main/java/restudio/reglass/client/screen/widget/world/WorldListEntryWidget.java
index 03d8bed..ff5c265 100644
--- a/src/main/java/restudio/reglass/client/screen/widget/world/WorldListEntryWidget.java
+++ b/src/main/java/restudio/reglass/client/screen/widget/world/WorldListEntryWidget.java
@@ -1,7 +1,7 @@
 package restudio.reglass.client.screen.widget.world;
 
 import com.mojang.logging.LogUtils;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.client.input.MouseButtonEvent;
@@ -11,8 +11,8 @@
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
-//#else
-import net.minecraft.client.MinecraftClient;
+//? } else {
+/*import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.client.gui.Click;
 import net.minecraft.client.gui.DrawContext;
@@ -21,7 +21,7 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
-//#endif
+*///? }
 import net.minecraft.world.level.storage.LevelSummary;
 import org.slf4j.Logger;
 import restudio.reglass.client.api.ReGlassApi;
@@ -41,18 +41,18 @@
 
 public class WorldListEntryWidget extends ScrollableListWidget.Entry<WorldListEntryWidget> {
     private static final Logger LOGGER = LogUtils.getLogger();
-//#if MC >= 26
+//? if >= 26 {
     private static final Identifier DEFAULT_ICON_ID = Identifier.fromNamespaceAndPath("textures/misc/unknown_server.png");
-//#else
-    private static final Identifier DEFAULT_ICON_ID = Identifier.of("textures/misc/unknown_server.png");
-//#endif
+//? } else {
+    /*private static final Identifier DEFAULT_ICON_ID = Identifier.of("textures/misc/unknown_server.png");
+*///? }
     public static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT).withZone(ZoneId.systemDefault());
 
-//#if MC >= 26
+//? if >= 26 {
     private final Minecraft client;
-//#else
-    private final MinecraftClient client;
-//#endif
+//? } else {
+    /*private final MinecraftClient client;
+*///? }
     private final CustomWorldSelectScreen parent;
     private final LevelSummary summary;
     private final Identifier iconId;
@@ -60,27 +60,27 @@ public class WorldListEntryWidget extends ScrollableListWidget.Entry<WorldListEn
     private final WidgetStyle hoveredStyle = new WidgetStyle().tint(0xFFFFFF, 0.1f);
     private final WidgetStyle selectedStyle = new WidgetStyle().tint(0xFFFFFF, 0.2f);
 
-//#if MC >= 26
+//? if >= 26 {
     private DynamicTexture iconTexture;
-//#else
-    private NativeImageBackedTexture iconTexture;
-//#endif
+//? } else {
+    /*private NativeImageBackedTexture iconTexture;
+*///? }
 
     public WorldListEntryWidget(CustomWorldSelectScreen parent, LevelSummary summary, int x, int y, int height) {
         super(x, y, parent.width - 150 - 40, height);
         this.parent = parent;
         this.summary = summary;
-//#if MC >= 26
+//? if >= 26 {
         this.minecraft = Minecraft.getInstance();
-//#else
-        this.client = MinecraftClient.getInstance();
-//#endif
+//? } else {
+        /*this.client = MinecraftClient.getInstance();
+*///? }
         String safeName = summary.getName().toLowerCase().replaceAll("[^a-z0-9/._-]", "_");
-//#if MC >= 26
+//? if >= 26 {
         this.iconId = Identifier.fromNamespaceAndPath("world-select/icon/" + safeName);
-//#else
-        this.iconId = Identifier.of("world-select/icon/" + safeName);
-//#endif
+//? } else {
+        /*this.iconId = Identifier.of("world-select/icon/" + safeName);
+*///? }
 
         loadIcon();
     }
@@ -101,13 +101,13 @@ private void loadIcon() {
                         return null;
                     }
                 };
-//#if MC >= 26
+//? if >= 26 {
                 this.iconTexture = new DynamicTexture(nativeImageSupplier, image);
                 this.minecraft.getTextureManager().registerTexture(this.iconId, this.iconTexture);
-//#else
-                this.iconTexture = new NativeImageBackedTexture(nativeImageSupplier, image);
+//? } else {
+                /*this.iconTexture = new NativeImageBackedTexture(nativeImageSupplier, image);
                 this.client.getTextureManager().registerTexture(this.iconId, this.iconTexture);
-//#endif
+*///? }
             } catch (Exception e) {
                 LOGGER.error("Failed to load world icon for {}", summary.getName(), e);
                 this.iconTexture = null;
@@ -116,13 +116,13 @@ private void loadIcon() {
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public void extractRenderState(GuiGraphicsExtractor context, int index, int x, int y, int width, int height, int mouseX, int mouseY, boolean hovered, float delta) {
         super.extractRenderState(context, index, x, y, width, height, mouseX, mouseY, hovered, delta);
-//#else
-    public void render(DrawContext context, int index, int x, int y, int width, int height, int mouseX, int mouseY, boolean hovered, float delta) {
+//? } else {
+    /*public void render(DrawContext context, int index, int x, int y, int width, int height, int mouseX, int mouseY, boolean hovered, float delta) {
         super.render(context, index, x, y, width, height, mouseX, mouseY, hovered, delta);
-//#endif
+*///? }
 
         boolean isSelected = this.parent.getList().getSelectedEntries().contains(this);
 
@@ -134,11 +134,11 @@ public void render(DrawContext context, int index, int x, int y, int width, int
         }
 
         ReGlassApi.create(context)
-//#if MC >= 26
+//? if >= 26 {
                 .bounds(x, y, width, height)
-//#else
-                .dimensions(x, y, width, height)
-//#endif
+//? } else {
+                /*.dimensions(x, y, width, height)
+*///? }
                 .cornerRadius(8)
                 .style(style)
                 .hover(hovered ? 1f : 0f)
@@ -153,39 +153,39 @@ public void render(DrawContext context, int index, int x, int y, int width, int
         }
 
         if (displayName == null || displayName.isEmpty()) {
-//#if MC >= 26
+//? if >= 26 {
             displayName = Component.translatable("selectWorld.world").getString() + " " + (index + 1);
-//#else
-            displayName = Text.translatable("selectWorld.world").getString() + " " + (index + 1);
-//#endif
+//? } else {
+            /*displayName = Text.translatable("selectWorld.world").getString() + " " + (index + 1);
+*///? }
         }
 
-//#if MC >= 26
+//? if >= 26 {
         MutableComponent details = (MutableComponent) summary.getDetails();
-//#else
-        MutableText details = (MutableText) summary.getDetails();
-//#endif
+//? } else {
+        /*MutableText details = (MutableText) summary.getDetails();
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
         context.text(client.font, displayName, x + 40, y + 2, 0xFFFFFFFF);
         context.text(client.font, name, x + 40, y + 10 + 3, 0xFF808080);
         context.text(client.font, details, x + 40, y + 10 + 9 + 3, 0xFF808080);
-//#else
-        context.drawTextWithShadow(client.textRenderer, displayName, x + 40, y + 2, 0xFFFFFFFF);
+//? } else {
+        /*context.drawTextWithShadow(client.textRenderer, displayName, x + 40, y + 2, 0xFFFFFFFF);
         context.drawTextWithShadow(client.textRenderer, name, x + 40, y + 10 + 3, 0xFF808080);
         context.drawTextWithShadow(client.textRenderer, details, x + 40, y + 10 + 9 + 3, 0xFF808080);
-//#endif
+*///? }
 
         Identifier texture = this.iconTexture != null ? this.iconId : DEFAULT_ICON_ID;
         context.drawTexture(RenderPipelines.GUI_TEXTURED, texture, x + 2, y + 2, 0, 0, 32, 32, 32, 32);
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public boolean mouseClicked(MouseButtonEvent click) {
-//#else
-    public boolean mouseClicked(Click click) {
-//#endif
+//? } else {
+    /*public boolean mouseClicked(Click click) {
+*///? }
         if (isMouseOver(click.x(), click.y())) {
             parent.getList().setSelected(this);
             return true;
@@ -200,11 +200,11 @@ public LevelSummary getSummary() {
     @Override
     public void close() {
         if (this.iconTexture != null) {
-//#if MC >= 26
+//? if >= 26 {
             this.minecraft.getTextureManager().destroyTexture(this.iconId);
-//#else
-            this.client.getTextureManager().destroyTexture(this.iconId);
-//#endif
+//? } else {
+            /*this.client.getTextureManager().destroyTexture(this.iconId);
+*///? }
             this.iconTexture.close();
             this.iconTexture = null;
         }
diff --git a/src/main/java/restudio/reglass/client/screen/world/CustomWorldSelectScreen.java b/src/main/java/restudio/reglass/client/screen/world/CustomWorldSelectScreen.java
index 114e4ef..629f8cd 100644
--- a/src/main/java/restudio/reglass/client/screen/world/CustomWorldSelectScreen.java
+++ b/src/main/java/restudio/reglass/client/screen/world/CustomWorldSelectScreen.java
@@ -1,7 +1,7 @@
 package restudio.reglass.client.screen.world;
 
 import com.mojang.logging.LogUtils;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.ConfirmScreen;
@@ -9,22 +9,22 @@
 import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
 import net.minecraft.client.gui.screens.worldselection.EditWorldScreen;
 import net.minecraft.client.gui.components.Button;
-//#else
-import net.minecraft.client.MinecraftClient;
+//? } else {
+/*import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ConfirmScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.world.CreateWorldScreen;
 import net.minecraft.client.gui.screen.world.EditWorldScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
-//#endif
+*///? }
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.toast.SystemToast;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.network.chat.Component;
-//#else
-import net.minecraft.text.Text;
-//#endif
+//? } else {
+/*import net.minecraft.text.Text;
+*///? }
 import net.minecraft.util.path.SymlinkValidationException;
 import net.minecraft.world.level.storage.LevelStorage;
 import net.minecraft.world.level.storage.LevelStorageException;
@@ -44,18 +44,18 @@ public class CustomWorldSelectScreen extends Screen {
     private final Screen parent;
     private ScrollableListWidget<WorldListEntryWidget> worldList;
     private TextFieldWidget searchBox;
-//#if MC >= 26
+//? if >= 26 {
     private Button playButton, createButton, editButton, deleteButton;
-//#else
-    private ButtonWidget playButton, createButton, editButton, deleteButton;
-//#endif
+//? } else {
+    /*private ButtonWidget playButton, createButton, editButton, deleteButton;
+*///? }
 
     public CustomWorldSelectScreen(Screen parent) {
-//#if MC >= 26
+//? if >= 26 {
         super(Component.translatable("selectWorld.title"));
-//#else
-        super(Text.translatable("selectWorld.title"));
-//#endif
+//? } else {
+        /*super(Text.translatable("selectWorld.title"));
+*///? }
         this.parent = parent;
     }
 
@@ -65,95 +65,95 @@ protected void init() {
         this.worldList = new ScrollableListWidget<>(this, 20, 50, listWidth - 40, this.height - 100, 36);
         this.worldList.setVerticalPadding(5);
 
-//#if MC >= 26
+//? if >= 26 {
         this.searchBox = new TextFieldWidget(this.font, 20, 20, listWidth - 40, 20, Component.translatable("selectWorld.search"));
-//#else
-        this.searchBox = new TextFieldWidget(this.textRenderer, 20, 20, listWidth - 40, 20, Text.translatable("selectWorld.search"));
-//#endif
+//? } else {
+        /*this.searchBox = new TextFieldWidget(this.textRenderer, 20, 20, listWidth - 40, 20, Text.translatable("selectWorld.search"));
+*///? }
         this.searchBox.setChangedListener(this::filterWorlds);
 
         this.loadWorldList();
 
-//#if MC >= 26
+//? if >= 26 {
         this.addRenderableWidget(this.worldList);
         this.addRenderableWidget(this.searchBox);
-//#else
-        this.addDrawableChild(this.worldList);
+//? } else {
+        /*this.addDrawableChild(this.worldList);
         this.addDrawableChild(this.searchBox);
-//#endif
+*///? }
 
         int buttonWidth = 120;
 
-//#if MC >= 26
+//? if >= 26 {
         this.playButton = Button.builder(Component.translatable("selectWorld.select"), button -> play(getSelectedSummaries())).bounds(listWidth, 50, buttonWidth, 20).build();
         this.createButton = Button.builder(Component.translatable("selectWorld.create"), button -> CreateWorldScreen.show(this.minecraft, null)).bounds(listWidth, 80, buttonWidth, 20).build();
         this.editButton = Button.builder(Component.translatable("selectWorld.edit"), button -> {
-//#else
-        this.playButton = ButtonWidget.builder(Text.translatable("selectWorld.select"), button -> play(getSelectedSummaries())).dimensions(listWidth, 50, buttonWidth, 20).build();
+//? } else {
+        /*this.playButton = ButtonWidget.builder(Text.translatable("selectWorld.select"), button -> play(getSelectedSummaries())).dimensions(listWidth, 50, buttonWidth, 20).build();
         this.createButton = ButtonWidget.builder(Text.translatable("selectWorld.create"), button -> CreateWorldScreen.show(this.client, null)).dimensions(listWidth, 80, buttonWidth, 20).build();
         this.editButton = ButtonWidget.builder(Text.translatable("selectWorld.edit"), button -> {
-//#endif
+*///? }
             Set<LevelSummary> summaries = getSelectedSummaries();
             if (summaries.size() == 1) {
                 LevelSummary summary = summaries.iterator().next();
                 try {
-//#if MC >= 26
+//? if >= 26 {
                     LevelStorage.Session session = this.minecraft.getLevelStorage().createSession(summary.getName());
                     this.minecraft.setScreen(EditWorldScreen.create(this.minecraft, session, (saved) -> {
-//#else
-                    LevelStorage.Session session = this.client.getLevelStorage().createSession(summary.getName());
+//? } else {
+                    /*LevelStorage.Session session = this.client.getLevelStorage().createSession(summary.getName());
                     this.client.setScreen(EditWorldScreen.create(this.client, session, (saved) -> {
-//#endif
+*///? }
                         if (saved) {
                             this.loadWorldList();
                         }
-//#if MC >= 26
+//? if >= 26 {
                         this.minecraft.setScreen(this);
-//#else
-                        this.client.setScreen(this);
-//#endif
+//? } else {
+                        /*this.client.setScreen(this);
+*///? }
                     }));
                 } catch (IOException e) {
                     LOGGER.error("Failed to access world {}", summary.getName(), e);
-//#if MC >= 26
+//? if >= 26 {
                     SystemToast.addWorldAccessFailureToast(this.minecraft, summary.getName());
-//#else
-                    SystemToast.addWorldAccessFailureToast(this.client, summary.getName());
-//#endif
+//? } else {
+                    /*SystemToast.addWorldAccessFailureToast(this.client, summary.getName());
+*///? }
                 } catch (SymlinkValidationException e) {
                     LOGGER.warn("Failed to validate symlinks for world {}", summary.getName(), e);
-//#if MC >= 26
+//? if >= 26 {
                     SystemToast.addWorldAccessFailureToast(this.minecraft, summary.getName());
-//#else
-                    SystemToast.addWorldAccessFailureToast(this.client, summary.getName());
-//#endif
+//? } else {
+                    /*SystemToast.addWorldAccessFailureToast(this.client, summary.getName());
+*///? }
                 }
             }
-//#if MC >= 26
+//? if >= 26 {
         }).bounds(listWidth, 100, buttonWidth, 20).build();
         this.deleteButton = Button.builder(Component.translatable("selectWorld.delete"), button -> this.delete(getSelectedSummaries())).bounds(listWidth, 120, buttonWidth, 20).build();
-//#else
-        }).dimensions(listWidth, 100, buttonWidth, 20).build();
+//? } else {
+        /*}).dimensions(listWidth, 100, buttonWidth, 20).build();
         this.deleteButton = ButtonWidget.builder(Text.translatable("selectWorld.delete"), button -> this.delete(getSelectedSummaries())).dimensions(listWidth, 120, buttonWidth, 20).build();
-//#endif
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
         this.addRenderableWidget(this.playButton);
         this.addRenderableWidget(this.createButton);
         this.addRenderableWidget(this.editButton);
         this.addRenderableWidget(this.deleteButton);
-//#else
-        this.addDrawableChild(this.playButton);
+//? } else {
+        /*this.addDrawableChild(this.playButton);
         this.addDrawableChild(this.createButton);
         this.addDrawableChild(this.editButton);
         this.addDrawableChild(this.deleteButton);
-//#endif
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
         this.addRenderableWidget(Button.builder(Component.translatable("gui.cancel"), b -> this.minecraft.setScreen(this.parent)).bounds(listWidth, this.height - 40, buttonWidth, 20).build());
-//#else
-        this.addDrawableChild(ButtonWidget.builder(Text.translatable("gui.cancel"), b -> this.client.setScreen(this.parent)).dimensions(listWidth, this.height - 40, buttonWidth, 20).build());
-//#endif
+//? } else {
+        /*this.addDrawableChild(ButtonWidget.builder(Text.translatable("gui.cancel"), b -> this.client.setScreen(this.parent)).dimensions(listWidth, this.height - 40, buttonWidth, 20).build());
+*///? }
 
         updateButtonStates();
     }
@@ -161,13 +161,13 @@ protected void init() {
     private void loadWorldList() {
         this.worldList.clearEntries();
         try {
-//#if MC >= 26
+//? if >= 26 {
             LevelStorage.LevelList levelList = this.minecraft.getLevelStorage().getLevelList();
             List<LevelSummary> summaries = this.minecraft.getLevelStorage().loadSummaries(levelList).join();
-//#else
-            LevelStorage.LevelList levelList = this.client.getLevelStorage().getLevelList();
+//? } else {
+            /*LevelStorage.LevelList levelList = this.client.getLevelStorage().getLevelList();
             List<LevelSummary> summaries = this.client.getLevelStorage().loadSummaries(levelList).join();
-//#endif
+*///? }
 
             for (LevelSummary summary : summaries) {
                 this.worldList.addEntry(new WorldListEntryWidget(this, summary, 0, 0, 30));
@@ -186,27 +186,27 @@ private void filterWorlds(String filter) {
     }
 
     @Override
-//#if MC >= 26
+//? if >= 26 {
     public void extractRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
-//#else
-    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+//? } else {
+    /*public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         this.renderBackground(context, mouseX, mouseY, delta);
 
-//#endif
+*///? }
         this.worldList.render(context, mouseX, mouseY, delta);
         this.searchBox.render(context, mouseX, mouseY, delta);
 
-//#if MC >= 26
+//? if >= 26 {
         context.centeredText(this.font, this.title, this.width / 2, 8, 0xFFFFFF);
-//#else
-        context.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 8, 0xFFFFFF);
-//#endif
+//? } else {
+        /*context.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 8, 0xFFFFFF);
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
         super.extractRenderState(context, mouseX, mouseY, delta);
-//#else
-        super.render(context, mouseX, mouseY, delta);
-//#endif
+//? } else {
+        /*super.render(context, mouseX, mouseY, delta);
+*///? }
 
         updateButtonStates();
     }
@@ -225,38 +225,38 @@ public ScrollableListWidget<WorldListEntryWidget> getList() {
     public void play(Set<LevelSummary> summaries) {
         if (summaries.size() == 1) {
             LevelSummary summary = summaries.iterator().next();
-//#if MC >= 26
+//? if >= 26 {
             client.createIntegratedServerLoader().start(summary.getName(), () -> this.minecraft.setScreen(this));
-//#else
-            client.createIntegratedServerLoader().start(summary.getName(), () -> this.client.setScreen(this));
-//#endif
+//? } else {
+            /*client.createIntegratedServerLoader().start(summary.getName(), () -> this.client.setScreen(this));
+*///? }
         }
     }
 
     public void delete(Set<LevelSummary> summaries) {
         if (summaries.isEmpty()) return;
 
-//#if MC >= 26
+//? if >= 26 {
         Component title = Component.translatable("selectWorld.deleteQuestion");
         Component message = Component.translatable("selectWorld.deleteWarning", summaries.stream().map(LevelSummary::getDisplayName).collect(Collectors.joining(", ")));
-//#else
-        Text title = Text.translatable("selectWorld.deleteQuestion");
+//? } else {
+        /*Text title = Text.translatable("selectWorld.deleteQuestion");
         Text message = Text.translatable("selectWorld.deleteWarning", summaries.stream().map(LevelSummary::getDisplayName).collect(Collectors.joining(", ")));
-//#endif
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
         this.minecraft.setScreen(new ConfirmScreen(confirmed -> {
-//#else
-        this.client.setScreen(new ConfirmScreen(confirmed -> {
-//#endif
+//? } else {
+        /*this.client.setScreen(new ConfirmScreen(confirmed -> {
+*///? }
             if (confirmed) {
                 try {
                     for (LevelSummary summary : summaries) {
-//#if MC >= 26
+//? if >= 26 {
                         try (LevelStorage.Session session = this.minecraft.getLevelStorage().createSession(summary.getName())) {
-//#else
-                        try (LevelStorage.Session session = this.client.getLevelStorage().createSession(summary.getName())) {
-//#endif
+//? } else {
+                        /*try (LevelStorage.Session session = this.client.getLevelStorage().createSession(summary.getName())) {
+*///? }
                             session.deleteSessionLock();
                         } catch (SymlinkValidationException e) {
                             LOGGER.warn("Failed to validate symlinks for world {}", summary.getName(), e);
@@ -267,11 +267,11 @@ public void delete(Set<LevelSummary> summaries) {
                 }
                 this.loadWorldList();
             }
-//#if MC >= 26
+//? if >= 26 {
             this.minecraft.setScreen(this);
-//#else
-            this.client.setScreen(this);
-//#endif
+//? } else {
+            /*this.client.setScreen(this);
+*///? }
         }, title, message));
     }
 
@@ -283,10 +283,10 @@ private Set<LevelSummary> getSelectedSummaries() {
 
     @Override
     public void close() {
-//#if MC >= 26
+//? if >= 26 {
         this.minecraft.setScreen(this.parent);
-//#else
-        this.client.setScreen(this.parent);
-//#endif
+//? } else {
+        /*this.client.setScreen(this.parent);
+*///? }
     }
 }
diff --git a/src/main/java/restudio/reglass/client/ui/MappedSlider.java b/src/main/java/restudio/reglass/client/ui/MappedSlider.java
index 27987be..8682082 100644
--- a/src/main/java/restudio/reglass/client/ui/MappedSlider.java
+++ b/src/main/java/restudio/reglass/client/ui/MappedSlider.java
@@ -1,52 +1,52 @@
 package restudio.reglass.client.ui;
 
 import java.util.function.Consumer;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.components.AbstractSliderButton;
 import net.minecraft.network.chat.Component;
-//#else
-import net.minecraft.client.gui.widget.SliderWidget;
+//? } else {
+/*import net.minecraft.client.gui.widget.SliderWidget;
 import net.minecraft.text.Text;
-//#endif
+*///? }
 import restudio.reglass.mixin.accessor.SliderWidgetAccessor;
 
-//#if MC >= 26
+//? if >= 26 {
 public class MappedSlider extends AbstractSliderButton {
-//#else
-public class MappedSlider extends SliderWidget {
-//#endif
+//? } else {
+/*public class MappedSlider extends SliderWidget {
+*///? }
 
     private final double min;
     private final double max;
     private final Consumer<Double> onChange;
     private final boolean integer;
-//#if MC >= 26
+//? if >= 26 {
     private final Component originalMessage = this.getMessage();
-//#else
-    private final Text originalMessage = this.getMessage();
-//#endif
+//? } else {
+    /*private final Text originalMessage = this.getMessage();
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
     public static MappedSlider floatSlider(int x, int y, int width, int height, Component msg, double min, double max, double init, Consumer<Double> onChange) {
-//#else
-    public static MappedSlider floatSlider(int x, int y, int width, int height, Text msg, double min, double max, double init, Consumer<Double> onChange) {
-//#endif
+//? } else {
+    /*public static MappedSlider floatSlider(int x, int y, int width, int height, Text msg, double min, double max, double init, Consumer<Double> onChange) {
+*///? }
         return new MappedSlider(x, y, width, height, msg, min, max, init, onChange, false);
     }
 
-//#if MC >= 26
+//? if >= 26 {
     public static MappedSlider intSlider(int x, int y, int width, int height, Component msg, int min, int max, int init, Consumer<Integer> onChange) {
-//#else
-    public static MappedSlider intSlider(int x, int y, int width, int height, Text msg, int min, int max, int init, Consumer<Integer> onChange) {
-//#endif
+//? } else {
+    /*public static MappedSlider intSlider(int x, int y, int width, int height, Text msg, int min, int max, int init, Consumer<Integer> onChange) {
+*///? }
         return new MappedSlider(x, y, width, height, msg, min, max, init, d -> onChange.accept(d.intValue()), true);
     }
 
-//#if MC >= 26
+//? if >= 26 {
     private MappedSlider(int x, int y, int width, int height, Component message, double min, double max, double init, Consumer<Double> onChange, boolean integer) {
-//#else
-    private MappedSlider(int x, int y, int width, int height, Text message, double min, double max, double init, Consumer<Double> onChange, boolean integer) {
-//#endif
+//? } else {
+    /*private MappedSlider(int x, int y, int width, int height, Text message, double min, double max, double init, Consumer<Double> onChange, boolean integer) {
+*///? }
         super(x, y, width, height, message, 0);
         this.min = min;
         this.max = max;
@@ -69,11 +69,11 @@ private double inverseMap(double real) {
     protected void updateMessage() {
         double v = map(this.value);
         if (integer) v = Math.round(v);
-//#if MC >= 26
+//? if >= 26 {
         this.setMessage(Component.literal(originalMessage.getString() + ": " + format(v)));
-//#else
-        this.setMessage(Text.literal(originalMessage.getString() + ": " + format(v)));
-//#endif
+//? } else {
+        /*this.setMessage(Text.literal(originalMessage.getString() + ": " + format(v)));
+*///? }
     }
 
     private String format(double v) {
diff --git a/src/main/java/restudio/reglass/mixin/accessor/BeaconScreenButtonAccessor.java b/src/main/java/restudio/reglass/mixin/accessor/BeaconScreenButtonAccessor.java
index 0d8ccec..e3608c0 100644
--- a/src/main/java/restudio/reglass/mixin/accessor/BeaconScreenButtonAccessor.java
+++ b/src/main/java/restudio/reglass/mixin/accessor/BeaconScreenButtonAccessor.java
@@ -1,31 +1,31 @@
 package restudio.reglass.mixin.accessor;
 
-//#if MC < 26
-import net.minecraft.client.gui.screen.ingame.BeaconScreen;
+//? if < 26 {
+/*import net.minecraft.client.gui.screen.ingame.BeaconScreen;
 import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.registry.entry.RegistryEntry;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
-//#if MC >= 26
+//? if >= 26 {
 import org.spongepowered.asm.mixin.gen.Invoker;
-//#else
-import org.spongepowered.asm.mixin.gen.Accessor;
-//#endif
+//? } else {
+/*import org.spongepowered.asm.mixin.gen.Accessor;
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
 @Mixin(targets = "net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconScreenButton")
-//#else
-@Mixin(BeaconScreen.class)
-//#endif
+//? } else {
+/*@Mixin(BeaconScreen.class)
+*///? }
 public interface BeaconScreenButtonAccessor {
-//#if MC >= 26
+//? if >= 26 {
     @Invoker("isSelected")
     boolean reglass$isSelected();
-//#else
-    @Accessor("primaryEffect")
+//? } else {
+    /*@Accessor("primaryEffect")
     RegistryEntry<StatusEffect> reglass$getPrimaryEffect();
 
     @Accessor("secondaryEffect")
     RegistryEntry<StatusEffect> reglass$getSecondaryEffect();
-//#endif
+*///? }
 }
diff --git a/src/main/java/restudio/reglass/mixin/accessor/DrawContextAccessor.java b/src/main/java/restudio/reglass/mixin/accessor/DrawContextAccessor.java
index 5708e4a..e83bab5 100644
--- a/src/main/java/restudio/reglass/mixin/accessor/DrawContextAccessor.java
+++ b/src/main/java/restudio/reglass/mixin/accessor/DrawContextAccessor.java
@@ -1,29 +1,29 @@
 package restudio.reglass.mixin.accessor;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.GuiGraphicsExtractor.ScissorStack;
 import net.minecraft.client.renderer.state.gui.GuiRenderState;
-//#else
-import net.minecraft.client.gui.DrawContext;
-//#endif
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-//#if MC >= 26
+//? if >= 26 {
 @Mixin(GuiGraphicsExtractor.class)
-//#else
-@Mixin(DrawContext.class)
-//#endif
+//? } else {
+/*@Mixin(DrawContext.class)
+*///? }
 public interface DrawContextAccessor {
 
     @Accessor("scissorStack")
-//#if MC >= 26
+//? if >= 26 {
     ScissorStack getScissorStack();
 
     @Accessor("guiRenderState")
     GuiRenderState getGuiRenderState();
-//#else
-    DrawContext.ScissorStack getScissorStack();
-//#endif
+//? } else {
+    /*DrawContext.ScissorStack getScissorStack();
+*///? }
 }
diff --git a/src/main/java/restudio/reglass/mixin/accessor/GameRendererAccessor.java b/src/main/java/restudio/reglass/mixin/accessor/GameRendererAccessor.java
index 1f50fa2..2ebf88f 100644
--- a/src/main/java/restudio/reglass/mixin/accessor/GameRendererAccessor.java
+++ b/src/main/java/restudio/reglass/mixin/accessor/GameRendererAccessor.java
@@ -1,11 +1,11 @@
 package restudio.reglass.mixin.accessor;
 
 import net.minecraft.client.gui.render.GuiRenderer;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.renderer.GameRenderer;
-//#else
-import net.minecraft.client.render.GameRenderer;
-//#endif
+//? } else {
+/*import net.minecraft.client.render.GameRenderer;
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
diff --git a/src/main/java/restudio/reglass/mixin/accessor/GuiRenderStateAccessor.java b/src/main/java/restudio/reglass/mixin/accessor/GuiRenderStateAccessor.java
index 6e8c138..d22fc31 100644
--- a/src/main/java/restudio/reglass/mixin/accessor/GuiRenderStateAccessor.java
+++ b/src/main/java/restudio/reglass/mixin/accessor/GuiRenderStateAccessor.java
@@ -1,10 +1,10 @@
 package restudio.reglass.mixin.accessor;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.renderer.state.gui.GuiRenderState;
-//#else
-import net.minecraft.client.gui.render.state.GuiRenderState;
-//#endif
+//? } else {
+/*import net.minecraft.client.gui.render.state.GuiRenderState;
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
diff --git a/src/main/java/restudio/reglass/mixin/accessor/GuiRendererAccessor.java b/src/main/java/restudio/reglass/mixin/accessor/GuiRendererAccessor.java
index 185a6bd..792ee2d 100644
--- a/src/main/java/restudio/reglass/mixin/accessor/GuiRendererAccessor.java
+++ b/src/main/java/restudio/reglass/mixin/accessor/GuiRendererAccessor.java
@@ -1,11 +1,11 @@
 package restudio.reglass.mixin.accessor;
 
 import net.minecraft.client.gui.render.GuiRenderer;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.renderer.MultiBufferSource;
-//#else
-import net.minecraft.client.render.VertexConsumerProvider;
-//#endif
+//? } else {
+/*import net.minecraft.client.render.VertexConsumerProvider;
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
@@ -13,10 +13,10 @@
 public interface GuiRendererAccessor {
 
     @Accessor("vertexConsumers")
-//#if MC >= 26
+//? if >= 26 {
     MultiBufferSource.BufferSource getVertexConsumers();
-//#else
-    VertexConsumerProvider.Immediate getVertexConsumers();
-//#endif
+//? } else {
+    /*VertexConsumerProvider.Immediate getVertexConsumers();
+*///? }
 }
 
diff --git a/src/main/java/restudio/reglass/mixin/accessor/OptionsAccessor.java b/src/main/java/restudio/reglass/mixin/accessor/OptionsAccessor.java
index e584b1a..f5930ca 100644
--- a/src/main/java/restudio/reglass/mixin/accessor/OptionsAccessor.java
+++ b/src/main/java/restudio/reglass/mixin/accessor/OptionsAccessor.java
@@ -1,29 +1,29 @@
 package restudio.reglass.mixin.accessor;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Options;
-//#else
-import net.minecraft.client.option.GameOptions;
+//? } else {
+/*import net.minecraft.client.option.GameOptions;
 import net.minecraft.client.option.KeyBinding;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-//#if MC >= 26
+//? if >= 26 {
 @Mixin(Options.class)
-//#else
-@Mixin(GameOptions.class)
-//#endif
+//? } else {
+/*@Mixin(GameOptions.class)
+*///? }
 public interface OptionsAccessor {
     @Mutable
-//#if MC >= 26
+//? if >= 26 {
     @Accessor("keyMappings")
     void setKeyMappings(KeyMapping[] keyMappings);
-//#else
-    @Accessor("allKeys")
+//? } else {
+    /*@Accessor("allKeys")
     void setKeyMappings(KeyBinding[] keyMappings);
-//#endif
+*///? }
 }
 
diff --git a/src/main/java/restudio/reglass/mixin/accessor/ShulkerBoxMenuAccessor.java b/src/main/java/restudio/reglass/mixin/accessor/ShulkerBoxMenuAccessor.java
index 198ceb8..c984cc9 100644
--- a/src/main/java/restudio/reglass/mixin/accessor/ShulkerBoxMenuAccessor.java
+++ b/src/main/java/restudio/reglass/mixin/accessor/ShulkerBoxMenuAccessor.java
@@ -1,27 +1,27 @@
 package restudio.reglass.mixin.accessor;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.world.Container;
 import net.minecraft.world.inventory.ShulkerBoxMenu;
-//#else
-import net.minecraft.inventory.Inventory;
+//? } else {
+/*import net.minecraft.inventory.Inventory;
 import net.minecraft.screen.ShulkerBoxScreenHandler;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-//#if MC >= 26
+//? if >= 26 {
 @Mixin(ShulkerBoxMenu.class)
-//#else
-@Mixin(ShulkerBoxScreenHandler.class)
-//#endif
+//? } else {
+/*@Mixin(ShulkerBoxScreenHandler.class)
+*///? }
 public interface ShulkerBoxMenuAccessor {
-//#if MC >= 26
+//? if >= 26 {
     @Accessor("container")
     Container reglass$getContainer();
-//#else
-    @Accessor("inventory")
+//? } else {
+    /*@Accessor("inventory")
     Inventory reglass$getInventory();
-//#endif
+*///? }
 }
 
diff --git a/src/main/java/restudio/reglass/mixin/accessor/SliderWidgetAccessor.java b/src/main/java/restudio/reglass/mixin/accessor/SliderWidgetAccessor.java
index b86561d..c578735 100644
--- a/src/main/java/restudio/reglass/mixin/accessor/SliderWidgetAccessor.java
+++ b/src/main/java/restudio/reglass/mixin/accessor/SliderWidgetAccessor.java
@@ -1,18 +1,18 @@
 package restudio.reglass.mixin.accessor;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.components.AbstractSliderButton;
-//#else
-import net.minecraft.client.gui.widget.SliderWidget;
-//#endif
+//? } else {
+/*import net.minecraft.client.gui.widget.SliderWidget;
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-//#if MC >= 26
+//? if >= 26 {
 @Mixin(AbstractSliderButton.class)
-//#else
-@Mixin(SliderWidget.class)
-//#endif
+//? } else {
+/*@Mixin(SliderWidget.class)
+*///? }
 public interface SliderWidgetAccessor {
     @Accessor("value")
     double getValue();
diff --git a/src/main/java/restudio/reglass/mixin/accessor/SlotAccessor.java b/src/main/java/restudio/reglass/mixin/accessor/SlotAccessor.java
index b1afe62..9856783 100644
--- a/src/main/java/restudio/reglass/mixin/accessor/SlotAccessor.java
+++ b/src/main/java/restudio/reglass/mixin/accessor/SlotAccessor.java
@@ -1,10 +1,10 @@
 package restudio.reglass.mixin.accessor;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.world.inventory.Slot;
-//#else
-import net.minecraft.screen.slot.Slot;
-//#endif
+//? } else {
+/*import net.minecraft.screen.slot.Slot;
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.gen.Accessor;
diff --git a/src/main/java/restudio/reglass/mixin/accessor/TextIconButtonWidgetAccessor.java b/src/main/java/restudio/reglass/mixin/accessor/TextIconButtonWidgetAccessor.java
index 6b073a2..8024ad8 100644
--- a/src/main/java/restudio/reglass/mixin/accessor/TextIconButtonWidgetAccessor.java
+++ b/src/main/java/restudio/reglass/mixin/accessor/TextIconButtonWidgetAccessor.java
@@ -1,11 +1,11 @@
 package restudio.reglass.mixin.accessor;
 
 import net.minecraft.client.gui.widget.TextIconButtonWidget;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.resources.Identifier;
-//#else
-import net.minecraft.util.Identifier;
-//#endif
+//? } else {
+/*import net.minecraft.util.Identifier;
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
diff --git a/src/main/java/restudio/reglass/mixin/client/AbstractContainerScreenMixin.java b/src/main/java/restudio/reglass/mixin/client/AbstractContainerScreenMixin.java
index 70f1d62..19ee40f 100644
--- a/src/main/java/restudio/reglass/mixin/client/AbstractContainerScreenMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/AbstractContainerScreenMixin.java
@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
@@ -27,8 +27,8 @@
 import net.minecraft.world.inventory.ShulkerBoxMenu;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
-//#else
-import net.minecraft.block.entity.ShulkerBoxBlockEntity;
+//? } else {
+/*import net.minecraft.block.entity.ShulkerBoxBlockEntity;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
@@ -48,7 +48,7 @@
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.text.Text;
 import net.minecraft.util.DyeColor;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -56,19 +56,19 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-//#if MC < 26
-import restudio.reglass.client.ContainerColorContext;
-//#endif
+//? if < 26 {
+/*import restudio.reglass.client.ContainerColorContext;
+*///? }
 import restudio.reglass.client.api.ReGlassApi;
 import restudio.reglass.client.api.ReGlassConfig;
 import restudio.reglass.client.api.WidgetStyle;
-//#if MC >= 26
+//? if >= 26 {
 import restudio.reglass.client.ContainerColorContext;
-//#endif
+//? }
 import restudio.reglass.mixin.accessor.ShulkerBoxMenuAccessor;
 import restudio.reglass.mixin.accessor.SlotAccessor;
 
-//#if MC >= 26
+//? if >= 26 {
 @Mixin(AbstractContainerScreen.class)
 public abstract class AbstractContainerScreenMixin<T extends AbstractContainerMenu> extends Screen {
     @Shadow @Final protected T menu;
@@ -80,8 +80,8 @@ public abstract class AbstractContainerScreenMixin<T extends AbstractContainerMe
     @Shadow @Final protected Component playerInventoryTitle;
     @Shadow protected int leftPos;
     @Shadow protected int topPos;
-//#else
-@Mixin(HandledScreen.class)
+//? } else {
+/*@Mixin(HandledScreen.class)
 public abstract class AbstractContainerScreenMixin<T extends ScreenHandler> extends Screen {
     @Shadow @Final protected T handler;
     @Shadow protected int titleX;
@@ -92,15 +92,15 @@ public abstract class AbstractContainerScreenMixin<T extends ScreenHandler> exte
     @Shadow @Final protected Text playerInventoryTitle;
     @Shadow protected int x;
     @Shadow protected int y;
-//#endif
+*///? }
 
     @Unique private final Map<Slot, int[]> reglass$originalSlotPositions = new IdentityHashMap<>();
 
-//#if MC >= 26
+//? if >= 26 {
     protected AbstractContainerScreenMixin(Component title) {
-//#else
-    protected AbstractContainerScreenMixin(Text title) {
-//#endif
+//? } else {
+    /*protected AbstractContainerScreenMixin(Text title) {
+*///? }
         super(title);
     }
 
@@ -119,41 +119,41 @@ protected AbstractContainerScreenMixin(Text title) {
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         if (this.menu instanceof BeaconMenu) {
-//#else
-        if (this.handler instanceof BeaconScreenHandler) {
-//#endif
+//? } else {
+        /*if (this.handler instanceof BeaconScreenHandler) {
+*///? }
             reglass$spaceBeaconSlots();
-//#if MC >= 26
+//? if >= 26 {
         } else if (this.menu instanceof BrewingStandMenu) {
-//#else
-        } else if (this.handler instanceof BrewingStandScreenHandler) {
-//#endif
+//? } else {
+        /*} else if (this.handler instanceof BrewingStandScreenHandler) {
+*///? }
             reglass$spaceBrewingStandSlots();
-//#if MC >= 26
+//? if >= 26 {
         } else if (this.menu instanceof GrindstoneMenu) {
-//#else
-        } else if (this.handler instanceof GrindstoneScreenHandler) {
-//#endif
+//? } else {
+        /*} else if (this.handler instanceof GrindstoneScreenHandler) {
+*///? }
             reglass$spaceGrindstoneSlots();
-//#if MC >= 26
+//? if >= 26 {
         } else if (this.menu instanceof LoomMenu) {
-//#else
-        } else if (this.handler instanceof LoomScreenHandler) {
-//#endif
+//? } else {
+        /*} else if (this.handler instanceof LoomScreenHandler) {
+*///? }
             reglass$spaceLoomSlots();
-//#if MC >= 26
+//? if >= 26 {
         } else if (this.menu instanceof EnchantmentMenu) {
-//#else
-        } else if (this.handler instanceof EnchantmentScreenHandler) {
-//#endif
+//? } else {
+        /*} else if (this.handler instanceof EnchantmentScreenHandler) {
+*///? }
             reglass$spaceEnchantmentSlots();
         }
         reglass$spaceGenericHotbar();
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(
             method = "extractContents",
             at = @At(
@@ -162,53 +162,53 @@ protected AbstractContainerScreenMixin(Text title) {
             )
     )
     private void reglass$extractContainerGlass(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#else
-    @Inject(method = "renderMain", at = @At("HEAD"))
+//? } else {
+    /*@Inject(method = "renderMain", at = @At("HEAD"))
     private void reglass$renderContainerGlass(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
-//#if MC >= 26
+//? if >= 26 {
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
-//#else
-        if (cfg.features.enableRedesign && cfg.features.containers) {
+//? } else {
+        /*if (cfg.features.enableRedesign && cfg.features.containers) {
             reglass$renderBatchBlobs(context);
-//#endif
+*///? }
         }
-//#if MC >= 26
+//? if >= 26 {
 
         reglass$renderBatchBlobs(context);
-//#endif
+//? }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractLabels", at = @At("HEAD"), cancellable = true)
     private void reglass$hidePlayerInventoryLabels(GuiGraphicsExtractor context, int mouseX, int mouseY, CallbackInfo ci) {
-//#else
-    @Inject(method = "drawForeground", at = @At("HEAD"), cancellable = true)
+//? } else {
+    /*@Inject(method = "drawForeground", at = @At("HEAD"), cancellable = true)
     private void reglass$hidePlayerInventoryLabels(DrawContext context, int mouseX, int mouseY, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
         if (!reglass$isPlayerInventory()) {
-//#if MC >= 26
+//? if >= 26 {
             context.text(this.font, this.title, reglass$labelX(this.titleLabelX), reglass$labelY(this.titleLabelY), 0xFFFFFFFF, true);
-//#else
-            context.drawText(this.textRenderer, this.title, reglass$labelX(this.titleX), reglass$labelY(this.titleY), 0xFFFFFFFF, true);
-//#endif
+//? } else {
+            /*context.drawText(this.textRenderer, this.title, reglass$labelX(this.titleX), reglass$labelY(this.titleY), 0xFFFFFFFF, true);
+*///? }
         }
         ci.cancel();
     }
 
     @Unique
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$renderBatchBlobs(GuiGraphicsExtractor context) {
-//#else
-    private void reglass$renderBatchBlobs(DrawContext context) {
-//#endif
+//? } else {
+    /*private void reglass$renderBatchBlobs(DrawContext context) {
+*///? }
         for (int[] group : reglass$getSlotGroups()) {
             reglass$renderGroup(context, group);
         }
@@ -217,13 +217,13 @@ protected AbstractContainerScreenMixin(Text title) {
     @Unique
     private List<int[]> reglass$getSlotGroups() {
         List<Slot> slots = new ArrayList<>();
-//#if MC >= 26
+//? if >= 26 {
         for (Slot slot : this.menu.slots) {
             if (slot.isActive()) {
-//#else
-        for (Slot slot : this.handler.slots) {
+//? } else {
+        /*for (Slot slot : this.handler.slots) {
             if (slot.isEnabled()) {
-//#endif
+*///? }
                 slots.add(slot);
             }
         }
@@ -280,22 +280,22 @@ protected AbstractContainerScreenMixin(Text title) {
 
     @Unique
     private void reglass$mergeVillagerCostSlots(List<int[]> groups) {
-//#if MC >= 26
+//? if >= 26 {
         if (!(this.menu instanceof MerchantMenu) || this.menu.slots.size() < 2) {
-//#else
-        if (!(this.handler instanceof MerchantScreenHandler) || this.handler.slots.size() < 2) {
-//#endif
+//? } else {
+        /*if (!(this.handler instanceof MerchantScreenHandler) || this.handler.slots.size() < 2) {
+*///? }
             return;
         }
-//#if MC >= 26
+//? if >= 26 {
         Slot first = this.menu.slots.get(0);
         Slot second = this.menu.slots.get(1);
         if (!first.isActive() || !second.isActive()) {
-//#else
-        Slot first = this.handler.slots.get(0);
+//? } else {
+        /*Slot first = this.handler.slots.get(0);
         Slot second = this.handler.slots.get(1);
         if (!first.isEnabled() || !second.isEnabled()) {
-//#endif
+*///? }
             return;
         }
 
@@ -316,11 +316,11 @@ protected AbstractContainerScreenMixin(Text title) {
     }
 
     @Unique
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$renderGroup(GuiGraphicsExtractor context, int[] group) {
-//#else
-    private void reglass$renderGroup(DrawContext context, int[] group) {
-//#endif
+//? } else {
+    /*private void reglass$renderGroup(DrawContext context, int[] group) {
+*///? }
         int groupWidth = group[2] - group[0];
         int groupHeight = group[3] - group[1];
         if (reglass$isHotbarGroup(groupWidth, groupHeight)) {
@@ -329,27 +329,27 @@ protected AbstractContainerScreenMixin(Text title) {
         }
 
         int padding = groupWidth == 18 && groupHeight == 18 ? reglass$singleSlotPadding() : 4;
-//#if MC >= 26
+//? if >= 26 {
         int x = this.leftPos + group[0] - padding - 1;
         int y = this.topPos + group[1] - padding - 1;
-//#else
-        int groupX = this.x + group[0] - padding - 1;
+//? } else {
+        /*int groupX = this.x + group[0] - padding - 1;
         int groupY = this.y + group[1] - padding - 1;
-//#endif
+*///? }
         int width = groupWidth + padding * 2;
         int height = groupHeight + padding * 2;
 
         ReGlassApi.create(context)
-//#if MC >= 26
+//? if >= 26 {
                 .dimensions(x, y, width, height)
-//#else
-                .dimensions(groupX, groupY, width, height)
-//#endif
+//? } else {
+                /*.dimensions(groupX, groupY, width, height)
+*///? }
                 .cornerRadius(Math.min(12, Math.max(6, Math.min(width, height) * 0.22f)))
                 .style(reglass$panelStyle(group, groupWidth, groupHeight).layer(1))
-//#if MC >= 26
+//? if >= 26 {
                 .screenSpace()
-//#endif
+//? }
                 .render();
     }
 
@@ -359,35 +359,35 @@ protected AbstractContainerScreenMixin(Text title) {
     }
 
     @Unique
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$renderHotbarGroup(GuiGraphicsExtractor context, int[] group) {
-//#else
-    private void reglass$renderHotbarGroup(DrawContext context, int[] group) {
-//#endif
+//? } else {
+    /*private void reglass$renderHotbarGroup(DrawContext context, int[] group) {
+*///? }
         ReGlassApi.create(context)
-//#if MC >= 26
+//? if >= 26 {
                 .dimensions(this.leftPos + group[0] - 4, this.topPos + group[1] - 2, 170, 22)
-//#else
-                .dimensions(this.x + group[0] - 4, this.y + group[1] - 2, 170, 22)
-//#endif
+//? } else {
+                /*.dimensions(this.x + group[0] - 4, this.y + group[1] - 2, 170, 22)
+*///? }
                 .cornerRadius(11)
                 .style(WidgetStyle.create()
                         .tint(0x000000, 0.3f)
                         .layer(1))
-//#if MC >= 26
+//? if >= 26 {
                 .screenSpace()
-//#endif
+//? }
                 .render();
     }
 
     @Unique
     private WidgetStyle reglass$panelStyle() {
-//#if MC >= 26
+//? if >= 26 {
         return WidgetStyle.create()
                 .tint(0x000000, 0.16f);
-//#else
-        return WidgetStyle.create().tint(0x000000, 0.16f);
-//#endif
+//? } else {
+        /*return WidgetStyle.create().tint(0x000000, 0.16f);
+*///? }
     }
 
     @Unique
@@ -401,21 +401,21 @@ protected AbstractContainerScreenMixin(Text title) {
 
     @Unique
     private Integer reglass$shulkerMainTint(int[] group, int groupWidth, int groupHeight) {
-//#if MC >= 26
+//? if >= 26 {
         if (!(this.menu instanceof ShulkerBoxMenu) || groupWidth != 162 || groupHeight != 54 || group[1] >= 80) {
-//#else
-        if (!(this.handler instanceof ShulkerBoxScreenHandler) || groupWidth != 162 || groupHeight != 54 || group[1] >= 80) {
-//#endif
+//? } else {
+        /*if (!(this.handler instanceof ShulkerBoxScreenHandler) || groupWidth != 162 || groupHeight != 54 || group[1] >= 80) {
+*///? }
             return null;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         Container container = ((ShulkerBoxMenuAccessor) this.menu).reglass$getContainer();
         DyeColor color = container instanceof ShulkerBoxBlockEntity shulkerBox ? shulkerBox.getColor() : null;
-//#else
-        Inventory inventory = ((ShulkerBoxMenuAccessor) this.handler).reglass$getInventory();
+//? } else {
+        /*Inventory inventory = ((ShulkerBoxMenuAccessor) this.handler).reglass$getInventory();
         DyeColor color = inventory instanceof ShulkerBoxBlockEntity shulkerBox ? shulkerBox.getColor() : null;
-//#endif
+*///? }
         if (color == null) {
             color = ContainerColorContext.getLastShulkerColor();
         }
@@ -430,24 +430,24 @@ protected AbstractContainerScreenMixin(Text title) {
 
     @Unique
     private DyeColor reglass$shulkerColorFromTitle() {
-//#if MC >= 26
+//? if >= 26 {
         String title = this.title.getString().toLowerCase(Locale.ROOT).replace('_', ' ');
-//#else
-        String titleString = this.title.getString().toLowerCase(Locale.ROOT).replace('_', ' ');
-//#endif
+//? } else {
+        /*String titleString = this.title.getString().toLowerCase(Locale.ROOT).replace('_', ' ');
+*///? }
         DyeColor[] colors = DyeColor.values();
         List<DyeColor> sortedColors = new ArrayList<>(List.of(colors));
-//#if MC >= 26
+//? if >= 26 {
         sortedColors.sort(Comparator.comparingInt((DyeColor color) -> color.getName().length()).reversed());
-//#else
-        sortedColors.sort(Comparator.comparingInt((DyeColor color) -> color.getId().length()).reversed());
-//#endif
+//? } else {
+        /*sortedColors.sort(Comparator.comparingInt((DyeColor color) -> color.getId().length()).reversed());
+*///? }
         for (DyeColor color : sortedColors) {
-//#if MC >= 26
+//? if >= 26 {
             if (title.contains(color.getName().replace('_', ' '))) {
-//#else
-            if (titleString.contains(color.getId().replace('_', ' '))) {
-//#endif
+//? } else {
+            /*if (titleString.contains(color.getId().replace('_', ' '))) {
+*///? }
                 return color;
             }
         }
@@ -478,75 +478,75 @@ protected AbstractContainerScreenMixin(Text title) {
 
     @Unique
     private int reglass$singleSlotPadding() {
-//#if MC >= 26
+//? if >= 26 {
         return this.menu instanceof BeaconMenu ? 2 : 3;
-//#else
-        return this.handler instanceof BeaconScreenHandler ? 2 : 3;
-//#endif
+//? } else {
+        /*return this.handler instanceof BeaconScreenHandler ? 2 : 3;
+*///? }
     }
 
     @Unique
-//#if MC >= 26
+//? if >= 26 {
     private int reglass$labelY(int y) {
         if (this.menu instanceof LoomMenu) {
-//#else
-    private int reglass$labelY(int labelY) {
+//? } else {
+    /*private int reglass$labelY(int labelY) {
         if (this.handler instanceof LoomScreenHandler) {
-//#endif
+*///? }
             return 32;
         }
-//#if MC >= 26
+//? if >= 26 {
         if (this.menu instanceof CraftingMenu
                 || this.menu instanceof CrafterMenu
                 || this.menu instanceof DispenserMenu) {
             return y - 4;
-//#else
-        if (this.handler instanceof CraftingScreenHandler
+//? } else {
+        /*if (this.handler instanceof CraftingScreenHandler
                 || this.handler instanceof CrafterScreenHandler
                 || this.handler instanceof Generic3x3ContainerScreenHandler) {
             return labelY - 4;
-//#endif
+*///? }
         }
-//#if MC >= 26
+//? if >= 26 {
         if (this.menu instanceof BrewingStandMenu) {
             return y - 10;
-//#else
-        if (this.handler instanceof BrewingStandScreenHandler) {
+//? } else {
+        /*if (this.handler instanceof BrewingStandScreenHandler) {
             return labelY - 12;
-//#endif
+*///? }
         }
-//#if MC >= 26
+//? if >= 26 {
         return y - 2;
-//#else
-        return labelY - 2;
-//#endif
+//? } else {
+        /*return labelY - 2;
+*///? }
     }
 
     @Unique
-//#if MC >= 26
+//? if >= 26 {
     private int reglass$labelX(int x) {
         if (this.menu instanceof LoomMenu) {
             return -8;
-//#else
-    private int reglass$labelX(int labelX) {
+//? } else {
+    /*private int reglass$labelX(int labelX) {
         if (this.handler instanceof LoomScreenHandler) {
             return -4;
-//#endif
+*///? }
         }
-//#if MC >= 26
+//? if >= 26 {
         return x;
-//#else
-        return labelX;
-//#endif
+//? } else {
+        /*return labelX;
+*///? }
     }
 
     @Unique
     private void reglass$rememberOriginalSlots() {
-//#if MC >= 26
+//? if >= 26 {
         for (Slot slot : this.menu.slots) {
-//#else
-        for (Slot slot : this.handler.slots) {
-//#endif
+//? } else {
+        /*for (Slot slot : this.handler.slots) {
+*///? }
             reglass$originalSlotPositions.computeIfAbsent(slot, s -> new int[] { s.x, s.y });
         }
     }
@@ -573,15 +573,15 @@ protected AbstractContainerScreenMixin(Text title) {
     private void reglass$spaceGenericHotbar() {
         List<Slot> candidates = new ArrayList<>();
         int bestY = Integer.MIN_VALUE;
-//#if MC >= 26
+//? if >= 26 {
         for (Slot slot : this.menu.slots) {
             int containerSlot = slot.getContainerSlot();
             if (!slot.isActive() || containerSlot < 0 || containerSlot > 8) {
-//#else
-        for (Slot slot : this.handler.slots) {
+//? } else {
+        /*for (Slot slot : this.handler.slots) {
             int containerSlot = slot.getIndex();
             if (!slot.isEnabled() || containerSlot < 0 || containerSlot > 8) {
-//#endif
+*///? }
                 continue;
             }
             if (slot.y > bestY) {
@@ -591,26 +591,26 @@ protected AbstractContainerScreenMixin(Text title) {
         if (bestY == Integer.MIN_VALUE) {
             return;
         }
-//#if MC >= 26
+//? if >= 26 {
         for (Slot slot : this.menu.slots) {
             int containerSlot = slot.getContainerSlot();
             if (slot.isActive() && containerSlot >= 0 && containerSlot <= 8 && slot.y == bestY) {
-//#else
-        for (Slot slot : this.handler.slots) {
+//? } else {
+        /*for (Slot slot : this.handler.slots) {
             int containerSlot = slot.getIndex();
             if (slot.isEnabled() && containerSlot >= 0 && containerSlot <= 8 && slot.y == bestY) {
-//#endif
+*///? }
                 candidates.add(slot);
             }
         }
         if (candidates.size() != 9) {
             return;
         }
-//#if MC >= 26
+//? if >= 26 {
         candidates.sort(Comparator.comparingInt(Slot::getContainerSlot));
-//#else
-        candidates.sort(Comparator.comparingInt(Slot::getIndex));
-//#endif
+//? } else {
+        /*candidates.sort(Comparator.comparingInt(Slot::getIndex));
+*///? }
         for (Slot slot : candidates) {
             int[] original = reglass$originalSlotPositions.get(slot);
             if (original != null) {
@@ -690,32 +690,32 @@ protected AbstractContainerScreenMixin(Text title) {
     }
 
     @Unique
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$setSlotPosition(int index, int x, int y) {
         if (index < 0 || index >= this.menu.slots.size()) {
-//#else
-    private void reglass$setSlotPosition(int index, int slotX, int slotY) {
+//? } else {
+    /*private void reglass$setSlotPosition(int index, int slotX, int slotY) {
         if (index < 0 || index >= this.handler.slots.size()) {
-//#endif
+*///? }
             return;
         }
-//#if MC >= 26
+//? if >= 26 {
         reglass$setSlotPosition(this.menu.slots.get(index), x, y);
-//#else
-        reglass$setSlotPosition(this.handler.slots.get(index), slotX, slotY);
-//#endif
+//? } else {
+        /*reglass$setSlotPosition(this.handler.slots.get(index), slotX, slotY);
+*///? }
     }
 
     @Unique
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$setSlotPosition(Slot slot, int x, int y) {
         ((SlotAccessor) slot).reglass$setX(x);
         ((SlotAccessor) slot).reglass$setY(y);
-//#else
-    private void reglass$setSlotPosition(Slot slot, int slotX, int slotY) {
+//? } else {
+    /*private void reglass$setSlotPosition(Slot slot, int slotX, int slotY) {
         ((SlotAccessor) slot).reglass$setX(slotX);
         ((SlotAccessor) slot).reglass$setY(slotY);
-//#endif
+*///? }
     }
 
     @Unique
diff --git a/src/main/java/restudio/reglass/mixin/client/AnvilScreenMixin.java b/src/main/java/restudio/reglass/mixin/client/AnvilScreenMixin.java
index 3246e3f..6410710 100644
--- a/src/main/java/restudio/reglass/mixin/client/AnvilScreenMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/AnvilScreenMixin.java
@@ -1,55 +1,55 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.screens.inventory.AnvilScreen;
 import net.minecraft.network.chat.Component;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.AnvilScreen;
 import net.minecraft.client.gui.widget.TextFieldWidget;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-//#if MC >= 26
+//? if >= 26 {
 import org.spongepowered.asm.mixin.injection.Redirect;
-//#endif
+//? }
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import restudio.reglass.client.api.ReGlassConfig;
 
 @Mixin(AnvilScreen.class)
 public abstract class AnvilScreenMixin {
-//#if MC >= 26
+//? if >= 26 {
     @Shadow private EditBox name;
-//#else
-    @Shadow private TextFieldWidget nameField;
-//#endif
+//? } else {
+    /*@Shadow private TextFieldWidget nameField;
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "subInit", at = @At("TAIL"))
-//#else
-    @Inject(method = "setup", at = @At("TAIL"))
-//#endif
+//? } else {
+    /*@Inject(method = "setup", at = @At("TAIL"))
+*///? }
     private void reglass$layoutNameField(CallbackInfo ci) {
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         this.name.setX(this.name.getX() - 54);
         this.name.setWidth(160);
-//#else
-        this.nameField.setX(this.nameField.getX() - 54);
+//? } else {
+        /*this.nameField.setX(this.nameField.getX() - 54);
         this.nameField.setWidth(160);
-//#endif
+*///? }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Redirect(
             method = "extractLabels",
             at = @At(
@@ -58,24 +58,24 @@ public abstract class AnvilScreenMixin {
             )
     )
     private void reglass$text(GuiGraphicsExtractor context, Font font, Component text, int x, int y, int color) {
-//#else
-    @Inject(method = "drawForeground", at = @At("HEAD"), cancellable = true)
+//? } else {
+    /*@Inject(method = "drawForeground", at = @At("HEAD"), cancellable = true)
     private void reglass$drawForeground(DrawContext context, int mouseX, int mouseY, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
-//#if MC >= 26
+//? if >= 26 {
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             context.text(font, text, x, y, color);
             return;
-//#else
-        if (cfg.features.enableRedesign && cfg.features.containers) {
+//? } else {
+        /*if (cfg.features.enableRedesign && cfg.features.containers) {
             ci.cancel();
-//#endif
+*///? }
         }
-//#if MC >= 26
+//? if >= 26 {
 
         context.text(font, text, x, y, 0xFFFFFFFF, true);
-//#endif
+//? }
     }
 }
 
diff --git a/src/main/java/restudio/reglass/mixin/client/BeaconPowerButtonMixin.java b/src/main/java/restudio/reglass/mixin/client/BeaconPowerButtonMixin.java
index 2deceed..e17b2c8 100644
--- a/src/main/java/restudio/reglass/mixin/client/BeaconPowerButtonMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/BeaconPowerButtonMixin.java
@@ -1,13 +1,13 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.resources.Identifier;
-//#else
-import net.minecraft.client.gl.RenderPipelines;
+//? } else {
+/*import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.BeaconScreen;
 import net.minecraft.client.gui.widget.ClickableWidget;
@@ -15,7 +15,7 @@
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Final;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -27,41 +27,41 @@
 import restudio.reglass.client.api.WidgetStyle;
 import restudio.reglass.mixin.accessor.BeaconScreenButtonAccessor;
 
-//#if MC >= 26
+//? if >= 26 {
 @Mixin(targets = "net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconPowerButton")
-//#else
-@Mixin(targets = "net.minecraft.client.gui.screen.ingame.BeaconScreen$EffectButtonWidget")
-//#endif
+//? } else {
+/*@Mixin(targets = "net.minecraft.client.gui.screen.ingame.BeaconScreen$EffectButtonWidget")
+*///? }
 public abstract class BeaconPowerButtonMixin {
     @Shadow private Identifier sprite;
-//#if MC < 26
-    @Shadow private boolean primary;
+//? if < 26 {
+    /*@Shadow private boolean primary;
     @Shadow private RegistryEntry<StatusEffect> effect;
     @Shadow @Final BeaconScreen field_2811;
-//#endif
+*///? }
 
     @Unique private static double reglass$selectedBlobX = Double.NaN;
     @Unique private static double reglass$selectedBlobY = Double.NaN;
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractIcon", at = @At("HEAD"), cancellable = true)
     private void reglass$renderInactiveEffectIcon(GuiGraphicsExtractor context, CallbackInfo ci) {
-//#else
-    @Inject(method = "renderExtra", at = @At("HEAD"), cancellable = true)
+//? } else {
+    /*@Inject(method = "renderExtra", at = @At("HEAD"), cancellable = true)
     private void reglass$renderEffectIcon(DrawContext context, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         AbstractWidget widget = (AbstractWidget)(Object) this;
         if (widget.active && ((BeaconScreenButtonAccessor) this).reglass$isSelected()) {
-//#else
-        ClickableWidget widget = (ClickableWidget)(Object) this;
+//? } else {
+        /*ClickableWidget widget = (ClickableWidget)(Object) this;
         if (widget.active && reglass$isSelected()) {
-//#endif
+*///? }
             int targetX = widget.getX() + 1;
             int targetY = widget.getY() + 1;
             if (Double.isNaN(reglass$selectedBlobX)
@@ -72,32 +72,32 @@ public abstract class BeaconPowerButtonMixin {
                 reglass$selectedBlobY = targetY;
             }
 
-//#if MC >= 26
+//? if >= 26 {
             double deltaTicks = Minecraft.getInstance().getDeltaTracker().getRealtimeDeltaTicks();
             double deltaSeconds = deltaTicks / 20.0;
             double tau = 0.08;
             double alpha = 1.0 - Math.exp(-deltaSeconds / tau);
-//#else
-            double deltaSeconds = 1.0 / 60.0;
+//? } else {
+            /*double deltaSeconds = 1.0 / 60.0;
             double alpha = 1.0 - Math.exp(-deltaSeconds / 0.08);
-//#endif
+*///? }
             if (alpha < 0.0) alpha = 0.0;
             if (alpha > 1.0) alpha = 1.0;
             reglass$selectedBlobX += (targetX - reglass$selectedBlobX) * alpha;
             reglass$selectedBlobY += (targetY - reglass$selectedBlobY) * alpha;
 
             ReGlassApi.create(context)
-//#if MC >= 26
+//? if >= 26 {
                     .dimensions((int) Math.round(reglass$selectedBlobX), (int) Math.round(reglass$selectedBlobY), 20, 20)
-//#else
-                    .dimensions((int)Math.round(reglass$selectedBlobX), (int)Math.round(reglass$selectedBlobY), 20, 20)
-//#endif
+//? } else {
+                    /*.dimensions((int)Math.round(reglass$selectedBlobX), (int)Math.round(reglass$selectedBlobY), 20, 20)
+*///? }
                     .cornerRadius(6)
                     .hover(0.9f)
                     .style(WidgetStyle.create().tint(0x000000, 0.16f).layer(2))
-//#if MC >= 26
+//? if >= 26 {
                     .screenSpace()
-//#endif
+//? }
                     .render();
         }
 
@@ -105,22 +105,22 @@ public abstract class BeaconPowerButtonMixin {
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         context.blitSprite(RenderPipelines.GUI_TEXTURED, this.sprite, widget.getX() + 2, widget.getY() + 2, 18, 18, 0xFF555555);
-//#else
-        context.drawGuiTexture(RenderPipelines.GUI_TEXTURED, this.sprite, widget.getX() + 2, widget.getY() + 2, 18, 18, 0xFF555555);
-//#endif
+//? } else {
+        /*context.drawGuiTexture(RenderPipelines.GUI_TEXTURED, this.sprite, widget.getX() + 2, widget.getY() + 2, 18, 18, 0xFF555555);
+*///? }
         ci.cancel();
     }
 
-//#if MC < 26
-    @Unique
+//? if < 26 {
+    /*@Unique
     private boolean reglass$isSelected() {
         RegistryEntry<StatusEffect> selected = this.primary
                 ? ((BeaconScreenButtonAccessor) this.field_2811).reglass$getPrimaryEffect()
                 : ((BeaconScreenButtonAccessor) this.field_2811).reglass$getSecondaryEffect();
         return selected != null && selected.equals(this.effect);
     }
-//#endif
+*///? }
 }
 
diff --git a/src/main/java/restudio/reglass/mixin/client/BeaconScreenMixin.java b/src/main/java/restudio/reglass/mixin/client/BeaconScreenMixin.java
index 089c220..0689328 100644
--- a/src/main/java/restudio/reglass/mixin/client/BeaconScreenMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/BeaconScreenMixin.java
@@ -1,6 +1,6 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractWidget;
@@ -12,8 +12,8 @@
 import net.minecraft.world.inventory.BeaconMenu;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
-//#else
-import net.minecraft.client.font.TextRenderer;
+//? } else {
+/*import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.screen.ingame.BeaconScreen;
@@ -24,7 +24,7 @@
 import net.minecraft.item.Items;
 import net.minecraft.screen.BeaconScreenHandler;
 import net.minecraft.text.Text;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -35,15 +35,15 @@
 import restudio.reglass.client.api.WidgetStyle;
 
 @Mixin(BeaconScreen.class)
-//#if MC >= 26
+//? if >= 26 {
 public abstract class BeaconScreenMixin extends AbstractContainerScreen<BeaconMenu> {
     protected BeaconScreenMixin(BeaconMenu menu, Inventory inventory, Component title) {
         super(menu, inventory, title);
-//#else
-public abstract class BeaconScreenMixin extends HandledScreen<BeaconScreenHandler> {
+//? } else {
+/*public abstract class BeaconScreenMixin extends HandledScreen<BeaconScreenHandler> {
     protected BeaconScreenMixin(BeaconScreenHandler handler, PlayerInventory inventory, Text title) {
         super(handler, inventory, title);
-//#endif
+*///? }
     }
 
     @Inject(method = "init", at = @At("TAIL"))
@@ -51,11 +51,11 @@ protected BeaconScreenMixin(BeaconScreenHandler handler, PlayerInventory invento
         reglass$layoutBeaconControls();
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "containerTick", at = @At("TAIL"))
-//#else
-    @Inject(method = "handledScreenTick", at = @At("TAIL"))
-//#endif
+//? } else {
+    /*@Inject(method = "handledScreenTick", at = @At("TAIL"))
+*///? }
     private void reglass$relayoutButtons(CallbackInfo ci) {
         reglass$layoutBeaconControls();
     }
@@ -67,47 +67,47 @@ protected BeaconScreenMixin(BeaconScreenHandler handler, PlayerInventory invento
         }
 
         int primaryCols = 3;
-//#if MC >= 26
+//? if >= 26 {
         int primaryX = this.leftPos + 62 - (primaryCols * 28 - 4) / 2;
         int primaryY = this.topPos + 32;
         int secondaryX = this.leftPos + 168 - (2 * 28 - 4) / 2;
         int secondaryY = this.topPos + 46;
-//#else
-        int primaryX = this.x + 62 - (primaryCols * 28 - 4) / 2;
+//? } else {
+        /*int primaryX = this.x + 62 - (primaryCols * 28 - 4) / 2;
         int primaryY = this.y + 32;
         int secondaryX = this.x + 168 - (2 * 28 - 4) / 2;
         int secondaryY = this.y + 46;
-//#endif
+*///? }
 
         int powerIndex = 0;
-//#if MC >= 26
+//? if >= 26 {
         for (GuiEventListener child : this.children()) {
             if (!(child instanceof AbstractWidget widget)) {
-//#else
-        for (Element child : this.children()) {
+//? } else {
+        /*for (Element child : this.children()) {
             if (!(child instanceof ClickableWidget widget)) {
-//#endif
+*///? }
                 continue;
             }
 
             String widgetName = widget.getClass().getName();
-//#if MC >= 26
+//? if >= 26 {
             if (widgetName.contains("BeaconConfirmButton")) {
                 widget.setX(this.leftPos + 168);
                 widget.setY(this.topPos + 104);
             } else if (widgetName.contains("BeaconCancelButton")) {
-//#else
-            if (widgetName.contains("DoneButtonWidget")) {
+//? } else {
+            /*if (widgetName.contains("DoneButtonWidget")) {
                 widget.setX(this.x + 168);
                 widget.setY(this.y + 104);
             } else if (widgetName.contains("CancelButtonWidget")) {
-//#endif
+*///? }
                 widget.visible = false;
-//#if MC >= 26
+//? if >= 26 {
             } else if (widgetName.contains("BeaconPowerButton")) {
-//#else
-            } else if (widgetName.contains("EffectButtonWidget")) {
-//#endif
+//? } else {
+            /*} else if (widgetName.contains("EffectButtonWidget")) {
+*///? }
                 widget.visible = true;
                 if (powerIndex < 5) {
                     widget.setX(primaryX + powerIndex % primaryCols * 28);
@@ -122,121 +122,121 @@ protected BeaconScreenMixin(BeaconScreenHandler handler, PlayerInventory invento
         }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractBackground", at = @At("TAIL"))
     private void reglass$extractPanels(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#else
-    @Inject(method = "drawBackground", at = @At("TAIL"))
+//? } else {
+    /*@Inject(method = "drawBackground", at = @At("TAIL"))
     private void reglass$extractPanels(DrawContext context, float delta, int mouseX, int mouseY, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         reglass$panel(context, this.leftPos + 20, this.topPos + 28, 84, 58, 0.14f);
         reglass$panel(context, this.leftPos + 140, this.topPos + 42, 56, 30, 0.14f);
 
-//#else
-        reglass$panel(context, this.x + 20, this.y + 28, 84, 58, 0.14f);
+//? } else {
+        /*reglass$panel(context, this.x + 20, this.y + 28, 84, 58, 0.14f);
         reglass$panel(context, this.x + 140, this.y + 42, 56, 30, 0.14f);
-//#endif
+*///? }
         reglass$renderPaymentItems(context);
-//#if MC >= 26
+//? if >= 26 {
         reglass$panel(context, this.leftPos + 168, this.topPos + 104, 22, 22, 0.14f);
-//#else
-        reglass$panel(context, this.x + 168, this.y + 104, 22, 22, 0.14f);
-//#endif
+//? } else {
+        /*reglass$panel(context, this.x + 168, this.y + 104, 22, 22, 0.14f);
+*///? }
     }
 
     @Redirect(
-//#if MC >= 26
+//? if >= 26 {
             method = "extractBackground",
-//#else
-            method = "drawBackground",
-//#endif
+//? } else {
+            /*method = "drawBackground",
+*///? }
             at = @At(
                     value = "INVOKE",
-//#if MC >= 26
+//? if >= 26 {
                     target = "Lnet/minecraft/client/gui/GuiGraphicsExtractor;item(Lnet/minecraft/world/item/ItemStack;II)V"
-//#else
-                    target = "Lnet/minecraft/client/gui/DrawContext;drawItem(Lnet/minecraft/item/ItemStack;II)V"
-//#endif
+//? } else {
+                    /*target = "Lnet/minecraft/client/gui/DrawContext;drawItem(Lnet/minecraft/item/ItemStack;II)V"
+*///? }
             )
     )
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$skipVanillaPaymentItems(GuiGraphicsExtractor context, ItemStack itemStack, int x, int y) {
-//#else
-    private void reglass$skipVanillaPaymentItems(DrawContext context, ItemStack itemStack, int x, int y) {
-//#endif
+//? } else {
+    /*private void reglass$skipVanillaPaymentItems(DrawContext context, ItemStack itemStack, int x, int y) {
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
-//#if MC >= 26
+//? if >= 26 {
             context.item(itemStack, x, y);
-//#else
-            context.drawItem(itemStack, x, y);
-//#endif
+//? } else {
+            /*context.drawItem(itemStack, x, y);
+*///? }
         }
     }
 
     @Redirect(
-//#if MC >= 26
+//? if >= 26 {
             method = "extractLabels",
-//#else
-            method = "drawForeground",
-//#endif
+//? } else {
+            /*method = "drawForeground",
+*///? }
             at = @At(
                     value = "INVOKE",
-//#if MC >= 26
+//? if >= 26 {
                     target = "Lnet/minecraft/client/gui/GuiGraphicsExtractor;centeredText(Lnet/minecraft/client/gui/Font;Lnet/minecraft/network/chat/Component;III)V"
-//#else
-                    target = "Lnet/minecraft/client/gui/DrawContext;drawCenteredTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;III)V"
-//#endif
+//? } else {
+                    /*target = "Lnet/minecraft/client/gui/DrawContext;drawCenteredTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;III)V"
+*///? }
             )
     )
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$centeredText(GuiGraphicsExtractor context, Font font, Component text, int centerX, int y, int color) {
-//#else
-    private void reglass$centeredText(DrawContext context, TextRenderer font, Text text, int centerX, int y, int color) {
-//#endif
+//? } else {
+    /*private void reglass$centeredText(DrawContext context, TextRenderer font, Text text, int centerX, int y, int color) {
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
-//#if MC >= 26
+//? if >= 26 {
             context.centeredText(font, text, centerX, y, color);
-//#else
-            context.drawCenteredTextWithShadow(font, text, centerX, y, color);
-//#endif
+//? } else {
+            /*context.drawCenteredTextWithShadow(font, text, centerX, y, color);
+*///? }
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         context.text(font, text, centerX - font.width(text) / 2, y - 2, 0xFFFFFFFF, true);
-//#else
-        context.drawText(font, text, centerX - font.getWidth(text) / 2, y - 2, 0xFFFFFFFF, true);
-//#endif
+//? } else {
+        /*context.drawText(font, text, centerX - font.getWidth(text) / 2, y - 2, 0xFFFFFFFF, true);
+*///? }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$panel(GuiGraphicsExtractor context, int x, int y, int width, int height, float alpha) {
-//#else
-    private void reglass$panel(DrawContext context, int x, int y, int width, int height, float alpha) {
-//#endif
+//? } else {
+    /*private void reglass$panel(DrawContext context, int x, int y, int width, int height, float alpha) {
+*///? }
         ReGlassApi.create(context)
                 .dimensions(x, y, width, height)
                 .cornerRadius(8)
                 .style(WidgetStyle.create().tint(0x000000, alpha).layer(1))
-//#if MC >= 26
+//? if >= 26 {
                 .screenSpace()
-//#endif
+//? }
                 .render();
     }
 
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$renderPaymentItems(GuiGraphicsExtractor context) {
-//#else
-    private void reglass$renderPaymentItems(DrawContext context) {
-//#endif
+//? } else {
+    /*private void reglass$renderPaymentItems(DrawContext context) {
+*///? }
         ItemStack[] items = new ItemStack[] {
                 new ItemStack(Items.NETHERITE_INGOT),
                 new ItemStack(Items.EMERALD),
@@ -245,23 +245,23 @@ protected BeaconScreenMixin(BeaconScreenHandler handler, PlayerInventory invento
                 new ItemStack(Items.IRON_INGOT)
         };
 
-//#if MC >= 26
+//? if >= 26 {
         int startX = this.leftPos + 14;
         int y = this.topPos + 106;
-//#else
-        int startX = this.x + 14;
+//? } else {
+        /*int startX = this.x + 14;
         int itemY = this.y + 106;
-//#endif
+*///? }
         for (int i = 0; i < items.length; i++) {
-//#if MC >= 26
+//? if >= 26 {
             int x = startX + i * 23;
             reglass$panel(context, x - 2, y - 2, 20, 20, 0.13f);
             context.item(items[i], x, y);
-//#else
-            int itemX = startX + i * 23;
+//? } else {
+            /*int itemX = startX + i * 23;
             reglass$panel(context, itemX - 2, itemY - 2, 20, 20, 0.13f);
             context.drawItem(items[i], itemX, itemY);
-//#endif
+*///? }
         }
     }
 }
diff --git a/src/main/java/restudio/reglass/mixin/client/BrewingStandScreenMixin.java b/src/main/java/restudio/reglass/mixin/client/BrewingStandScreenMixin.java
index de986d2..b3f92b5 100644
--- a/src/main/java/restudio/reglass/mixin/client/BrewingStandScreenMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/BrewingStandScreenMixin.java
@@ -1,6 +1,6 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.BrewingStandScreen;
@@ -8,15 +8,15 @@
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.BrewingStandMenu;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.BrewingStandScreen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.screen.BrewingStandScreenHandler;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.MathHelper;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -25,62 +25,62 @@
 import restudio.reglass.client.api.ReGlassConfig;
 
 @Mixin(BrewingStandScreen.class)
-//#if MC >= 26
+//? if >= 26 {
 public abstract class BrewingStandScreenMixin extends AbstractContainerScreen<BrewingStandMenu> {
     protected BrewingStandScreenMixin(BrewingStandMenu menu, Inventory inventory, Component title) {
         super(menu, inventory, title);
-//#else
-public abstract class BrewingStandScreenMixin extends HandledScreen<BrewingStandScreenHandler> {
+//? } else {
+/*public abstract class BrewingStandScreenMixin extends HandledScreen<BrewingStandScreenHandler> {
     protected BrewingStandScreenMixin(BrewingStandScreenHandler handler, PlayerInventory inventory, Text title) {
         super(handler, inventory, title);
-//#endif
+*///? }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractBackground", at = @At("TAIL"))
     private void reglass$extractBrewingMeters(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#else
-    @Inject(method = "drawBackground", at = @At("TAIL"))
+//? } else {
+    /*@Inject(method = "drawBackground", at = @At("TAIL"))
     private void reglass$extractBrewingMeters(DrawContext context, float delta, int mouseX, int mouseY, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         int brewTicks = Mth.clamp(this.menu.getBrewingTicks(), 0, 400);
-//#else
-        int brewTicks = MathHelper.clamp(this.handler.getBrewTime(), 0, 400);
-//#endif
+//? } else {
+        /*int brewTicks = MathHelper.clamp(this.handler.getBrewTime(), 0, 400);
+*///? }
         float brewProgress = brewTicks == 0 ? 0f : 1.0f - brewTicks / 400.0f;
-//#if MC >= 26
+//? if >= 26 {
         reglass$progressRail(context, this.leftPos + 78, this.topPos + 33, 18, brewProgress);
-//#else
-        reglass$progressRail(context, this.x + 78, this.y + 33, 18, brewProgress);
-//#endif
+//? } else {
+        /*reglass$progressRail(context, this.x + 78, this.y + 33, 18, brewProgress);
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
         int fuel = Mth.clamp(this.menu.getFuel(), 0, 20);
         reglass$progressRail(context, this.leftPos + 22, this.topPos + 50, 18, fuel / 20.0f);
-//#else
-        int fuel = MathHelper.clamp(this.handler.getFuel(), 0, 20);
+//? } else {
+        /*int fuel = MathHelper.clamp(this.handler.getFuel(), 0, 20);
         reglass$progressRail(context, this.x + 22, this.y + 50, 18, fuel / 20.0f);
-//#endif
+*///? }
     }
 
     @Unique
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$progressRail(GuiGraphicsExtractor context, int x, int y, int width, float progress) {
-//#else
-    private void reglass$progressRail(DrawContext context, int x, int y, int width, float progress) {
-//#endif
+//? } else {
+    /*private void reglass$progressRail(DrawContext context, int x, int y, int width, float progress) {
+*///? }
         context.fill(x, y, x + width, y + 2, 0x66000000);
-//#if MC >= 26
+//? if >= 26 {
         int filled = Mth.clamp(Math.round(width * progress), 0, width);
-//#else
-        int filled = MathHelper.clamp(Math.round(width * progress), 0, width);
-//#endif
+//? } else {
+        /*int filled = MathHelper.clamp(Math.round(width * progress), 0, width);
+*///? }
         if (filled > 0) {
             context.fill(x, y, x + filled, y + 2, 0xCCFFFFFF);
         }
diff --git a/src/main/java/restudio/reglass/mixin/client/CreativeModeInventoryScreenMixin.java b/src/main/java/restudio/reglass/mixin/client/CreativeModeInventoryScreenMixin.java
index 994ca2a..9dd2f2e 100644
--- a/src/main/java/restudio/reglass/mixin/client/CreativeModeInventoryScreenMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/CreativeModeInventoryScreenMixin.java
@@ -1,6 +1,6 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
@@ -9,8 +9,8 @@
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.CreativeModeTab;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.gui.widget.TextFieldWidget;
@@ -18,7 +18,7 @@
 import net.minecraft.item.ItemGroup;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.text.Text;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -31,27 +31,27 @@
 import restudio.reglass.client.api.WidgetStyle;
 import restudio.reglass.mixin.accessor.SlotAccessor;
 
-//#if MC >= 26
+//? if >= 26 {
 @Mixin(CreativeModeInventoryScreen.class)
 public abstract class CreativeModeInventoryScreenMixin extends AbstractContainerScreen<CreativeModeInventoryScreen.ItemPickerMenu> {
     @Shadow private static CreativeModeTab selectedTab;
     @Shadow private EditBox searchBox;
     @Shadow private Slot destroyItemSlot;
-//#else
-@Mixin(CreativeInventoryScreen.class)
+//? } else {
+/*@Mixin(CreativeInventoryScreen.class)
 public abstract class CreativeModeInventoryScreenMixin extends HandledScreen<CreativeInventoryScreen.CreativeScreenHandler> {
     @Shadow private static ItemGroup selectedTab;
     @Shadow private TextFieldWidget searchBox;
     @Shadow private Slot deleteItemSlot;
-//#endif
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
     protected CreativeModeInventoryScreenMixin(CreativeModeInventoryScreen.ItemPickerMenu menu, Inventory inventory, Component title) {
         super(menu, inventory, title);
-//#else
-    protected CreativeModeInventoryScreenMixin(CreativeInventoryScreen.CreativeScreenHandler handler, PlayerInventory inventory, Text title) {
+//? } else {
+    /*protected CreativeModeInventoryScreenMixin(CreativeInventoryScreen.CreativeScreenHandler handler, PlayerInventory inventory, Text title) {
         super(handler, inventory, title);
-//#endif
+*///? }
     }
 
     @Inject(method = "init", at = @At("TAIL"))
@@ -61,38 +61,38 @@ protected CreativeModeInventoryScreenMixin(CreativeInventoryScreen.CreativeScree
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         this.searchBox.setY(this.topPos + 4);
-//#else
-        this.searchBox.setY(this.y + 4);
-//#endif
+//? } else {
+        /*this.searchBox.setY(this.y + 4);
+*///? }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "selectTab", at = @At("TAIL"))
     private void reglass$spaceSurvivalTab(CreativeModeTab tab, CallbackInfo ci) {
-//#else
-    @Inject(method = "setSelectedTab", at = @At("TAIL"))
+//? } else {
+    /*@Inject(method = "setSelectedTab", at = @At("TAIL"))
     private void reglass$spaceSurvivalTab(ItemGroup tab, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
-//#if MC >= 26
+//? if >= 26 {
         if (!cfg.features.enableRedesign || !cfg.features.containers || selectedTab.getType() != CreativeModeTab.Type.INVENTORY) {
-//#else
-        if (!cfg.features.enableRedesign || !cfg.features.containers || selectedTab.getType() != ItemGroup.Type.INVENTORY) {
-//#endif
+//? } else {
+        /*if (!cfg.features.enableRedesign || !cfg.features.containers || selectedTab.getType() != ItemGroup.Type.INVENTORY) {
+*///? }
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         for (int i = 0; i < this.menu.slots.size(); i++) {
             Slot slot = this.menu.slots.get(i);
             if (slot == this.destroyItemSlot) {
-//#else
-        for (int i = 0; i < this.handler.slots.size(); i++) {
+//? } else {
+        /*for (int i = 0; i < this.handler.slots.size(); i++) {
             Slot slot = this.handler.slots.get(i);
             if (slot == this.deleteItemSlot) {
-//#endif
+*///? }
                 reglass$setSlotPosition(slot, 181, 120);
             } else if (i >= 5 && i <= 8) {
                 int armorIndex = i - 5;
@@ -106,46 +106,46 @@ protected CreativeModeInventoryScreenMixin(CreativeInventoryScreen.CreativeScree
     }
 
     @Inject(method = "getTabY", at = @At("HEAD"), cancellable = true)
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$getTabY(CreativeModeTab tab, CallbackInfoReturnable<Integer> cir) {
-//#else
-    private void reglass$getTabY(ItemGroup tab, CallbackInfoReturnable<Integer> cir) {
-//#endif
+//? } else {
+    /*private void reglass$getTabY(ItemGroup tab, CallbackInfoReturnable<Integer> cir) {
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         cir.setReturnValue(tab.row() == CreativeModeTab.Row.TOP ? -36 : this.imageHeight + 4);
-//#else
-        cir.setReturnValue(tab.getRow() == ItemGroup.Row.TOP ? -36 : this.backgroundHeight + 4);
-//#endif
+//? } else {
+        /*cir.setReturnValue(tab.getRow() == ItemGroup.Row.TOP ? -36 : this.backgroundHeight + 4);
+*///? }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractTabButton", at = @At("HEAD"), cancellable = true)
     private void reglass$extractTabButton(GuiGraphicsExtractor context, int mouseX, int mouseY, CreativeModeTab tab, CallbackInfo ci) {
-//#else
-    @Inject(method = "renderTabIcon", at = @At("HEAD"), cancellable = true)
+//? } else {
+    /*@Inject(method = "renderTabIcon", at = @At("HEAD"), cancellable = true)
     private void reglass$renderTabIcon(DrawContext context, int mouseX, int mouseY, ItemGroup tab, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         boolean selected = tab == selectedTab;
         boolean top = tab.row() == CreativeModeTab.Row.TOP;
         int x = this.leftPos + reglass$getTabX(tab);
         int y = this.topPos + (top ? -34 : this.imageHeight + 6);
-//#else
-        boolean selected = tab == selectedTab;
+//? } else {
+        /*boolean selected = tab == selectedTab;
         boolean top = tab.getRow() == ItemGroup.Row.TOP;
         int x = this.x + reglass$getTabX(tab);
         int y = this.y + (top ? -34 : this.backgroundHeight + 6);
-//#endif
+*///? }
         int blobX = x + 1;
         int blobY = y + (top ? 5 : 3);
 
@@ -156,38 +156,38 @@ protected CreativeModeInventoryScreenMixin(CreativeInventoryScreen.CreativeScree
                 .style(WidgetStyle.create()
                         .tint(0x000000, selected ? 0.22f : 0.12f)
                         .layer(selected ? 3 : 2))
-//#if MC >= 26
+//? if >= 26 {
                 .screenSpace()
-//#endif
+//? }
                 .render();
 
-//#if MC >= 26
+//? if >= 26 {
         context.item(tab.getIconItem(), x + 5, y + (top ? 9 : 7));
-//#else
-        context.drawItem(tab.getIcon(), x + 5, y + (top ? 9 : 7));
-//#endif
+//? } else {
+        /*context.drawItem(tab.getIcon(), x + 5, y + (top ? 9 : 7));
+*///? }
         ci.cancel();
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractLabels", at = @At("HEAD"), cancellable = true)
     private void reglass$extractLabels(GuiGraphicsExtractor context, int mouseX, int mouseY, CallbackInfo ci) {
-//#else
-    @Inject(method = "drawForeground", at = @At("HEAD"), cancellable = true)
+//? } else {
+    /*@Inject(method = "drawForeground", at = @At("HEAD"), cancellable = true)
     private void reglass$drawLabels(DrawContext context, int mouseX, int mouseY, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         if (selectedTab.showTitle()) {
             context.text(this.font, selectedTab.getDisplayName(), 8, 4, 0xFFFFFFFF, true);
-//#else
-        if (selectedTab.shouldRenderName()) {
+//? } else {
+        /*if (selectedTab.shouldRenderName()) {
             context.drawText(this.textRenderer, selectedTab.getDisplayName(), 8, 4, 0xFFFFFFFF, true);
-//#endif
+*///? }
         }
         ci.cancel();
     }
@@ -197,7 +197,7 @@ protected CreativeModeInventoryScreenMixin(CreativeInventoryScreen.CreativeScree
         ((SlotAccessor) slot).reglass$setX(x);
         ((SlotAccessor) slot).reglass$setY(y);
     }
-//#if MC >= 26
+//? if >= 26 {
 
     @Unique
     private int reglass$getTabX(CreativeModeTab tab) {
@@ -207,8 +207,8 @@ protected CreativeModeInventoryScreenMixin(CreativeInventoryScreen.CreativeScree
         }
         return 27 * column;
     }
-//#else
-    @Unique
+//? } else {
+    /*@Unique
     private int reglass$getTabX(ItemGroup tab) {
         int column = tab.getColumn();
         if (tab.isSpecial()) {
@@ -216,6 +216,6 @@ protected CreativeModeInventoryScreenMixin(CreativeInventoryScreen.CreativeScree
         }
         return 27 * column;
     }
-//#endif
+*///? }
 }
 
diff --git a/src/main/java/restudio/reglass/mixin/client/EnchantmentScreenMixin.java b/src/main/java/restudio/reglass/mixin/client/EnchantmentScreenMixin.java
index 798102f..d0eefca 100644
--- a/src/main/java/restudio/reglass/mixin/client/EnchantmentScreenMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/EnchantmentScreenMixin.java
@@ -1,20 +1,20 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.EnchantmentScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.EnchantmentMenu;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.EnchantmentScreen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.screen.EnchantmentScreenHandler;
 import net.minecraft.text.Text;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -24,40 +24,40 @@
 import restudio.reglass.client.api.WidgetStyle;
 
 @Mixin(EnchantmentScreen.class)
-//#if MC >= 26
+//? if >= 26 {
 public abstract class EnchantmentScreenMixin extends AbstractContainerScreen<EnchantmentMenu> {
     protected EnchantmentScreenMixin(EnchantmentMenu menu, Inventory inventory, Component title) {
         super(menu, inventory, title);
-//#else
-public abstract class EnchantmentScreenMixin extends HandledScreen<EnchantmentScreenHandler> {
+//? } else {
+/*public abstract class EnchantmentScreenMixin extends HandledScreen<EnchantmentScreenHandler> {
     protected EnchantmentScreenMixin(EnchantmentScreenHandler handler, PlayerInventory inventory, Text title) {
         super(handler, inventory, title);
-//#endif
+*///? }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractBackground", at = @At("TAIL"))
     private void reglass$extractEnchantingOptionPanel(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#else
-    @Inject(method = "drawBackground", at = @At("TAIL"))
+//? } else {
+    /*@Inject(method = "drawBackground", at = @At("TAIL"))
     private void reglass$extractEnchantingOptionPanel(DrawContext context, float delta, int mouseX, int mouseY, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
         ReGlassApi.create(context)
-//#if MC >= 26
+//? if >= 26 {
                 .dimensions(this.leftPos + 58, this.topPos + 12, 112, 62)
-//#else
-                .dimensions(this.x + 58, this.y + 12, 112, 62)
-//#endif
+//? } else {
+                /*.dimensions(this.x + 58, this.y + 12, 112, 62)
+*///? }
                 .cornerRadius(9)
                 .style(WidgetStyle.create().tint(0x000000, 0.14f).layer(1))
-//#if MC >= 26
+//? if >= 26 {
                 .screenSpace()
-//#endif
+//? }
                 .render();
     }
 }
diff --git a/src/main/java/restudio/reglass/mixin/client/GuiRendererMixin.java b/src/main/java/restudio/reglass/mixin/client/GuiRendererMixin.java
index 67bf231..a05550f 100644
--- a/src/main/java/restudio/reglass/mixin/client/GuiRendererMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/GuiRendererMixin.java
@@ -3,13 +3,13 @@
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.client.gui.render.GuiRenderer;
 import net.minecraft.client.gui.render.SpecialGuiElementRenderer;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.renderer.state.gui.GuiElementRenderState;
 import net.minecraft.client.renderer.MultiBufferSource;
-//#else
-import net.minecraft.client.gui.render.state.special.SpecialGuiElementRenderState;
+//? } else {
+/*import net.minecraft.client.gui.render.state.special.SpecialGuiElementRenderState;
 import net.minecraft.client.render.VertexConsumerProvider;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -23,20 +23,20 @@ public class GuiRendererMixin {
             method = "<init>",
             at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableMap$Builder;buildOrThrow()Lcom/google/common/collect/ImmutableMap;")
     )
-//#if MC >= 26
+//? if >= 26 {
     private ImmutableMap<Class<? extends GuiElementRenderState>, SpecialGuiElementRenderer<?>> addCustomRenderer(
             ImmutableMap.Builder<Class<? extends GuiElementRenderState>, SpecialGuiElementRenderer<?>> builder
-//#else
-    private ImmutableMap<Class<? extends SpecialGuiElementRenderState>, SpecialGuiElementRenderer<?>> addCustomRenderer(
+//? } else {
+    /*private ImmutableMap<Class<? extends SpecialGuiElementRenderState>, SpecialGuiElementRenderer<?>> addCustomRenderer(
             ImmutableMap.Builder<Class<? extends SpecialGuiElementRenderState>, SpecialGuiElementRenderer<?>> builder
-//#endif
+*///? }
     ) {
         GuiRenderer thisGuiRenderer = (GuiRenderer)(Object)this;
-//#if MC >= 26
+//? if >= 26 {
         MultiBufferSource.BufferSource vertexConsumers = ((GuiRendererAccessor) thisGuiRenderer).getVertexConsumers();
-//#else
-        VertexConsumerProvider.Immediate vertexConsumers = ((GuiRendererAccessor) thisGuiRenderer).getVertexConsumers();
-//#endif
+//? } else {
+        /*VertexConsumerProvider.Immediate vertexConsumers = ((GuiRendererAccessor) thisGuiRenderer).getVertexConsumers();
+*///? }
 
         LiquidGlassGuiElementRenderer liquidGlassRenderer = new LiquidGlassGuiElementRenderer(vertexConsumers);
         builder.put(liquidGlassRenderer.getElementClass(), liquidGlassRenderer);
diff --git a/src/main/java/restudio/reglass/mixin/client/InGameHudMixin.java b/src/main/java/restudio/reglass/mixin/client/InGameHudMixin.java
index bcf693c..49b3de4 100644
--- a/src/main/java/restudio/reglass/mixin/client/InGameHudMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/InGameHudMixin.java
@@ -1,19 +1,19 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.DeltaTracker;
-//#if MC >= 26.2
+//? if >= 26.2 {
 import net.minecraft.client.gui.Hud;
-//#else
-import net.minecraft.client.gui.Gui;
-//#endif
+//? } else {
+/*import net.minecraft.client.gui.Gui;
+*///? }
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.world.entity.HumanoidArm;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-//#else
-import net.minecraft.client.MinecraftClient;
+//? } else {
+/*import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.render.RenderTickCounter;
@@ -22,7 +22,7 @@
 import net.minecraft.util.Arm;
 import net.minecraft.util.profiler.Profilers;
 import net.minecraft.world.GameMode;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -35,38 +35,38 @@
 import restudio.reglass.client.api.ReGlassConfig;
 import restudio.reglass.client.api.WidgetStyle;
 
-//#if MC >= 26.2
+//? if >= 26.2 {
 @Mixin(Hud.class)
-//#elseif MC >= 26
-@Mixin(Gui.class)
-//#else
-@Mixin(InGameHud.class)
-//#endif
+//? } elif >= 26 {
+/*@Mixin(Gui.class)
+*///? } else {
+/*@Mixin(InGameHud.class)
+*///? }
 public abstract class InGameHudMixin {
 
-//#if MC >= 26
+//? if >= 26 {
     @Shadow @Final private Minecraft minecraft;
-//#else
-    @Shadow @Final private MinecraftClient client;
-//#endif
+//? } else {
+    /*@Shadow @Final private MinecraftClient client;
+*///? }
 
     @Shadow
-//#if MC >= 26
+//? if >= 26 {
     protected abstract void extractSlot(
             GuiGraphicsExtractor context,
-//#else
-    protected abstract void renderHotbarItem(
+//? } else {
+    /*protected abstract void renderHotbarItem(
             DrawContext context,
-//#endif
+*///? }
             int x,
             int y,
-//#if MC >= 26
+//? if >= 26 {
             DeltaTracker tickCounter,
             Player player,
-//#else
-            RenderTickCounter tickCounter,
+//? } else {
+            /*RenderTickCounter tickCounter,
             PlayerEntity player,
-//#endif
+*///? }
             ItemStack stack,
             int seed
     );
@@ -74,64 +74,64 @@ protected abstract void renderHotbarItem(
     @Unique private double reglass$slotBlobX = Double.NaN;
     @Unique private int reglass$lastSelected = -1;
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractItemHotbar", at = @At("HEAD"), cancellable = true)
-//#else
-    @Inject(method = "renderHotbar", at = @At("HEAD"), cancellable = true)
-//#endif
+//? } else {
+    /*@Inject(method = "renderHotbar", at = @At("HEAD"), cancellable = true)
+*///? }
     private void reglass$onRenderHotbar(
-//#if MC >= 26
+//? if >= 26 {
             GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci
-//#else
-            DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci
-//#endif
+//? } else {
+            /*DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci
+*///? }
     ) {
         if (!ReGlassConfig.INSTANCE.features.enableRedesign
                 || !ReGlassConfig.INSTANCE.features.hotbar) {
             return;
         }
-//#if MC >= 26
+//? if >= 26 {
         if (this.minecraft.gameMode != null && this.minecraft.gameMode.isSpectator()) {
-//#else
-        if (this.client.interactionManager.getCurrentGameMode() == GameMode.SPECTATOR) {
-//#endif
+//? } else {
+        /*if (this.client.interactionManager.getCurrentGameMode() == GameMode.SPECTATOR) {
+*///? }
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         Player player = this.getCameraPlayer();
-//#else
-        PlayerEntity player = this.getCameraPlayer();
-//#endif
+//? } else {
+        /*PlayerEntity player = this.getCameraPlayer();
+*///? }
         if (player == null) {
             return;
         }
 
-//#if MC >= 26.2
+//? if >= 26.2 {
         if (this.minecraft.gui.hud.isHidden()) {
-//#elseif MC >= 26
-        if (this.minecraft.options.hideGui) {
-//#else
-        if (this.client.options.hudHidden) {
-//#endif
+//? } elif >= 26 {
+        /*if (this.minecraft.options.hideGui) {
+*///? } else {
+        /*if (this.client.options.hudHidden) {
+*///? }
             return;
         }
 
         ci.cancel();
 
-//#if MC < 26
-        Profilers.get().push("reglass-hotbar");
+//? if < 26 {
+        /*Profilers.get().push("reglass-hotbar");
 
-//#endif
+*///? }
         int hotbarWidth = 182;
         int hotbarHeight = 22;
-//#if MC >= 26
+//? if >= 26 {
         int x = this.minecraft.getWindow().getGuiScaledWidth() / 2 - hotbarWidth / 2;
         int offhandY = this.minecraft.getWindow().getGuiScaledHeight() - hotbarHeight;
-//#else
-        int x = this.client.getWindow().getScaledWidth() / 2 - hotbarWidth / 2;
+//? } else {
+        /*int x = this.client.getWindow().getScaledWidth() / 2 - hotbarWidth / 2;
         int offhandY = this.client.getWindow().getScaledHeight() - hotbarHeight;
-//#endif
+*///? }
 
         ReGlassApi.create(context)
                 .dimensions(x, offhandY, hotbarWidth, hotbarHeight)
@@ -146,16 +146,16 @@ protected abstract void renderHotbarItem(
             this.reglass$slotBlobX = targetCircleX;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         double deltaTicks = tickCounter.getRealtimeDeltaTicks();
-//#else
-        double deltaTicks;
+//? } else {
+        /*double deltaTicks;
         try {
             deltaTicks = tickCounter.getDynamicDeltaTicks();
         } catch (Throwable t) {
             deltaTicks = 1.0 / 60.0 * 20.0;
         }
-//#endif
+*///? }
         double deltaSeconds = deltaTicks / 20.0;
 
         double tau = 0.08;
@@ -179,38 +179,38 @@ protected abstract void renderHotbarItem(
         for (int i = 0; i < 9; ++i) {
             int itemX = x + 3 + i * 20;
             int itemY = offhandY + 3;
-//#if MC >= 26
+//? if >= 26 {
             this.extractSlot(
-//#else
-            this.renderHotbarItem(
-//#endif
+//? } else {
+            /*this.renderHotbarItem(
+*///? }
                     context,
                     itemX,
                     itemY,
                     tickCounter,
                     player,
-//#if MC >= 26
+//? if >= 26 {
                     player.getInventory().getItem(i),
-//#else
-                    player.getInventory().getStack(i),
-//#endif
+//? } else {
+                    /*player.getInventory().getStack(i),
+*///? }
                     i + 1
             );
         }
 
-//#if MC >= 26
+//? if >= 26 {
         ItemStack offHandStack = player.getOffhandItem();
-//#else
-        ItemStack offHandStack = player.getOffHandStack();
-//#endif
+//? } else {
+        /*ItemStack offHandStack = player.getOffHandStack();
+*///? }
         if (!offHandStack.isEmpty()) {
-//#if MC >= 26
+//? if >= 26 {
             HumanoidArm arm = player.getMainArm().getOpposite();
             int offhandX = (arm == HumanoidArm.LEFT ? x - hotbarHeight - 4 : x + hotbarWidth + 4);
-//#else
-            Arm arm = player.getMainArm().getOpposite();
+//? } else {
+            /*Arm arm = player.getMainArm().getOpposite();
             int offhandX = (arm == Arm.LEFT ? x - hotbarHeight - 4 : x + hotbarWidth + 4);
-//#endif
+*///? }
 
             ReGlassApi.create(context)
                     .dimensions(offhandX, offhandY, hotbarHeight, hotbarHeight)
@@ -218,26 +218,26 @@ protected abstract void renderHotbarItem(
                     .style(new WidgetStyle().tint(0x000000, 0.3f).layer(0))
                     .render();
 
-//#if MC >= 26
+//? if >= 26 {
             this.extractSlot(context, offhandX + 3, offhandY + 3, tickCounter, player, offHandStack, 0);
-//#else
-            this.renderHotbarItem(context, offhandX + 3, offhandY + 3, tickCounter, player, offHandStack, 0);
-//#endif
+//? } else {
+            /*this.renderHotbarItem(context, offhandX + 3, offhandY + 3, tickCounter, player, offHandStack, 0);
+*///? }
         }
 
         LiquidGlassUniforms.get().tryApplyBlur(context);
-//#if MC < 26
+//? if < 26 {
 
-        Profilers.get().pop();
-//#endif
+        /*Profilers.get().pop();
+*///? }
     }
 
     @Shadow
-//#if MC >= 26
+//? if >= 26 {
     private Player getCameraPlayer() {
-//#else
-    private PlayerEntity getCameraPlayer() {
-//#endif
+//? } else {
+    /*private PlayerEntity getCameraPlayer() {
+*///? }
         throw new AssertionError("Mixin application failed!");
     }
 }
diff --git a/src/main/java/restudio/reglass/mixin/client/InventoryScreenMixin.java b/src/main/java/restudio/reglass/mixin/client/InventoryScreenMixin.java
index d0c2ff7..4c4741a 100644
--- a/src/main/java/restudio/reglass/mixin/client/InventoryScreenMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/InventoryScreenMixin.java
@@ -1,14 +1,14 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.navigation.ScreenPosition;
 import net.minecraft.client.gui.screens.inventory.InventoryScreen;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.ScreenPos;
 import net.minecraft.client.gui.screen.ingame.InventoryScreen;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -18,38 +18,38 @@
 
 @Mixin(InventoryScreen.class)
 public class InventoryScreenMixin {
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractLabels", at = @At("HEAD"), cancellable = true)
     private void reglass$hidePlayerInventoryLabels(GuiGraphicsExtractor context, int mouseX, int mouseY, CallbackInfo ci) {
-//#else
-    @Inject(method = "drawForeground", at = @At("HEAD"), cancellable = true)
+//? } else {
+    /*@Inject(method = "drawForeground", at = @At("HEAD"), cancellable = true)
     private void reglass$hidePlayerInventoryLabels(DrawContext context, int mouseX, int mouseY, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (cfg.features.enableRedesign && cfg.features.containers) {
             ci.cancel();
         }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "getRecipeBookButtonPosition", at = @At("RETURN"), cancellable = true)
     private void reglass$moveRecipeBookButton(CallbackInfoReturnable<ScreenPosition> cir) {
-//#else
-    @Inject(method = "getRecipeBookButtonPos", at = @At("RETURN"), cancellable = true)
+//? } else {
+    /*@Inject(method = "getRecipeBookButtonPos", at = @At("RETURN"), cancellable = true)
     private void reglass$moveRecipeBookButton(CallbackInfoReturnable<ScreenPos> cir) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         ScreenPosition original = cir.getReturnValue();
         cir.setReturnValue(new ScreenPosition(original.x() + 28, original.y() - 4));
-//#else
-        ScreenPos original = cir.getReturnValue();
+//? } else {
+        /*ScreenPos original = cir.getReturnValue();
         cir.setReturnValue(new ScreenPos(original.x() + 28, original.y() - 4));
-//#endif
+*///? }
     }
 }
 
diff --git a/src/main/java/restudio/reglass/mixin/client/LoomScreenMixin.java b/src/main/java/restudio/reglass/mixin/client/LoomScreenMixin.java
index f9717c2..849779e 100644
--- a/src/main/java/restudio/reglass/mixin/client/LoomScreenMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/LoomScreenMixin.java
@@ -1,6 +1,6 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.model.object.banner.BannerFlagModel;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
@@ -10,62 +10,62 @@
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.LoomMenu;
 import net.minecraft.world.level.block.entity.BannerPatternLayers;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.gui.screen.ingame.LoomScreen;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.screen.LoomScreenHandler;
 import net.minecraft.text.Text;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-//#if MC >= 26
+//? if >= 26 {
 import org.spongepowered.asm.mixin.injection.Redirect;
-//#endif
+//? }
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import restudio.reglass.client.api.ReGlassApi;
 import restudio.reglass.client.api.ReGlassConfig;
 import restudio.reglass.client.api.WidgetStyle;
 
 @Mixin(LoomScreen.class)
-//#if MC >= 26
+//? if >= 26 {
 public abstract class LoomScreenMixin extends AbstractContainerScreen<LoomMenu> {
     protected LoomScreenMixin(LoomMenu menu, Inventory inventory, Component title) {
         super(menu, inventory, title);
-//#else
-public abstract class LoomScreenMixin extends HandledScreen<LoomScreenHandler> {
+//? } else {
+/*public abstract class LoomScreenMixin extends HandledScreen<LoomScreenHandler> {
     protected LoomScreenMixin(LoomScreenHandler handler, PlayerInventory inventory, Text title) {
         super(handler, inventory, title);
-//#endif
+*///? }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractBackground", at = @At("TAIL"))
     private void reglass$extractPatternPanel(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#else
-    @Inject(method = "drawBackground", at = @At("TAIL"))
+//? } else {
+    /*@Inject(method = "drawBackground", at = @At("TAIL"))
     private void reglass$extractPatternPanel(DrawContext context, float delta, int mouseX, int mouseY, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
         ReGlassApi.create(context)
-//#if MC >= 26
+//? if >= 26 {
                 .dimensions(this.leftPos + 58, this.topPos + 12, 58, 58)
-//#else
-                .dimensions(this.x + 58, this.y + 12, 58, 58)
-//#endif
+//? } else {
+                /*.dimensions(this.x + 58, this.y + 12, 58, 58)
+*///? }
                 .cornerRadius(9)
                 .style(WidgetStyle.create().tint(0x000000, 0.14f).layer(1))
-//#if MC >= 26
+//? if >= 26 {
                 .screenSpace()
-//#endif
+//? }
                 .render();
-//#if MC >= 26
+//? if >= 26 {
     }
 
     @Redirect(
@@ -83,7 +83,7 @@ protected LoomScreenMixin(LoomScreenHandler handler, PlayerInventory inventory,
         }
 
         context.bannerPattern(model, dyeColor, layers, x1 - 3, y1 - 9, x2 - 2, y2 - 9);
-//#endif
+//? }
     }
 }
 
diff --git a/src/main/java/restudio/reglass/mixin/client/MerchantScreenMixin.java b/src/main/java/restudio/reglass/mixin/client/MerchantScreenMixin.java
index 568365d..ccf73ec 100644
--- a/src/main/java/restudio/reglass/mixin/client/MerchantScreenMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/MerchantScreenMixin.java
@@ -1,6 +1,6 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
@@ -11,8 +11,8 @@
 import net.minecraft.world.inventory.MerchantMenu;
 import net.minecraft.world.item.trading.MerchantOffer;
 import net.minecraft.world.item.trading.MerchantOffers;
-//#else
-import net.minecraft.client.gl.RenderPipelines;
+//? } else {
+/*import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.gui.screen.ingame.MerchantScreen;
@@ -22,7 +22,7 @@
 import net.minecraft.util.Identifier;
 import net.minecraft.village.TradeOffer;
 import net.minecraft.village.TradeOfferList;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -33,40 +33,40 @@
 import restudio.reglass.client.api.ReGlassConfig;
 
 @Mixin(MerchantScreen.class)
-//#if MC >= 26
+//? if >= 26 {
 public abstract class MerchantScreenMixin extends AbstractContainerScreen<MerchantMenu> {
     @Shadow @Final private static Component TRADES_LABEL;
     @Shadow @Final private static Identifier TRADE_ARROW_SPRITE;
     @Shadow private int shopItem;
-//#else
-public abstract class MerchantScreenMixin extends HandledScreen<MerchantScreenHandler> {
+//? } else {
+/*public abstract class MerchantScreenMixin extends HandledScreen<MerchantScreenHandler> {
     @Shadow @Final private static Text TRADES_TEXT;
     @Shadow @Final private static Identifier TRADE_ARROW_TEXTURE;
     @Shadow private int selectedIndex;
-//#endif
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
     protected MerchantScreenMixin(MerchantMenu menu, Inventory inventory, Component title) {
         super(menu, inventory, title);
-//#else
-    protected MerchantScreenMixin(MerchantScreenHandler handler, PlayerInventory inventory, Text title) {
+//? } else {
+    /*protected MerchantScreenMixin(MerchantScreenHandler handler, PlayerInventory inventory, Text title) {
         super(handler, inventory, title);
-//#endif
+*///? }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractLabels", at = @At("HEAD"), cancellable = true)
     private void reglass$extractLabels(GuiGraphicsExtractor context, int mouseX, int mouseY, CallbackInfo ci) {
-//#else
-    @Inject(method = "drawForeground", at = @At("HEAD"), cancellable = true)
+//? } else {
+    /*@Inject(method = "drawForeground", at = @At("HEAD"), cancellable = true)
     private void reglass$drawLabels(DrawContext context, int mouseX, int mouseY, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         Component titleText = this.title;
         int traderLevel = this.menu.getTraderLevel();
         if (traderLevel > 0 && traderLevel <= 5 && this.menu.showProgressBar()) {
@@ -75,83 +75,83 @@ protected MerchantScreenMixin(MerchantScreenHandler handler, PlayerInventory inv
                     this.title,
                     Component.translatable("merchant.level." + traderLevel));
         }
-//#else
-        Text titleText = this.title;
+//? } else {
+        /*Text titleText = this.title;
         int titleWidth = this.textRenderer.getWidth(titleText);
         context.drawText(this.textRenderer, titleText, 49 + this.backgroundWidth / 2 - titleWidth / 2, 4, 0xFFFFFFFF, true);
-//#endif
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
         int titleWidth = this.font.width(titleText);
         context.text(this.font, titleText, 49 + this.imageWidth / 2 - titleWidth / 2, reglass$labelY(6), 0xFFFFFFFF, true);
 
         int tradesWidth = this.font.width(TRADES_LABEL);
         context.text(this.font, TRADES_LABEL, 53 - tradesWidth / 2, reglass$labelY(6), 0xFFFFFFFF, true);
-//#else
-        int tradesWidth = this.textRenderer.getWidth(TRADES_TEXT);
+//? } else {
+        /*int tradesWidth = this.textRenderer.getWidth(TRADES_TEXT);
         context.drawText(this.textRenderer, TRADES_TEXT, 53 - tradesWidth / 2, 4, 0xFFFFFFFF, true);
-//#endif
+*///? }
         ci.cancel();
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractBackground", at = @At("TAIL"))
     private void reglass$extractSelectedTradeArrow(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#else
-    @Inject(method = "drawBackground", at = @At("TAIL"))
+//? } else {
+    /*@Inject(method = "drawBackground", at = @At("TAIL"))
     private void reglass$drawSelectedTradeArrow(DrawContext context, float delta, int mouseX, int mouseY, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         MerchantOffers offers = this.menu.getOffers();
         if (offers.isEmpty() || this.shopItem < 0 || this.shopItem >= offers.size()) {
-//#else
-        TradeOfferList offers = this.handler.getRecipes();
+//? } else {
+        /*TradeOfferList offers = this.handler.getRecipes();
         if (offers.isEmpty() || this.selectedIndex < 0 || this.selectedIndex >= offers.size()) {
-//#endif
+*///? }
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         MerchantOffer offer = offers.get(this.shopItem);
         if (offer.isOutOfStock()) {
-//#else
-        TradeOffer offer = offers.get(this.selectedIndex);
+//? } else {
+        /*TradeOffer offer = offers.get(this.selectedIndex);
         if (offer.isDisabled()) {
-//#endif
+*///? }
             return;
         }
 
         int arrowWidth = 20;
         int arrowHeight = 18;
-//#if MC >= 26
+//? if >= 26 {
         context.blitSprite(
-//#else
-        context.drawGuiTexture(
-//#endif
+//? } else {
+        /*context.drawGuiTexture(
+*///? }
                 RenderPipelines.GUI_TEXTURED,
-//#if MC >= 26
+//? if >= 26 {
                 TRADE_ARROW_SPRITE,
                 this.leftPos + 182 + (28 - arrowWidth) / 2,
                 this.topPos + 35 + (21 - arrowHeight) / 2,
-//#else
-                TRADE_ARROW_TEXTURE,
+//? } else {
+                /*TRADE_ARROW_TEXTURE,
                 this.x + 182 + (28 - arrowWidth) / 2,
                 this.y + 35 + (21 - arrowHeight) / 2,
-//#endif
+*///? }
                 arrowWidth,
                 arrowHeight);
     }
-//#if MC >= 26
+//? if >= 26 {
 
     @Unique
     private int reglass$labelY(int y) {
         return y - 2;
     }
-//#endif
+//? }
 }
 
diff --git a/src/main/java/restudio/reglass/mixin/client/MinecraftClientMixin.java b/src/main/java/restudio/reglass/mixin/client/MinecraftClientMixin.java
index 89e5789..736d184 100644
--- a/src/main/java/restudio/reglass/mixin/client/MinecraftClientMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/MinecraftClientMixin.java
@@ -1,12 +1,12 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
-//#else
-import net.minecraft.client.MinecraftClient;
+//? } else {
+/*import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
-//#endif
+*///? }
 import net.minecraft.client.gui.screen.world.SelectWorldScreen;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -17,11 +17,11 @@
 import restudio.reglass.client.api.ReGlassConfig;
 import restudio.reglass.client.screen.world.CustomWorldSelectScreen;
 
-//#if MC >= 26
+//? if >= 26 {
 @Mixin(Minecraft.class)
-//#else
-@Mixin(MinecraftClient.class)
-//#endif
+//? } else {
+/*@Mixin(MinecraftClient.class)
+*///? }
 public abstract class MinecraftClientMixin {
 
     @Shadow
diff --git a/src/main/java/restudio/reglass/mixin/client/RecipeBookComponentMixin.java b/src/main/java/restudio/reglass/mixin/client/RecipeBookComponentMixin.java
index 762a0fd..598a4aa 100644
--- a/src/main/java/restudio/reglass/mixin/client/RecipeBookComponentMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/RecipeBookComponentMixin.java
@@ -1,12 +1,12 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -17,72 +17,72 @@
 import restudio.reglass.client.api.ReGlassConfig;
 import restudio.reglass.client.api.WidgetStyle;
 
-//#if MC >= 26
+//? if >= 26 {
 @Mixin(RecipeBookComponent.class)
-//#else
-@Mixin(RecipeBookWidget.class)
-//#endif
+//? } else {
+/*@Mixin(RecipeBookWidget.class)
+*///? }
 public abstract class RecipeBookComponentMixin {
-//#if MC >= 26
+//? if >= 26 {
     @Shadow public abstract boolean isVisible();
     @Shadow private int getXOrigin() {
         throw new AssertionError();
     }
     @Shadow private int getYOrigin() {
-//#else
-    @Shadow public abstract boolean isOpen();
+//? } else {
+    /*@Shadow public abstract boolean isOpen();
 
     @Shadow private int getLeft() {
-//#endif
+*///? }
         throw new AssertionError();
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractRenderState", at = @At("HEAD"))
     private void reglass$renderRecipeBookGlass(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#else
-    @Shadow private int getTop() {
+//? } else {
+    /*@Shadow private int getTop() {
         throw new AssertionError();
     }
 
     @Inject(method = "render", at = @At("HEAD"))
     private void reglass$renderRecipeBookGlass(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
-//#if MC >= 26
+//? if >= 26 {
         if (!cfg.features.enableRedesign || !cfg.features.containers || !this.isVisible()) {
-//#else
-        if (!cfg.features.enableRedesign || !cfg.features.containers || !this.isOpen()) {
-//#endif
+//? } else {
+        /*if (!cfg.features.enableRedesign || !cfg.features.containers || !this.isOpen()) {
+*///? }
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         int x = this.getXOrigin();
         int y = this.getYOrigin();
-//#endif
+//? }
         ReGlassApi.create(context)
-//#if MC >= 26
+//? if >= 26 {
                 .dimensions(x, y, 147, 166)
-//#else
-                .dimensions(this.getLeft(), this.getTop(), 147, 166)
-//#endif
+//? } else {
+                /*.dimensions(this.getLeft(), this.getTop(), 147, 166)
+*///? }
                 .cornerRadius(10)
                 .style(reglass$recipeBookStyle().layer(1))
-//#if MC >= 26
+//? if >= 26 {
                 .screenSpace()
-//#endif
+//? }
                 .render();
     }
 
     @Unique
     private WidgetStyle reglass$recipeBookStyle() {
-//#if MC >= 26
+//? if >= 26 {
         return WidgetStyle.create()
                 .tint(0x000000, 0.18f);
-//#else
-        return WidgetStyle.create().tint(0x000000, 0.18f);
-//#endif
+//? } else {
+        /*return WidgetStyle.create().tint(0x000000, 0.18f);
+*///? }
     }
 }
 
diff --git a/src/main/java/restudio/reglass/mixin/client/RecipeBookTabButtonMixin.java b/src/main/java/restudio/reglass/mixin/client/RecipeBookTabButtonMixin.java
index b3a5ad8..5ea7a93 100644
--- a/src/main/java/restudio/reglass/mixin/client/RecipeBookTabButtonMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/RecipeBookTabButtonMixin.java
@@ -1,17 +1,17 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
 import net.minecraft.client.gui.screens.recipebook.RecipeBookTabButton;
 import net.minecraft.world.item.ItemStack;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget;
 import net.minecraft.client.gui.screen.recipebook.RecipeGroupButtonWidget;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.item.ItemStack;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -22,37 +22,37 @@
 import restudio.reglass.client.api.ReGlassConfig;
 import restudio.reglass.client.api.WidgetStyle;
 
-//#if MC >= 26
+//? if >= 26 {
 @Mixin(RecipeBookTabButton.class)
-//#else
-@Mixin(RecipeGroupButtonWidget.class)
-//#endif
+//? } else {
+/*@Mixin(RecipeGroupButtonWidget.class)
+*///? }
 public abstract class RecipeBookTabButtonMixin {
-//#if MC >= 26
+//? if >= 26 {
     @Shadow private RecipeBookComponent.TabInfo tabInfo;
     @Shadow private boolean selected;
-//#else
-    @Shadow private RecipeBookWidget.Tab tab;
+//? } else {
+    /*@Shadow private RecipeBookWidget.Tab tab;
     @Shadow private boolean groupFocused;
-//#endif
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractContents", at = @At("HEAD"), cancellable = true)
     private void reglass$renderStableTab(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#else
-    @Inject(method = "drawIcon", at = @At("HEAD"), cancellable = true)
+//? } else {
+    /*@Inject(method = "drawIcon", at = @At("HEAD"), cancellable = true)
     private void reglass$renderStableTab(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
-//#if MC >= 26
+//? if >= 26 {
         RecipeBookTabButton self = (RecipeBookTabButton)(Object) this;
-//#else
-        ClickableWidget self = (ClickableWidget)(Object) this;
-//#endif
+//? } else {
+        /*ClickableWidget self = (ClickableWidget)(Object) this;
+*///? }
         int x = self.getX();
         int y = self.getY();
         int width = self.getWidth();
@@ -64,20 +64,20 @@ public abstract class RecipeBookTabButtonMixin {
         ReGlassApi.create(context)
                 .dimensions(cx - size / 2, cy - size / 2, size, size)
                 .cornerRadius(size * 0.5f)
-//#if MC >= 26
+//? if >= 26 {
                 .hover(this.selected ? 1f : 0f)
-//#else
-                .hover(this.groupFocused ? 1f : 0f)
-//#endif
+//? } else {
+                /*.hover(this.groupFocused ? 1f : 0f)
+*///? }
                 .style(WidgetStyle.create()
-//#if MC >= 26
+//? if >= 26 {
                         .tint(0x000000, this.selected ? 0.22f : 0.12f)
                         .layer(this.selected ? 3 : 2))
                 .screenSpace()
-//#else
-                        .tint(0x000000, this.groupFocused ? 0.22f : 0.12f)
+//? } else {
+                        /*.tint(0x000000, this.groupFocused ? 0.22f : 0.12f)
                         .layer(this.groupFocused ? 3 : 2))
-//#endif
+*///? }
                 .render();
 
         reglass$renderIcon(context, cx, cy);
@@ -85,24 +85,24 @@ public abstract class RecipeBookTabButtonMixin {
     }
 
     @Unique
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$renderIcon(GuiGraphicsExtractor context, int cx, int cy) {
         if (this.tabInfo.secondaryIcon().isPresent()) {
             context.fakeItem(this.tabInfo.primaryIcon(), cx - 13, cy - 8);
             context.fakeItem((ItemStack)this.tabInfo.secondaryIcon().get(), cx - 3, cy - 8);
-//#else
-    private void reglass$renderIcon(DrawContext context, int cx, int cy) {
+//? } else {
+    /*private void reglass$renderIcon(DrawContext context, int cx, int cy) {
         if (this.tab.secondaryIcon().isPresent()) {
             context.drawItem(this.tab.primaryIcon(), cx - 13, cy - 8);
             context.drawItem((ItemStack)this.tab.secondaryIcon().get(), cx - 3, cy - 8);
-//#endif
+*///? }
             return;
         }
-//#if MC >= 26
+//? if >= 26 {
         context.fakeItem(this.tabInfo.primaryIcon(), cx - 8, cy - 8);
-//#else
-        context.drawItem(this.tab.primaryIcon(), cx - 8, cy - 8);
-//#endif
+//? } else {
+        /*context.drawItem(this.tab.primaryIcon(), cx - 8, cy - 8);
+*///? }
     }
 }
 
diff --git a/src/main/java/restudio/reglass/mixin/client/ScreenMixin.java b/src/main/java/restudio/reglass/mixin/client/ScreenMixin.java
index 3113177..1cf89a2 100644
--- a/src/main/java/restudio/reglass/mixin/client/ScreenMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/ScreenMixin.java
@@ -1,27 +1,27 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.Screen;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.render.state.GuiRenderState;
 import net.minecraft.client.gui.screen.Screen;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import restudio.reglass.client.LiquidGlassUniforms;
 import restudio.reglass.client.api.ReGlassConfig;
-//#if MC < 26
-import restudio.reglass.mixin.accessor.GuiRenderStateAccessor;
-//#endif
+//? if < 26 {
+/*import restudio.reglass.mixin.accessor.GuiRenderStateAccessor;
+*///? }
 
 @Mixin(Screen.class)
 public class ScreenMixin {
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(
             method = "extractBlurredBackground(Lnet/minecraft/client/gui/GuiGraphicsExtractor;)V",
             at = @At("HEAD"),
@@ -29,8 +29,8 @@ public class ScreenMixin {
     )
     private void reglass$skipDuplicateBlur(GuiGraphicsExtractor context, CallbackInfo ci) {
         if (LiquidGlassUniforms.get().screenWantsBlur()) {
-//#else
-    @Inject(method = "renderBackground(Lnet/minecraft/client/gui/DrawContext;IIF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;applyBlur(Lnet/minecraft/client/gui/DrawContext;)V"))
+//? } else {
+    /*@Inject(method = "renderBackground(Lnet/minecraft/client/gui/DrawContext;IIF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;applyBlur(Lnet/minecraft/client/gui/DrawContext;)V"))
     private void reglass$onScreenBlur(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         LiquidGlassUniforms.get().setScreenWantsBlur(true);
     }
@@ -40,34 +40,34 @@ public class ScreenMixin {
         GuiRenderState state = context.state;
         int blurLayer = ((GuiRenderStateAccessor) state).getBlurLayer();
         if (blurLayer != Integer.MAX_VALUE) {
-//#endif
+*///? }
             ci.cancel();
         }
     }
 
-//#if MC < 26
-    @Inject(method = "renderInGameBackground", at = @At("HEAD"), cancellable = true)
+//? if < 26 {
+    /*@Inject(method = "renderInGameBackground", at = @At("HEAD"), cancellable = true)
     private void reglass$onRenderInGameBackground(DrawContext context, CallbackInfo ci) {
         if (ReGlassConfig.INSTANCE.features.enableRedesign && ReGlassConfig.INSTANCE.features.cancelScreenDarkening) {
             ci.cancel();
         }
     }
-//#endif
+*///? }
 
     @Inject(
-//#if MC >= 26
+//? if >= 26 {
             method = "extractTransparentBackground(Lnet/minecraft/client/gui/GuiGraphicsExtractor;)V",
-//#else
-            method = "renderDarkening(Lnet/minecraft/client/gui/DrawContext;)V",
-//#endif
+//? } else {
+            /*method = "renderDarkening(Lnet/minecraft/client/gui/DrawContext;)V",
+*///? }
             at = @At("HEAD"),
             cancellable = true
     )
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$onRenderDarkening(GuiGraphicsExtractor context, CallbackInfo ci) {
-//#else
-    private void reglass$onRenderDarkening(DrawContext context, CallbackInfo ci) {
-//#endif
+//? } else {
+    /*private void reglass$onRenderDarkening(DrawContext context, CallbackInfo ci) {
+*///? }
         if (ReGlassConfig.INSTANCE.features.enableRedesign && ReGlassConfig.INSTANCE.features.cancelScreenDarkening) {
             ci.cancel();
         }
diff --git a/src/main/java/restudio/reglass/mixin/client/ShulkerBoxBlockMixin.java b/src/main/java/restudio/reglass/mixin/client/ShulkerBoxBlockMixin.java
index e45aaef..e2fbd58 100644
--- a/src/main/java/restudio/reglass/mixin/client/ShulkerBoxBlockMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/ShulkerBoxBlockMixin.java
@@ -1,6 +1,6 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.DyeColor;
@@ -8,8 +8,8 @@
 import net.minecraft.world.level.block.ShulkerBoxBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
-//#else
-import net.minecraft.block.BlockState;
+//? } else {
+/*import net.minecraft.block.BlockState;
 import net.minecraft.block.ShulkerBoxBlock;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.ActionResult;
@@ -17,7 +17,7 @@
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -29,15 +29,15 @@
 public abstract class ShulkerBoxBlockMixin {
     @Shadow public abstract DyeColor getColor();
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "useWithoutItem", at = @At("HEAD"))
     private void reglass$captureShulkerColor(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hit, CallbackInfoReturnable<?> cir) {
         if (level.isClientSide()) {
-//#else
-    @Inject(method = "onUse", at = @At("HEAD"))
+//? } else {
+    /*@Inject(method = "onUse", at = @At("HEAD"))
     private void reglass$captureShulkerColor(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit, CallbackInfoReturnable<ActionResult> cir) {
         if (world.isClient()) {
-//#endif
+*///? }
             ContainerColorContext.setLastShulkerColor(this.getColor());
         }
     }
diff --git a/src/main/java/restudio/reglass/mixin/client/StonecutterScreenMixin.java b/src/main/java/restudio/reglass/mixin/client/StonecutterScreenMixin.java
index 52f3c25..9b6cea3 100644
--- a/src/main/java/restudio/reglass/mixin/client/StonecutterScreenMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/StonecutterScreenMixin.java
@@ -1,20 +1,20 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.StonecutterScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.StonecutterMenu;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.gui.screen.ingame.StonecutterScreen;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.screen.StonecutterScreenHandler;
 import net.minecraft.text.Text;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -24,40 +24,40 @@
 import restudio.reglass.client.api.WidgetStyle;
 
 @Mixin(StonecutterScreen.class)
-//#if MC >= 26
+//? if >= 26 {
 public abstract class StonecutterScreenMixin extends AbstractContainerScreen<StonecutterMenu> {
     protected StonecutterScreenMixin(StonecutterMenu menu, Inventory inventory, Component title) {
         super(menu, inventory, title);
-//#else
-public abstract class StonecutterScreenMixin extends HandledScreen<StonecutterScreenHandler> {
+//? } else {
+/*public abstract class StonecutterScreenMixin extends HandledScreen<StonecutterScreenHandler> {
     protected StonecutterScreenMixin(StonecutterScreenHandler handler, PlayerInventory inventory, Text title) {
         super(handler, inventory, title);
-//#endif
+*///? }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractBackground", at = @At("TAIL"))
     private void reglass$extractRecipePanel(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#else
-    @Inject(method = "drawBackground", at = @At("TAIL"))
+//? } else {
+    /*@Inject(method = "drawBackground", at = @At("TAIL"))
     private void reglass$extractRecipePanel(DrawContext context, float delta, int mouseX, int mouseY, CallbackInfo ci) {
-//#endif
+*///? }
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
         if (!cfg.features.enableRedesign || !cfg.features.containers) {
             return;
         }
 
         ReGlassApi.create(context)
-//#if MC >= 26
+//? if >= 26 {
                 .dimensions(this.leftPos + 52, this.topPos + 13, 66, 56)
-//#else
-                .dimensions(this.x + 52, this.y + 13, 66, 56)
-//#endif
+//? } else {
+                /*.dimensions(this.x + 52, this.y + 13, 66, 56)
+*///? }
                 .cornerRadius(9)
                 .style(WidgetStyle.create().tint(0x000000, 0.14f).layer(1))
-//#if MC >= 26
+//? if >= 26 {
                 .screenSpace()
-//#endif
+//? }
                 .render();
     }
 }
diff --git a/src/main/java/restudio/reglass/mixin/client/TitleScreenMixin.java b/src/main/java/restudio/reglass/mixin/client/TitleScreenMixin.java
index a3c41df..ba1beb5 100644
--- a/src/main/java/restudio/reglass/mixin/client/TitleScreenMixin.java
+++ b/src/main/java/restudio/reglass/mixin/client/TitleScreenMixin.java
@@ -1,16 +1,16 @@
 package restudio.reglass.mixin.client;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.network.chat.Component;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.text.Text;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -19,22 +19,22 @@
 @Mixin(TitleScreen.class)
 public abstract class TitleScreenMixin extends Screen {
 
-//#if MC >= 26
+//? if >= 26 {
     protected TitleScreenMixin(Component title) {
-//#else
-    protected TitleScreenMixin(Text title) {
-//#endif
+//? } else {
+    /*protected TitleScreenMixin(Text title) {
+*///? }
         super(title);
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractRenderState", at = @At("HEAD"))
     private void reglass$applyBlurOnTitleScreen(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         this.extractBlurredBackground(context);
-//#else
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;render(Lnet/minecraft/client/gui/DrawContext;IIF)V", shift = At.Shift.BY))
+//? } else {
+    /*@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;render(Lnet/minecraft/client/gui/DrawContext;IIF)V", shift = At.Shift.BY))
     private void reglass$applyBlurOnTitleScreen(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         this.applyBlur(context);
-//#endif
+*///? }
     }
 }
diff --git a/src/main/java/restudio/reglass/mixin/logical/GameRendererMixin.java b/src/main/java/restudio/reglass/mixin/logical/GameRendererMixin.java
index 498fa67..f3defb3 100644
--- a/src/main/java/restudio/reglass/mixin/logical/GameRendererMixin.java
+++ b/src/main/java/restudio/reglass/mixin/logical/GameRendererMixin.java
@@ -1,38 +1,38 @@
 package restudio.reglass.mixin.logical;
 
 import com.mojang.blaze3d.buffers.GpuBuffer;
-//#if MC >= 26
+//? if >= 26 {
 import com.mojang.blaze3d.pipeline.RenderTarget;
-//#endif
+//? }
 import com.mojang.blaze3d.pipeline.RenderPipeline;
 import com.mojang.blaze3d.systems.RenderPass;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.textures.FilterMode;
-//#if MC >= 26.2
+//? if >= 26.2 {
 import com.mojang.blaze3d.PrimitiveTopology;
-//#endif
+//? }
 import com.mojang.blaze3d.vertex.VertexFormat;
 import java.util.List;
 import java.util.OptionalDouble;
-//#if MC >= 26.2
+//? if >= 26.2 {
 import java.util.Optional;
-//#else
-import java.util.OptionalInt;
-//#endif
-//#if MC >= 26
+//? } else {
+/*import java.util.OptionalInt;
+*///? }
+//? if >= 26 {
 import net.minecraft.client.Minecraft;
-//#else
-import net.minecraft.client.MinecraftClient;
+//? } else {
+/*import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gl.Framebuffer;
-//#endif
+*///? }
 import net.minecraft.client.gui.render.GuiRenderer;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.DeltaTracker;
-//#else
-import net.minecraft.client.render.GameRenderer;
+//? } else {
+/*import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.RenderTickCounter;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -49,26 +49,26 @@
 
 @Mixin(GameRenderer.class)
 public abstract class GameRendererMixin {
-//#if MC >= 26
+//? if >= 26 {
     @Shadow @Final private Minecraft minecraft;
-//#else
-    @Shadow @Final private MinecraftClient client;
-//#endif
+//? } else {
+    /*@Shadow @Final private MinecraftClient client;
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extract", at = @At("HEAD"))
     private void reglass$beginGuiFrame(DeltaTracker tickCounter, boolean tick, CallbackInfo ci) {
-//#else
-    @Inject(method = "render", at = @At("HEAD"))
+//? } else {
+    /*@Inject(method = "render", at = @At("HEAD"))
     private void reglass$beginGuiFrame(RenderTickCounter tickCounter, boolean tick, CallbackInfo ci) {
-//#endif
+*///? }
         double deltaTicks;
         try {
-//#if MC >= 26
+//? if >= 26 {
             deltaTicks = tickCounter.getRealtimeDeltaTicks();
-//#else
-            deltaTicks = tickCounter.getDynamicDeltaTicks();
-//#endif
+//? } else {
+            /*deltaTicks = tickCounter.getDynamicDeltaTicks();
+*///? }
         } catch (Throwable t) {
             deltaTicks = 1.0 / 60.0 * 20.0;
         }
@@ -77,11 +77,11 @@ public abstract class GameRendererMixin {
         ReGlassAnim.INSTANCE.update(ReGlassConfig.INSTANCE, dt);
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "processBlurEffect", at = @At("HEAD"), cancellable = true)
-//#else
-    @Inject(method = "renderBlur", at = @At("HEAD"), cancellable = true)
-//#endif
+//? } else {
+    /*@Inject(method = "renderBlur", at = @At("HEAD"), cancellable = true)
+*///? }
     private void reglass$renderLiquidGlass(CallbackInfo ci) {
         LiquidGlassUniforms uniforms = LiquidGlassUniforms.get();
         if (uniforms.getCount() > 0) {
@@ -91,70 +91,70 @@ public abstract class GameRendererMixin {
             List<Integer> radii = uniforms.getUsedBlurRadiiOrdered();
             LiquidGlassPrecomputeRuntime.get().setRequestedRadii(radii);
             LiquidGlassPrecomputeRuntime.get().run();
-//#if MC >= 26.2
+//? if >= 26.2 {
             RenderTarget mainFb = this.minecraft.gameRenderer.mainRenderTarget();
-//#elseif MC >= 26
-            RenderTarget mainFb = this.minecraft.getMainRenderTarget();
-//#else
-            Framebuffer mainFb = this.client.getFramebuffer();
-//#endif
+//? } elif >= 26 {
+            /*RenderTarget mainFb = this.minecraft.getMainRenderTarget();
+*///? } else {
+            /*Framebuffer mainFb = this.client.getFramebuffer();
+*///? }
             try (RenderPass pass = RenderSystem.getDevice().createCommandEncoder().createRenderPass(
                     () -> "reglass liquid glass pass",
-//#if MC >= 26
+//? if >= 26 {
                     mainFb.getColorTextureView(),
-//#else
-                    mainFb.getColorAttachmentView(),
-//#endif
-//#if MC >= 26.2
+//? } else {
+                    /*mainFb.getColorAttachmentView(),
+*///? }
+//? if >= 26.2 {
                     Optional.empty(),
-//#else
-                    OptionalInt.empty(),
-//#endif
-//#if MC >= 26
+//? } else {
+                    /*OptionalInt.empty(),
+*///? }
+//? if >= 26 {
                     mainFb.useDepth ? mainFb.getDepthTextureView() : null,
-//#else
-                    mainFb.useDepthAttachment ? mainFb.getDepthAttachmentView() : null,
-//#endif
+//? } else {
+                    /*mainFb.useDepthAttachment ? mainFb.getDepthAttachmentView() : null,
+*///? }
                     OptionalDouble.empty()
             )) {
                 RenderPipeline pipeline = LiquidGlassPipelines.getGuiPipeline();
                 pass.setPipeline(pipeline);
 
-//#if MC < 26.2
-                RenderSystem.bindDefaultUniforms(pass);
-//#endif
+//? if < 26.2 {
+                /*RenderSystem.bindDefaultUniforms(pass);
+*///? }
                 pass.setUniform("SamplerInfo", uniforms.getSamplerInfoBuffer());
                 pass.setUniform("CustomUniforms", uniforms.getCustomUniformsBuffer());
                 pass.setUniform("WidgetInfo", uniforms.getWidgetInfoBuffer());
                 pass.setUniform("BgConfig", uniforms.getBgConfigBuffer());
-//#if MC >= 26
+//? if >= 26 {
                 pass.bindTexture("Sampler0", mainFb.getColorTextureView(), RenderSystem.getSamplerCache().getClampToEdge(FilterMode.LINEAR));
-//#else
-                pass.bindTexture("Sampler0", mainFb.getColorAttachmentView(), RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
-//#endif
+//? } else {
+                /*pass.bindTexture("Sampler0", mainFb.getColorAttachmentView(), RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
+*///? }
 
                 GuiRenderer guiRenderer = ((GameRendererAccessor) this).getGuiRenderer();
                 GpuBuffer quadVB = ((QuadVertexBufferProvider) guiRenderer).getQuadVertexBuffer();
-//#if MC >= 26.2
+//? if >= 26.2 {
                 RenderSystem.AutoStorageIndexBuffer quadIBInfo = RenderSystem.getSequentialBuffer(PrimitiveTopology.QUADS);
                 com.mojang.blaze3d.buffers.GpuBuffer quadIB = quadIBInfo.getBuffer(6);
-//#elseif MC >= 26
-                RenderSystem.AutoStorageIndexBuffer quadIBInfo = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS);
+//? } elif >= 26 {
+                /*RenderSystem.AutoStorageIndexBuffer quadIBInfo = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS);
                 com.mojang.blaze3d.buffers.GpuBuffer quadIB = quadIBInfo.getBuffer(6);
-//#else
-                RenderSystem.ShapeIndexBuffer quadIBInfo = RenderSystem.getSequentialBuffer(VertexFormat.DrawMode.QUADS);
+*///? } else {
+                /*RenderSystem.ShapeIndexBuffer quadIBInfo = RenderSystem.getSequentialBuffer(VertexFormat.DrawMode.QUADS);
                 com.mojang.blaze3d.buffers.GpuBuffer quadIB = quadIBInfo.getIndexBuffer(6);
-//#endif
-//#if MC >= 26.2
+*///? }
+//? if >= 26.2 {
                 pass.setVertexBuffer(0, quadVB.slice());
-//#else
-                pass.setVertexBuffer(0, quadVB);
-//#endif
-//#if MC >= 26
+//? } else {
+                /*pass.setVertexBuffer(0, quadVB);
+*///? }
+//? if >= 26 {
                 pass.setIndexBuffer(quadIB, quadIBInfo.type());
-//#else
-                pass.setIndexBuffer(quadIB, quadIBInfo.getIndexType());
-//#endif
+//? } else {
+                /*pass.setIndexBuffer(quadIB, quadIBInfo.getIndexType());
+*///? }
                 for (int i = 0; i < 5; i++) {
                     String samplerName = switch (i) {
                         case 0 -> "Sampler1";
@@ -165,32 +165,32 @@ public abstract class GameRendererMixin {
                     };
                     if (i < radii.size()) {
                         int r = radii.get(i);
-//#if MC >= 26
+//? if >= 26 {
                         if (r <= 0) pass.bindTexture(samplerName, mainFb.getColorTextureView(), RenderSystem.getSamplerCache().getClampToEdge(FilterMode.LINEAR));
                         else pass.bindTexture(samplerName, LiquidGlassPrecomputeRuntime.get().getBlurredViewForRadius(r), RenderSystem.getSamplerCache().getClampToEdge(FilterMode.LINEAR));
-//#else
-                        if (r <= 0) pass.bindTexture(samplerName, mainFb.getColorAttachmentView(), RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
+//? } else {
+                        /*if (r <= 0) pass.bindTexture(samplerName, mainFb.getColorAttachmentView(), RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
                         else pass.bindTexture(samplerName, LiquidGlassPrecomputeRuntime.get().getBlurredViewForRadius(r), RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
-//#endif
+*///? }
                     } else {
                         if (!radii.isEmpty()) {
                             int r0 = radii.getFirst();
-//#if MC >= 26
+//? if >= 26 {
                             if (r0 <= 0) pass.bindTexture(samplerName, mainFb.getColorTextureView(), RenderSystem.getSamplerCache().getClampToEdge(FilterMode.LINEAR));
                             else pass.bindTexture(samplerName, LiquidGlassPrecomputeRuntime.get().getBlurredViewForRadius(r0), RenderSystem.getSamplerCache().getClampToEdge(FilterMode.LINEAR));
                         } else pass.bindTexture(samplerName, mainFb.getColorTextureView(), RenderSystem.getSamplerCache().getClampToEdge(FilterMode.LINEAR));
-//#else
-                            if (r0 <= 0) pass.bindTexture(samplerName, mainFb.getColorAttachmentView(), RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
+//? } else {
+                            /*if (r0 <= 0) pass.bindTexture(samplerName, mainFb.getColorAttachmentView(), RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
                             else pass.bindTexture(samplerName, LiquidGlassPrecomputeRuntime.get().getBlurredViewForRadius(r0), RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
                         } else pass.bindTexture(samplerName, mainFb.getColorAttachmentView(), RenderSystem.getSamplerCache().get(FilterMode.LINEAR));
-//#endif
+*///? }
                     }
                 }
-//#if MC >= 26.2
+//? if >= 26.2 {
                 pass.drawIndexed(6, 1, 0, 0, 0);
-//#else
-                pass.drawIndexed(0, 0, 6, 1);
-//#endif
+//? } else {
+                /*pass.drawIndexed(0, 0, 6, 1);
+*///? }
             }
         }
     }
diff --git a/src/main/java/restudio/reglass/mixin/widgets/DrawContextMixin.java b/src/main/java/restudio/reglass/mixin/widgets/DrawContextMixin.java
index 33e5504..15a2f14 100644
--- a/src/main/java/restudio/reglass/mixin/widgets/DrawContextMixin.java
+++ b/src/main/java/restudio/reglass/mixin/widgets/DrawContextMixin.java
@@ -1,19 +1,19 @@
 package restudio.reglass.mixin.widgets;
 
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
-//#else
-import net.minecraft.client.gl.RenderPipelines;
+//? } else {
+/*import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.util.Identifier;
-//#endif
+*///? }
 import java.util.HashMap;
 import java.util.Map;
 import org.spongepowered.asm.mixin.Mixin;
@@ -26,50 +26,50 @@
 import restudio.reglass.client.api.ReGlassConfig;
 import restudio.reglass.client.api.WidgetStyle;
 
-//#if MC >= 26
+//? if >= 26 {
 @Mixin(GuiGraphicsExtractor.class)
-//#else
-@Mixin(DrawContext.class)
-//#endif
+//? } else {
+/*@Mixin(DrawContext.class)
+*///? }
 public abstract class DrawContextMixin {
 
     @Unique
-//#if MC >= 26
+//? if >= 26 {
     private static final Identifier BUTTON_TEXTURE = Identifier.withDefaultNamespace("widget/button");
-//#else
-    private static final Identifier BUTTON_TEXTURE = Identifier.ofVanilla("widget/button");
-//#endif
+//? } else {
+    /*private static final Identifier BUTTON_TEXTURE = Identifier.ofVanilla("widget/button");
+*///? }
     @Unique
-//#if MC >= 26
+//? if >= 26 {
     private static final Identifier BUTTON_DISABLED_TEXTURE = Identifier.withDefaultNamespace("widget/button_disabled");
-//#else
-    private static final Identifier BUTTON_DISABLED_TEXTURE = Identifier.ofVanilla("widget/button_disabled");
-//#endif
+//? } else {
+    /*private static final Identifier BUTTON_DISABLED_TEXTURE = Identifier.ofVanilla("widget/button_disabled");
+*///? }
     @Unique
-//#if MC >= 26
+//? if >= 26 {
     private static final Identifier BUTTON_HIGHLIGHTED_TEXTURE = Identifier.withDefaultNamespace("widget/button_highlighted");
-//#else
-    private static final Identifier BUTTON_HIGHLIGHTED_TEXTURE = Identifier.ofVanilla("widget/button_highlighted");
-//#endif
+//? } else {
+    /*private static final Identifier BUTTON_HIGHLIGHTED_TEXTURE = Identifier.ofVanilla("widget/button_highlighted");
+*///? }
     @Unique
-//#if MC >= 26
+//? if >= 26 {
     private static final Identifier VILLAGER_TRADE_ARROW_OUT_OF_STOCK = Identifier.withDefaultNamespace("container/villager/trade_arrow_out_of_stock");
-//#else
-    private static final Identifier VILLAGER_TRADE_ARROW_OUT_OF_STOCK = Identifier.ofVanilla("container/villager/trade_arrow_out_of_stock");
-//#endif
+//? } else {
+    /*private static final Identifier VILLAGER_TRADE_ARROW_OUT_OF_STOCK = Identifier.ofVanilla("container/villager/trade_arrow_out_of_stock");
+*///? }
     @Unique
     private static final Map<Long, Double> REGLASS$SCROLLER_Y = new HashMap<>();
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "blurBeforeThisStratum", at = @At("HEAD"))
     private void reglass$onBlurBeforeThisStratum(CallbackInfo ci) {
         LiquidGlassUniforms.get().setScreenWantsBlur(true);
     }
 
     @Inject(method = "blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIIII)V",
-//#else
-    @Inject(method = "drawGuiTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIIII)V",
-//#endif
+//? } else {
+    /*@Inject(method = "drawGuiTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIIII)V",
+*///? }
             at = @At("HEAD"), cancellable = true)
     private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, int y, int width, int height, int color, CallbackInfo ci) {
         if (reglass$handleContainerSprite(sprite, x, y, width, height)) {
@@ -81,21 +81,21 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
                 || sprite.getPath().equals(BUTTON_DISABLED_TEXTURE.getPath())
                 || sprite.getPath().equals(BUTTON_HIGHLIGHTED_TEXTURE.getPath());
 
-//#if MC >= 26
+//? if >= 26 {
         if (isButtonTexture && (ReGlassConfig.INSTANCE.features.enableRedesign && ReGlassConfig.INSTANCE.features.buttons)) {
-//#else
-        if (isButtonTexture && ReGlassConfig.INSTANCE.features.enableRedesign && ReGlassConfig.INSTANCE.features.buttons) {
-//#endif
+//? } else {
+        /*if (isButtonTexture && ReGlassConfig.INSTANCE.features.enableRedesign && ReGlassConfig.INSTANCE.features.buttons) {
+*///? }
             boolean isHighlighted = sprite.getPath().equals(BUTTON_HIGHLIGHTED_TEXTURE.getPath());
             boolean isDisabled = sprite.getPath().equals(BUTTON_DISABLED_TEXTURE.getPath());
             boolean isTradeRowButton = ReGlassConfig.INSTANCE.features.containers && width >= 80 && width <= 100 && height == 20;
             int glassY = isTradeRowButton ? y + 1 : y;
             int glassHeight = isTradeRowButton ? height - 2 : height;
-//#if MC >= 26
+//? if >= 26 {
             ReGlassApi.create((GuiGraphicsExtractor)(Object) this)
-//#else
-            ReGlassApi.create((DrawContext)(Object) this)
-//#endif
+//? } else {
+            /*ReGlassApi.create((DrawContext)(Object) this)
+*///? }
                     .position(x, glassY)
                     .size(width, glassHeight)
                     .hover(isHighlighted ? 1f : 0f)
@@ -105,11 +105,11 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
         }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIII)V",
-//#else
-    @Inject(method = "drawGuiTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIII)V",
-//#endif
+//? } else {
+    /*@Inject(method = "drawGuiTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIII)V",
+*///? }
             at = @At("HEAD"), cancellable = true)
     private void reglass$onDrawSprite(RenderPipeline pipeline, Identifier sprite, int x, int y, int width, int height, CallbackInfo ci) {
         if (reglass$handleContainerSprite(sprite, x, y, width, height)) {
@@ -117,11 +117,11 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
         }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIIIIIII)V",
-//#else
-    @Inject(method = "drawGuiTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIIIIIII)V",
-//#endif
+//? } else {
+    /*@Inject(method = "drawGuiTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIIIIIII)V",
+*///? }
             at = @At("HEAD"), cancellable = true)
     private void reglass$onDrawSlicedSprite(RenderPipeline pipeline, Identifier sprite, int spriteWidth, int spriteHeight, int u, int v, int x, int y, int width, int height, CallbackInfo ci) {
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
@@ -130,33 +130,33 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
         }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "blit(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIFFIIIII)V",
-//#else
-    @Inject(method = "drawTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIFFIIIII)V",
-//#endif
+//? } else {
+    /*@Inject(method = "drawTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIFFIIIII)V",
+*///? }
             at = @At("HEAD"), cancellable = true)
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$onBlitTexture(RenderPipeline pipeline, Identifier texture, int x, int y, float u, float v, int width, int height, int sourceWidth, int sourceHeight, int textureWidth, CallbackInfo ci) {
-//#else
-    private void reglass$onDrawTexture(RenderPipeline pipeline, Identifier texture, int x, int y, float u, float v, int width, int height, int sourceWidth, int sourceHeight, int textureWidth, CallbackInfo ci) {
-//#endif
+//? } else {
+    /*private void reglass$onDrawTexture(RenderPipeline pipeline, Identifier texture, int x, int y, float u, float v, int width, int height, int sourceWidth, int sourceHeight, int textureWidth, CallbackInfo ci) {
+*///? }
         if (reglass$shouldSkipContainerTexture(texture, width, height)) {
             ci.cancel();
         }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "blit(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIFFIIII)V",
-//#else
-    @Inject(method = "drawTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIFFIIII)V",
-//#endif
+//? } else {
+    /*@Inject(method = "drawTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIFFIIII)V",
+*///? }
             at = @At("HEAD"), cancellable = true)
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$onBlitTextureNoSourceSize(RenderPipeline pipeline, Identifier texture, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight, CallbackInfo ci) {
-//#else
-    private void reglass$onDrawTextureNoSourceSize(RenderPipeline pipeline, Identifier texture, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight, CallbackInfo ci) {
-//#endif
+//? } else {
+    /*private void reglass$onDrawTextureNoSourceSize(RenderPipeline pipeline, Identifier texture, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight, CallbackInfo ci) {
+*///? }
         if (reglass$handleModMenuButtonTexture(texture, x, y, u, v, width, height, textureWidth, textureHeight)) {
             ci.cancel();
             return;
@@ -166,17 +166,17 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
         }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "blit(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIFFIIIIII)V",
-//#else
-    @Inject(method = "drawTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIFFIIIIII)V",
-//#endif
+//? } else {
+    /*@Inject(method = "drawTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIFFIIIIII)V",
+*///? }
             at = @At("HEAD"), cancellable = true)
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$onBlitTextureFull(RenderPipeline pipeline, Identifier texture, int x, int y, float u, float v, int width, int height, int sourceWidth, int sourceHeight, int textureWidth, int textureHeight, CallbackInfo ci) {
-//#else
-    private void reglass$onDrawTextureFull(RenderPipeline pipeline, Identifier texture, int x, int y, float u, float v, int width, int height, int sourceWidth, int sourceHeight, int textureWidth, int textureHeight, CallbackInfo ci) {
-//#endif
+//? } else {
+    /*private void reglass$onDrawTextureFull(RenderPipeline pipeline, Identifier texture, int x, int y, float u, float v, int width, int height, int sourceWidth, int sourceHeight, int textureWidth, int textureHeight, CallbackInfo ci) {
+*///? }
         if (reglass$handleModMenuButtonTexture(texture, x, y, u, v, width, height, textureWidth, textureHeight)) {
             ci.cancel();
             return;
@@ -186,17 +186,17 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
         }
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "blit(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIFFIIIIIII)V",
-//#else
-    @Inject(method = "drawTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIFFIIIIIII)V",
-//#endif
+//? } else {
+    /*@Inject(method = "drawTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIFFIIIIIII)V",
+*///? }
             at = @At("HEAD"), cancellable = true)
-//#if MC >= 26
+//? if >= 26 {
     private void reglass$onBlitTextureFullWithColor(RenderPipeline pipeline, Identifier texture, int x, int y, float u, float v, int width, int height, int sourceWidth, int sourceHeight, int textureWidth, int textureHeight, int color, CallbackInfo ci) {
-//#else
-    private void reglass$onDrawTextureFullWithColor(RenderPipeline pipeline, Identifier texture, int x, int y, float u, float v, int width, int height, int sourceWidth, int sourceHeight, int textureWidth, int textureHeight, int color, CallbackInfo ci) {
-//#endif
+//? } else {
+    /*private void reglass$onDrawTextureFullWithColor(RenderPipeline pipeline, Identifier texture, int x, int y, float u, float v, int width, int height, int sourceWidth, int sourceHeight, int textureWidth, int textureHeight, int color, CallbackInfo ci) {
+*///? }
         if (reglass$handleModMenuButtonTexture(texture, x, y, u, v, width, height, textureWidth, textureHeight)) {
             ci.cancel();
             return;
@@ -209,14 +209,14 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
     @Unique
     private boolean reglass$handleModMenuButtonTexture(Identifier texture, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) {
         ReGlassConfig cfg = ReGlassConfig.INSTANCE;
-//#if MC >= 26
+//? if >= 26 {
         if (!cfg.features.enableRedesign || !cfg.features.buttons) {
             return false;
         }
         if (!texture.getNamespace().equals("modmenu")) {
-//#else
-        if (!cfg.features.enableRedesign || !cfg.features.buttons || !texture.getNamespace().equals("modmenu")) {
-//#endif
+//? } else {
+        /*if (!cfg.features.enableRedesign || !cfg.features.buttons || !texture.getNamespace().equals("modmenu")) {
+*///? }
             return false;
         }
 
@@ -226,35 +226,35 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
         }
 
         String fileName = path.substring("textures/gui/".length());
-//#if MC >= 26
+//? if >= 26 {
         Identifier iconTexture = Identifier.fromNamespaceAndPath("reglass", "textures/gui/modmenu/" + fileName);
-//#else
-        Identifier iconTexture = Identifier.of("reglass", "textures/gui/modmenu/" + fileName);
-//#endif
+//? } else {
+        /*Identifier iconTexture = Identifier.of("reglass", "textures/gui/modmenu/" + fileName);
+*///? }
         boolean hovered = v > 0f && v < 40f;
         boolean disabled = v >= 40f;
 
-//#if MC >= 26
+//? if >= 26 {
         ReGlassApi.create((GuiGraphicsExtractor)(Object) this)
-//#else
-        ReGlassApi.create((DrawContext)(Object) this)
-//#endif
+//? } else {
+        /*ReGlassApi.create((DrawContext)(Object) this)
+*///? }
                 .dimensions(x, y, width, height)
                 .cornerRadius(Math.min(width, height) * 0.5f)
                 .hover(hovered ? 1f : 0f)
                 .style(WidgetStyle.create()
                         .tint(disabled ? 0x000000 : 0xFFFFFFFF, disabled ? 0.36f : 0f)
                         .layer(3))
-//#if MC >= 26
+//? if >= 26 {
                 .screenSpace()
-//#endif
+//? }
                 .render();
 
-//#if MC >= 26
+//? if >= 26 {
         ((GuiGraphicsExtractor)(Object) this).blit(
-//#else
-        ((DrawContext)(Object) this).drawTexture(
-//#endif
+//? } else {
+        /*((DrawContext)(Object) this).drawTexture(
+*///? }
                 RenderPipelines.GUI_TEXTURED,
                 iconTexture,
                 x,
@@ -270,14 +270,14 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
 
     @Unique
     private boolean reglass$shouldSkipContainerTexture(Identifier texture, int width, int height) {
-//#if MC >= 26
+//? if >= 26 {
         if (!ReGlassConfig.INSTANCE.features.enableRedesign || !ReGlassConfig.INSTANCE.features.containers) {
             return false;
         }
         if (width < 100 || height < 54) {
-//#else
-        if (!ReGlassConfig.INSTANCE.features.enableRedesign || !ReGlassConfig.INSTANCE.features.containers || width < 100 || height < 54) {
-//#endif
+//? } else {
+        /*if (!ReGlassConfig.INSTANCE.features.enableRedesign || !ReGlassConfig.INSTANCE.features.containers || width < 100 || height < 54) {
+*///? }
             return false;
         }
 
@@ -299,11 +299,11 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
         String path = sprite.getPath();
         if (path.equals("recipe_book/button") || path.equals("recipe_book/button_highlighted")) {
             reglass$renderRoundSprite(x, y, width, height, path.contains("highlighted") ? 1f : 0f, 3);
-//#if MC >= 26
+//? if >= 26 {
             ((GuiGraphicsExtractor)(Object) this).fakeItem(new ItemStack(Items.KNOWLEDGE_BOOK), x + width / 2 - 8, y + height / 2 - 8);
-//#else
-            ((DrawContext)(Object) this).drawItem(new ItemStack(Items.KNOWLEDGE_BOOK), x + width / 2 - 8, y + height / 2 - 8);
-//#endif
+//? } else {
+            /*((DrawContext)(Object) this).drawItem(new ItemStack(Items.KNOWLEDGE_BOOK), x + width / 2 - 8, y + height / 2 - 8);
+*///? }
             return true;
         }
 
@@ -363,17 +363,17 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
 
         if (path.startsWith("recipe_book/slot_")) {
             boolean craftable = path.contains("craftable") && !path.contains("uncraftable");
-//#if MC >= 26
+//? if >= 26 {
             boolean many = path.contains("many");
-//#endif
+//? }
             int size = Math.max(16, Math.min(width, height) - 4);
             int cx = x + width / 2;
             int cy = y + height / 2;
-//#if MC >= 26
+//? if >= 26 {
             ReGlassApi.create((GuiGraphicsExtractor)(Object) this)
-//#else
-            ReGlassApi.create((DrawContext)(Object) this)
-//#endif
+//? } else {
+            /*ReGlassApi.create((DrawContext)(Object) this)
+*///? }
                     .dimensions(cx - size / 2 - 1, cy - size / 2 - 1, size, size)
                     .cornerRadius(5)
                     .hover(craftable ? 0.65f : 0f)
@@ -381,9 +381,9 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
                             .tint(0x000000, craftable ? 0.18f : 0.12f)
                             .shadow(0f, 0f, 0f, 0f)
                             .layer(3))
-//#if MC >= 26
+//? if >= 26 {
                     .screenSpace()
-//#endif
+//? }
                     .render();
             return true;
         }
@@ -393,20 +393,20 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
             int size = Math.min(24, Math.min(width, height));
             int cx = x + width / 2;
             int cy = y + height / 2;
-//#if MC >= 26
+//? if >= 26 {
             ReGlassApi.create((GuiGraphicsExtractor)(Object) this)
-//#else
-            ReGlassApi.create((DrawContext)(Object) this)
-//#endif
+//? } else {
+            /*ReGlassApi.create((DrawContext)(Object) this)
+*///? }
                     .dimensions(cx - size / 2, cy - size / 2, size, size)
                     .cornerRadius(size * 0.5f)
                     .hover(selected ? 1f : 0f)
                     .style(WidgetStyle.create()
                             .tint(0x000000, selected ? 0.22f : 0.12f)
                             .layer(selected ? 3 : 2))
-//#if MC >= 26
+//? if >= 26 {
                     .screenSpace()
-//#endif
+//? }
                     .render();
             return true;
         }
@@ -454,11 +454,11 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
         int thumbWidth = Math.max(5, Math.min(width, 8));
         int thumbHeight = Math.max(12, height);
         int cx = x + width / 2;
-//#if MC >= 26
+//? if >= 26 {
         ReGlassApi.create((GuiGraphicsExtractor)(Object) this)
-//#else
-        ReGlassApi.create((DrawContext)(Object) this)
-//#endif
+//? } else {
+        /*ReGlassApi.create((DrawContext)(Object) this)
+*///? }
                 .dimensions(cx - thumbWidth / 2, (int)Math.round(renderY), thumbWidth, thumbHeight)
                 .cornerRadius(thumbWidth * 0.5f)
                 .hover(0.7f)
@@ -466,9 +466,9 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
                         .tint(0x000000, 0.18f)
                         .fadeKey(scrollerKey)
                         .layer(4))
-//#if MC >= 26
+//? if >= 26 {
                 .screenSpace()
-//#endif
+//? }
                 .render();
     }
 
@@ -510,11 +510,11 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
     private void reglass$renderTradeArrowOutOfStock(int x, int y, int width, int height) {
         int arrowWidth = 20;
         int arrowHeight = 18;
-//#if MC >= 26
+//? if >= 26 {
         ((GuiGraphicsExtractor)(Object) this).blitSprite(
-//#else
-        ((DrawContext)(Object) this).drawGuiTexture(
-//#endif
+//? } else {
+        /*((DrawContext)(Object) this).drawGuiTexture(
+*///? }
                 RenderPipelines.GUI_TEXTURED,
                 VILLAGER_TRADE_ARROW_OUT_OF_STOCK,
                 x + (width - arrowWidth) / 2,
@@ -525,33 +525,33 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
 
     @Unique
     private void reglass$renderTextField(int x, int y, int width, int height, boolean highlighted) {
-//#if MC >= 26
+//? if >= 26 {
         ReGlassApi.create((GuiGraphicsExtractor)(Object) this)
-//#else
-        ReGlassApi.create((DrawContext)(Object) this)
-//#endif
+//? } else {
+        /*ReGlassApi.create((DrawContext)(Object) this)
+*///? }
                 .dimensions(x, y, width, height)
                 .cornerRadius(5)
                 .hover(highlighted ? 1f : 0f)
                 .style(WidgetStyle.create()
                         .tint(0x000000, 0.16f)
                         .layer(3))
-//#if MC >= 26
+//? if >= 26 {
                 .screenSpace()
-//#endif
+//? }
                 .render();
     }
 
     @Unique
     private void reglass$renderRecipeFilterIcon(String path, int x, int y, int width, int height) {
         String file = path.substring("recipe_book/".length());
-//#if MC >= 26
+//? if >= 26 {
         Identifier texture = Identifier.fromNamespaceAndPath("reglass", "textures/gui/recipe_book/filter_icons/" + file + ".png");
         ((GuiGraphicsExtractor)(Object) this).blit(
-//#else
-        Identifier texture = Identifier.of("reglass", "textures/gui/recipe_book/filter_icons/" + file + ".png");
+//? } else {
+        /*Identifier texture = Identifier.of("reglass", "textures/gui/recipe_book/filter_icons/" + file + ".png");
         ((DrawContext)(Object) this).drawTexture(
-//#endif
+*///? }
                 RenderPipelines.GUI_TEXTURED,
                 texture,
                 x,
@@ -568,20 +568,20 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
 
     @Unique
     private void reglass$renderRecipeFilterBackground(int x, int y, int width, int height, float hover) {
-//#if MC >= 26
+//? if >= 26 {
         ReGlassApi.create((GuiGraphicsExtractor)(Object) this)
-//#else
-        ReGlassApi.create((DrawContext)(Object) this)
-//#endif
+//? } else {
+        /*ReGlassApi.create((DrawContext)(Object) this)
+*///? }
                 .dimensions(x, y, width, height)
                 .cornerRadius(5)
                 .hover(hover)
                 .style(WidgetStyle.create()
                         .tint(0x000000, hover > 0f ? 0.20f : 0.12f)
                         .layer(3))
-//#if MC >= 26
+//? if >= 26 {
                 .screenSpace()
-//#endif
+//? }
                 .render();
     }
 
@@ -593,20 +593,20 @@ private void onDrawTexture(RenderPipeline pipeline, Identifier sprite, int x, in
         }
         int cx = x + width / 2;
         int cy = y + height / 2;
-//#if MC >= 26
+//? if >= 26 {
         ReGlassApi.create((GuiGraphicsExtractor)(Object) this)
-//#else
-        ReGlassApi.create((DrawContext)(Object) this)
-//#endif
+//? } else {
+        /*ReGlassApi.create((DrawContext)(Object) this)
+*///? }
                 .dimensions(cx - size / 2, cy - size / 2, size, size)
                 .cornerRadius(size * 0.5f)
                 .hover(hover)
                 .style(WidgetStyle.create()
                         .tint(0x000000, hover > 0f ? 0.20f : 0.12f)
                         .layer(layer))
-//#if MC >= 26
+//? if >= 26 {
                 .screenSpace()
-//#endif
+//? }
                 .render();
     }
 }
diff --git a/src/main/java/restudio/reglass/mixin/widgets/GuiRendererMixin.java b/src/main/java/restudio/reglass/mixin/widgets/GuiRendererMixin.java
index 37abd1d..90a9a53 100644
--- a/src/main/java/restudio/reglass/mixin/widgets/GuiRendererMixin.java
+++ b/src/main/java/restudio/reglass/mixin/widgets/GuiRendererMixin.java
@@ -6,17 +6,17 @@
 import java.nio.FloatBuffer;
 import java.util.List;
 import net.minecraft.client.gui.render.GuiRenderer;
-//#if MC >= 26.2
-import net.minecraft.client.renderer.state.gui.GuiRenderState;
-//#elseif MC >= 26
+//? if >= 26.2 {
 import net.minecraft.client.renderer.state.gui.GuiRenderState;
+//? } elif >= 26 {
+/*import net.minecraft.client.renderer.state.gui.GuiRenderState;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.SubmitNodeCollector;
-//#else
-import net.minecraft.client.gui.render.state.GuiRenderState;
+*///? } else {
+/*import net.minecraft.client.gui.render.state.GuiRenderState;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.command.OrderedRenderCommandQueue;
-//#endif
+*///? }
 import org.lwjgl.system.MemoryStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
@@ -31,13 +31,13 @@ public class GuiRendererMixin implements QuadVertexBufferProvider {
     private GpuBuffer reglass$quadVertexBuffer;
 
     @Inject(method = "<init>", at = @At("TAIL"))
-//#if MC >= 26.2
+//? if >= 26.2 {
     private void reglass$onInit(GuiRenderState state, net.minecraft.client.renderer.feature.FeatureRenderDispatcher dispatcher, List specialElementRenderers, CallbackInfo ci) {
-//#elseif MC >= 26
-    private void reglass$onInit(GuiRenderState state, MultiBufferSource.BufferSource vertexConsumers, SubmitNodeCollector queue, net.minecraft.client.renderer.feature.FeatureRenderDispatcher dispatcher, List specialElementRenderers, CallbackInfo ci) {
-//#else
-    private void reglass$onInit(GuiRenderState state, VertexConsumerProvider.Immediate vertexConsumers, OrderedRenderCommandQueue queue, net.minecraft.client.render.command.RenderDispatcher dispatcher, List specialElementRenderers, CallbackInfo ci) {
-//#endif
+//? } elif >= 26 {
+    /*private void reglass$onInit(GuiRenderState state, MultiBufferSource.BufferSource vertexConsumers, SubmitNodeCollector queue, net.minecraft.client.renderer.feature.FeatureRenderDispatcher dispatcher, List specialElementRenderers, CallbackInfo ci) {
+*///? } else {
+    /*private void reglass$onInit(GuiRenderState state, VertexConsumerProvider.Immediate vertexConsumers, OrderedRenderCommandQueue queue, net.minecraft.client.render.command.RenderDispatcher dispatcher, List specialElementRenderers, CallbackInfo ci) {
+*///? }
         try (MemoryStack stack = MemoryStack.stackPush()) {
             ByteBuffer byteBuffer = stack.malloc(4 * 3 * 4);
             FloatBuffer floatBuffer = byteBuffer.asFloatBuffer();
diff --git a/src/main/java/restudio/reglass/mixin/widgets/SliderWidgetMixin.java b/src/main/java/restudio/reglass/mixin/widgets/SliderWidgetMixin.java
index 1403d6c..55339f2 100644
--- a/src/main/java/restudio/reglass/mixin/widgets/SliderWidgetMixin.java
+++ b/src/main/java/restudio/reglass/mixin/widgets/SliderWidgetMixin.java
@@ -1,6 +1,6 @@
 package restudio.reglass.mixin.widgets;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
@@ -8,15 +8,15 @@
 import net.minecraft.client.gui.components.AbstractSliderButton;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
-//#else
-import net.minecraft.client.MinecraftClient;
+//? } else {
+/*import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.gui.widget.SliderWidget;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.MathHelper;
-//#endif
+*///? }
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -28,34 +28,34 @@
 import restudio.reglass.client.api.WidgetStyle;
 import restudio.reglass.mixin.accessor.SliderWidgetAccessor;
 
-//#if MC >= 26
+//? if >= 26 {
 @Mixin(AbstractSliderButton.class)
 public abstract class SliderWidgetMixin extends AbstractWidget {
-//#else
-@Mixin(SliderWidget.class)
+//? } else {
+/*@Mixin(SliderWidget.class)
 public abstract class SliderWidgetMixin extends ClickableWidget {
-//#endif
+*///? }
 
     @Unique
     WidgetStyle knobStyle = new WidgetStyle().smoothing(-0.005f).tint(0x000000, 0.1f);
     @Unique
     private double reglass$knobX = Double.NaN;
 
-//#if MC >= 26
+//? if >= 26 {
     public SliderWidgetMixin(int x, int y, int width, int height, Component message) {
-//#else
-    public SliderWidgetMixin(int x, int y, int width, int height, Text message) {
-//#endif
+//? } else {
+    /*public SliderWidgetMixin(int x, int y, int width, int height, Text message) {
+*///? }
         super(x, y, width, height, message);
     }
 
-//#if MC >= 26
+//? if >= 26 {
     @Inject(method = "extractWidgetRenderState", at = @At("HEAD"), cancellable = true)
     private void onRenderWidget(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#else
-    @Inject(method = "renderWidget", at = @At("HEAD"), cancellable = true)
+//? } else {
+    /*@Inject(method = "renderWidget", at = @At("HEAD"), cancellable = true)
     private void onRenderWidget(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-//#endif
+*///? }
         if (!ReGlassConfig.INSTANCE.features.enableRedesign || !ReGlassConfig.INSTANCE.features.sliders) {
             return;
         }
@@ -66,12 +66,12 @@ private void onRenderWidget(DrawContext context, int mouseX, int mouseY, float d
         if (Double.isNaN(this.reglass$knobX)) {
             this.reglass$knobX = targetKnobX;
         }
-//#if MC >= 26
+//? if >= 26 {
         double deltaTicks = Minecraft.getInstance().getDeltaTracker().getRealtimeDeltaTicks();
         double deltaSeconds = deltaTicks / 20.0;
-//#else
-        double deltaSeconds = delta / 20.0;
-//#endif
+//? } else {
+        /*double deltaSeconds = delta / 20.0;
+*///? }
         double alpha = 1.0 - Math.exp(-deltaSeconds / 0.08);
         if (alpha < 0.0) alpha = 0.0;
         if (alpha > 1.0) alpha = 1.0;
@@ -93,23 +93,23 @@ private void onRenderWidget(DrawContext context, int mouseX, int mouseY, float d
 
         LiquidGlassUniforms.get().tryApplyBlur(context);
 
-//#if MC >= 26
+//? if >= 26 {
         Font font = Minecraft.getInstance().font;
-//#else
-        TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-//#endif
+//? } else {
+        /*TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+*///? }
         int color = this.active ? 0xFFFFFF : 0xA0A0A0;
-//#if MC >= 26
+//? if >= 26 {
         int finalColor = color | Mth.ceil(this.alpha * 255.0f) << 24;
-//#else
-        int finalColor = color | MathHelper.ceil(this.alpha * 255.0f) << 24;
-//#endif
+//? } else {
+        /*int finalColor = color | MathHelper.ceil(this.alpha * 255.0f) << 24;
+*///? }
 
-//#if MC >= 26
+//? if >= 26 {
         context.centeredText(font, this.getMessage(), this.getX() + this.getWidth() / 2, this.getY() + (this.getHeight() - 8) / 2, finalColor);
-//#else
-        context.drawCenteredTextWithShadow(textRenderer, this.getMessage(), this.getX() + this.getWidth() / 2, this.getY() + (this.getHeight() - 8) / 2, finalColor);
-//#endif
+//? } else {
+        /*context.drawCenteredTextWithShadow(textRenderer, this.getMessage(), this.getX() + this.getWidth() / 2, this.getY() + (this.getHeight() - 8) / 2, finalColor);
+*///? }
     }
 }
 
diff --git a/src/main/java/restudio/reglass/mixin/widgets/TooltipStateMixin.java b/src/main/java/restudio/reglass/mixin/widgets/TooltipStateMixin.java
index 4ac4444..43302ae 100644
--- a/src/main/java/restudio/reglass/mixin/widgets/TooltipStateMixin.java
+++ b/src/main/java/restudio/reglass/mixin/widgets/TooltipStateMixin.java
@@ -1,12 +1,12 @@
 package restudio.reglass.mixin.widgets;
 
-//#if MC >= 26
+//? if >= 26 {
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
-//#else
-import net.minecraft.client.gui.DrawContext;
+//? } else {
+/*import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.ScreenRect;
-//#endif
+*///? }
 import net.minecraft.client.gui.tooltip.Tooltip;
 import net.minecraft.client.gui.tooltip.TooltipState;
 import org.jetbrains.annotations.Nullable;
@@ -23,11 +23,11 @@ public class TooltipStateMixin {
     @Shadow @Nullable private Tooltip tooltip;
 
 //    @Inject(method = "render", at = @At("HEAD"), cancellable = true)
-//#if MC >= 26
-//    private void onRender(GuiGraphicsExtractor context, int mouseX, int mouseY, boolean hovered, boolean focused, ScreenRectangle navigationFocus, CallbackInfo ci) {
-//#else
-//    private void onRender(DrawContext context, int mouseX, int mouseY, boolean hovered, boolean focused, ScreenRect navigationFocus, CallbackInfo ci) {
-//#endif
+//? if >= 26 {
+    private void onRender(GuiGraphicsExtractor context, int mouseX, int mouseY, boolean hovered, boolean focused, ScreenRectangle navigationFocus, CallbackInfo ci) {
+#else
+    private void onRender(DrawContext context, int mouseX, int mouseY, boolean hovered, boolean focused, ScreenRect navigationFocus, CallbackInfo ci) {
+//? }
 //        if (!ReGlassConfig.INSTANCE.features.enableRedesign) return;
 //
 //        ci.cancel();