diff --git a/README.md b/README.md
index dfabd27..ed5a176 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,8 @@ Dependencies: Minetest Game or MineClone.
 * [ ] Mind, Life, Body and Soul Stones (Mind = MCL only)
 * [ ] Talisman of Repair (will only work in player inventory, not Alchemical Chests like ProjectE)
 * [ ] Gem of Eternal Density (will only work in player inventory, not Alchemical Chests like ProjectE)
+* [ ] DM/RM blocks can only be broken by correct (or higher) type.
+* [ ] Change energy collector recipes to match ProjectE
 * [ ] Edit wiki:
     * [ ] Achievements?
     * [ ] Divining rods
@@ -97,8 +99,6 @@ Dependencies: Minetest Game or MineClone.
     * [ ] Modify tools page
     * [ ] Klein Stars
     * [ ] Remove page for PESA
-* [ ] DM/RM blocks can only be broken by correct (or higher) type.
-* [ ] Change energy collector recipes to match ProjectE
 
 ## Changelog
 <details><summary>Look at this fancy expanding changelog</summary>
diff --git a/exchangeclone/armor.lua b/exchangeclone/armor.lua
index 7cecbb1..127fc73 100644
--- a/exchangeclone/armor.lua
+++ b/exchangeclone/armor.lua
@@ -255,13 +255,6 @@ else
         preview = get_armor_texture("boots","dark", true),
         groups = {armor_feet = 1, dark_matter_armor = 1, disable_repair = 1, exchangeclone_upgradable = 1, armor_feather = 1}
     })
-    armor:register_armor("exchangeclone:shield_dark_matter", {
-        description = S("Dark Matter Shield"),
-        texture = get_armor_texture("shield","dark"),
-        inventory_image = get_armor_texture("inv_shield","dark"),
-        preview = get_armor_texture("shield","dark", true),
-        groups = {armor_shield = 1, dark_matter_armor = 1, disable_repair = 1, exchangeclone_upgradable = 1}
-    })
     armor:register_armor("exchangeclone:helmet_red_matter", {
         description = S("Red Matter Helmet"),
         texture = get_armor_texture("helmet","red"),
@@ -290,13 +283,6 @@ else
         preview = get_armor_texture("boots","red", true),
         groups = {armor_feet = 1, red_matter_armor = 1, disable_repair = 1, exchangeclone_upgradable = 1}
     })
-    armor:register_armor("exchangeclone:shield_red_matter", {
-        description = S("Red Matter Shield"),
-        texture = get_armor_texture("shield","red"),
-        inventory_image = get_armor_texture("inv_shield","red"),
-        preview = get_armor_texture("shield","red", true),
-        groups = {armor_shield = 1, red_matter_armor = 1, disable_repair = 1, exchangeclone_upgradable = 1}
-    })
     minetest.register_on_player_hpchange(function(player, hp_change, reason)
         if hp_change < 0 then
             local _, armor_inv = armor:get_valid_player(player, "3d_armor")
@@ -374,21 +360,47 @@ minetest.register_craft({
         {r,"",r},
     }
 })
-if minetest.get_modpath("3d_armor") then
-    minetest.register_craft({
-        output = "exchangeclone:shield_dark_matter",
+
+if exchangeclone.mtg then
+    minetest.register_tool("exchangeclone:dark_matter_shield", {
+        description = "Dark Matter Shield (deprecated)\nYou still have this so you can turn it into energy.",
+        wield_image = get_armor_texture("shield", "dark"),
+        inventory_image = get_armor_texture("shield", "dark"),
+        groups = {disable_repair = 1, not_in_creative_inventory = 1}
+    })
+    exchangeclone.register_craft({
+        output = "exchangeclone:dark_matter_shield",
+        type = "shapeless",
         recipe = {
-            {d,d,d},
-            {d,d,d},
-            {"",d,""},
+            "exchangeclone:dark_matter",
+            "exchangeclone:dark_matter",
+            "exchangeclone:dark_matter",
+            "exchangeclone:dark_matter",
+            "exchangeclone:dark_matter",
+            "exchangeclone:dark_matter",
+            "exchangeclone:dark_matter",
+            "exchangeclone:dark_matter"
         }
     })
-    minetest.register_craft({
-        output = "exchangeclone:shield_red_matter",
+
+    minetest.register_tool("exchangeclone:red_matter_shield", {
+        description = "Red Matter Shield (deprecated)\nYou still have this so you can turn it into energy.",
+        wield_image = get_armor_texture("shield", "red"),
+        inventory_image = get_armor_texture("shield", "red"),
+        groups = {disable_repair = 1, not_in_creative_inventory = 1}
+    })
+    exchangeclone.register_craft({
+        output = "exchangeclone:red_matter_shield",
+        type = "shapeless",
         recipe = {
-            {r,r,r},
-            {r,r,r},
-            {"exchangeclone:shield_dark_matter",r,""},
+            "exchangeclone:dark_matter_shield",
+            "exchangeclone:red_matter",
+            "exchangeclone:red_matter",
+            "exchangeclone:red_matter",
+            "exchangeclone:red_matter",
+            "exchangeclone:red_matter",
+            "exchangeclone:red_matter",
+            "exchangeclone:red_matter"
         }
     })
 end
\ No newline at end of file