diff --git a/illuna_aestival/src/armor.lua b/illuna_aestival/src/armor.lua
index 4667539..0b3445b 100644
--- a/illuna_aestival/src/armor.lua
+++ b/illuna_aestival/src/armor.lua
@@ -1,30 +1,30 @@
 minetest.override_item("nether_mobs:dragon_helmet", {
-    groups = {armor_head=1, armor_heal=15, armor_use=350, armor_fire=1},
+    groups = {armor_head=1, armor_heal=15, armor_use=100, armor_fire=1},
     armor_groups = {fleshy=18},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("nether_mobs:dragon_chestplate", {
-    groups = {armor_torso=1, armor_heal=15, armor_use=350, armor_fire=1},
+    groups = {armor_torso=1, armor_heal=15, armor_use=100, armor_fire=1},
     armor_groups = {fleshy=23},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("nether_mobs:dragon_leggings", {
-    groups = {armor_legs=1, armor_heal=15, armor_use=350, armor_fire=1},
+    groups = {armor_legs=1, armor_heal=15, armor_use=100, armor_fire=1},
     armor_groups = {fleshy=23},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("nether_mobs:dragon_boots", {
-    groups = {armor_feet=1, armor_heal=15, armor_use=350, armor_fire=1,
+    groups = {armor_feet=1, armor_heal=15, armor_use=100, armor_fire=1,
         physics_speed=1, physics_jump=0.5},
     armor_groups = {fleshy=17}, -- not 18 to prevent level=100 (already give speed)
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("nether_mobs:dragon_shield", {
-    groups = {armor_shield=1, armor_heal=15, armor_use=350},
+    groups = {armor_shield=1, armor_heal=15, armor_use=100, armor_fire=2},
     armor_groups = {fleshy=18},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
@@ -32,31 +32,31 @@ minetest.override_item("nether_mobs:dragon_shield", {
 -- [[ ... ]] --
 
 minetest.override_item("3d_armor:helmet_mithril", {
-    groups = {armor_head=1, armor_heal=14, armor_use=200},
+    groups = {armor_head=1, armor_heal=14, armor_use=66},
     armor_groups = {fleshy=17},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("3d_armor:chestplate_mithril", {
-    groups = {armor_torso=1, armor_heal=14, armor_use=200},
+    groups = {armor_torso=1, armor_heal=14, armor_use=66},
     armor_groups = {fleshy=22},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("3d_armor:leggings_mithril", {
-    groups = {armor_legs=1, armor_heal=14, armor_use=200},
+    groups = {armor_legs=1, armor_heal=14, armor_use=66},
     armor_groups = {fleshy=22},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("3d_armor:boots_mithril", {
-    groups = {armor_feet=1, armor_heal=14, armor_use=200},
+    groups = {armor_feet=1, armor_heal=14, armor_use=66},
     armor_groups = {fleshy=17},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("shields:shield_mithril", {
-    groups = {armor_shield=1, armor_heal=14, armor_use=200},
+    groups = {armor_shield=1, armor_heal=14, armor_use=66},
     armor_groups = {fleshy=17},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
@@ -92,3 +92,35 @@ minetest.override_item("obsidianstuff:shield", {
     armor_groups = {fleshy=16},
     damage_groups = {cracky=2, snappy=1, choppy=1, level=3},
 })
+
+-- [[ ... ]] --
+
+minetest.override_item("3d_armor:helmet_nether", {
+    groups = {armor_head=1, armor_heal=13, armor_use=200, armor_fire=1},
+    armor_groups = {fleshy=16},
+    damage_groups = {cracky=2, snappy=1, level=3},
+})
+
+minetest.override_item("3d_armor:chestplate_nether", {
+    groups = {armor_torso=1, armor_heal=13, armor_use=200, armor_fire=1},
+    armor_groups = {fleshy=21},
+    damage_groups = {cracky=2, snappy=1, level=3},
+})
+
+minetest.override_item("3d_armor:leggings_nether", {
+    groups = {armor_legs=1, armor_heal=13, armor_use=200, armor_fire=1},
+    armor_groups = {fleshy=21},
+    damage_groups = {cracky=2, snappy=1, level=3},
+})
+
+minetest.override_item("3d_armor:boots_nether", {
+    groups = {armor_feet=1, armor_heal=13, armor_use=200, armor_fire=1},
+    armor_groups = {fleshy=16},
+    damage_groups = {cracky=2, snappy=1, level=3},
+})
+
+minetest.override_item("shields:shield_nether", {
+    groups = {armor_shield=1, armor_heal=13, armor_use=200, armor_fire=1},
+    armor_groups = {fleshy=16},
+    damage_groups = {cracky=2, snappy=1, level=3},
+})
diff --git a/illuna_aestival/src/tools.lua b/illuna_aestival/src/tools.lua
index 8e440d8..578db3c 100644
--- a/illuna_aestival/src/tools.lua
+++ b/illuna_aestival/src/tools.lua
@@ -71,64 +71,48 @@ minetest.override_item("sickles:scythe_steel", {
 	groups = { scythe = 2, scythe_uses = 140 },
 })
 
--- FIXME - TMP - these should only be overrides!
-minetest.register_tool(":nether:pick_nether", {
-	description = "Nether Pickaxe",
-	inventory_image = "nether_tool_netherpick.png",
+--Nether tools
+
+minetest.override_item("nether:pick_nether", {
 	tool_capabilities = {
 		full_punch_interval = 0.5,
 		max_drop_level=3,
 		groupcaps={
-		cracky = {times={[1]=1.80, [2]=0.8, [3]=0.4}, uses=200, maxlevel=3},
-			},
-		damage_groups = {fleshy=7},
+			cracky = {times={[1]=1.80, [2]=0.8, [3]=0.4}, uses=50, maxlevel=3},
 		},
-	sound = {breaks = "default_tool_breaks"},
-	groups = {pickaxe = 1},
+		damage_groups = {fleshy=7},
+	},
 })
 
-minetest.register_tool(":nether:shovel_nether", {
-	description = "Nether Shovel",
-	inventory_image = "nether_tool_nethershovel.png",
-	wield_image = "nether_tool_nethershovel.png^[transformR90",
+minetest.override_item("nether:shovel_nether", {
 	tool_capabilities = {
 		full_punch_interval = 0.9,
 		max_drop_level=3,
 		groupcaps={
-			crumbly = {times={[1]=1.0, [2]=0.4, [3]=0.25}, uses=200, maxlevel=3},
+			crumbly = {times={[1]=1.0, [2]=0.4, [3]=0.25}, uses=50, maxlevel=3},
 		},
 		damage_groups = {fleshy=5},
 	},
-	sound = {breaks = "default_tool_breaks"},
-	groups = {shovel = 1},
 })
 
-minetest.register_tool(":nether:axe_nether", {
-	description = "Nether Axe",
-	inventory_image = "nether_tool_netheraxe.png",
+minetest.override_item("nether:axe_nether", {
 	tool_capabilities = {
 		full_punch_interval = 0.7,
 		max_drop_level=1,
 		groupcaps={
-			choppy={times={[1]=1.9, [2]=0.7, [3]=0.4}, uses=200, maxlevel=3},
+			choppy={times={[1]=1.9, [2]=0.7, [3]=0.4}, uses=50, maxlevel=3},
 		},
 		damage_groups = {fleshy=8},
 	},
-	sound = {breaks = "default_tool_breaks"},
-	groups = {axe = 1},
 })
 
-minetest.register_tool(":nether:sword_nether", {
-	description = "Nether Sword",
-	inventory_image = "nether_tool_nethersword.png",
+minetest.override_item("nether:sword_nether", {
 	tool_capabilities = {
 		full_punch_interval = 0.5,
 		max_drop_level=1,
 		groupcaps={
-			snappy={times={[1]=1.5, [2]=0.6, [3]=0.2}, uses=200, maxlevel=3},
+			snappy={times={[1]=1.5, [2]=0.6, [3]=0.2}, uses=100, maxlevel=3},
 		},
 		damage_groups = {fleshy=15},
 	},
-	sound = {breaks = "default_tool_breaks"},
-	groups = {sword = 1},
 })