diff --git a/assets/Module_PCB.aseprite b/assets/Module_PCB.aseprite
index b88154e..be01039 100644
Binary files a/assets/Module_PCB.aseprite and b/assets/Module_PCB.aseprite differ
diff --git a/src/main/java/systems/brn/serverstorage/ServerStorage.java b/src/main/java/systems/brn/serverstorage/ServerStorage.java
index d8367d2..925b138 100644
--- a/src/main/java/systems/brn/serverstorage/ServerStorage.java
+++ b/src/main/java/systems/brn/serverstorage/ServerStorage.java
@@ -24,8 +24,9 @@ import java.util.Arrays;
 import java.util.List;
 
 public class ServerStorage implements ModInitializer {
-    public static final List<String> moduleList = Arrays.asList("bus", "configuration", "container", "display", "drive", "filtering", "inventory", "pagination", "pcb", "transport");
+    public static final List<String> moduleList = Arrays.asList("bus", "configuration", "container", "display", "drive", "filtering", "inventory", "pagination", "pcb", "transport", "netherite_upgrade");
     public static final List<String> tiers = Arrays.asList("iron", "golden", "diamond", "netherite");
+    public static final List<String> materialList = Arrays.asList("pcb", "pcb_substrate", "cpu", "cpu_substrate", "drive_controller", "drive_casing");
 
     public static final String MOD_ID = "serverstorage";
 
@@ -45,21 +46,16 @@ public class ServerStorage implements ModInitializer {
     public static BlockEntityType<InventoryInterfaceBlockEntity> INVENTORY_INTERFACE_BLOCK_ENTITY;
 
     public static final GameRules.Key<GameRules.BooleanRule> ServerStorage_Crafting_Enable =
-            GameRuleRegistry.register("serverstoragecraftingmodule", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true));
+            GameRuleRegistry.register("serverstorage_crafting_module", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true));
 
     public static final GameRules.Key<GameRules.BooleanRule> ServerStorage_Terminal_Enable =
-            GameRuleRegistry.register("serverstorageterminalmodule", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true));
+            GameRuleRegistry.register("serverstorage_terminal_module", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true));
 
     public static final GameRules.Key<GameRules.BooleanRule> ServerStorage_Interface_Enable =
-                GameRuleRegistry.register("serverstorageinterfacemodule", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true));
+            GameRuleRegistry.register("serverstorage_interface_module", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true));
 
 
-    public static Item DRIVE_CASING;
-    public static Item CPU;
-    public static Item CPU_SUBSTRATE;
-    public static Item DRIVE_CONTROLLER;
-    public static Item PCB;
-    public static Item PCB_SUBSTRATE;
+    public static List<Item> MATERIALS;
     public static List<Item> MODULES;
     public static List<Item> PLATTERS;
     public static List<Item> DRIVES;
@@ -71,8 +67,7 @@ public class ServerStorage implements ModInitializer {
     }
 
     @Override
