diff --git a/src/api/java/blusunrize/immersiveengineering/api/ManualHelper.java b/src/api/java/blusunrize/immersiveengineering/api/ManualHelper.java
index 0b488aa0db..78de0ceb5a 100644
--- a/src/api/java/blusunrize/immersiveengineering/api/ManualHelper.java
+++ b/src/api/java/blusunrize/immersiveengineering/api/ManualHelper.java
@@ -33,8 +33,8 @@ public class ManualHelper
 	public static String CAT_ELECTRICAL_GRIDS = "electrical_grids";
 	public static String CAT_EXPLOSIVES_WEAPONRY = "explosives_weaponry";
 	public static String CAT_TOOLS = "tools";
-	public static String CAT_DEVICES = "devices";
 	public static String CAT_SIMPLE_MACHINERY = "simple_machinery";
+	public static String CAT_LARGE_FURNACES_OVENS = "large_furnaces_ovens";
 	public static String CAT_HEAVY_MACHINERY = "heavy_machinery";
 	public static String CAT_UPDATE = "update";
 
diff --git a/src/main/resources/assets/immersiveengineering/lang/en_us.json b/src/main/resources/assets/immersiveengineering/lang/en_us.json
index 7b7537c5dc..8b455fef44 100644
--- a/src/main/resources/assets/immersiveengineering/lang/en_us.json
+++ b/src/main/resources/assets/immersiveengineering/lang/en_us.json
@@ -736,8 +736,8 @@
   "manual.immersiveengineering.electrical_grids": "Electrical Grids",
   "manual.immersiveengineering.explosives_weaponry": "Explosives & Weaponry",
   "manual.immersiveengineering.tools": "Tools",
-  "manual.immersiveengineering.devices": "Devices",
   "manual.immersiveengineering.simple_machinery": "Simple Machinery",
+  "manual.immersiveengineering.large_furnaces_ovens": "Large Furnaces & Ovens",
   "manual.immersiveengineering.heavy_machinery": "Heavy Machinery",
   "manual.immersiveengineering.test": "A subcategory!?",
   "desc.immersiveengineering.info.shader.details.rosequartz": "First shader ever made!<br>No direct reference, though the name itself was inspired by a character in the „Inkheart“ series of novels",
diff --git a/src/main/resources/assets/immersiveengineering/manual/autoload.json b/src/main/resources/assets/immersiveengineering/manual/autoload.json
index 11cd1a0941..bc3e0e8639 100644
--- a/src/main/resources/assets/immersiveengineering/manual/autoload.json
+++ b/src/main/resources/assets/immersiveengineering/manual/autoload.json
@@ -6,7 +6,8 @@
       "ores",
       "industrial_hemp",
       "industrial_dyes",
