diff --git a/build.gradle b/build.gradle
index 29fca03..c8f90a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'dev.architectury.loom' version '1.7-SNAPSHOT' apply false
+    id 'dev.architectury.loom' version '1.10-SNAPSHOT' apply false
     id 'architectury-plugin' version '3.4-SNAPSHOT'
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
diff --git a/common/build.gradle b/common/build.gradle
index bc200dd..3f3460e 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -26,9 +26,9 @@ dependencies {
     modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"
 
     // Mod implementations
-    modImplementation "maven.modrinth:sodium:mc1.21.4-0.6.13-fabric"            // Sodium
-    modImplementation "maven.modrinth:sodium-extra:mc1.21.4-0.6.1+fabric"       // Sodium Extra
-    modImplementation "maven.modrinth:iris:1.8.5+1.21.4-fabric"                 // Iris
-    modImplementation "maven.modrinth:distanthorizons:2.2.1-a-1.21.1"           // Distant Horizons
-    modImplementation "maven.modrinth:controlify:2.1.1-fabric,1.21.4"           // Controlify
+    modImplementation "maven.modrinth:sodium:mc1.21.6-0.6.13-fabric"            // Sodium
+    modImplementation "maven.modrinth:sodium-extra:mc1.21.6-0.6.6+fabric"       // Sodium Extra
+    modImplementation "maven.modrinth:iris:1.9.1+1.21.7-fabric"                 // Iris
+    modImplementation "maven.modrinth:distanthorizons:2.3.4-b-1.21.6"           // Distant Horizons
+    modImplementation "maven.modrinth:controlify:2.2.1-fabric,1.21.6"           // Controlify
 }
diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java b/common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java
index bf2c02f..8baf833 100644
--- a/common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java
+++ b/common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java
@@ -117,7 +117,7 @@ public class OptionsToggleList extends ContainerObjectSelectionList<OptionsToggl
             int posY = y - 2;
             int textY = y + entryHeight / 2;
 
-            guiGraphics.drawString(fontRenderer, this.optionKey, x, textY - 9 / 2, 16777215, false);
+            guiGraphics.drawString(fontRenderer, this.optionKey, x, textY - 9 / 2, -1);
 
             this.toggleButton.setPosition(posX, posY);
             this.toggleButton.render(guiGraphics, mouseX, mouseY, tickDelta);
diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java b/common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java
index e8d7d3a..427e63c 100644
--- a/common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java
+++ b/common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java
@@ -109,7 +109,7 @@ public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Prof
             int posY = y - 2;
             int textY = y + entryHeight / 2;
 
-            guiGraphics.drawString(fontRenderer, this.profileName, x, textY - 9 / 2, 16777215, false);
+            guiGraphics.drawString(fontRenderer, this.profileName, x, textY - 9 / 2, -1);
 
             this.editButton.setPosition(posX - this.editButton.getWidth(), posY);
             this.editButton.render(guiGraphics, mouseX, mouseY, tickDelta);
diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumExtraLoader.java b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumExtraLoader.java
index 9d28efa..86e45af 100644
--- a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumExtraLoader.java
+++ b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumExtraLoader.java
@@ -1,5 +1,7 @@
 package net.trafficlunar.optionsprofiles.profiles.loaders;
 
