diff --git a/data/json/recipes/electronic/components.json b/data/json/recipes/electronic/components.json
index af8ec1c112a9..2a173a91b53c 100644
--- a/data/json/recipes/electronic/components.json
+++ b/data/json/recipes/electronic/components.json
@@ -158,7 +158,7 @@
     "time": "1 h 25 m",
     "reversible": true,
     "decomp_learn": 4,
-    "book_learn": [ [ "recipe_lab_elec", 7 ] ],
+    "book_learn": [ [ "recipe_lab_elec", 7 ], [ "textbook_atomic_lab", 8 ] ],
     "using": [ [ "soldering_standard", 24 ] ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [ [ [ "power_supply", 6 ] ], [ [ "amplifier", 5 ] ], [ [ "scrap", 4 ] ], [ [ "cable", 14 ] ], [ [ "plut_cell", 2 ] ] ]
diff --git a/data/json/recipes/electronic/lighting.json b/data/json/recipes/electronic/lighting.json
index 7cd31d1b915d..4322c4ebad4b 100644
--- a/data/json/recipes/electronic/lighting.json
+++ b/data/json/recipes/electronic/lighting.json
@@ -159,7 +159,7 @@
     "difficulty": 2,
     "time": "20 m",
     "reversible": true,
-    "book_learn": [ [ "textbook_electronics", 3 ], [ "advanced_electronics", 3 ], [ "recipe_caseless", 2 ] ],
+    "book_learn": [ [ "textbook_electronics", 3 ], [ "advanced_electronics", 3 ], [ "recipe_caseless", 2 ], [ "textbook_atomic_lab", 4 ] ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "plastic_chunk", 1 ] ],
@@ -179,7 +179,7 @@
     "difficulty": 3,
     "time": "30 m",
     "reversible": true,
-    "book_learn": [ [ "textbook_electronics", 4 ], [ "advanced_electronics", 4 ], [ "recipe_caseless", 3 ] ],
+    "book_learn": [ [ "textbook_electronics", 4 ], [ "advanced_electronics", 4 ], [ "recipe_caseless", 3 ], [ "textbook_atomic_lab", 5 ] ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "plastic_chunk", 2 ] ],
diff --git a/data/json/recipes/electronic/parts.json b/data/json/recipes/electronic/parts.json
index 78236ef4333b..bc3afaf900f5 100644
--- a/data/json/recipes/electronic/parts.json
+++ b/data/json/recipes/electronic/parts.json
@@ -624,8 +624,7 @@
     "difficulty": 6,
     "skills_required": [ "fabrication", 6 ],
     "time": "60 m",
