diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/Items.kt b/src/main/kotlin/org/neoflock/neocomputers/item/Items.kt
index 964720a..c4051e8 100644
--- a/src/main/kotlin/org/neoflock/neocomputers/item/Items.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/item/Items.kt
@@ -13,19 +13,12 @@ import java.util.function.Supplier
 object Items {
     val ITEMS: DeferredRegister<Item> = DeferredRegister.create(NeoComputers.MODID, Registries.ITEM)
 
-    val MEM0 = register("memory0") { MemoryTier1() }
-    val MEM1 = register("memory1") { MemoryTier1_5() }
-    val MEM2 = register("memory2") { MemoryTier2() }
-    val MEM3 = register("memory3") { MemoryTier2_5() }
-    val MEM4 = register("memory4") { MemoryTier3() }
-    val MEM5 = register("memory5") { MemoryTier3_5() }
+    val MEM0 = ITEMS.register("memory0") { MemoryTier1() }
+    val MEM1 = ITEMS.register("memory1") { MemoryTier1_5() }
+    val MEM2 = ITEMS.register("memory2") { MemoryTier2() }
+    val MEM3 = ITEMS.register("memory3") { MemoryTier2_5() }
+    val MEM4 = ITEMS.register("memory4") { MemoryTier3() }
+    val MEM5 = ITEMS.register("memory5") { MemoryTier3_5() }
 
-    val EE0 = register("eeprom0") { EEPROM0() }
-
-    fun<T: Item> register(name: String, itemFac: Supplier<T>): T {
-        val key = ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NeoComputers.MODID, name))
-        val item = itemFac.get()
-        Registry.register(BuiltInRegistries.ITEM, key, item)
-        return item
-    }
+    val EE0 = ITEMS.register("eeprom0") { EEPROM0() }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/org/neoflock/neocomputers/item/Tabs.kt b/src/main/kotlin/org/neoflock/neocomputers/item/Tabs.kt
index 35ccb71..aba1b2a 100644
--- a/src/main/kotlin/org/neoflock/neocomputers/item/Tabs.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/item/Tabs.kt
@@ -12,24 +12,24 @@ import net.minecraft.world.item.ItemStack
 import org.neoflock.neocomputers.NeoComputers
 
 object Tabs {
-    val TABS: DeferredRegister<CreativeModeTab> = DeferredRegister.create(NeoComputers.MODID, Registries.CREATIVE_MODE_TAB)
+    val TABS: DeferredRegister<CreativeModeTab> =
+        DeferredRegister.create(NeoComputers.MODID, Registries.CREATIVE_MODE_TAB)
 
-    val TAB: CreativeModeTab = Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB,
-        ResourceLocation.fromNamespaceAndPath(NeoComputers.MODID, "neocomputers_tab"), CreativeTabRegistry.create {
-        builder ->
-        builder.title(Component.literal("NeoComputers"))
-        builder.icon {
-            ItemStack(Items.MEM0)
-        }
-        builder.displayItems {
-            parameters, output ->
-            output.accept(ItemStack(Items.EE0))
+    val TAB = TABS.register("neocomputers_tab") {
+        CreativeTabRegistry.create { builder ->
+            builder.title(Component.literal("NeoComputers"))
+            builder.icon {
+                ItemStack(Items.MEM0.get())
+            }
+            builder.displayItems { parameters, output ->
+                output.accept(ItemStack(Items.EE0.get()))
 
-            val luaBios = ItemStack(Items.EE0)
-            luaBios.set(DataComponents.LABEL, "Lua BIOS")
-            luaBios.set(DataComponents.EEPROM_CODE, "error('hi')")
-            luaBios.set(DataComponents.EEPROM_DATA, "random garbage")
-            output.accept(luaBios)
+                val luaBios = ItemStack(Items.EE0.get())
+                luaBios.set(DataComponents.LABEL, "Lua BIOS")
+                luaBios.set(DataComponents.EEPROM_CODE, "error('hi')")
+                luaBios.set(DataComponents.EEPROM_DATA, "random garbage")
+                output.accept(luaBios)
+            }
         }
-    })
+    }
 }
\ No newline at end of file