diff --git a/lignumis/prototypes/compatibility/aai-loaders.lua b/lignumis/prototypes/compatibility/aai-loaders.lua
index da3c063..2137280 100644
--- a/lignumis/prototypes/compatibility/aai-loaders.lua
+++ b/lignumis/prototypes/compatibility/aai-loaders.lua
@@ -46,7 +46,7 @@ AAILoaders.make_tier({
     order = "d[loader]-a00[aai-wood-loader]"
 })
 
-data.raw.recipe["aai-wood-loader"].additional_categories = { "wood-processing" }
+data.raw.recipe["aai-wood-loader"].category = "wood-processing-or-assembling"
 
 if not basic_circuit_board then
     local nauvis_recipe = Recipe:new("aai-wood-loader"):clone("wood-loader-electronic-circuit")
diff --git a/lignumis/prototypes/compatibility/crushing-industry.lua b/lignumis/prototypes/compatibility/crushing-industry.lua
index 5b035c3..9a88705 100644
--- a/lignumis/prototypes/compatibility/crushing-industry.lua
+++ b/lignumis/prototypes/compatibility/crushing-industry.lua
@@ -90,9 +90,10 @@ end
 local gold_recipe = Recipe:new("burner-crusher")
     :replaceIngredient("iron-gear-wheel", "wooden-gear-wheel")
     :replaceIngredient("iron-plate", "gold-plate")
-if settings.startup["lignumis-lumber-mill-more-recipes"].value then
-    gold_recipe.prototype.additional_categories = { "wood-processing" }
-end
+    :assign({
+        category = settings.startup["lignumis-lumber-mill-more-recipes"].value and "wood-processing-or-assembling" or
+        "crafting"
+    })
 
 gold_recipe:clone("burner-crusher-copper")
     :replaceIngredient("gold-plate", "copper-plate")
