diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java
index b57db908..6816db98 100644
--- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java
+++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java
@@ -56,7 +56,7 @@ public class NetworkQuantumStorage extends SlimefunItem implements DistinctiveIt
         Integer.MAX_VALUE
     };
 
-    private static final String WIKI_PAGE = "Quantum-Storage";
+    private static final String WIKI_PAGE = "network-storage/quantum-storage";
 
     public static final String BS_AMOUNT = "stored_amount";
     public static final String BS_VOID = "void_excess";
diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java b/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java
index 0dd77cdf..d6e6889b 100644
--- a/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java
+++ b/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java
@@ -27,7 +27,7 @@
 
 public class NetworkRemote extends SlimefunItem {
 
-    private static final String WIKI_PAGE = "Network-Remote";
+    private static final String WIKI_PAGE = "tools/network-remote";
 
     private static final NamespacedKey KEY = Keys.newKey("location");
     private static final int[] RANGES = new int[]{
diff --git a/src/main/resources/wiki.json b/src/main/resources/wiki.json
index 149b5ed4..d2fd5485 100644
--- a/src/main/resources/wiki.json
+++ b/src/main/resources/wiki.json
@@ -1,37 +1,36 @@
 {
-  "NTW_SYNTHETIC_EMERALD_SHARD": "Materials",
-  "NTW_OPTIC_GLASS": "Materials",
-  "NTW_OPTIC_CABLE": "Materials",
-  "NTW_OPTIC_STAR": "Materials",
-  "NTW_RADIOACTIVE_OPTIC_STAR": "Materials",
-  "NTW_SHRINKING_BASE": "Materials",
-  "NTW_SIMPLE_NANOBOTS": "Materials",
-  "NTW_ADVANCED_NANOBOTS": "Materials",
-  "NTW_AI_CORE": "Materials",
-  "NTW_EMPOWERED_AI_CORE": "Materials",
-  "NTW_PRISTINE_AI_CORE": "Materials",
-  "NTW_INTERDIMENSIONAL_PRESENCE": "Materials",
-  "NTW_CONTROLLER": "Network-Controller",
-  "NTW_BRIDGE": "Network-Bridge",
-  "NTW_MONITOR": "Network-Monitor",
-  "NTW_IMPORT": "Network-Importer",
-  "NTW_EXPORT": "Network-Exporter",
-  "NTW_GRABBER": "Network-Grabber",
-  "NTW_PUSHER": "Network-Pusher",
-  "NTW_TRASH": "Network-Purger",
-  "NTW_GRID": "Network-Grid",
-  "NTW_CRAFTING_GRID": "Network-Grid",
-  "NTW_CELL": "Network-Cell",
-  "NTW_MEMORY_SHELL": "Network-Memory-Shell",
-  "NTW_QUANTUM_WORKBENCH": "Quantum-Workbench",
-  "NTW_CAPACITOR_1": "Network-Capacitor",
-  "NTW_CAPACITOR_2": "Network-Capacitor",
-  "NTW_POWER_DISPLAY": "Network-Power-Display",
-  "NTW_RECIPE_ENCODER": "Network-Encoder",
-  "NTW_AUTO_CRAFTER": "Network-Autocrafter",
-  "NTW_AUTO_CRAFTER_WITHHOLDING": "Network-Autocrafter",
-  "NTW_CRAFTING_BLUEPRINT": "Crafting-Blueprint",
-  "NTW_PROBE": "Network-Probe",
-  "NTW_CONFIGURATOR": "Network-Configurator",
-  "NTW_CRAYON": "Network-Crayon"
+  "NTW_CONTROLLER": "network-nodes/network-controller",
+  "NTW_BRIDGE": "network-nodes/network-bridge",
+  "NTW_MONITOR": "network-nodes/network-monitor",
+  "NTW_IMPORT": "network-nodes/network-importer",
+  "NTW_EXPORT": "network-nodes/network-exporter",
+  "NTW_GRABBER": "network-nodes/network-grabber",
+  "NTW_PUSHER": "network-nodes/network-pusher",
+  "NTW_CONTROL_X": "network-nodes/network-control-x",
+  "NTW_CONTROL_V": "network-nodes/network-control-v",
+  "NTW_VACUUM": "network-nodes/network-vacuum",
+  "NTW_VANILLA_GRABBER": "network-nodes/network-vanilla-grabber",
+  "NTW_VANILLA_PUSHER": "network-nodes/network-vanilla-pusher",
+  "NTW_NETWORK_WIRELESS_TRANSMITTER": "network-nodes/network-wireless-transmitter",
+  "NTW_NETWORK_WIRELESS_RECEIVER": "network-nodes/network-wireless-receiver",
+  "NTW_TRASH": "network-nodes/network-purger",
+  "NTW_GRID": "network-nodes/network-grid",
+  "NTW_CRAFTING_GRID": "network-nodes/network-grid",
+  "NTW_CELL": "network-nodes/network-cell",
+  "NTW_GREEDY_BLOCK": "network-nodes/network-greedy-block",
+  "NTW_CAPACITOR_1": "network-nodes/network-capacitor",
+  "NTW_CAPACITOR_2": "network-nodes/network-capacitor",
+  "NTW_CAPACITOR_3": "network-nodes/network-capacitor",
+  "NTW_CAPACITOR_4": "network-nodes/network-capacitor",
+  "NTW_POWER_OUTLET_1": "network-nodes/network-power-outlet",
+  "NTW_POWER_OUTLET_2": "network-nodes/network-power-outlet",
+  "NTW_POWER_DISPLAY": "network-nodes/network-power-display",
+  "NTW_RECIPE_ENCODER": "network-nodes/network-encoder",
+  "NTW_AUTO_CRAFTER": "network-nodes/network-autocrafters",
+  "NTW_AUTO_CRAFTER_WITHHOLDING": "network-nodes/network-autocrafters",
+  "NTW_CRAFTING_BLUEPRINT": "tools/crafting-blueprint",
+  "NTW_PROBE": "tools/network-probe",
+  "NTW_CRAYON": "tools/network-crayon",
+  "NTW_CONFIGURATOR": "tools/network-configurator",
+  "NTW_WIRELESS_CONFIGURATOR": "tools/network-configurator"
 }