diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json
index 39c54da637363..0456a2f882436 100644
--- a/data/json/itemgroups/books.json
+++ b/data/json/itemgroups/books.json
@@ -124,9 +124,8 @@
     "//": "Books found in school library",
     "items": [
       { "group": "novels", "prob": 50 },
-      { "group": "manuals_school", "prob": 40 },
-      { "group": "textbooks_school", "prob": 30 },
-      { "group": "kids_books", "prob": 30 },
+      { "group": "kids_books", "prob": 40 },
+      { "group": "manuals_school", "prob": 30 },
       { "group": "literature", "prob": 30 }
     ]
   },
@@ -480,75 +479,57 @@
     "type": "item_group",
     "id": "manuals_school",
     "//": "Same as manuals, but without inappropriate books, like weapons or traps.",
+    "//2": "The autobiography of a mountain man is included as, while an advanced survival book, it’s also a story novel in its current form. Should it be expanded with variants to include books that are not novels, then it should be removed.",
+    "//3": "While a rather high-level fabrication book, this could conceivably be something that a craft shop/design and technology class would use in its current form: Plastics and Polymers: Projects for the Classroom. Should it be expanded with variants to include books that aren’t so school-based, it should be removed.",
+    "//4": "While it has the potential to be a high-level tailoring book, its current form, Friendly, Humane Fashion, can be passed off as an educational library book. Should it be expanded with variants to include books that aren’t so school-based, it should be removed.",
+    "//5": "While a high-level speech book, Principles of Effective Communication, a public speaking book, isn’t unrealistic for a school library to possess,. Should it be expanded with variants to include books that aren’t so school-based, it should be removed.",
+    "//6": "Bit of a stretch, but The Wonderful World of Arthropodology could feasibly exist as a library encyclopaedia.",
     "subtype": "distribution",
     "entries": [
-      { "item": "manual_brawl", "prob": 30 },
-      { "item": "manual_dodge", "prob": 1 },
-      { "item": "manual_throw", "prob": 12 },
-      { "item": "manual_mechanics", "prob": 35 },
-      { "item": "manual_speech", "prob": 50 },
+      { "item": "manual_swimming", "prob": 5 },
+      { "item": "manual_dodge", "variant": "manual_dodge", "prob": 5 },
+      { "item": "manual_dodge", "variant": "manual_dodge_1", "prob": 5 },
+      { "item": "manual_throw", "variant": "manual_throw", "prob": 6 },
+      { "item": "manual_throw", "variant": "manual_throw_4", "prob": 6 },
+      { "item": "manual_mechanics", "prob": 25 },
+      { "item": "book_pneumatics", "prob": 5 },
+      { "item": "manual_speech", "prob": 40 },
+      { "item": "textbook_speech", "prob": 10 },
       { "item": "manual_business", "prob": 40 },
-      { "item": "manual_first_aid", "prob": 40 },
+      { "item": "manual_first_aid", "prob": 30 },
+      { "item": "pocket_firstaid", "prob": 30 },
       { "item": "manual_computer", "prob": 20 },
+      { "item": "howto_computer", "prob": 10 },
       { "item": "webbasics_computer", "prob": 20 },
       { "item": "hackerman_computer", "prob": 10 },
-      { "item": "howto_computer", "prob": 10 },
-      { "item": "cookbook", "prob": 35 },
-      { "item": "offalcooking", "prob": 8 },
-      { "item": "cookbook_italian", "prob": 25 },
+      { "item": "cookbook", "prob": 25 },
+      { "item": "offalcooking", "prob": 5 },
+      { "item": "cookbook_italian", "prob": 10 },
       { "item": "cookbook_indian", "prob": 10 },
-      { "item": "cookbook_native", "prob": 5 },
       { "item": "cookbook_mexican", "prob": 10 },
       { "item": "sweets_book", "prob": 10 },
-      { "item": "manual_electronics", "prob": 20 },
+      { "item": "cookbook_native", "prob": 5 },
+      { "item": "manual_electronics", "prob": 25 },
+      { "item": "arduino_experiments", "prob": 15 },
       { "item": "manual_tailor", "prob": 15 },
+      { "item": "recipe_fauxfur", "prob": 5 },
       { "item": "manual_carpentry", "prob": 10 },
-      { "item": "101_carpentry", "prob": 6 },
-      { "item": "manual_fabrication", "prob": 20 },
-      { "item": "manual_driving", "prob": 15 },
-      { "item": "manual_survival", "prob": 20 },
+      { "item": "101_carpentry", "prob": 10 },
+      { "item": "manual_fabrication", "prob": 10 },
+      { "item": "plastics_book", "prob": 10 },
+      { "item": "manual_survival", "prob": 10 },
+      { "item": "pocket_survival", "prob": 10 },
+      { "item": "survival_book", "prob": 2 },
+      { "item": "textbook_arthropod", "prob": 2 },
+      { "item": "basic_chemistry", "prob": 30 },
       { "item": "dnd_handbook", "prob": 2 },
-      { "item": "reference_cooking", "prob": 1 },
-      { "item": "reference_fabrication1", "prob": 1 },
-      { "item": "reference_firstaid1", "prob": 1 },
-      { "item": "reference_firstaid2", "prob": 1 },
-      { "item": "basic_chemistry", "prob": 10 },
-      { "item": "survnote", "prob": 3 },
-      { "item": "manual_canning", "prob": 8 },
-      { "item": "manual_sealing", "prob": 9 },
-      { "item": "vacuum_sealing", "prob": 5 },
-      { "item": "arduino_experiments", "prob": 5 },
-      { "item": "fermenting_book", "prob": 8 },
-      { "item": "book_pneumatics", "prob": 3 }
+      { "item": "survnote", "prob": 3 }
     ]
   },
   {
     "type": "item_group",
     "id": "textbooks",
     "subtype": "distribution",
-    "entries": [
-      { "group": "textbooks_school", "prob": 228 },
-      { "item": "textbook_gaswarfare", "prob": 5 },
-      { "item": "recipe_bullets", "prob": 8 },
-      { "item": "book_pneumatics", "prob": 8 },
-      { "item": "text_gunsmith", "prob": 4 },
-      { "item": "pocket_firearms", "prob": 2 },
-      { "item": "textbook_traps", "prob": 4 },
-      { "item": "reference_cooking", "prob": 2 },
-      { "item": "reference_fabrication1", "prob": 6 },
-      { "item": "reference_firstaid1", "prob": 2 },
-      { "item": "reference_firstaid2", "prob": 1 },
-      { "item": "textbook_toxicology", "prob": 2 },
-      { "item": "alloy_book", "prob": 5 },
-      { "item": "metal_casting_book", "prob": 5 },
-      { "item": "bronze_book", "prob": 6 }
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "textbooks_school",
-    "//": "Same as textbooks, but without inappropriate books, like weapons or traps. Contains archery and armors/melee weapons as sport and historical information sources.",
-    "subtype": "distribution",
     "entries": [
       { "item": "textbook_computer", "prob": 4 },
       { "item": "computer_science", "prob": 8 },
@@ -609,7 +590,19 @@
       { "item": "textbook_arthropod", "prob": 5 },
       { "item": "textbook_botany", "prob": 5 },
       { "item": "theater_props", "prob": 2 },
-      { "item": "ballista_book", "prob": 3 }
+      { "item": "ballista_book", "prob": 3 },
+      { "item": "textbook_gaswarfare", "prob": 5 },
+      { "item": "recipe_bullets", "prob": 8 },
+      { "item": "text_gunsmith", "prob": 4 },
+      { "item": "pocket_firearms", "prob": 2 },
+      { "item": "textbook_traps", "prob": 4 },
+      { "item": "reference_cooking", "prob": 2 },
+      { "item": "reference_fabrication1", "prob": 6 },
+      { "item": "reference_firstaid1", "prob": 2 },
+      { "item": "reference_firstaid2", "prob": 1 },
+      { "item": "textbook_toxicology", "prob": 2 },
+      { "item": "alloy_book", "prob": 5 },
+      { "item": "metal_casting_book", "prob": 5 }
     ]
   },
   {