diff --git a/mods/jewels/init.lua b/mods/jewels/init.lua
index fc4f0d0..8295d66 100644
--- a/mods/jewels/init.lua
+++ b/mods/jewels/init.lua
@@ -67,15 +67,21 @@ function jewels.register_jewel(toolname, new_toolname, def)
 
 	    if data.stats.maxlevel and cap.maxlevel then
 	       cap.maxlevel = cap.maxlevel + data.stats.maxlevel
-	       desc = desc .. "\nDig level: " .. p(data.stats.maxlevel)
 	    end
 
 	    if data.stats.uses and cap.uses then
 	       cap.uses = cap.uses + data.stats.uses
-	       desc = desc .. "\nUses: " .. p(data.stats.uses)
 	    end
 	 end
-	 desc = desc .. "\nDig speed: " .. p(data.stats.digspeed) .. " seconds"
+
+	 desc = desc .. "\nDig time: " .. p(data.stats.digspeed) .. " seconds"
+      end
+
+      if data.stats.uses then
+	 desc = desc .. "\nUses: " .. p(data.stats.uses)
+      end
+      if data.stats.maxlevel then
+	 desc = desc .. "\nDig level: " .. p(data.stats.maxlevel)
       end
 
       if data.stats.fleshy and new_tooldef.tool_capabilities.damage_groups and new_tooldef.tool_capabilities.damage_groups.fleshy then
@@ -89,15 +95,6 @@ function jewels.register_jewel(toolname, new_toolname, def)
    minetest.register_tool(new_toolname, new_tooldef)
 end
 