-      "duroplast"
+      "crafting_components",
+      "resin_and_duroplast"
     ]
   },
   "workbenches_storage": {
@@ -30,10 +31,11 @@
   "electrical_grids": {
     "category_weight": 30,
     "entry_list": [
-      "grid_construction",
+      "basic_wiring",
       "accumulators",
+      "breaker_switch",
       "redstone_wiring",
-      "redstone_control",
+      "current_transformer",
       "kinetic_dynamo",
       "thermoelectric_generator",
       "diesel_generator",
@@ -68,7 +70,7 @@
       "shaders"
     ]
   },
-  "devices": {
+  "simple_machinery": {
     "category_weight": 60,
     "entry_list": [
       "turntable",
@@ -83,7 +85,7 @@
       "charging_station"
     ]
   },
-  "simple_machinery": {
+  "large_furnaces_ovens": {
     "category_weight": 70,
     "entry_list": [
       "coke_oven",
diff --git a/src/main/resources/assets/immersiveengineering/manual/engineered_metal_products.json b/src/main/resources/assets/immersiveengineering/manual/crafting_components.json
similarity index 87%
rename from src/main/resources/assets/immersiveengineering/manual/engineered_metal_products.json
rename to src/main/resources/assets/immersiveengineering/manual/crafting_components.json
index 5466f2be50..a73b5f9a9f 100644
--- a/src/main/resources/assets/immersiveengineering/manual/engineered_metal_products.json
+++ b/src/main/resources/assets/immersiveengineering/manual/crafting_components.json
@@ -1,5 +1,5 @@
 {
-    "start": {
+    "mech_components": {
         "type": "crafting",
         "recipes": [
             [
@@ -8,11 +8,7 @@
             ]
         ]
     },
-    "create_bp": {
-        "type": "crafting",
-        "recipe": "crafting/blueprint_components"
-    },
-    "mech_components": {
+    "component_blueprint": {
         "type": "blueprint",
         "recipes": [
             "blueprint/component_iron",
diff --git a/src/main/resources/assets/immersiveengineering/manual/todo????.json b/src/main/resources/assets/immersiveengineering/manual/current_transformer.json
similarity index 100%
rename from src/main/resources/assets/immersiveengineering/manual/todo????.json
rename to src/main/resources/assets/immersiveengineering/manual/current_transformer.json
diff --git a/src/main/resources/assets/immersiveengineering/manual/en_us/components.txt b/src/main/resources/assets/immersiveengineering/manual/en_us/components.txt
deleted file mode 100644
index 1ffb38ec88..0000000000
--- a/src/main/resources/assets/immersiveengineering/manual/en_us/components.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Crafting Components
-Integral Pieces
-Many machines and tools are constructed from various sub-components. Some of these you will have to use on a regular basis, which is why they have their own entry in this manual. The §2Iron§r and §2Steel Mechanical Components§r are integral to the majority of Multiblocks and machinery.<np>
-<&create_bp>As you will find yourself creating these components more frequently, it may be advisable to draft a <link;blueprints;Blueprint> for them.
-<&mech_components>Using this blueprint in an <link;workbench;Engineer's Workbench> will allow you to construct the components at a reduced cost.<np>
-<&elec_components>§2Electronic Components§r are more complicated and less commonly used than their mechanical counterpart. They are however essential for any devices with an extended level of control such as the <link;item_batcher;Item Batcher> or <link;turrets;Turrets>.<np>
-<&light_bulbs>§2Incandescent Light Bulbs§r are made of a carbonized bamboo or paper filament which produce light and warmth when powered. They are primarily used to craft <link;lighting;lanterns;electric_lantern>.<np>
-<&tubes>Another, albeit less frequently used component are §2Vacuum Tubes§r. These expensive ingredients are used in <link;logic_circuits;logic circuits> and more complex electronic machinery.<np>
-<&pcb>The §2Circuit Backplane§r is an insulated copper board that can have a variety of components soldered to it in order to create <link;logic_circuits;Logic Circuits>.
-
-
diff --git a/src/main/resources/assets/immersiveengineering/manual/en_us/crafting_components.txt b/src/main/resources/assets/immersiveengineering/manual/en_us/crafting_components.txt
new file mode 100644
index 0000000000..dfa8d07cb4
--- /dev/null
+++ b/src/main/resources/assets/immersiveengineering/manual/en_us/crafting_components.txt
@@ -0,0 +1,16 @@
+Crafting Components
+Integral Pieces
+Many machines and tools are constructed from various sub-components. Some of these you will have to use on a regular basis, detailed on the following pages.<br>
+Simple components can be crafted in the regular §2Crafting Table§r, but advanced components will need the help of a <link;engineers_workbench;specialized workbench>.<np>
+<&mech_components>The §2Iron§r and §2Steel Mechanical Components§r are integral to the majority of machinery large and small.<br>
+As you will find yourself creating these components more frequently, it may be advisable to draft a <link;blueprints;Blueprint> for them.<np>
+<&component_blueprint>
+Instructions for drafting this blueprint can be found <link;blueprints;here;molds_components>.<br>
+Using this blueprint in an <link;engineers_workbench;Engineer's Workbench> will allow you to construct simple components at a reduced cost.<br>
+Blueprints are necessary for more advanced components, as detailed on the following pages.<np>
+<&elec_components>§2Electronic Components§r are more complicated and less commonly used than their mechanical counterpart. They are however essential for any devices with an extended level of control such as the <link;item_batcher;Item Batcher> or <link;turrets;Turrets>.<np>
+<&light_bulbs>§2Incandescent Light Bulbs§r are made of a carbonized bamboo or paper filament which produce light and warmth when powered. They are primarily used to craft <link;engineered_lighting;lanterns;electric_lantern>.<np>
+<&tubes>Another, albeit less frequently used component are §2Vacuum Tubes§r. These expensive ingredients are used in <link;logic_circuits;logic circuits> and more complex electronic machinery.<np>
+<&pcb>The §2Circuit Backplane§r is an insulated copper board that can have a variety of components soldered to it in order to create <link;logic_circuits;Logic Circuits>.
+
+
diff --git a/src/main/resources/assets/immersiveengineering/manual/en_us/todo3.txt b/src/main/resources/assets/immersiveengineering/manual/en_us/current_transformer.txt
similarity index 100%
rename from src/main/resources/assets/immersiveengineering/manual/en_us/todo3.txt
rename to src/main/resources/assets/immersiveengineering/manual/en_us/current_transformer.txt
diff --git a/src/main/resources/assets/immersiveengineering/manual/en_us/duroplast.txt b/src/main/resources/assets/immersiveengineering/manual/en_us/resin_and_duroplast.txt
similarity index 100%
rename from src/main/resources/assets/immersiveengineering/manual/en_us/duroplast.txt
rename to src/main/resources/assets/immersiveengineering/manual/en_us/resin_and_duroplast.txt
diff --git a/src/main/resources/assets/immersiveengineering/manual/duroplast.json b/src/main/resources/assets/immersiveengineering/manual/resin_and_duroplast.json
similarity index 100%
rename from src/main/resources/assets/immersiveengineering/manual/duroplast.json
rename to src/main/resources/assets/immersiveengineering/manual/resin_and_duroplast.json