diff --git a/gradle.properties b/gradle.properties
index 91d0d7a..0d0c3ef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21.8
-yarn_mappings=1.21.8+build.1
-loader_version=0.16.14
+minecraft_version=1.21.10
+yarn_mappings=1.21.10+build.2
+loader_version=0.17.3
 
 # Mod Properties
-mod_version = 1.5
+mod_version = 1.6
 maven_group = com.kasetoatz
 archives_base_name = TridentHacks
 
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.131.0+1.21.8
+fabric_version=0.135.0+1.21.10
diff --git a/src/main/java/com/kasetoatz/tridenthacks/TridentHacks.java b/src/main/java/com/kasetoatz/tridenthacks/TridentHacks.java
index 2a9e2b3..b810a63 100644
--- a/src/main/java/com/kasetoatz/tridenthacks/TridentHacks.java
+++ b/src/main/java/com/kasetoatz/tridenthacks/TridentHacks.java
@@ -9,9 +9,11 @@ import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.item.Items;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 import org.lwjgl.glfw.GLFW;
 
-public class TridentHacks implements ClientModInitializer {
+public class TridentHacks implements ClientModInitializer
+{
     public static MinecraftClient client;
     public static boolean onGround = true;
     public static boolean riptideConditions = false;
@@ -21,10 +23,11 @@ public class TridentHacks implements ClientModInitializer {
     public static long lastTridentUse = 0;
 
     @Override
-    public void onInitializeClient() {
+    public void onInitializeClient()
+    {
         Config.load();
         client = MinecraftClient.getInstance();
-        keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding("Toggle Riptide", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_RIGHT_ALT, "RiptideHacks"));
+        keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding("key.tridenthacks.toggle_riptide", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_RIGHT_ALT, KeyBinding.Category.create(Identifier.of("tridenthacks", "tridenthacks"))));
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
             while (keyBinding.wasPressed()) {
                 Config.toggleRiptide = !Config.toggleRiptide;
diff --git a/src/main/java/com/kasetoatz/tridenthacks/config/Config.java b/src/main/java/com/kasetoatz/tridenthacks/config/Config.java
index 9019723..35de753 100644
--- a/src/main/java/com/kasetoatz/tridenthacks/config/Config.java
+++ b/src/main/java/com/kasetoatz/tridenthacks/config/Config.java
@@ -3,7 +3,6 @@ package com.kasetoatz.tridenthacks.config;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.Gson;
-import com.kasetoatz.tridenthacks.TridentHacks;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.crash.CrashException;
 import net.minecraft.util.crash.CrashReport;
@@ -13,7 +12,8 @@ import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 
-public class Config {
+public class Config
+{
     public static boolean toggleRiptide = true;
     public static boolean noFallDamage = true;
     public static boolean returnToSameSlot = true;
diff --git a/src/main/java/com/kasetoatz/tridenthacks/mixin/ClientConnectionMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/ClientConnectionMixin.java
index 375073a..0c26ed2 100644
--- a/src/main/java/com/kasetoatz/tridenthacks/mixin/ClientConnectionMixin.java
+++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/ClientConnectionMixin.java
@@ -14,8 +14,9 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientConnection.class)
-public abstract class ClientConnectionMixin {
-    @Inject(method="send*", at=@At("HEAD"), cancellable = true)
+public abstract class ClientConnectionMixin
+{
+    @Inject(method="send*", at=@At("HEAD"), cancellable=true)
     private void send(Packet<?> packet, CallbackInfo ci)
     {
         if (Config.toggleRiptide)
diff --git a/src/main/java/com/kasetoatz/tridenthacks/mixin/EnchantmentHelperMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/EnchantmentHelperMixin.java
index 00dbc1b..5f71382 100644
--- a/src/main/java/com/kasetoatz/tridenthacks/mixin/EnchantmentHelperMixin.java
+++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/EnchantmentHelperMixin.java
@@ -9,8 +9,9 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(EnchantmentHelper.class)
-public abstract class EnchantmentHelperMixin {
-    @Inject(method="getTridentSpinAttackStrength", at=@At("RETURN"), cancellable = true)
+public abstract class EnchantmentHelperMixin
+{
+    @Inject(method="getTridentSpinAttackStrength", at=@At("RETURN"), cancellable=true)
     private static void getTridentSpinAttackStrength(CallbackInfoReturnable<Float> cir)
     {
         if (Config.toggleRiptide)
diff --git a/src/main/java/com/kasetoatz/tridenthacks/mixin/EntityMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/EntityMixin.java
index 1ac027a..ee6dfc1 100644
--- a/src/main/java/com/kasetoatz/tridenthacks/mixin/EntityMixin.java
+++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/EntityMixin.java
@@ -9,8 +9,9 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Entity.class)
-public abstract class EntityMixin {
-    @Inject(method="isTouchingWaterOrRain", at=@At("RETURN"), cancellable = true)
+public abstract class EntityMixin
+{
+    @Inject(method="isTouchingWaterOrRain", at=@At("RETURN"), cancellable=true)
     private void isTouchingWaterOrRain(CallbackInfoReturnable<Boolean> cir)
     {
         if (Config.toggleRiptide)
diff --git a/src/main/java/com/kasetoatz/tridenthacks/mixin/LivingEntityMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/LivingEntityMixin.java
index e9c94f8..f86202b 100644
--- a/src/main/java/com/kasetoatz/tridenthacks/mixin/LivingEntityMixin.java
+++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/LivingEntityMixin.java
@@ -9,8 +9,9 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(LivingEntity.class)
-public abstract class LivingEntityMixin {
-    @Inject(method="isUsingRiptide", at=@At("HEAD"), cancellable = true)
+public abstract class LivingEntityMixin
+{
+    @Inject(method="isUsingRiptide", at=@At("HEAD"), cancellable=true)
     private void isUsingRiptide(CallbackInfoReturnable<Boolean> cir)
     {
         LivingEntity entity = (LivingEntity)(Object)this;
diff --git a/src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerInventoryMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerInventoryMixin.java
index 06390ea..5eaa6df 100644
--- a/src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerInventoryMixin.java
+++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerInventoryMixin.java
@@ -14,7 +14,8 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(PlayerInventory.class)
-public abstract class PlayerInventoryMixin {
+public abstract class PlayerInventoryMixin
+{
     @Inject(method="setStack", at=@At("HEAD"))
     public void setStack(int slot, ItemStack stack, CallbackInfo ci)
     {
diff --git a/src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerMoveC2SPacketMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerMoveC2SPacketMixin.java
index d8516e8..5122f93 100644
--- a/src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerMoveC2SPacketMixin.java
+++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerMoveC2SPacketMixin.java
@@ -6,7 +6,8 @@ import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(PlayerMoveC2SPacket.class)
-public interface PlayerMoveC2SPacketMixin {
+public interface PlayerMoveC2SPacketMixin
+{
     @Accessor("onGround")
     @Mutable
     void setOnGround(boolean onGround);
diff --git a/src/main/java/com/kasetoatz/tridenthacks/mixin/TridentItemMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/TridentItemMixin.java
index d3b7fe4..e327ea3 100644
--- a/src/main/java/com/kasetoatz/tridenthacks/mixin/TridentItemMixin.java
+++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/TridentItemMixin.java
@@ -2,12 +2,10 @@ package com.kasetoatz.tridenthacks.mixin;
 
 import com.kasetoatz.tridenthacks.config.Config;
 import com.kasetoatz.tridenthacks.TridentHacks;
-import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
 import net.minecraft.item.TridentItem;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
@@ -15,11 +13,11 @@ import net.minecraft.world.World;
 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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(TridentItem.class)
-public class TridentItemMixin {
+public class TridentItemMixin
+{
     @Inject(method="onStoppedUsing", at=@At("HEAD"))
     private void onStoppedUsing(ItemStack stack, World world, LivingEntity user, int remainingUseTicks, CallbackInfoReturnable<Boolean> cir)
     {
diff --git a/src/main/resources/assets/tridenthacks/lang/en_us.json b/src/main/resources/assets/tridenthacks/lang/en_us.json
new file mode 100644
index 0000000..8ca0371
--- /dev/null
+++ b/src/main/resources/assets/tridenthacks/lang/en_us.json
@@ -0,0 +1,4 @@
+{
+  "key.category.tridenthacks.tridenthacks": "TridentHacks",
+  "key.tridenthacks.toggle_riptide": "Toggle Riptide"
+}
\ No newline at end of file