+import me.flashyreese.mods.sodiumextra.client.gui.FogTypeConfig;
+import net.minecraft.world.level.material.FogType;
 import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -10,6 +12,7 @@ import net.minecraft.resources.ResourceLocation;
 import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.EnumMap;
 import java.util.Map;
 
 public class SodiumExtraLoader {
@@ -47,10 +50,8 @@ public class SodiumExtraLoader {
         SodiumExtraClientMod.options().detailSettings.biomeColors = configuration.detail_settings.biome_colors;
         SodiumExtraClientMod.options().detailSettings.skyColors = configuration.detail_settings.sky_colors;
 
-        SodiumExtraClientMod.options().renderSettings.fogDistance = configuration.render_settings.fog_distance;
-        SodiumExtraClientMod.options().renderSettings.fogStart = configuration.render_settings.fog_start;
-        SodiumExtraClientMod.options().renderSettings.multiDimensionFogControl = configuration.render_settings.multi_dimension_fog_control;
-        SodiumExtraClientMod.options().renderSettings.dimensionFogDistanceMap = configuration.render_settings.dimensionFogDistance;
+        SodiumExtraClientMod.options().renderSettings.globalFog = configuration.render_settings.global_fog;
+        SodiumExtraClientMod.options().renderSettings.fogTypeConfig = configuration.render_settings.fog_type_config;
         SodiumExtraClientMod.options().renderSettings.lightUpdates = configuration.render_settings.light_updates;
         SodiumExtraClientMod.options().renderSettings.itemFrame = configuration.render_settings.item_frame;
         SodiumExtraClientMod.options().renderSettings.armorStand = configuration.render_settings.armor_stand;
@@ -120,10 +121,8 @@ public class SodiumExtraLoader {
         }
 
         public static class RenderSettings {
-            public int fog_distance;
-            public int fog_start;
-            public boolean multi_dimension_fog_control;
-            public Map<ResourceLocation, Integer> dimensionFogDistance;
+            public boolean global_fog;
+            public EnumMap<FogType, FogTypeConfig> fog_type_config;
             public boolean light_updates;
             public boolean item_frame;
             public boolean armor_stand;
diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumLoader.java b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumLoader.java
index 791c4e8..98201fc 100644
--- a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumLoader.java
+++ b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumLoader.java
@@ -42,8 +42,6 @@ public class SodiumLoader {
         SodiumClientMod.options().notifications.hasClearedDonationButton = configuration.notifications.has_cleared_donation_button;
         SodiumClientMod.options().notifications.hasSeenDonationPrompt = configuration.notifications.has_seen_donation_prompt;
 
-        SodiumClientMod.options().debug.terrainSortingEnabled = configuration.debug.terrain_sorting_enabled;
-
         try {
             SodiumGameOptions.writeToDisk(SodiumClientMod.options());
         } catch (IOException e) {
@@ -56,7 +54,6 @@ public class SodiumLoader {
         public Advanced advanced;
         public Performance performance;
         public Notifications notifications;
-        public Debug debug;
 
         public static class Quality {
             public String weather_quality;
@@ -84,9 +81,5 @@ public class SodiumLoader {
             public boolean has_cleared_donation_button;
             public boolean has_seen_donation_prompt;
         }
-
-        public static class Debug {
-            public boolean terrain_sorting_enabled;
-        }
     }
 }
\ No newline at end of file
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 51d54e5..d9b91f4 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -25,10 +25,10 @@
     "optionsprofiles.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.15.11",
+    "fabricloader": ">=0.16.14",
     "minecraft": "~1.21",
     "java": ">=21",
-    "architectury": ">=15.0.3",
+    "architectury": ">=17.0.6",
     "fabric-api": "*"
   }
 }
diff --git a/gradle.properties b/gradle.properties
index 45e4f04..83fe4e5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,10 +11,10 @@ archives_name=optionsprofiles
 enabled_platforms=fabric,neoforge
 
 # Minecraft properties
-minecraft_version=1.21.4
+minecraft_version=1.21.6
 
 # Dependencies
-architectury_api_version = 15.0.3
-fabric_loader_version=0.16.9
-fabric_api_version=0.111.0+1.21.4
-neoforge_version=21.4.9-beta
\ No newline at end of file
+architectury_api_version = 17.0.6
+fabric_loader_version=0.16.14
+fabric_api_version=0.128.2+1.21.6
+neoforge_version=21.6.20-beta
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2617362..aa02b02 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
index 64ca7c9..c532f02 100644
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -16,7 +16,7 @@ logoFile = "icon.png"
 [[dependencies.optionsprofiles]]
 modId = "neoforge"
 type = "required"
-versionRange = "[21.0,)"
+versionRange = "[21.6,)"
 ordering = "NONE"
 side = "BOTH"
 
@@ -30,7 +30,7 @@ side = "BOTH"
 [[dependencies.optionsprofiles]]
 modId = "architectury"
 type = "required"
-versionRange = "[15.0.3,)"
+versionRange = "[17.0.6,)"
 ordering = "AFTER"
 side = "BOTH"