-    public void onInitialize()
-    {
+    public void onInitialize() {
         StorageInterfaceBlock.register();
         SimpleBlockItem.register(STORAGE_INTERFACE_BLOCK);
 
@@ -85,13 +80,7 @@ public class ServerStorage implements ModInitializer {
         InventoryInterfaceBlock.register();
         SimpleBlockItem.register(INVENTORY_INTERFACE_BLOCK);
 
-        PCB = SimpleItem.register("pcb", ItemGroups.INGREDIENTS);
-        PCB_SUBSTRATE = SimpleItem.register("pcb_substrate", ItemGroups.INGREDIENTS);
-        CPU = SimpleItem.register("cpu", ItemGroups.INGREDIENTS);
-        CPU_SUBSTRATE = SimpleItem.register("cpu_substrate", ItemGroups.INGREDIENTS);
-        DRIVE_CONTROLLER = SimpleItem.register("drive_controller", ItemGroups.INGREDIENTS);
-        DRIVE_CASING = SimpleItem.register("drive_casing", ItemGroups.INGREDIENTS);
-
+        MATERIALS = SimpleItem.register("material", materialList, false, ItemGroups.INGREDIENTS);
         MODULES = SimpleItem.register("module", moduleList, false, ItemGroups.INGREDIENTS);
 
         HEADS = SimpleItem.register("head", tiers, ItemGroups.INGREDIENTS);
@@ -99,8 +88,7 @@ public class ServerStorage implements ModInitializer {
 
         DRIVES = HardDriveItem.register(tiers);
 
-
-
+        systems.brn.serverstorage.lib.ItemGroups.register();
         PolymerResourcePackUtils.addModAssets(MOD_ID);
         PolymerResourcePackUtils.markAsRequired();
 
diff --git a/src/main/java/systems/brn/serverstorage/items/HardDrive.java b/src/main/java/systems/brn/serverstorage/items/HardDrive.java
index 23afc9e..f2b81c9 100644
--- a/src/main/java/systems/brn/serverstorage/items/HardDrive.java
+++ b/src/main/java/systems/brn/serverstorage/items/HardDrive.java
@@ -34,29 +34,29 @@ public class HardDrive {
 
     public void setMaxItems() {
         String itemName = driveStack.getItem().getRegistryEntry().registryKey().getValue().getPath();
+
         switch (itemName) {
             case "iron_drive":
                 tier = 0;
+                maxItems = 4096;
                 break;
             case "golden_drive":
                 tier = 1;
+                maxItems = 8192;
                 break;
             case "diamond_drive":
                 tier = 2;
+                maxItems = 32768;
                 break;
             case "netherite_drive":
                 tier = 3;
+                maxItems = 131072;
                 break;
             default:
                 tier = -1;
+                maxItems = 0;
                 break;
         }
-
-        maxItems = 0;
-
-        if (tier >= 0) {
-            maxItems = (int) Math.pow(2, tier + 8);
-        }
     }
 
     public void updateData() {
diff --git a/src/main/java/systems/brn/serverstorage/lib/ItemGroups.java b/src/main/java/systems/brn/serverstorage/lib/ItemGroups.java
new file mode 100644
index 0000000..a167f64
--- /dev/null
+++ b/src/main/java/systems/brn/serverstorage/lib/ItemGroups.java
@@ -0,0 +1,57 @@
+package systems.brn.serverstorage.lib;
+import eu.pb4.polymer.core.api.item.PolymerItemGroupUtils;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemStack;
+import net.minecraft.text.Text;
+
+import static systems.brn.serverstorage.ServerStorage.*;
+
+public class ItemGroups {
+    public static final ItemGroup BLOCKS_GROUP = PolymerItemGroupUtils.builder()
+            .icon(() -> new ItemStack(STORAGE_INTERFACE_BLOCK))
+            .displayName(Text.translatable("serverstorage.groups.blocks"))
+            .entries(((context, entries) -> {
+                entries.add(STORAGE_INTERFACE_BLOCK);
+                entries.add(HARD_DRIVE_CONTAINER_BLOCK);
+                entries.add(BUS_CONNECTOR_BLOCK);
+                entries.add(INVENTORY_INTERFACE_BLOCK);
+            }))
+            .build();
+
+    public static final ItemGroup MATERIALS_GROUP = PolymerItemGroupUtils.builder()
+            .icon(() -> new ItemStack(MODULES.getFirst()))
+            .displayName(Text.translatable("serverstorage.groups.materials"))
+            .entries(((context, entries) -> {
+                for (Item module : MODULES) {
+                    entries.add(module);
+                }
+                for (Item material : MATERIALS) {
+                    entries.add(material);
+                }
+                int partLength = HEADS.size();
+                if (partLength == PLATTERS.size()) {
+                    for (int i = 0; i < PLATTERS.size(); i++) {
+                        entries.add(PLATTERS.get(i));
+                        entries.add(HEADS.get(i));
+                    }
+                }
+            }))
+            .build();
+
+    public static final ItemGroup DRIVES_GROUP = PolymerItemGroupUtils.builder()
+            .icon(() -> new ItemStack(DRIVES.getFirst()))
+            .displayName(Text.translatable("serverstorage.groups.drives"))
+            .entries(((context, entries) -> {
+                for (Item drive : DRIVES) {
+                    entries.add(drive);
+                }
+            }))
+            .build();
+
+    public static void register() {
+        PolymerItemGroupUtils.registerPolymerItemGroup(id("blocks"), BLOCKS_GROUP);
+        PolymerItemGroupUtils.registerPolymerItemGroup(id("drives"), DRIVES_GROUP);
+        PolymerItemGroupUtils.registerPolymerItemGroup(id("materials"), MATERIALS_GROUP);
+    }
+}
diff --git a/src/main/resources/assets/serverstorage/lang/en_us.json b/src/main/resources/assets/serverstorage/lang/en_us.json
index b072505..edd2c5d 100644
--- a/src/main/resources/assets/serverstorage/lang/en_us.json
+++ b/src/main/resources/assets/serverstorage/lang/en_us.json
@@ -5,8 +5,6 @@
 
   "block.serverstorage.drive_container": "Hard drive container",
 
-  "item.serverstorage.drive_casing": "Hard drive casing",
-
   "block.serverstorage.bus_connector": "Storage network connector",
 
   "item.serverstorage.iron_drive": "Iron hard drive",
@@ -34,14 +32,17 @@
   "item.serverstorage.module_inventory": "Inventory module",
   "item.serverstorage.module_pagination": "Pagination module",
   "item.serverstorage.module_transport": "Transport module",
+  "item.serverstorage.module_netherite_upgrade": "Netherite upgrade module",
+
 
   "item.serverstorage.module_pcb": "Module PCB",
 
-  "item.serverstorage.drive_controller": "Drive controller",
-  "item.serverstorage.cpu": "Central Processing Unit",
-  "item.serverstorage.cpu_substrate": "CPU substrate",
-  "item.serverstorage.pcb": "Printed Circuit Board",
-  "item.serverstorage.pcb_substrate": "PCB substrate",
+  "item.serverstorage.material_drive_casing": "Hard drive casing",
+  "item.serverstorage.material_drive_controller": "Drive controller",
+  "item.serverstorage.material_cpu": "Central Processing Unit",
+  "item.serverstorage.material_cpu_substrate": "CPU substrate",
+  "item.serverstorage.material_pcb": "Printed Circuit Board",
+  "item.serverstorage.material_pcb_substrate": "PCB substrate",
 
 
   "gui.serverstorage.store_all": "Store all items from inventory",
@@ -57,5 +58,9 @@
   "gui.serverstorage.direction_up": "Up",
   "gui.serverstorage.direction_down": "Down",
 
+  "serverstorage.groups.blocks" : "Serverstorage blocks",
+  "serverstorage.groups.materials" : "Serverstorage materials",
+  "serverstorage.groups.drives" : "Serverstorage drives",
+
   "message.serverstorage.block_disabled": "This block was disabled in a gamerule, contact admins"
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/diamond_drive.json b/src/main/resources/assets/serverstorage/models/item/diamond_drive.json
index 4a1cd31..df3b23a 100644
--- a/src/main/resources/assets/serverstorage/models/item/diamond_drive.json
+++ b/src/main/resources/assets/serverstorage/models/item/diamond_drive.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/drive_diamond"
+    "layer0": "serverstorage:item/diamond_drive"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/diamond_head.json b/src/main/resources/assets/serverstorage/models/item/diamond_head.json
index 338a0aa..8bf2f77 100644
--- a/src/main/resources/assets/serverstorage/models/item/diamond_head.json
+++ b/src/main/resources/assets/serverstorage/models/item/diamond_head.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/head_diamond"
+    "layer0": "serverstorage:item/diamond_drive_head"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/diamond_platter.json b/src/main/resources/assets/serverstorage/models/item/diamond_platter.json
index 0435fe1..6c340a0 100644
--- a/src/main/resources/assets/serverstorage/models/item/diamond_platter.json
+++ b/src/main/resources/assets/serverstorage/models/item/diamond_platter.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/platter_diamond"
+    "layer0": "serverstorage:item/diamond_drive_platter"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/golden_drive.json b/src/main/resources/assets/serverstorage/models/item/golden_drive.json
index ec6e287..9aea240 100644
--- a/src/main/resources/assets/serverstorage/models/item/golden_drive.json
+++ b/src/main/resources/assets/serverstorage/models/item/golden_drive.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/drive_gold"
+    "layer0": "serverstorage:item/golden_drive"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/golden_head.json b/src/main/resources/assets/serverstorage/models/item/golden_head.json
index 3a39d0b..a5a60bb 100644
--- a/src/main/resources/assets/serverstorage/models/item/golden_head.json
+++ b/src/main/resources/assets/serverstorage/models/item/golden_head.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/head_gold"
+    "layer0": "serverstorage:item/golden_drive_head"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/golden_platter.json b/src/main/resources/assets/serverstorage/models/item/golden_platter.json
index 138d33f..98750fb 100644
--- a/src/main/resources/assets/serverstorage/models/item/golden_platter.json
+++ b/src/main/resources/assets/serverstorage/models/item/golden_platter.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/platter_gold"
+    "layer0": "serverstorage:item/golden_drive_platter"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/iron_drive.json b/src/main/resources/assets/serverstorage/models/item/iron_drive.json
index 6fab3ad..57ccfe8 100644
--- a/src/main/resources/assets/serverstorage/models/item/iron_drive.json
+++ b/src/main/resources/assets/serverstorage/models/item/iron_drive.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/drive_iron"
+    "layer0": "serverstorage:item/iron_drive"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/iron_head.json b/src/main/resources/assets/serverstorage/models/item/iron_head.json
index 7e7c7ef..267a8ae 100644
--- a/src/main/resources/assets/serverstorage/models/item/iron_head.json
+++ b/src/main/resources/assets/serverstorage/models/item/iron_head.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/head_iron"
+    "layer0": "serverstorage:item/iron_drive_head"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/iron_platter.json b/src/main/resources/assets/serverstorage/models/item/iron_platter.json
index 5db5a4c..c2fbd1e 100644
--- a/src/main/resources/assets/serverstorage/models/item/iron_platter.json
+++ b/src/main/resources/assets/serverstorage/models/item/iron_platter.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/platter_iron"
+    "layer0": "serverstorage:item/iron_drive_platter"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/cpu.json b/src/main/resources/assets/serverstorage/models/item/material_cpu.json
similarity index 56%
rename from src/main/resources/assets/serverstorage/models/item/cpu.json
rename to src/main/resources/assets/serverstorage/models/item/material_cpu.json
index a26ba02..8c6a72b 100644
--- a/src/main/resources/assets/serverstorage/models/item/cpu.json
+++ b/src/main/resources/assets/serverstorage/models/item/material_cpu.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/cpu"
+    "layer0": "serverstorage:item/material_cpu"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/drive_controller.json b/src/main/resources/assets/serverstorage/models/item/material_cpu_substrate.json
similarity index 51%
rename from src/main/resources/assets/serverstorage/models/item/drive_controller.json
rename to src/main/resources/assets/serverstorage/models/item/material_cpu_substrate.json
index 679ec93..600d8fd 100644
--- a/src/main/resources/assets/serverstorage/models/item/drive_controller.json
+++ b/src/main/resources/assets/serverstorage/models/item/material_cpu_substrate.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/drive_controller"
+    "layer0": "serverstorage:item/material_cpu_substrate"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/cpu_substrate.json b/src/main/resources/assets/serverstorage/models/item/material_drive_casing.json
similarity index 52%
rename from src/main/resources/assets/serverstorage/models/item/cpu_substrate.json
rename to src/main/resources/assets/serverstorage/models/item/material_drive_casing.json
index 33fc958..62b99e7 100644
--- a/src/main/resources/assets/serverstorage/models/item/cpu_substrate.json
+++ b/src/main/resources/assets/serverstorage/models/item/material_drive_casing.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/cpu_substrate"
+    "layer0": "serverstorage:item/material_drive_casing"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/material_drive_controller.json b/src/main/resources/assets/serverstorage/models/item/material_drive_controller.json
new file mode 100644
index 0000000..f56b5ec
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/models/item/material_drive_controller.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "serverstorage:item/material_drive_controller"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/drive_casing.json b/src/main/resources/assets/serverstorage/models/item/material_pcb.json
similarity index 56%
rename from src/main/resources/assets/serverstorage/models/item/drive_casing.json
rename to src/main/resources/assets/serverstorage/models/item/material_pcb.json
index b963cd8..c48b0ed 100644
--- a/src/main/resources/assets/serverstorage/models/item/drive_casing.json
+++ b/src/main/resources/assets/serverstorage/models/item/material_pcb.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/drive_casing"
+    "layer0": "serverstorage:item/material_pcb"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/material_pcb_substrate.json b/src/main/resources/assets/serverstorage/models/item/material_pcb_substrate.json
new file mode 100644
index 0000000..f800b68
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/models/item/material_pcb_substrate.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "serverstorage:item/material_pcb_substrate"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/module_netherite_upgrade.json b/src/main/resources/assets/serverstorage/models/item/module_netherite_upgrade.json
new file mode 100644
index 0000000..1975e62
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/models/item/module_netherite_upgrade.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "serverstorage:item/module_netherite_upgrade"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/netherite_drive.json b/src/main/resources/assets/serverstorage/models/item/netherite_drive.json
index 6a74a34..1e68d78 100644
--- a/src/main/resources/assets/serverstorage/models/item/netherite_drive.json
+++ b/src/main/resources/assets/serverstorage/models/item/netherite_drive.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/drive_netherite"
+    "layer0": "serverstorage:item/netherite_drive"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/netherite_head.json b/src/main/resources/assets/serverstorage/models/item/netherite_head.json
index a2e1184..9c6fc09 100644
--- a/src/main/resources/assets/serverstorage/models/item/netherite_head.json
+++ b/src/main/resources/assets/serverstorage/models/item/netherite_head.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/head_netherite"
+    "layer0": "serverstorage:item/netherite_drive_head"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/netherite_platter.json b/src/main/resources/assets/serverstorage/models/item/netherite_platter.json
index 7621bbc..45e50f3 100644
--- a/src/main/resources/assets/serverstorage/models/item/netherite_platter.json
+++ b/src/main/resources/assets/serverstorage/models/item/netherite_platter.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "serverstorage:item/platter_netherite"
+    "layer0": "serverstorage:item/netherite_drive_platter"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/pcb.json b/src/main/resources/assets/serverstorage/models/item/pcb.json
deleted file mode 100644
index 63f7e7e..0000000
--- a/src/main/resources/assets/serverstorage/models/item/pcb.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "serverstorage:item/pcb"
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/models/item/pcb_substrate.json b/src/main/resources/assets/serverstorage/models/item/pcb_substrate.json
deleted file mode 100644
index 1e880ab..0000000
--- a/src/main/resources/assets/serverstorage/models/item/pcb_substrate.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "serverstorage:item/pcb_substrate"
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/textures/block/bus_connector_blank.png b/src/main/resources/assets/serverstorage/textures/block/bus_connector_blank.png
index 4f4b595..371b49d 100644
Binary files a/src/main/resources/assets/serverstorage/textures/block/bus_connector_blank.png and b/src/main/resources/assets/serverstorage/textures/block/bus_connector_blank.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/block/bus_connector_bus.png b/src/main/resources/assets/serverstorage/textures/block/bus_connector_bus.png
index e074ebd..d472af3 100644
Binary files a/src/main/resources/assets/serverstorage/textures/block/bus_connector_bus.png and b/src/main/resources/assets/serverstorage/textures/block/bus_connector_bus.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/block/bus_connector_inventory.png b/src/main/resources/assets/serverstorage/textures/block/bus_connector_inventory.png
index 229f0c1..abc35df 100644
Binary files a/src/main/resources/assets/serverstorage/textures/block/bus_connector_inventory.png and b/src/main/resources/assets/serverstorage/textures/block/bus_connector_inventory.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/block/controller_back.png b/src/main/resources/assets/serverstorage/textures/block/controller_back.png
index c62a4e2..db2d012 100644
Binary files a/src/main/resources/assets/serverstorage/textures/block/controller_back.png and b/src/main/resources/assets/serverstorage/textures/block/controller_back.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/block/controller_bottom.png b/src/main/resources/assets/serverstorage/textures/block/controller_bottom.png
index fa89d1f..0a188a7 100644
Binary files a/src/main/resources/assets/serverstorage/textures/block/controller_bottom.png and b/src/main/resources/assets/serverstorage/textures/block/controller_bottom.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/block/controller_front.png b/src/main/resources/assets/serverstorage/textures/block/controller_front.png
index ad244a3..ae42377 100644
Binary files a/src/main/resources/assets/serverstorage/textures/block/controller_front.png and b/src/main/resources/assets/serverstorage/textures/block/controller_front.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/block/controller_left.png b/src/main/resources/assets/serverstorage/textures/block/controller_left.png
index 287eafc..985c38d 100644
Binary files a/src/main/resources/assets/serverstorage/textures/block/controller_left.png and b/src/main/resources/assets/serverstorage/textures/block/controller_left.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/block/controller_right.png b/src/main/resources/assets/serverstorage/textures/block/controller_right.png
index 3054b40..37bd2fd 100644
Binary files a/src/main/resources/assets/serverstorage/textures/block/controller_right.png and b/src/main/resources/assets/serverstorage/textures/block/controller_right.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/block/controller_top.png b/src/main/resources/assets/serverstorage/textures/block/controller_top.png
index 601da97..70b2c56 100644
Binary files a/src/main/resources/assets/serverstorage/textures/block/controller_top.png and b/src/main/resources/assets/serverstorage/textures/block/controller_top.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/block/drive_container_front.png b/src/main/resources/assets/serverstorage/textures/block/drive_container_front.png
index b24476c..3076c82 100644
Binary files a/src/main/resources/assets/serverstorage/textures/block/drive_container_front.png and b/src/main/resources/assets/serverstorage/textures/block/drive_container_front.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/block/drive_container_side.png b/src/main/resources/assets/serverstorage/textures/block/drive_container_side.png
index 6d0284b..f641dd8 100644
Binary files a/src/main/resources/assets/serverstorage/textures/block/drive_container_side.png and b/src/main/resources/assets/serverstorage/textures/block/drive_container_side.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/block/inventory_interface_blank.png b/src/main/resources/assets/serverstorage/textures/block/inventory_interface_blank.png
index 6cbfd16..01e9973 100644
Binary files a/src/main/resources/assets/serverstorage/textures/block/inventory_interface_blank.png and b/src/main/resources/assets/serverstorage/textures/block/inventory_interface_blank.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/block/inventory_interface_inventory.png b/src/main/resources/assets/serverstorage/textures/block/inventory_interface_inventory.png
index f657b5d..d0e87fe 100644
Binary files a/src/main/resources/assets/serverstorage/textures/block/inventory_interface_inventory.png and b/src/main/resources/assets/serverstorage/textures/block/inventory_interface_inventory.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/icon.png b/src/main/resources/assets/serverstorage/textures/icon.png
index 2e356b5..013b43b 100644
Binary files a/src/main/resources/assets/serverstorage/textures/icon.png and b/src/main/resources/assets/serverstorage/textures/icon.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/cpu.png b/src/main/resources/assets/serverstorage/textures/item/cpu.png
deleted file mode 100644
index 39b2fdb..0000000
Binary files a/src/main/resources/assets/serverstorage/textures/item/cpu.png and /dev/null differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/cpu_substrate.png b/src/main/resources/assets/serverstorage/textures/item/cpu_substrate.png
deleted file mode 100644
index f407003..0000000
Binary files a/src/main/resources/assets/serverstorage/textures/item/cpu_substrate.png and /dev/null differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_diamond.png b/src/main/resources/assets/serverstorage/textures/item/diamond_drive.png
similarity index 79%
rename from src/main/resources/assets/serverstorage/textures/item/drive_diamond.png
rename to src/main/resources/assets/serverstorage/textures/item/diamond_drive.png
index 46a2f71..dc2900c 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/drive_diamond.png and b/src/main/resources/assets/serverstorage/textures/item/diamond_drive.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/diamond_drive_head.png b/src/main/resources/assets/serverstorage/textures/item/diamond_drive_head.png
new file mode 100644
index 0000000..c023055
Binary files /dev/null and b/src/main/resources/assets/serverstorage/textures/item/diamond_drive_head.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/platter_diamond.png b/src/main/resources/assets/serverstorage/textures/item/diamond_drive_platter.png
similarity index 60%
rename from src/main/resources/assets/serverstorage/textures/item/platter_diamond.png
rename to src/main/resources/assets/serverstorage/textures/item/diamond_drive_platter.png
index a66c301..20cbbfc 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/platter_diamond.png and b/src/main/resources/assets/serverstorage/textures/item/diamond_drive_platter.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_casing.png b/src/main/resources/assets/serverstorage/textures/item/drive_casing.png
deleted file mode 100644
index 004db47..0000000
Binary files a/src/main/resources/assets/serverstorage/textures/item/drive_casing.png and /dev/null differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_controller.png b/src/main/resources/assets/serverstorage/textures/item/drive_controller.png
deleted file mode 100644
index 8c15ff9..0000000
Binary files a/src/main/resources/assets/serverstorage/textures/item/drive_controller.png and /dev/null differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_controller_head.png b/src/main/resources/assets/serverstorage/textures/item/drive_controller_head.png
index 7e8d204..6301c09 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/drive_controller_head.png and b/src/main/resources/assets/serverstorage/textures/item/drive_controller_head.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_controller_spindle.png b/src/main/resources/assets/serverstorage/textures/item/drive_controller_spindle.png
index 4dfd17a..27775ce 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/drive_controller_spindle.png and b/src/main/resources/assets/serverstorage/textures/item/drive_controller_spindle.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_gold.png b/src/main/resources/assets/serverstorage/textures/item/golden_drive.png
similarity index 79%
rename from src/main/resources/assets/serverstorage/textures/item/drive_gold.png
rename to src/main/resources/assets/serverstorage/textures/item/golden_drive.png
index 0d6611d..57d13df 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/drive_gold.png and b/src/main/resources/assets/serverstorage/textures/item/golden_drive.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/head_gold.png b/src/main/resources/assets/serverstorage/textures/item/golden_drive_head.png
similarity index 52%
rename from src/main/resources/assets/serverstorage/textures/item/head_gold.png
rename to src/main/resources/assets/serverstorage/textures/item/golden_drive_head.png
index 7d2b2bf..8c4bb90 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/head_gold.png and b/src/main/resources/assets/serverstorage/textures/item/golden_drive_head.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/golden_drive_platter.png b/src/main/resources/assets/serverstorage/textures/item/golden_drive_platter.png
new file mode 100644
index 0000000..4ae7e77
Binary files /dev/null and b/src/main/resources/assets/serverstorage/textures/item/golden_drive_platter.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/head_diamond.png b/src/main/resources/assets/serverstorage/textures/item/head_diamond.png
deleted file mode 100644
index 7c6cc21..0000000
Binary files a/src/main/resources/assets/serverstorage/textures/item/head_diamond.png and /dev/null differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/head_iron.png b/src/main/resources/assets/serverstorage/textures/item/head_iron.png
deleted file mode 100644
index 66a8ac1..0000000
Binary files a/src/main/resources/assets/serverstorage/textures/item/head_iron.png and /dev/null differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/head_netherite.png b/src/main/resources/assets/serverstorage/textures/item/head_netherite.png
deleted file mode 100644
index 326450f..0000000
Binary files a/src/main/resources/assets/serverstorage/textures/item/head_netherite.png and /dev/null differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_iron.png b/src/main/resources/assets/serverstorage/textures/item/iron_drive.png
similarity index 79%
rename from src/main/resources/assets/serverstorage/textures/item/drive_iron.png
rename to src/main/resources/assets/serverstorage/textures/item/iron_drive.png
index 653cc42..9d49fd8 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/drive_iron.png and b/src/main/resources/assets/serverstorage/textures/item/iron_drive.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/iron_drive_head.png b/src/main/resources/assets/serverstorage/textures/item/iron_drive_head.png
new file mode 100644
index 0000000..b5b1c0d
Binary files /dev/null and b/src/main/resources/assets/serverstorage/textures/item/iron_drive_head.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/iron_drive_platter.png b/src/main/resources/assets/serverstorage/textures/item/iron_drive_platter.png
new file mode 100644
index 0000000..6c16699
Binary files /dev/null and b/src/main/resources/assets/serverstorage/textures/item/iron_drive_platter.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/material_cpu.png b/src/main/resources/assets/serverstorage/textures/item/material_cpu.png
new file mode 100644
index 0000000..3720738
Binary files /dev/null and b/src/main/resources/assets/serverstorage/textures/item/material_cpu.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/material_cpu_substrate.png b/src/main/resources/assets/serverstorage/textures/item/material_cpu_substrate.png
new file mode 100644
index 0000000..975e3a3
Binary files /dev/null and b/src/main/resources/assets/serverstorage/textures/item/material_cpu_substrate.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/material_drive_casing.png b/src/main/resources/assets/serverstorage/textures/item/material_drive_casing.png
new file mode 100644
index 0000000..38fc692
Binary files /dev/null and b/src/main/resources/assets/serverstorage/textures/item/material_drive_casing.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/material_drive_controller.png b/src/main/resources/assets/serverstorage/textures/item/material_drive_controller.png
new file mode 100644
index 0000000..0b9994e
Binary files /dev/null and b/src/main/resources/assets/serverstorage/textures/item/material_drive_controller.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/material_pcb.png b/src/main/resources/assets/serverstorage/textures/item/material_pcb.png
new file mode 100644
index 0000000..ba46f52
Binary files /dev/null and b/src/main/resources/assets/serverstorage/textures/item/material_pcb.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/material_pcb_substrate.png b/src/main/resources/assets/serverstorage/textures/item/material_pcb_substrate.png
new file mode 100644
index 0000000..d4d912e
Binary files /dev/null and b/src/main/resources/assets/serverstorage/textures/item/material_pcb_substrate.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/module_bus.png b/src/main/resources/assets/serverstorage/textures/item/module_bus.png
index 5ece744..6328212 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/module_bus.png and b/src/main/resources/assets/serverstorage/textures/item/module_bus.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/module_configuration.png b/src/main/resources/assets/serverstorage/textures/item/module_configuration.png
index 93d5025..bdaff11 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/module_configuration.png and b/src/main/resources/assets/serverstorage/textures/item/module_configuration.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/module_container.png b/src/main/resources/assets/serverstorage/textures/item/module_container.png
index 7539aa0..eeba943 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/module_container.png and b/src/main/resources/assets/serverstorage/textures/item/module_container.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/module_display.png b/src/main/resources/assets/serverstorage/textures/item/module_display.png
index 6de010b..2c0fd90 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/module_display.png and b/src/main/resources/assets/serverstorage/textures/item/module_display.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/module_drive.png b/src/main/resources/assets/serverstorage/textures/item/module_drive.png
index cdb9503..b550f5f 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/module_drive.png and b/src/main/resources/assets/serverstorage/textures/item/module_drive.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/module_filtering.png b/src/main/resources/assets/serverstorage/textures/item/module_filtering.png
index ddc328d..9829e29 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/module_filtering.png and b/src/main/resources/assets/serverstorage/textures/item/module_filtering.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/module_inventory.png b/src/main/resources/assets/serverstorage/textures/item/module_inventory.png
index ddda696..0b02122 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/module_inventory.png and b/src/main/resources/assets/serverstorage/textures/item/module_inventory.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/module_netherite_upgrade.png b/src/main/resources/assets/serverstorage/textures/item/module_netherite_upgrade.png
new file mode 100644
index 0000000..7deb279
Binary files /dev/null and b/src/main/resources/assets/serverstorage/textures/item/module_netherite_upgrade.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/module_pagination.png b/src/main/resources/assets/serverstorage/textures/item/module_pagination.png
index 23b6ab5..e3bbd23 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/module_pagination.png and b/src/main/resources/assets/serverstorage/textures/item/module_pagination.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/module_pcb.png b/src/main/resources/assets/serverstorage/textures/item/module_pcb.png
index 4579d12..601d8f3 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/module_pcb.png and b/src/main/resources/assets/serverstorage/textures/item/module_pcb.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/module_transport.png b/src/main/resources/assets/serverstorage/textures/item/module_transport.png
index d0bc70b..9a148f3 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/module_transport.png and b/src/main/resources/assets/serverstorage/textures/item/module_transport.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_netherite.png b/src/main/resources/assets/serverstorage/textures/item/netherite_drive.png
similarity index 79%
rename from src/main/resources/assets/serverstorage/textures/item/drive_netherite.png
rename to src/main/resources/assets/serverstorage/textures/item/netherite_drive.png
index 1dd1d53..561bce1 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/drive_netherite.png and b/src/main/resources/assets/serverstorage/textures/item/netherite_drive.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/netherite_drive_head.png b/src/main/resources/assets/serverstorage/textures/item/netherite_drive_head.png
new file mode 100644
index 0000000..5b9e888
Binary files /dev/null and b/src/main/resources/assets/serverstorage/textures/item/netherite_drive_head.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/platter_netherite.png b/src/main/resources/assets/serverstorage/textures/item/netherite_drive_platter.png
similarity index 55%
rename from src/main/resources/assets/serverstorage/textures/item/platter_netherite.png
rename to src/main/resources/assets/serverstorage/textures/item/netherite_drive_platter.png
index 14bb2d4..dbab3ba 100644
Binary files a/src/main/resources/assets/serverstorage/textures/item/platter_netherite.png and b/src/main/resources/assets/serverstorage/textures/item/netherite_drive_platter.png differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/pcb.png b/src/main/resources/assets/serverstorage/textures/item/pcb.png
deleted file mode 100644
index 704d75b..0000000
Binary files a/src/main/resources/assets/serverstorage/textures/item/pcb.png and /dev/null differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/pcb_substrate.png b/src/main/resources/assets/serverstorage/textures/item/pcb_substrate.png
deleted file mode 100644
index 8b28f39..0000000
Binary files a/src/main/resources/assets/serverstorage/textures/item/pcb_substrate.png and /dev/null differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/platter_gold.png b/src/main/resources/assets/serverstorage/textures/item/platter_gold.png
deleted file mode 100644
index f080efa..0000000
Binary files a/src/main/resources/assets/serverstorage/textures/item/platter_gold.png and /dev/null differ
diff --git a/src/main/resources/assets/serverstorage/textures/item/platter_iron.png b/src/main/resources/assets/serverstorage/textures/item/platter_iron.png
deleted file mode 100644
index 59f321a..0000000
Binary files a/src/main/resources/assets/serverstorage/textures/item/platter_iron.png and /dev/null differ
diff --git a/src/main/resources/data/serverstorage/recipe/bus_connector.json b/src/main/resources/data/serverstorage/recipe/bus_connector.json
index 6b9c65d..a309a11 100644
--- a/src/main/resources/data/serverstorage/recipe/bus_connector.json
+++ b/src/main/resources/data/serverstorage/recipe/bus_connector.json
@@ -8,13 +8,13 @@
   ],
   "key": {
     "C": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "G": {
       "item": "minecraft:gold_nugget"
     },
     "P": {
-      "item": "serverstorage:pcb"
+      "item": "serverstorage:material_pcb"
     },
     "R": {
       "item": "minecraft:redstone_block"
diff --git a/src/main/resources/data/serverstorage/recipe/cpu.json b/src/main/resources/data/serverstorage/recipe/cpu.json
index d754ee8..451890d 100644
--- a/src/main/resources/data/serverstorage/recipe/cpu.json
+++ b/src/main/resources/data/serverstorage/recipe/cpu.json
@@ -14,11 +14,11 @@
       "item": "minecraft:amethyst_shard"
     },
     "S": {
-      "item": "serverstorage:cpu_substrate"
+      "item": "serverstorage:material_cpu_substrate"
     }
   },
   "result": {
-    "id": "serverstorage:cpu",
+    "id": "serverstorage:material_cpu",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/serverstorage/recipe/cpu_substrate.json b/src/main/resources/data/serverstorage/recipe/cpu_substrate.json
index 2dfbf72..e75bf65 100644
--- a/src/main/resources/data/serverstorage/recipe/cpu_substrate.json
+++ b/src/main/resources/data/serverstorage/recipe/cpu_substrate.json
@@ -15,7 +15,7 @@
     }
   },
   "result": {
-    "id": "serverstorage:cpu_substrate",
+    "id": "serverstorage:material_cpu_substrate",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/serverstorage/recipe/diamond_drive.json b/src/main/resources/data/serverstorage/recipe/diamond_drive.json
index c809698..4f0cef3 100644
--- a/src/main/resources/data/serverstorage/recipe/diamond_drive.json
+++ b/src/main/resources/data/serverstorage/recipe/diamond_drive.json
@@ -14,10 +14,10 @@
       "item": "serverstorage:diamond_platter"
     },
     "C": {
-      "item": "serverstorage:drive_casing"
+      "item": "serverstorage:material_drive_casing"
     },
     "X": {
-      "item": "serverstorage:drive_controller"
+      "item": "serverstorage:material_drive_controller"
     }
   },
   "result": {
diff --git a/src/main/resources/data/serverstorage/recipe/drive_casing.json b/src/main/resources/data/serverstorage/recipe/drive_casing.json
index 0e5ff38..7b5cdc1 100644
--- a/src/main/resources/data/serverstorage/recipe/drive_casing.json
+++ b/src/main/resources/data/serverstorage/recipe/drive_casing.json
@@ -18,7 +18,7 @@
     }
   },
   "result": {
-    "id": "serverstorage:drive_casing",
+    "id": "serverstorage:material_drive_casing",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/serverstorage/recipe/drive_container.json b/src/main/resources/data/serverstorage/recipe/drive_container.json
index ca29769..ef58952 100644
--- a/src/main/resources/data/serverstorage/recipe/drive_container.json
+++ b/src/main/resources/data/serverstorage/recipe/drive_container.json
@@ -8,10 +8,10 @@
   ],
   "key": {
     "C": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "P": {
-      "item": "serverstorage:pcb"
+      "item": "serverstorage:material_pcb"
     },
     "R": {
       "item": "minecraft:redstone_block"
diff --git a/src/main/resources/data/serverstorage/recipe/drive_controller.json b/src/main/resources/data/serverstorage/recipe/drive_controller.json
index a7e994a..76a8d4f 100644
--- a/src/main/resources/data/serverstorage/recipe/drive_controller.json
+++ b/src/main/resources/data/serverstorage/recipe/drive_controller.json
@@ -11,17 +11,17 @@
       "item": "minecraft:gold_ingot"
     },
     "X": {
-      "item": "serverstorage:drive_casing"
+      "item": "serverstorage:material_drive_casing"
     },
     "C": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "S": {
-      "item": "serverstorage:pcb_substrate"
+      "item": "serverstorage:material_pcb_substrate"
     }
   },
   "result": {
-    "id": "serverstorage:drive_controller",
+    "id": "serverstorage:material_drive_controller",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/serverstorage/recipe/golden_drive.json b/src/main/resources/data/serverstorage/recipe/golden_drive.json
index 0bc4b53..6031bd0 100644
--- a/src/main/resources/data/serverstorage/recipe/golden_drive.json
+++ b/src/main/resources/data/serverstorage/recipe/golden_drive.json
@@ -14,10 +14,10 @@
       "item": "serverstorage:golden_platter"
     },
     "C": {
-      "item": "serverstorage:drive_casing"
+      "item": "serverstorage:material_drive_casing"
     },
     "X": {
-      "item": "serverstorage:drive_controller"
+      "item": "serverstorage:material_drive_controller"
     }
   },
   "result": {
diff --git a/src/main/resources/data/serverstorage/recipe/inventory_interface.json b/src/main/resources/data/serverstorage/recipe/inventory_interface.json
index 949d9d4..545c8dc 100644
--- a/src/main/resources/data/serverstorage/recipe/inventory_interface.json
+++ b/src/main/resources/data/serverstorage/recipe/inventory_interface.json
@@ -8,10 +8,10 @@
   ],
   "key": {
     "P": {
-      "item": "serverstorage:pcb"
+      "item": "serverstorage:material_pcb"
     },
     "U": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "C": {
       "item": "serverstorage:module_container"
diff --git a/src/main/resources/data/serverstorage/recipe/iron_drive.json b/src/main/resources/data/serverstorage/recipe/iron_drive.json
index a9a1324..d80f19a 100644
--- a/src/main/resources/data/serverstorage/recipe/iron_drive.json
+++ b/src/main/resources/data/serverstorage/recipe/iron_drive.json
@@ -14,10 +14,10 @@
       "item": "serverstorage:iron_platter"
     },
     "C": {
-      "item": "serverstorage:drive_casing"
+      "item": "serverstorage:material_drive_casing"
     },
     "X": {
-      "item": "serverstorage:drive_controller"
+      "item": "serverstorage:material_drive_controller"
     }
   },
   "result": {
diff --git a/src/main/resources/data/serverstorage/recipe/module_bus.json b/src/main/resources/data/serverstorage/recipe/module_bus.json
index 5d02929..bd066a7 100644
--- a/src/main/resources/data/serverstorage/recipe/module_bus.json
+++ b/src/main/resources/data/serverstorage/recipe/module_bus.json
@@ -11,10 +11,10 @@
       "item": "minecraft:gold_nugget"
     },
     "C": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "S": {
-      "item": "serverstorage:pcb_substrate"
+      "item": "serverstorage:material_pcb_substrate"
     },
     "I": {
       "item": "minecraft:iron_ingot"
diff --git a/src/main/resources/data/serverstorage/recipe/module_configuration.json b/src/main/resources/data/serverstorage/recipe/module_configuration.json
index bceb293..97db703 100644
--- a/src/main/resources/data/serverstorage/recipe/module_configuration.json
+++ b/src/main/resources/data/serverstorage/recipe/module_configuration.json
@@ -11,10 +11,10 @@
       "item": "minecraft:gold_nugget"
     },
     "C": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "S": {
-      "item": "serverstorage:pcb_substrate"
+      "item": "serverstorage:material_pcb_substrate"
     },
     "I": {
       "item": "minecraft:iron_ingot"
diff --git a/src/main/resources/data/serverstorage/recipe/module_container.json b/src/main/resources/data/serverstorage/recipe/module_container.json
index d5defb7..a1078aa 100644
--- a/src/main/resources/data/serverstorage/recipe/module_container.json
+++ b/src/main/resources/data/serverstorage/recipe/module_container.json
@@ -11,10 +11,10 @@
       "item": "minecraft:gold_nugget"
     },
     "C": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "S": {
-      "item": "serverstorage:pcb_substrate"
+      "item": "serverstorage:material_pcb_substrate"
     },
     "H": {
       "item": "minecraft:chest"
diff --git a/src/main/resources/data/serverstorage/recipe/module_display.json b/src/main/resources/data/serverstorage/recipe/module_display.json
index 10c42c5..f54ceb9 100644
--- a/src/main/resources/data/serverstorage/recipe/module_display.json
+++ b/src/main/resources/data/serverstorage/recipe/module_display.json
@@ -11,10 +11,10 @@
       "item": "minecraft:gold_nugget"
     },
     "C": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "S": {
-      "item": "serverstorage:pcb_substrate"
+      "item": "serverstorage:material_pcb_substrate"
     },
     "D": {
       "item": "minecraft:gray_stained_glass"
diff --git a/src/main/resources/data/serverstorage/recipe/module_drive.json b/src/main/resources/data/serverstorage/recipe/module_drive.json
index db67d1f..4b28ba3 100644
--- a/src/main/resources/data/serverstorage/recipe/module_drive.json
+++ b/src/main/resources/data/serverstorage/recipe/module_drive.json
@@ -14,10 +14,10 @@
       "item": "minecraft:gold_ingot"
     },
     "C": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "S": {
-      "item": "serverstorage:pcb_substrate"
+      "item": "serverstorage:material_pcb_substrate"
     }
   },
   "result": {
diff --git a/src/main/resources/data/serverstorage/recipe/module_filtering.json b/src/main/resources/data/serverstorage/recipe/module_filtering.json
index 8994d46..9d3b702 100644
--- a/src/main/resources/data/serverstorage/recipe/module_filtering.json
+++ b/src/main/resources/data/serverstorage/recipe/module_filtering.json
@@ -11,10 +11,10 @@
       "item": "minecraft:gold_nugget"
     },
     "C": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "S": {
-      "item": "serverstorage:pcb_substrate"
+      "item": "serverstorage:material_pcb_substrate"
     },
     "L": {
       "item": "minecraft:glass"
diff --git a/src/main/resources/data/serverstorage/recipe/module_inventory.json b/src/main/resources/data/serverstorage/recipe/module_inventory.json
index 3fe7c3f..909b004 100644
--- a/src/main/resources/data/serverstorage/recipe/module_inventory.json
+++ b/src/main/resources/data/serverstorage/recipe/module_inventory.json
@@ -11,10 +11,10 @@
       "item": "minecraft:gold_nugget"
     },
     "C": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "S": {
-      "item": "serverstorage:pcb_substrate"
+      "item": "serverstorage:material_pcb_substrate"
     },
     "H": {
       "item": "minecraft:chest"
diff --git a/src/main/resources/data/serverstorage/recipe/module_pagination.json b/src/main/resources/data/serverstorage/recipe/module_pagination.json
index 6f08576..13521d6 100644
--- a/src/main/resources/data/serverstorage/recipe/module_pagination.json
+++ b/src/main/resources/data/serverstorage/recipe/module_pagination.json
@@ -11,10 +11,10 @@
       "item": "minecraft:gold_nugget"
     },
     "C": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "S": {
-      "item": "serverstorage:pcb_substrate"
+      "item": "serverstorage:material_pcb_substrate"
     },
     "I": {
       "item": "minecraft:iron_ingot"
diff --git a/src/main/resources/data/serverstorage/recipe/module_pcb.json b/src/main/resources/data/serverstorage/recipe/module_pcb.json
index f193f49..2ebb5cd 100644
--- a/src/main/resources/data/serverstorage/recipe/module_pcb.json
+++ b/src/main/resources/data/serverstorage/recipe/module_pcb.json
@@ -11,10 +11,10 @@
       "item": "minecraft:gold_nugget"
     },
     "C": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "S": {
-      "item": "serverstorage:pcb_substrate"
+      "item": "serverstorage:material_pcb_substrate"
     }
   },
   "result": {
diff --git a/src/main/resources/data/serverstorage/recipe/module_transport.json b/src/main/resources/data/serverstorage/recipe/module_transport.json
index 6318df3..d5322a4 100644
--- a/src/main/resources/data/serverstorage/recipe/module_transport.json
+++ b/src/main/resources/data/serverstorage/recipe/module_transport.json
@@ -11,10 +11,10 @@
       "item": "minecraft:gold_nugget"
     },
     "C": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "S": {
-      "item": "serverstorage:pcb_substrate"
+      "item": "serverstorage:material_pcb_substrate"
     },
     "H": {
       "item": "minecraft:hopper"
diff --git a/src/main/resources/data/serverstorage/recipe/netherite_drive.json b/src/main/resources/data/serverstorage/recipe/netherite_drive.json
index b17a8fe..601333d 100644
--- a/src/main/resources/data/serverstorage/recipe/netherite_drive.json
+++ b/src/main/resources/data/serverstorage/recipe/netherite_drive.json
@@ -14,10 +14,10 @@
       "item": "serverstorage:netherite_platter"
     },
     "C": {
-      "item": "serverstorage:drive_casing"
+      "item": "serverstorage:material_drive_casing"
     },
     "X": {
-      "item": "serverstorage:drive_controller"
+      "item": "serverstorage:material_drive_controller"
     }
   },
   "result": {
diff --git a/src/main/resources/data/serverstorage/recipe/netherite_head.json b/src/main/resources/data/serverstorage/recipe/netherite_head.json
index 2921319..9017702 100644
--- a/src/main/resources/data/serverstorage/recipe/netherite_head.json
+++ b/src/main/resources/data/serverstorage/recipe/netherite_head.json
@@ -1,18 +1,16 @@
 {
-  "type": "minecraft:crafting_shaped",
-  "category": "misc",
-  "pattern": [
-    "#  ",
-    "## ",
-    " ##"
-  ],
-  "key": {
-    "#": {
-      "item": "minecraft:netherite_ingot"
-    }
+  "type": "minecraft:smithing_transform",
+  "addition": {
+    "item": "minecraft:netherite_ingot"
+  },
+  "base": {
+    "item": "serverstorage:diamond_head"
   },
   "result": {
-    "id": "serverstorage:netherite_head",
-    "count": 1
+    "count": 1,
+    "id": "serverstorage:netherite_head"
+  },
+  "template": {
+    "item": "serverstorage:module_netherite_upgrade"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/serverstorage/recipe/netherite_platter.json b/src/main/resources/data/serverstorage/recipe/netherite_platter.json
index e21c7fa..56fb1c2 100644
--- a/src/main/resources/data/serverstorage/recipe/netherite_platter.json
+++ b/src/main/resources/data/serverstorage/recipe/netherite_platter.json
@@ -1,18 +1,16 @@
 {
-  "type": "minecraft:crafting_shaped",
-  "category": "misc",
-  "pattern": [
-    "###",
-    "# #",
-    "###"
-  ],
-  "key": {
-    "#": {
-      "item": "minecraft:netherite_ingot"
-    }
+  "type": "minecraft:smithing_transform",
+  "addition": {
+    "item": "minecraft:netherite_ingot"
+  },
+  "base": {
+    "item": "serverstorage:diamond_platter"
   },
   "result": {
-    "id": "serverstorage:netherite_platter",
-    "count": 1
+    "count": 1,
+    "id": "serverstorage:netherite_platter"
+  },
+  "template": {
+    "item": "serverstorage:module_netherite_upgrade"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/serverstorage/recipe/netherite_upgrade.json b/src/main/resources/data/serverstorage/recipe/netherite_upgrade.json
new file mode 100644
index 0000000..4e1c8b6
--- /dev/null
+++ b/src/main/resources/data/serverstorage/recipe/netherite_upgrade.json
@@ -0,0 +1,24 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "pattern": [
+    "SLS",
+    "LCL",
+    "SLS"
+  ],
+  "key": {
+    "C": {
+      "item": "serverstorage:material_cpu"
+    },
+    "S": {
+      "item": "serverstorage:material_pcb_substrate"
+    },
+    "L": {
+      "item": "minecraft:glass"
+    }
+  },
+  "result": {
+    "id": "serverstorage:module_netherite_upgrade",
+    "count": 1
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/serverstorage/recipe/pcb.json b/src/main/resources/data/serverstorage/recipe/pcb.json
index a049966..ec57ff0 100644
--- a/src/main/resources/data/serverstorage/recipe/pcb.json
+++ b/src/main/resources/data/serverstorage/recipe/pcb.json
@@ -11,11 +11,11 @@
       "item": "minecraft:lime_dye"
     },
     "P": {
-      "item": "serverstorage:pcb_substrate"
+      "item": "serverstorage:material_pcb_substrate"
     }
   },
   "result": {
-    "id": "serverstorage:pcb",
+    "id": "serverstorage:material_pcb",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/serverstorage/recipe/pcb_substrate.json b/src/main/resources/data/serverstorage/recipe/pcb_substrate.json
index f076c73..ebeef7b 100644
--- a/src/main/resources/data/serverstorage/recipe/pcb_substrate.json
+++ b/src/main/resources/data/serverstorage/recipe/pcb_substrate.json
@@ -15,7 +15,7 @@
     }
   },
   "result": {
-    "id": "serverstorage:pcb_substrate",
+    "id": "serverstorage:material_pcb_substrate",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/serverstorage/recipe/storage.json b/src/main/resources/data/serverstorage/recipe/storage.json
index ce50af5..6ef3691 100644
--- a/src/main/resources/data/serverstorage/recipe/storage.json
+++ b/src/main/resources/data/serverstorage/recipe/storage.json
@@ -29,10 +29,10 @@
       "item": "serverstorage:module_inventory"
     },
     "X": {
-      "item": "serverstorage:cpu"
+      "item": "serverstorage:material_cpu"
     },
     "O": {
-      "item": "serverstorage:pcb"
+      "item": "serverstorage:material_pcb"
     }
   },
   "result": {