diff --git a/common/src/main/kotlin/fr/username404/snowygui/utils/RenderingUtil.kt b/common/src/main/kotlin/fr/username404/snowygui/utils/RenderingUtil.kt
index db774aa..20924f5 100644
--- a/common/src/main/kotlin/fr/username404/snowygui/utils/RenderingUtil.kt
+++ b/common/src/main/kotlin/fr/username404/snowygui/utils/RenderingUtil.kt
@@ -51,7 +51,7 @@ object RenderingUtil {
         Matrix4f()
     )
     fun renderBufferWithPipeline(
-        name: String? = "Dynamic vertex buffer",
+        name: String = "Dynamic vertex buffer",
         renderPipeline: RenderPipeline,
         renderTarget: RenderTarget = Minecraft.getInstance().mainRenderTarget,
         uniformAndSamplerConsumer: ((RenderPass) -> Unit)? = null,
diff --git a/fabric/src/main/java/fr/username404/snowygui/mixins/KeyMappings.java b/fabric/src/main/java/fr/username404/snowygui/mixins/KeyMappings.java
index 31d4048..8e79bfd 100644
--- a/fabric/src/main/java/fr/username404/snowygui/mixins/KeyMappings.java
+++ b/fabric/src/main/java/fr/username404/snowygui/mixins/KeyMappings.java
@@ -25,14 +25,11 @@ abstract class KeyMappings {
 
 	@Inject(method = "<init>*", at = @At("RETURN"))
 	private void onSettingsConstructed(Minecraft minecraft, File file, CallbackInfo ci) {
-		final var categoryMap = KeysAccessor.getSortedCategoryMap();
+		final var categoryList = KeysAccessor.getSortedCategoryList();
 		var newKeys = Lists.newArrayList(keyMappings);
 		for (KeyMapping key : keysToAdd) {
-			if (!categoryMap.containsKey(key.getCategory())) {
-				Optional<Integer> biggest = categoryMap.values().stream().max(Integer::compareTo);
-				int biggestInt = biggest.orElse(0);
-				categoryMap.put(key.getCategory(), biggestInt + 1);
-			}
+			if (!categoryList.contains(key.getCategory()))
+				categoryList.add(key.getCategory());
 			newKeys.remove(key);
 			newKeys.add(key);
 		}
diff --git a/fabric/src/main/java/fr/username404/snowygui/mixins/KeysAccessor.java b/fabric/src/main/java/fr/username404/snowygui/mixins/KeysAccessor.java
index 39039da..efc977e 100644
--- a/fabric/src/main/java/fr/username404/snowygui/mixins/KeysAccessor.java
+++ b/fabric/src/main/java/fr/username404/snowygui/mixins/KeysAccessor.java
@@ -4,10 +4,10 @@ import net.minecraft.client.KeyMapping;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-import java.util.Map;
+import java.util.List;
 
-@Mixin(KeyMapping.class)
+@Mixin(KeyMapping.Category.class)
 public interface KeysAccessor {
-	@Accessor("CATEGORY_SORT_ORDER")
-	static Map<String, Integer> getSortedCategoryMap() { throw new AssertionError(); }
+	@Accessor("SORT_ORDER")
+	static List<KeyMapping.Category> getSortedCategoryList() { throw new AssertionError(); }
 }
diff --git a/fabric/src/main/kotlin/fr/username404/snowygui/fabric/FabricInit.kt b/fabric/src/main/kotlin/fr/username404/snowygui/fabric/FabricInit.kt
index 83fe30d..2ea75e0 100644
--- a/fabric/src/main/kotlin/fr/username404/snowygui/fabric/FabricInit.kt
+++ b/fabric/src/main/kotlin/fr/username404/snowygui/fabric/FabricInit.kt
@@ -21,7 +21,7 @@ class FabricInit: Snowy(), ClientModInitializer {
         EVENT.register(
             object: HudRenderCallback, EventSnowy {
                 override val type: String = "HudRender"
-                override fun onHudRender(guiGraphics: GuiGraphics?, tickCounter: DeltaTracker?) = fire(guiGraphics)
+                override fun onHudRender(guiGraphics: GuiGraphics, tickCounter: DeltaTracker) = fire(guiGraphics)
             }
         )
     }