@@ -83,8 +83,13 @@
 	}
 	minetest.register_craftitem(screw, {
 		description = sorcery.lib.str.capitalize(name) .. ' Screw';
 		inventory_image = sorcery.lib.image('sorcery_screw.png'):multiply(sorcery.lib.color(metal.tone)):render();
+		groups = {
+			metal = 1;
+			sorcery_screw = 1;
+			sorcery_tech_component = 1;
+		};
 		_sorcery = {
 			material = {
 				id = name, data = metal;
 				grindcost = 2, grindvalue = 1;
@@ -101,9 +106,9 @@
 			output = 'dye:' .. metal.dye .. ' 4';
 			recipe = {
 				{'',     powder,                   ''};
 				{powder,'basic_materials:paraffin',powder};
-				{'','bucket:bucket_water',''};
+				{'',    'bucket:bucket_water',     ''};
 			};
 			replacements = {
 				{'bucket:bucket_water', 'bucket:bucket_empty'};
 			};
@@ -143,12 +148,25 @@
 			lump_image = (metal.image and metal.image.lump) or nil;
 			armor_weight = metal.armor_weight;
 			armor_protection = metal.armor_protection;
 		}
+	end
+	local ti = (metal.image and metal.image.tool)
+	for _,t in pairs{'pick','sword'} do
+		-- i really need to rip out instant-ores already
+		local tid = string.format('sorcery:%s_%s',t,name)
+		if minetest.registered_items[tid] then
+			minetest.override_item(tid, {
+				inventory_image = ti and ti.pick or string.format('sorcery_%s_%s.png',name,t);
+			})
+		end
 	end
 	minetest.register_craftitem(fragment, {
 		inventory_image = 'sorcery_' .. name .. '_fragment.png';
 		description = sorcery.lib.str.capitalize(name) .. ' Fragment';
+		groups = {
+			metal = 1; sorcery_metal_fragment = 1;
+		};
 		_sorcery = {
 			recipe = {
 				canonical = {
 					cook = {{ingot}};