diff --git a/common/build.gradle b/common/build.gradle
index ae043a0..f101db0 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -23,6 +23,6 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
     // Mod implementations
-    modImplementation "maven.modrinth:sodium:mc1.20.6-0.5.8"
-    modImplementation "maven.modrinth:sodium-extra:mc1.20.6-0.5.5"
+    modImplementation "maven.modrinth:sodium:mc1.21-0.5.9"
+    modImplementation "maven.modrinth:sodium-extra:mc1.21-0.5.7"
 }
\ No newline at end of file
diff --git a/common/src/main/java/com/axolotlmaid/optionsprofiles/mixin/MixinOptionsScreen.java b/common/src/main/java/com/axolotlmaid/optionsprofiles/mixin/MixinOptionsScreen.java
index 22a807a..3cc5669 100644
--- a/common/src/main/java/com/axolotlmaid/optionsprofiles/mixin/MixinOptionsScreen.java
+++ b/common/src/main/java/com/axolotlmaid/optionsprofiles/mixin/MixinOptionsScreen.java
@@ -2,8 +2,8 @@ package com.axolotlmaid.optionsprofiles.mixin;
 
 import com.axolotlmaid.optionsprofiles.gui.ProfilesScreen;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.OptionsScreen;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.options.OptionsScreen;
 import net.minecraft.network.chat.Component;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/SodiumExtraConfigLoader.java b/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/SodiumExtraConfigLoader.java
index dc0394a..2d07edb 100644
--- a/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/SodiumExtraConfigLoader.java
+++ b/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/SodiumExtraConfigLoader.java
@@ -56,6 +56,7 @@ public class SodiumExtraConfigLoader {
         SodiumExtraClientMod.options().renderSettings.painting = configData.render_settings.painting;
         SodiumExtraClientMod.options().renderSettings.piston = configData.render_settings.piston;
         SodiumExtraClientMod.options().renderSettings.beaconBeam = configData.render_settings.beacon_beam;
+        SodiumExtraClientMod.options().renderSettings.limitBeaconBeamHeight = configData.render_settings.limit_beacon_beam_height;
         SodiumExtraClientMod.options().renderSettings.enchantingTableBook = configData.render_settings.enchanting_table_book;
         SodiumExtraClientMod.options().renderSettings.itemFrameNameTag = configData.render_settings.item_frame_name_tag;
         SodiumExtraClientMod.options().renderSettings.playerNameTag = configData.render_settings.player_name_tag;
@@ -127,6 +128,7 @@ public class SodiumExtraConfigLoader {
             public boolean painting;
             public boolean piston;
             public boolean beacon_beam;
+            public boolean limit_beacon_beam_height;
             public boolean enchanting_table_book;
             public boolean item_frame_name_tag;
             public boolean player_name_tag;
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 49139b3..dfa1327 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -25,8 +25,8 @@
   ],
   "depends": {
     "fabricloader": ">=0.15.11",
-    "minecraft": "~1.20.6",
+    "minecraft": "~1.21",
     "java": ">=21",
     "fabric-api": "*"
   }
-}
\ No newline at end of file
+}
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index 940e003..5f7c376 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[50,)"
+loaderVersion = "[51,)"
 #issueTrackerURL = ""
 license = "GNU GPL 3.0"
 
@@ -16,13 +16,13 @@ logoFile = "icon.png"
 [[dependencies.optionsprofiles]]
 modId = "forge"
 mandatory = true
-versionRange = "[50,)"
+versionRange = "[51,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.optionsprofiles]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.6,)"
+versionRange = "[1.21,)"
 ordering = "NONE"
-side = "BOTH"
\ No newline at end of file
+side = "BOTH"
diff --git a/gradle.properties b/gradle.properties
index f3d2ea7..1801941 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,16 +1,16 @@
 org.gradle.jvmargs=-Xmx6G
 org.gradle.parallel=true
 
-mod_version=1.2.1
+mod_version=1.2.2
 maven_group=com.axolotlmaid.optionsprofiles
 archives_name=optionsprofiles
 enabled_platforms=fabric,forge,neoforge
 
-minecraft_version=1.20.6
+minecraft_version=1.21
 
 fabric_loader_version=0.15.11
-fabric_api_version=0.99.4+1.20.6
+fabric_api_version=0.100.1+1.21
 
-forge_version=1.20.6-50.0.13
+forge_version=1.21-51.0.7
 
-neoforge_version=20.6.75-beta
+neoforge_version=21.0.6-beta
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
index 19e9642..ef69fad 100644
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -16,14 +16,14 @@ logoFile = "icon.png"
 [[dependencies.optionsprofiles]]
 modId = "neoforge"
 type = "required"
-versionRange = "[20.6,)"
+versionRange = "[21.0,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.optionsprofiles]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.20.6,)"
+versionRange = "[1.21,)"
 ordering = "NONE"
 side = "BOTH"
 
diff --git a/settings.gradle b/settings.gradle
index 3f9b831..25e0900 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,4 +12,4 @@ include("fabric")
 include("forge")
 include("neoforge")
 
-rootProject.name = "optionsprofiles-v1.2.1-1.20.6"
+rootProject.name = "optionsprofiles-v1.2.2-1.21"