diff --git a/lignumis/prototypes/compatibility/lane-splitters.lua b/lignumis/prototypes/compatibility/lane-splitters.lua
index 075cc68..5493840 100644
--- a/lignumis/prototypes/compatibility/lane-splitters.lua
+++ b/lignumis/prototypes/compatibility/lane-splitters.lua
@@ -23,7 +23,7 @@ lane_splitter.prototype.structure_patch.west.filename = data.raw.splitter["wood-
 lane_splitter.prototype.structure_patch.north.filename = data.raw.splitter["wood-splitter"].structure_patch.north.filename
 lane_splitter.item.icon = Lignumis.graphics .. "icons/wood-lane-splitter.png"
 lane_splitter.item.order = "d[lane-splitter]-0[wood-lane-splitter]"
-lane_splitter.recipe.additional_categories = { "wood-processing" }
+lane_splitter.recipe.category = "wood-processing-or-assembling"
 
 data:extend({
     lane_splitter.prototype,
diff --git a/lignumis/prototypes/content/basic-circuit-board.lua b/lignumis/prototypes/content/basic-circuit-board.lua
index 8858fdf..04dbf0a 100644
--- a/lignumis/prototypes/content/basic-circuit-board.lua
+++ b/lignumis/prototypes/content/basic-circuit-board.lua
@@ -19,8 +19,7 @@ data:extend({
     {
         type = "recipe",
         name = "basic-circuit-board",
-        category = "crafting",
-        additional_categories = { "wood-processing" },
+        category = "wood-processing-or-assembling",
         icons = {
             { icon = Lignumis.graphics .. "icons/basic-circuit-board.png" },
             { icon = Lignumis.graphics .. "icons/gold-cable.png", scale = 0.25, shift = { 8, 8 } }
@@ -37,8 +36,7 @@ data:extend({
         type = "recipe",
         name = "basic-circuit-board-copper",
         localised_name = { "item-name.basic-circuit-board" },
-        category = "crafting",
-        additional_categories = { "wood-processing" },
+        category = "wood-processing-or-assembling",
         icons = {
             { icon = Lignumis.graphics .. "icons/basic-circuit-board.png" },
             { icon = "__base__/graphics/icons/copper-cable.png", scale = 0.25, shift = { 8, 8 } }
diff --git a/lignumis/prototypes/content/basic-gun-turret.lua b/lignumis/prototypes/content/basic-gun-turret.lua
index 3935386..335010b 100644
--- a/lignumis/prototypes/content/basic-gun-turret.lua
+++ b/lignumis/prototypes/content/basic-gun-turret.lua
@@ -58,7 +58,7 @@ local turret_recipe = {
     results = { { type = "item", name = "basic-gun-turret", amount = 1 } }
 }
 if settings.startup["lignumis-lumber-mill-more-recipes"].value then
-    turret_recipe.additional_categories = { "wood-processing" }
+    turret_recipe.category = "wood-processing-or-assembling"
 end
 
 local turret_technology = {
diff --git a/lignumis/prototypes/content/burner-agricultural-tower.lua b/lignumis/prototypes/content/burner-agricultural-tower.lua
index dc5a31e..e76a2da 100644
--- a/lignumis/prototypes/content/burner-agricultural-tower.lua
+++ b/lignumis/prototypes/content/burner-agricultural-tower.lua
@@ -84,8 +84,7 @@ data:extend({
     {
         type = "recipe",
         name = "burner-agricultural-tower",
-        category = "crafting",
-        additional_categories = { "wood-processing" },
+        category = "wood-processing-or-assembling",
         energy_required = 10,
         ingredients = {
             { type = "item", name = "stone-brick",       amount = 5 },
@@ -117,8 +116,7 @@ data:extend({
     {
         type = "recipe",
         name = "burner-agricultural-tower-copper",
-        category = "crafting",
-        additional_categories = { "wood-processing" },
+        category = "wood-processing-or-assembling",
         localised_name = { "entity-name.burner-agricultural-tower" },
         icons = {
             { icon = Lignumis.graphics .. "icons/burner-agricultural-tower.png" },
diff --git a/lignumis/prototypes/content/burner-assembling-machine.lua b/lignumis/prototypes/content/burner-assembling-machine.lua
index 0c46bad..58cd14b 100644
--- a/lignumis/prototypes/content/burner-assembling-machine.lua
+++ b/lignumis/prototypes/content/burner-assembling-machine.lua
@@ -17,6 +17,7 @@ assembling_machine.crafting_categories = {
     "crafting",
     "electronics",
     "pressing",
+    "wood-processing-or-assembling",
     "organic-or-assembling",
     "electronics-or-assembling",
     "metallurgy-or-assembling"
@@ -49,6 +50,8 @@ remnants.animation[2].filename = gfx .. "burner-assembling-machine-remnants.png"
 remnants.animation[3].filename = gfx .. "burner-assembling-machine-remnants.png"
 remnants.order = "0[burner-assembling-machine]"
 
+local crafting_category = settings.startup["lignumis-lumber-mill-more-recipes"].value and "wood-processing-or-assembling" or "crafting"
+
 data:extend({
     assembling_machine,
     remnants,
@@ -67,8 +70,7 @@ data:extend({
     {
         type = "recipe",
         name = "burner-assembling-machine",
-        category = "crafting",
-        additional_categories = settings.startup["lignumis-lumber-mill-more-recipes"].value and { "wood-processing" } or nil,
+        category = crafting_category,
         enabled = false,
         ingredients = {
             { type = "item", name = "wooden-gear-wheel", amount = 5 },
diff --git a/lignumis/prototypes/content/burner-long-handed-inserter.lua b/lignumis/prototypes/content/burner-long-handed-inserter.lua
index b6dffcf..de8a785 100644
--- a/lignumis/prototypes/content/burner-long-handed-inserter.lua
+++ b/lignumis/prototypes/content/burner-long-handed-inserter.lua
@@ -44,6 +44,8 @@ remnants.animation[3].filename = gfx .. "burner-long-handed-inserter-remnants.pn
 remnants.animation[4].filename = gfx .. "burner-long-handed-inserter-remnants.png"
 remnants.order = "a-c-0"
 
+local crafting_category = settings.startup["lignumis-lumber-mill-more-recipes"].value and "wood-processing-or-assembling" or "crafting"
+
 data:extend({
     long_handed_inserter,
     remnants,
@@ -63,8 +65,7 @@ data:extend({
     {
         type = "recipe",
         name = "burner-long-handed-inserter",
-        category = "crafting",
-        additional_categories = settings.startup["lignumis-lumber-mill-more-recipes"].value and { "wood-processing" } or nil,
+        category = crafting_category,
         enabled = false,
         ingredients = {
             { type = "item", name = "wooden-gear-wheel", amount = 1 },
diff --git a/lignumis/prototypes/content/lumber-mill.lua b/lignumis/prototypes/content/lumber-mill.lua
index 8419fbd..0bb904c 100644
--- a/lignumis/prototypes/content/lumber-mill.lua
+++ b/lignumis/prototypes/content/lumber-mill.lua
@@ -7,17 +7,19 @@ local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].val
 data:extend({
     {
         type = "recipe-category",
-        name = "wood-processing"
+        name = "wood-processing-or-assembling"
     }
 })
 
+table.insert(data.raw["character"]["character"].crafting_categories, "wood-processing-or-assembling")
+
 local has_oxygen = data.raw["surface-property"]["oxygen"] ~= nil
 
 LumberMill.EntityBuilder:new()
     :burnerEnergySource({ emissions_per_minute = { noise = 100 } })
     :baseProductivity(0.5)
     :apply({
-    crafting_categories = { "wood-processing" },
+        crafting_categories = { "wood-processing-or-assembling" },
         crafting_speed = 2,
         energy_usage = "1000kW",
         surface_conditions = {
@@ -48,7 +50,7 @@ LumberMill.RecipeBuilder:new()
         { type = "item", name = "burner-assembling-machine", amount = 2 }
     }))
     :apply({
-    additional_categories = { "wood-processing" }
+        category = "wood-processing-or-assembling"
     })
 
 LumberMill.TechnologyBuilder:new()
@@ -70,7 +72,7 @@ LumberMill.RecipeBuilder:new()
     :apply({
         name = "lumber-mill-copper",
         localised_name = { "entity-name.lumber-mill" },
-    additional_categories = { "wood-processing" },
+        category = "wood-processing-or-assembling",
         icons = {
             { icon = lumber_mill_item.icon },
             { icon = basic_circuit_board and "__base__/graphics/icons/copper-plate.png" or "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } }
diff --git a/lignumis/prototypes/content/lumber.lua b/lignumis/prototypes/content/lumber.lua
index 2d0d1de..8cb9b14 100644
--- a/lignumis/prototypes/content/lumber.lua
+++ b/lignumis/prototypes/content/lumber.lua
@@ -23,8 +23,7 @@ data:extend({
     {
         type = "recipe",
         name = "lumber",
-        category = "crafting",
-        additional_categories = { "wood-processing" },
+        category = "wood-processing-or-assembling",
         allow_productivity = true,
         allow_as_intermediate = true,
         ingredients = { { type = "item", name = "wood", amount = 2 } },
diff --git a/lignumis/prototypes/content/steam-assembling-machine.lua b/lignumis/prototypes/content/steam-assembling-machine.lua
index 687ed02..da5ef2d 100644
--- a/lignumis/prototypes/content/steam-assembling-machine.lua
+++ b/lignumis/prototypes/content/steam-assembling-machine.lua
@@ -20,6 +20,7 @@ assembling_machine.crafting_categories = {
     "crafting",
     "electronics",
     "pressing",
+    "wood-processing-or-assembling",
     "organic-or-assembling",
     "electronics-or-assembling",
     "metallurgy-or-assembling",
diff --git a/lignumis/prototypes/content/wood-lab.lua b/lignumis/prototypes/content/wood-lab.lua
index 2010910..7db5aec 100644
--- a/lignumis/prototypes/content/wood-lab.lua
+++ b/lignumis/prototypes/content/wood-lab.lua
@@ -144,8 +144,7 @@ data:extend({
     {
         type = "recipe",
         name = "wood-lab",
-        category = "crafting",
-        additional_categories = { "wood-processing" },
+        category = "wood-processing-or-assembling",
         energy_required = 2,
         ingredients = {
             { type = "item", name = "lumber",            amount = 6 },
diff --git a/lignumis/prototypes/content/wood-logistics.lua b/lignumis/prototypes/content/wood-logistics.lua
index 36048d4..78cb353 100644
--- a/lignumis/prototypes/content/wood-logistics.lua
+++ b/lignumis/prototypes/content/wood-logistics.lua
@@ -58,13 +58,13 @@ Belt.RecipeBuilder:new()
     })
     :apply({
         transportBelt = {
-            additional_categories = { "wood-processing" }
+            category = "wood-processing-or-assembling"
         },
         undergroundBelt = {
-            additional_categories = { "wood-processing" }
+            category = "wood-processing-or-assembling"
         },
         splitter = {
-            additional_categories = { "wood-processing" }
+            category = "wood-processing-or-assembling"
         }
     })
 
@@ -91,7 +91,7 @@ if not basic_circuit_board then
                         { icon = splitter_item.icon },
                         { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } }
                     },
-                    additional_categories = { "wood-processing" }
+                    category = "wood-processing-or-assembling"
                 }
             })
             .splitter
diff --git a/lignumis/prototypes/content/wood-military.lua b/lignumis/prototypes/content/wood-military.lua
index 6c3e312..1dd775f 100644
--- a/lignumis/prototypes/content/wood-military.lua
+++ b/lignumis/prototypes/content/wood-military.lua
@@ -82,8 +82,7 @@ data:extend({
     {
         type = "recipe",
         name = "wood-darts-magazine",
-        category = "crafting",
-        additional_categories = { "wood-processing" },
+        category = "wood-processing-or-assembling",
         energy_required = 1,
         ingredients = { { type = "item", name = "wood", amount = 2 } },
         results = { { type = "item", name = "wood-darts-magazine", amount = 1 } }
diff --git a/lignumis/prototypes/content/wooden-gearwheel.lua b/lignumis/prototypes/content/wooden-gearwheel.lua
index 0d57a98..229b175 100644
--- a/lignumis/prototypes/content/wooden-gearwheel.lua
+++ b/lignumis/prototypes/content/wooden-gearwheel.lua
@@ -17,8 +17,7 @@ data:extend({
     {
         type = "recipe",
         name = "wooden-gear-wheel",
-        category = "crafting",
-        additional_categories = { "wood-processing" },
+        category = "wood-processing-or-assembling",
         ingredients = { { type = "item", name = "lumber", amount = 1 } },
         results = { { type = "item", name = "wooden-gear-wheel", amount = 2 } },
         allow_productivity = true
diff --git a/lignumis/prototypes/integrations/Wood-Walls.lua b/lignumis/prototypes/integrations/Wood-Walls.lua
index 884dfdd..d1f11d5 100644
--- a/lignumis/prototypes/integrations/Wood-Walls.lua
+++ b/lignumis/prototypes/integrations/Wood-Walls.lua
@@ -1,4 +1,4 @@
 local recipe = data.raw.recipe["wooden-wall"]
 recipe.ingredients = { { type = "item", name = "lumber", amount = 4 } }
 recipe.results = { { type = "item", name = "wooden-wall", amount = 1 } }
-recipe.additional_categories = { "wood-processing" }
\ No newline at end of file
+recipe.category = "wood-processing-or-assembling"
\ No newline at end of file
diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua
index 9c51438..92ae192 100644
--- a/lignumis/prototypes/integrations/vanilla.lua
+++ b/lignumis/prototypes/integrations/vanilla.lua
@@ -21,8 +21,7 @@ local drill_item = data.raw["item"]["burner-mining-drill"]
 drill_item.icon = Lignumis.graphics .. "icons/burner-mining-drill.png"
 
 local drill_recipe = data.raw["recipe"]["burner-mining-drill"]
-drill_recipe.category = "crafting"
-drill_recipe.additional_categories = { "wood-processing" }
+drill_recipe.category = "wood-processing-or-assembling"
 drill_recipe.ingredients = {
     { type = "item", name = "stone-furnace",     amount = 1 },
     { type = "item", name = "wooden-gear-wheel", amount = basic_circuit_board and 2 or 3 },
@@ -49,7 +48,7 @@ burner_inserter_recipe.ingredients = {
     { type = "item", name = "lumber",            amount = 1 }
 }
 if settings.startup["lignumis-lumber-mill-more-recipes"].value then
-    burner_inserter_recipe.additional_categories = { "wood-processing" }
+    burner_inserter_recipe.category = "wood-processing-or-assembling"
 end
 
 
@@ -132,7 +131,10 @@ if mods["Diversitree"] then
     data.raw.plant["s6xdvt-fake-tree"].surface_conditions[1].min = 900
 end
 
+table.insert(data.raw["assembling-machine"]["assembling-machine-1"].crafting_categories, "wood-processing-or-assembling")
 table.insert(data.raw["assembling-machine"]["assembling-machine-1"].crafting_categories, "organic-or-assembling")
+table.insert(data.raw["assembling-machine"]["assembling-machine-2"].crafting_categories, "wood-processing-or-assembling")
+table.insert(data.raw["assembling-machine"]["assembling-machine-3"].crafting_categories, "wood-processing-or-assembling")
 
 
 -- Disable vanilla early game recipes
diff --git a/lignumis/settings/wood-military.lua b/lignumis/settings/wood-military.lua
index 01765eb..75ee975 100644
--- a/lignumis/settings/wood-military.lua
+++ b/lignumis/settings/wood-military.lua
@@ -2,12 +2,10 @@ if not mods["wood-military"] then
     return
 end
 
-local Settings = require("__cf-lib__/settings/Settings")
-local force = Settings.force
-local default = Settings.default
-
-default("wood-military-rockets", false)
-default("wood-military-artillery", false)
-default("wood-military-damage-buff", false)
-force("wood-military-armor", true)
-force("wood-military-nerf-start", true)
\ No newline at end of file
+data.raw["bool-setting"]["wood-military-rockets"].default_value = false
+data.raw["bool-setting"]["wood-military-artillery"].default_value = false
+data.raw["bool-setting"]["wood-military-damage-buff"].default_value = false
+data.raw["bool-setting"]["wood-military-armor"].hidden = true
+data.raw["bool-setting"]["wood-military-armor"].forced_value = true
+data.raw["bool-setting"]["wood-military-nerf-start"].hidden = true
+data.raw["bool-setting"]["wood-military-nerf-start"].forced_value = true
\ No newline at end of file