diff --git a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets.txt b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets.txt
index fe711aa..430452b 100644
--- a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets.txt
+++ b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets.txt
@@ -5,8 +5,8 @@ module ImprovisedCabinetry {
 
     /* Modern Counter ------------------------------------------- */
     recipe ICMakeCabinet1 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -25,8 +25,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet1Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -45,8 +45,8 @@ module ImprovisedCabinetry {
 
     /* Wooden Counter ------------------------------------------- */
     recipe ICMakeCabinet2 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -63,8 +63,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet2Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -81,8 +81,8 @@ module ImprovisedCabinetry {
 
     /* Birchwood Counter ---------------------------------------- */
     recipe ICMakeCabinet3 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -99,8 +99,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet3Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -116,8 +116,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet3Float {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue,
         Nails=4,
@@ -135,8 +135,8 @@ module ImprovisedCabinetry {
 
     /* Oak Counter ---------------------------------------------- */
     recipe ICMakeCabinet4 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -153,8 +153,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet4Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -171,8 +171,8 @@ module ImprovisedCabinetry {
 
     /* Dark Counter --------------------------------------------- */
     recipe ICMakeCabinet5 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -190,8 +190,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet5Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -209,8 +209,8 @@ module ImprovisedCabinetry {
 
     /* Green Counter -------------------------------------------- */
     recipe ICMakeCabinet6 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -228,8 +228,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet6Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -247,8 +247,8 @@ module ImprovisedCabinetry {
 
     /* White Counter -------------------------------------------- */
     recipe ICMakeCabinet7 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -266,8 +266,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet7Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -285,8 +285,8 @@ module ImprovisedCabinetry {
 
     /* Bathroom Cabinets ---------------------------------------- */
     recipe ICMakeCabinetBathroom {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue,
         Nails=4,
diff --git a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_bar.txt b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_bar.txt
index b6eb8ae..9a1194b 100644
--- a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_bar.txt
+++ b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_bar.txt
@@ -18,8 +18,8 @@ module ImprovisedCabinetry {
 
     /* Bar Counter (Natural) ------------------------------------- */
     recipe ICMakeCabinetBar1Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=4,
         Woodglue=2,
         Nails=8,
@@ -36,8 +36,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetBar1 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=4,
         Woodglue=2,
         Nails=8,
diff --git a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_motel.txt b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_motel.txt
index 1da145e..00231ca 100644
--- a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_motel.txt
+++ b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_motel.txt
@@ -5,8 +5,8 @@ module ImprovisedCabinetry {
 
     /* Sunstar Model --------------------------------------------- */
     recipe ICMakeCabinetMotel1 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -24,8 +24,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetMotel2 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue,
         Nails=4,
diff --git a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_restaurant.txt b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_restaurant.txt
index ae50448..af870f4 100644
--- a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_restaurant.txt
+++ b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_restaurant.txt
@@ -5,8 +5,8 @@ module ImprovisedCabinetry {
 
     /* Diner ---------------------------------------------------- */
     recipe ICMakeCabinetRestaurant1 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -25,8 +25,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetRestaurant1Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -46,8 +46,8 @@ module ImprovisedCabinetry {
 
     /* Pie Restaurant -------------------------------------------- */
     recipe ICMakeCabinetRestaurant2 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -64,8 +64,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetRestaurant2Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -83,8 +83,8 @@ module ImprovisedCabinetry {
 
     /* Pizza Whirled -------------------------------------------- */
     recipe ICMakeCabinetRestaurant3 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -104,8 +104,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetRestaurant3Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -126,8 +126,8 @@ module ImprovisedCabinetry {
 
     /* Seahorse Coffee ------------------------------------------ */
     recipe ICMakeCabinetRestaurant4 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -147,8 +147,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetRestaurant4Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -168,8 +168,8 @@ module ImprovisedCabinetry {
 
     /* Spiffo's ------------------------------------------------- */
     recipe ICMakeCabinetRestaurant5 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -188,8 +188,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetRestaurant5Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
diff --git a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_shops.txt b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_shops.txt
index 5959a72..f72f83f 100644
--- a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_shops.txt
+++ b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_shops.txt
@@ -5,8 +5,8 @@ module ImprovisedCabinetry {
 
     /* Fossoil -------------------------------------------------- */
     recipe ICMakeCabinetShop1 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -24,8 +24,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetShop1Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -44,8 +44,8 @@ module ImprovisedCabinetry {
 
     /* Gas2Go --------------------------------------------------- */
     recipe ICMakeCabinetShop2 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -63,8 +63,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetShop2Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -83,8 +83,8 @@ module ImprovisedCabinetry {
 
     /* Generic Shop --------------------------------------------- */
     recipe ICMakeCabinetShop3 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -100,8 +100,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetShop3Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -118,8 +118,8 @@ module ImprovisedCabinetry {
 
     /* Zippee --------------------------------------------------- */
     recipe ICMakeCabinetShop4 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -138,8 +138,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetShop4Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
diff --git a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_theatre.txt b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_theatre.txt
index d89a7e0..ad09608 100644
--- a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_theatre.txt
+++ b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_theatre.txt
@@ -5,8 +5,8 @@ module ImprovisedCabinetry {
 
     /* Theatre Counter ------------------------------------------ */
     recipe ICMakeCabinetTheater1 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -25,8 +25,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetTheater2 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -45,8 +45,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetTheater3 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
diff --git a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_trailer.txt b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_trailer.txt
index 0ed5ee4..9cf43c7 100644
--- a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_trailer.txt
+++ b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_trailer.txt
@@ -5,8 +5,8 @@ module ImprovisedCabinetry {
 
     /* Trailer */
     recipe ICMakeCabinetTrailer1 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -24,8 +24,8 @@ module ImprovisedCabinetry {
 
     /* Trailer float */
     recipe ICMakeCabinetTrailer2 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue,
         Nails=4,
@@ -43,8 +43,8 @@ module ImprovisedCabinetry {
 
     /* trailer with fridge */
     recipe ICMakeCabinetTrailer3 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
diff --git a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_crossover_glass.txt b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_crossover_glass.txt
index 4b954e6..0841955 100644
--- a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_crossover_glass.txt
+++ b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_crossover_glass.txt
@@ -6,7 +6,7 @@ module ImprovisedCabinetry {
     recipe ICMakeCabinetImprovisedGlass1 {
         keep BlowTorch=12,
         WeldingRods=6,
-        keep WeldingMask,
+        keep [Recipe.GetItemTypes.WeldingMask],
         MetalPipe=2,
         SheetMetal=1,
         ImprovisedGlass.GlassPane=4,
@@ -24,7 +24,7 @@ module ImprovisedCabinetry {
 
     recipe ICMakeCabinetImprovisedGlass1Corner {
         keep BlowTorch=12,
-        keep WeldingMask,
+        keep [Recipe.GetItemTypes.WeldingMask],
         WeldingRods=6,
         MetalPipe=2,
         SheetMetal=1,
@@ -44,7 +44,7 @@ module ImprovisedCabinetry {
     recipe ICMakeCabinetImprovisedGlass2 {
         keep BlowTorch=12,
         WeldingRods=6,
-        keep WeldingMask,
+        keep [Recipe.GetItemTypes.WeldingMask],
         MetalPipe=2,
         SheetMetal=1,
         ImprovisedGlass.GlassPane=4,
diff --git a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_parts.txt b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_parts.txt
index c6de6bb..47e5e4a 100644
--- a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_parts.txt
+++ b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_parts.txt
@@ -4,7 +4,7 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeWoodPanel {
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue,
         Result: ImprovisedCabinetry.WoodPanel,
@@ -19,7 +19,7 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeSmallHinge {
-        keep Saw,
+        keep [Recipe.GetItemTypes.Saw],
         Hinge,
         Result: ImprovisedCabinetry.SmallHinge=2,
         Category: Cabinets,