diff --git a/nodes.lua b/nodes.lua
index 8d38a22..4c18d2f 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -1824,12 +1824,64 @@ minetest.register_node("too_many_stones:limestone_white_cracked_brick", {
 	groups = {limestone = 1, cracky = 2, white_stone = 1, stone = 1},
 	sounds = too_many_stones.node_sound_stone_defaults(),
 })
+-- Moonstone
+minetest.register_node("too_many_stones:moonstone", {
+	description = S("Moonstone"),
+    use_texture_alpha = "blend",
+	drawtype = "glasslike",
+	tiles = {"tms_moonstone.png"},
+	sunlight_propagates = true,
+	is_ground_content = false,
+	groups = {cracky = 3, blue_stone = 1, stone = 1},
+	sounds = too_many_stones.node_sound_glass_defaults(),
+    paramtype = "light",
+})
+
+minetest.register_node("too_many_stones:moonstone_block", {
+	description = S("Moonstone Block"),
+    use_texture_alpha = "blend",
+	drawtype = "glasslike",
+	tiles = {"tms_moonstone_block.png"},
+	sunlight_propagates = true,
+	is_ground_content = false,
+	groups = {cracky = 3, blue_stone = 1, stone = 1},
+	sounds = too_many_stones.node_sound_glass_defaults(),
+    paramtype = "light",
+})
+
+minetest.register_node("too_many_stones:moonstone_brick", {
+	description = S("Moonstone Brick"),
+    use_texture_alpha = "blend",
+	drawtype = "glasslike",
+	sunlight_propagates = true,
+	paramtype2 = "facedir",
+	place_param2 = 0,
+	tiles = {"tms_moonstone_brick.png"},
+	is_ground_content = false,
+	groups = {cracky = 2, blue_stone = 1, stone = 1},
+	sounds = too_many_stones.node_sound_glass_defaults(),
+    paramtype = "light",
+})
+
+minetest.register_node("too_many_stones:moonstone_cracked_brick", {
+	description = S("Cracked Moonstone Brick"),
+    use_texture_alpha = "blend",
+	drawtype = "glasslike",
+	sunlight_propagates = true,
+	paramtype2 = "facedir",
+	place_param2 = 0,
+	tiles = {"tms_moonstone_cracked_brick.png"},
+	is_ground_content = false,
+	groups = {cracky = 2, blue_stone = 1, stone = 1},
+	sounds = too_many_stones.node_sound_glass_defaults(),
+    paramtype = "light",
+})
 -- Morion Quartz
 minetest.register_node("too_many_stones:morion_quartz", {
 	description = S("Morion Quartz"),
 	tiles = {"tms_morion_quartz.png"},
 	is_ground_content = false,
-	groups = {cracky = 3, white_stone = 1, stone = 1, quartz =1},
+	groups = {cracky = 3, white_stone = 1, stone = 1, quartz = 1},
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
diff --git a/nodes_crystal.lua b/nodes_crystal.lua
index 18b04f6..a276dcf 100644
--- a/nodes_crystal.lua
+++ b/nodes_crystal.lua
@@ -47,7 +47,6 @@ minetest.register_node("too_many_stones:amazonite_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:amazonite_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -63,11 +62,6 @@ minetest.register_node("too_many_stones:amazonite_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:amazonite_shards", {
-    description = S("Amazonite Shards"),
-    inventory_image = "tms_amazonite_shards.png",
-})
-
 -- Amber
 
 minetest.register_abm({
@@ -103,7 +97,6 @@ minetest.register_node("too_many_stones:amber_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:amber_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -119,11 +112,6 @@ minetest.register_node("too_many_stones:amber_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:amber_shards", {
-    description = S("Amber Shards"),
-    inventory_image = "tms_amber_shards.png",
-})
-
 -- Amethyst
 
 minetest.register_abm({
@@ -159,7 +147,6 @@ minetest.register_node("too_many_stones:amethyst_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:amethyst_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -175,11 +162,6 @@ minetest.register_node("too_many_stones:amethyst_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:amethyst_shards", {
-    description = S("Amethyst Shards"),
-    inventory_image = "tms_amethyst_shards.png",
-})
-
 -- Celestine
 
 minetest.register_abm({
@@ -215,7 +197,6 @@ minetest.register_node("too_many_stones:celestine_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:celestine_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -231,11 +212,6 @@ minetest.register_node("too_many_stones:celestine_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:celestine_shards", {
-    description = S("Celestine Shards"),
-    inventory_image = "tms_celestine_shards.png",
-})
-
 -- Citrine
 
 minetest.register_abm({
@@ -271,7 +247,6 @@ minetest.register_node("too_many_stones:citrine_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:citrine_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -287,11 +262,6 @@ minetest.register_node("too_many_stones:citrine_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:citrine_shards", {
-    description = S("Citrine Shards"),
-    inventory_image = "tms_citrine_shards.png",
-})
-
 -- Crocoite
 
 minetest.register_abm({
@@ -326,7 +296,6 @@ minetest.register_node("too_many_stones:crocoite_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:crocoite_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -342,11 +311,6 @@ minetest.register_node("too_many_stones:crocoite_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:crocoite_shards", {
-    description = S("Crocoite Shards"),
-    inventory_image = "tms_crocoite_shards.png",
-})
-
 -- Eudialite
 
 minetest.register_abm({
@@ -381,7 +345,6 @@ minetest.register_node("too_many_stones:eudialite_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:eudialite_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -396,11 +359,6 @@ minetest.register_node("too_many_stones:eudialite_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:eudialite_shards", {
-    description = ("Eudialite Shards"),
-    inventory_image = "tms_eudialite_shards.png",
-})
-
 -- Heliodor
 
 minetest.register_abm({
@@ -436,7 +394,6 @@ minetest.register_node("too_many_stones:heliodor_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:heliodor_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -452,11 +409,6 @@ minetest.register_node("too_many_stones:heliodor_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:heliodor_shards", {
-    description = S("Heliodor Shards"),
-    inventory_image = "tms_heliodor_shards.png",
-})
-
 -- Kyanite
 
 minetest.register_abm({
@@ -492,7 +444,6 @@ minetest.register_node("too_many_stones:kyanite_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:kyanite_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -508,11 +459,6 @@ minetest.register_node("too_many_stones:kyanite_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:kyanite_shards", {
-    description = S("Kyanite Shards"),
-    inventory_image = "tms_kyanite_shards.png",
-})
-
 -- Prasiolite
 
 minetest.register_abm({
@@ -548,7 +494,6 @@ minetest.register_node("too_many_stones:prasiolite_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:prasiolite_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -564,11 +509,6 @@ minetest.register_node("too_many_stones:prasiolite_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:prasiolite_shards", {
-    description = S("Prasiolite Shards"),
-    inventory_image = "tms_prasiolite_shards.png",
-})
-
 -- Morion Quartz
 
 minetest.register_abm({
@@ -604,7 +544,6 @@ minetest.register_node("too_many_stones:morion_quartz_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:morion_quartz_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -620,11 +559,6 @@ minetest.register_node("too_many_stones:morion_quartz_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:morion_quartz_shards", {
-    description = S("Morion Quartz Shards"),
-    inventory_image = "tms_morion_quartz_shards.png",
-})
-
 -- Quartz
 
 minetest.register_abm({
@@ -660,7 +594,6 @@ minetest.register_node("too_many_stones:quartz_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:quartz_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -676,11 +609,6 @@ minetest.register_node("too_many_stones:quartz_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:quartz_shards", {
-    description = S("Quartz Shards"),
-    inventory_image = "tms_quartz_shards.png",
-})
-
 -- Rose Quartz
 
 minetest.register_abm({
@@ -716,7 +644,6 @@ minetest.register_node("too_many_stones:rose_quartz_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:rose_quartz_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -732,11 +659,6 @@ minetest.register_node("too_many_stones:rose_quartz_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:rose_quartz_shards", {
-    description = S("Rose Quartz Shards"),
-    inventory_image = "tms_rose_quartz_shards.png",
-})
-
 -- Smokey Quartz
 
 minetest.register_abm({
@@ -772,7 +694,6 @@ minetest.register_node("too_many_stones:smokey_quartz_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:smokey_quartz_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -788,11 +709,6 @@ minetest.register_node("too_many_stones:smokey_quartz_budding", {
     paramtype = "light",
 })
 
-minetest.register_craftitem("too_many_stones:smokey_quartz_shards", {
-    description = S("Smokey Quartz Shards"),
-    inventory_image = "tms_smokey_quartz_shards.png",
-})
-
 -- Vivianite
 
 minetest.register_abm({
@@ -828,7 +744,6 @@ minetest.register_node("too_many_stones:vivianite_crystal", {
         fixed = {-5/16, -8/16, -5/16, 5/16, 4/16, 5/16},
     },
     groups = {cracky = 3, attached_node = 1},
-	drop = "too_many_stones:vivianite_shards",
 	sounds = too_many_stones.node_sound_glass_defaults(),
 })
 
@@ -843,8 +758,3 @@ minetest.register_node("too_many_stones:vivianite_budding", {
 	sounds = too_many_stones.node_sound_glass_defaults(),
     paramtype = "light",
 })
-
-minetest.register_craftitem("too_many_stones:vivianite_shards", {
-    description = S("Vivianite Shards"),
-    inventory_image = "tms_vivianite_shards.png",
-})