-jewels.register_jewel(
-   "default:pick_steel",
-   "jewels:pick_steel_digspeed",
-   {
-      stats = {
-	 fleshy = 2,
-      }
-   })
-
 minetest.register_craftitem(
    "jewels:jewel",
    {
@@ -106,3 +103,4 @@ minetest.register_craftitem(
       stack_max = 10
    })
 
+dofile(minetest.get_modpath("jewels").."/jewels.lua")
\ No newline at end of file
diff --git a/mods/jewels/jewels.lua b/mods/jewels/jewels.lua
new file mode 100644
index 0000000..e299edd
--- /dev/null
+++ b/mods/jewels/jewels.lua
@@ -0,0 +1,332 @@
+--
+-- Jeweled tool defs
+--
+
+-- Pickaxes
+jewels.register_jewel(
+   "default:pick_stone",
+   "jewels:pick_stone_digspeed",
+   {
+      stats = {
+	 digspeed = -0.1,
+      }
+   })
+
+jewels.register_jewel(
+   "default:pick_steel",
+   "jewels:pick_steel_digspeed",
+   {
+      stats = {
+	 digspeed = -0.13,
+      }
+   })
+
+jewels.register_jewel(
+   "default:pick_carbonsteel",
+   "jewels:pick_carbonsteel_digspeed",
+   {
+      stats = {
+	 digspeed = -0.16,
+      }
+   })
+
+jewels.register_jewel(
+   "default:pick_stone",
+   "jewels:pick_stone_damage",
+   {
+      stats = {
+	 fleshy = 1,
+      }
+   })
+
+jewels.register_jewel(
+   "default:pick_steel",
+   "jewels:pick_steel_damage",
+   {
+      stats = {
+	 fleshy = 2,
+      }
+   })
+
+jewels.register_jewel(
+   "default:pick_carbonsteel",
+   "jewels:pick_carbonsteel_damage",
+   {
+      stats = {
+	 fleshy = 3,
+      }
+   })
+
+jewels.register_jewel(
+   "default:pick_stone",
+   "jewels:pick_stone_uses",
+   {
+      stats = {
+	 uses = 3,
+      }
+   })
+
+jewels.register_jewel(
+   "default:pick_steel",
+   "jewels:pick_steel_uses",
+   {
+      stats = {
+	 uses = 5,
+      }
+   })
+
+jewels.register_jewel(
+   "default:pick_carbonsteel",
+   "jewels:pick_carbonsteel_uses",
+   {
+      stats = {
+	 uses = 7,
+      }
+   })
+
+-- Shovels
+jewels.register_jewel(
+   "default:shovel_stone",
+   "jewels:shovel_stone_digspeed",
+   {
+      stats = {
+	 digspeed = -0.12,
+      }
+   })
+
+jewels.register_jewel(
+   "default:shovel_steel",
+   "jewels:shovel_steel_digspeed",
+   {
+      stats = {
+	 digspeed = -0.15,
+      }
+   })
+
+jewels.register_jewel(
+   "default:shovel_carbonsteel",
+   "jewels:shovel_carbonsteel_digspeed",
+   {
+      stats = {
+	 digspeed = -0.17,
+      }
+   })
+
+jewels.register_jewel(
+   "default:shovel_stone",
+   "jewels:shovel_stone_damage",
+   {
+      stats = {
+	 fleshy = 1,
+      }
+   })
+
+jewels.register_jewel(
+   "default:shovel_steel",
+   "jewels:shovel_steel_damage",
+   {
+      stats = {
+	 fleshy = 2,
+      }
+   })
+
+jewels.register_jewel(
+   "default:shovel_carbonsteel",
+   "jewels:shovel_carbonsteel_damage",
+   {
+      stats = {
+	 fleshy = 3,
+      }
+   })
+
+jewels.register_jewel(
+   "default:shovel_stone",
+   "jewels:shovel_stone_uses",
+   {
+      stats = {
+	 uses = 3,
+      }
+   })
+
+jewels.register_jewel(
+   "default:shovel_steel",
+   "jewels:shovel_steel_uses",
+   {
+      stats = {
+	 uses = 5,
+      }
+   })
+
+jewels.register_jewel(
+   "default:shovel_carbonsteel",
+   "jewels:shovel_carbonsteel_uses",
+   {
+      stats = {
+	 uses = 7,
+      }
+   })
+
+-- Axes
+jewels.register_jewel(
+   "default:axe_stone",
+   "jewels:axe_stone_digspeed",
+   {
+      stats = {
+	 digspeed = -0.1,
+      }
+   })
+
+jewels.register_jewel(
+   "default:axe_steel",
+   "jewels:axe_steel_digspeed",
+   {
+      stats = {
+	 digspeed = -0.13,
+      }
+   })
+
+jewels.register_jewel(
+   "default:axe_carbonsteel",
+   "jewels:axe_carbonsteel_digspeed",
+   {
+      stats = {
+	 digspeed = -0.16,
+      }
+   })
+
+jewels.register_jewel(
+   "default:axe_stone",
+   "jewels:axe_stone_damage",
+   {
+      stats = {
+	 fleshy = 2,
+      }
+   })
+
+jewels.register_jewel(
+   "default:axe_steel",
+   "jewels:axe_steel_damage",
+   {
+      stats = {
+	 fleshy = 3,
+      }
+   })
+
+jewels.register_jewel(
+   "default:axe_carbonsteel",
+   "jewels:axe_carbonsteel_damage",
+   {
+      stats = {
+	 fleshy = 4,
+      }
+   })
+
+jewels.register_jewel(
+   "default:axe_stone",
+   "jewels:axe_stone_uses",
+   {
+      stats = {
+	 uses = 3,
+      }
+   })
+
+jewels.register_jewel(
+   "default:axe_steel",
+   "jewels:axe_steel_uses",
+   {
+      stats = {
+	 uses = 5,
+      }
+   })
+
+jewels.register_jewel(
+   "default:axe_carbonsteel",
+   "jewels:axe_carbonsteel_uses",
+   {
+      stats = {
+	 uses = 7,
+      }
+   })
+
+-- Spears
+jewels.register_jewel(
+   "default:spear_stone",
+   "jewels:spear_stone_digspeed",
+   {
+      stats = {
+	 digspeed = -0.1,
+      }
+   })
+
+jewels.register_jewel(
+   "default:spear_steel",
+   "jewels:spear_steel_digspeed",
+   {
+      stats = {
+	 digspeed = -0.13,
+      }
+   })
+
+jewels.register_jewel(
+   "default:spear_carbonsteel",
+   "jewels:spear_carbonsteel_digspeed",
+   {
+      stats = {
+	 digspeed = -0.16,
+      }
+   })
+
+jewels.register_jewel(
+   "default:spear_stone",
+   "jewels:spear_stone_damage",
+   {
+      stats = {
+	 fleshy = 3,
+      }
+   })
+
+jewels.register_jewel(
+   "default:spear_steel",
+   "jewels:spear_steel_damage",
+   {
+      stats = {
+	 fleshy = 5,
+      }
+   })
+
+jewels.register_jewel(
+   "default:spear_carbonsteel",
+   "jewels:spear_carbonsteel_damage",
+   {
+      stats = {
+	 fleshy = 7,
+      }
+   })
+
+jewels.register_jewel(
+   "default:spear_stone",
+   "jewels:spear_stone_uses",
+   {
+      stats = {
+	 uses = 3,
+      }
+   })
+
+jewels.register_jewel(
+   "default:spear_steel",
+   "jewels:spear_steel_uses",
+   {
+      stats = {
+	 uses = 5,
+      }
+   })
+
+jewels.register_jewel(
+   "default:spear_carbonsteel",
+   "jewels:spear_carbonsteel_uses",
+   {
+      stats = {
+	 uses = 7,
+      }
+   })
+