-    "decomp_learn": 4,
-    "book_learn": [ [ "recipe_atomic_battery", 6 ] ],
+    "book_learn": [ [ "recipe_atomic_battery", 6 ], [ "textbook_atomic_lab", 7 ] ],
     "using": [ [ "soldering_standard", 10 ] ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [ [ [ "scrap", 6 ] ], [ [ "cable", 4 ] ], [ [ "plut_cell", 1 ] ] ]
@@ -639,8 +638,7 @@
     "difficulty": 6,
     "skills_required": [ "fabrication", 6 ],
     "time": "60 m",
-    "decomp_learn": 4,
-    "book_learn": [ [ "recipe_atomic_battery", 6 ] ],
+    "book_learn": [ [ "recipe_atomic_battery", 6 ], [ "textbook_atomic_lab", 7 ] ],
     "using": [ [ "soldering_standard", 10 ] ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [ [ [ "scrap", 6 ] ], [ [ "cable", 4 ] ], [ [ "plut_cell", 2 ] ] ]
@@ -654,8 +652,7 @@
     "difficulty": 6,
     "skills_required": [ "fabrication", 6 ],
     "time": "60 m",
-    "decomp_learn": 4,
-    "book_learn": [ [ "recipe_atomic_battery", 6 ] ],
+    "book_learn": [ [ "recipe_atomic_battery", 6 ], [ "textbook_atomic_lab", 7 ] ],
     "using": [ [ "soldering_standard", 10 ] ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [ [ [ "scrap", 6 ] ], [ [ "cable", 4 ] ], [ [ "plut_cell", 10 ] ] ]
@@ -669,12 +666,25 @@
     "difficulty": 6,
     "skills_required": [ "fabrication", 6 ],
     "time": "60 m",
-    "decomp_learn": 4,
-    "book_learn": [ [ "recipe_atomic_battery", 6 ] ],
+    "book_learn": [ [ "recipe_atomic_battery", 6 ], [ "textbook_atomic_lab", 7 ] ],
     "using": [ [ "soldering_standard", 10 ] ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [ [ [ "scrap", 6 ] ], [ [ "cable", 4 ] ], [ [ "plut_cell", 20 ] ] ]
   },
+  {
+    "result": "huge_atomic_battery_cell",
+    "type": "recipe",
+    "category": "CC_ELECTRONIC",
+    "subcategory": "CSC_ELECTRONIC_PARTS",
+    "skill_used": "electronics",
+    "difficulty": 8,
+    "skills_required": [ "fabrication", 8 ],
+    "time": "90 m",
+    "book_learn": [ [ "recipe_atomic_battery", 8 ], [ "textbook_atomic_lab", 9 ] ],
+    "using": [ [ "welding_standard", 50 ], [ "steel_standard", 5 ] ],
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "components": [ [ [ "cable", 20 ] ], [ [ "plut_cell", 200 ] ] ]
+  },
   {
     "result": "solder_wire",
     "type": "recipe",
diff --git a/data/json/recipes/electronic/tools.json b/data/json/recipes/electronic/tools.json
index 4537a2ccd8d1..c44c25e82744 100644
--- a/data/json/recipes/electronic/tools.json
+++ b/data/json/recipes/electronic/tools.json
@@ -395,7 +395,7 @@
     "difficulty": 6,
     "time": "1h 30 m",
     "reversible": true,
-    "book_learn": [ [ "recipe_caseless", 8 ] ],
+    "book_learn": [ [ "recipe_caseless", 8 ], [ "textbook_atomic_lab", 9 ] ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "plastic_chunk", 5 ] ],
diff --git a/data/mods/Aftershock/recipes/recipe_overrides.json b/data/mods/Aftershock/recipes/recipe_overrides.json
index 196ae9cb48c3..eacafc7fcfc3 100644
--- a/data/mods/Aftershock/recipes/recipe_overrides.json
+++ b/data/mods/Aftershock/recipes/recipe_overrides.json
@@ -1,64 +1,4 @@
 [
-  {
-    "type": "recipe",
-    "result": "atomic_coffeepot",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_TOOLS",
-    "skill_used": "electronics",
-    "difficulty": 4,
-    "time": 3000,
-    "reversible": true,
-    "book_learn": [ [ "recipe_caseless", 8 ], [ "textbook_atomic_lab", 3 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [
-      [ [ "plastic_chunk", 5 ] ],
-      [ [ "adhesive", 1, "LIST" ] ],
-      [ [ "power_supply", 1 ] ],
-      [ [ "element", 1 ] ],
-      [ [ "scrap", 2 ] ],
-      [ [ "plut_cell", 1 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "result": "atomic_light",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_LIGHTING",
-    "skill_used": "electronics",
-    "difficulty": 3,
-    "time": 20000,
-    "reversible": true,
-    "book_learn": [ [ "recipe_caseless", 6 ], [ "textbook_atomic_lab", 3 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [
-      [ [ "plastic_chunk", 1 ] ],
-      [ [ "adhesive", 1, "LIST" ] ],
-      [ [ "power_supply", 1 ] ],
-      [ [ "cable", 1 ] ],
-      [ [ "lightstrip_inactive", 1 ], [ "e_scrap", 1 ] ],
-      [ [ "plut_cell", 1 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "result": "atomic_lamp",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_LIGHTING",
-    "skill_used": "electronics",
-    "difficulty": 3,
-    "time": 30000,
-    "reversible": true,
-    "book_learn": [ [ "recipe_caseless", 6 ], [ "textbook_atomic_lab", 3 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [
-      [ [ "plastic_chunk", 2 ] ],
-      [ [ "adhesive", 1, "LIST" ] ],
-      [ [ "power_supply", 1 ] ],
-      [ [ "cable", 2 ] ],
-      [ [ "lightstrip_inactive", 1 ], [ "e_scrap", 1 ] ],
-      [ [ "plut_cell", 2 ] ]
-    ]
-  },
   {
     "type": "recipe",
     "result": "wearable_atomic_light",