diff --git a/overrides/scripts/electronics.zs b/overrides/scripts/electronics.zs
index a83ab1f..3d67410 100644
--- a/overrides/scripts/electronics.zs
+++ b/overrides/scripts/electronics.zs
@@ -127,7 +127,7 @@ mods.jei.JEI.removeAndHide(<enderio:item_endergy_conduit:8>);
 mods.jei.JEI.removeAndHide(<enderio:item_endergy_conduit:9>);
 
 
-val wrench = <ore:gtceWrenches>;
+val wrench = <ore:craftingToolWrench>;
 
 // Microversium Machine Casing
 makeShaped("of_microverse_casing", <contenttweaker:microverse_casing> * 2,
@@ -176,7 +176,7 @@ recipes.addShaped(<meta_tile_entity:pyrolyse_oven>, [
 //recipes.removeByRecipeName("gregtech:casing.lv");
 //recipes.addShaped(<gregtech:machine_casing:1>, [
 //    [<ore:plateWroughtIron>, <ore:plateWroughtIron>, <ore:plateWroughtIron>],
-//    [<ore:plateWroughtIron>, <ore:gtceWrenches>, <ore:plateWroughtIron>],
+//    [<ore:plateWroughtIron>, <ore:craftingToolWrench>, <ore:plateWroughtIron>],
 //    [<ore:plateWroughtIron>, <ore:plateWroughtIron>, <ore:plateWroughtIron>]
 //]);
 //// LV Machine Casing * 1
@@ -188,7 +188,7 @@ recipes.addShaped(<meta_tile_entity:pyrolyse_oven>, [
 //
 //recipes.addShaped(<gregtech:machine_casing>, [
 //    [<metaitem:plateIron>, <metaitem:plateIron>, <metaitem:plateIron>],
-//    [<metaitem:plateIron>, <ore:gtceWrenches>, <metaitem:plateIron>],
+//    [<metaitem:plateIron>, <ore:craftingToolWrench>, <metaitem:plateIron>],
 //    [<metaitem:plateIron>, <metaitem:plateIron>, <metaitem:plateIron>]
 //]);
 //// ULV Machine Casing * 1
diff --git a/overrides/scripts/gregtech_recipemaps.zs b/overrides/scripts/gregtech_recipemaps.zs
index f55e17f..9bf65a3 100644
--- a/overrides/scripts/gregtech_recipemaps.zs
+++ b/overrides/scripts/gregtech_recipemaps.zs
@@ -64,39 +64,4 @@ global thermal_centrifuge           as RecipeMap = RecipeMap.getByName("thermal_
 global thermal_sep                  as RecipeMap = RecipeMap.getByName("thermal_centrifuge");
 global unpackager                   as RecipeMap = RecipeMap.getByName("unpacker");
 global vacuum_freezer               as RecipeMap = RecipeMap.getByName("vacuum_freezer");
-global wiremill                     as RecipeMap = RecipeMap.getByName("wiremill");
-
-
-
-// Tools
-//<ore:gtceWrenches>.addItems([
-	//<gregtech:meta_tool:8>.withEmptyTag(), 
-	//<gregtech:meta_tool:28>.withEmptyTag(), 
-	//<gregtech:meta_tool:29>.withEmptyTag(), 
-	//<gregtech:meta_tool:30>.withEmptyTag()]);
-
-//<ore:gtceScrewdrivers>.addItems([
-	//<gregtech:meta_tool:11>.withEmptyTag(), 
-	//<gregtech:meta_tool:31>.withEmptyTag()]);
-
-//<ore:gtceHardHammers>.addItems([
-	//<gregtech:meta_tool:6>.withEmptyTag()]);
-
-//<ore:gtceSaws>.addItems([
-	//<gregtech:meta_tool:5>.withEmptyTag(),
-	//<gregtech:meta_tool:25>.withEmptyTag(), 
-	//<gregtech:meta_tool:26>.withEmptyTag(), 
-	//<gregtech:meta_tool:27>.withEmptyTag(),
-	//<gregtech:meta_tool:32>.withEmptyTag()]);
-
-//<ore:gtceFiles>.addItems([
-	//<gregtech:meta_tool:9>.withEmptyTag()]);
-
-<ore:gtceWireCutters>.addItems([
-	//<gregtech:meta_tool:13>.withEmptyTag()]);
-
-<ore:gtceSoftHammers>.addItems([
-	//<gregtech:meta_tool:7>.withEmptyTag()]);
-
-<ore:gtceMortars>.addItems([
-	//<gregtech:meta_tool:12>.withEmptyTag()]);
+global wiremill                     as RecipeMap = RecipeMap.getByName("wiremill");
\ No newline at end of file
diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs
index 858a506..2623675 100644
--- a/overrides/scripts/normalmode.zs
+++ b/overrides/scripts/normalmode.zs
@@ -304,7 +304,7 @@ makeShaped("of_nc_water_source", <nuclearcraft:water_source>,
 
 
 //Rubber by hand
-recipes.addShaped(<metaitem:plateRubber>,[[<ore:gtceHardHammers>],[<metaitem:rubber_drop>],[<metaitem:rubber_drop>]]);	
+recipes.addShaped(<metaitem:plateRubber>,[[<ore:craftingToolHammer>],[<metaitem:rubber_drop>],[<metaitem:rubber_drop>]]);	
 
 //Rubber Sheet
 compressor.recipeBuilder().inputs(<metaitem:rubber_drop>).outputs(<metaitem:plateRubber>).duration(20).EUt(8).buildAndRegister();