diff --git a/data/textures/sandstone_block.png b/data/textures/sandstone_block.png
deleted file mode 100644
index 3d33f00..0000000
Binary files a/data/textures/sandstone_block.png and /dev/null differ
diff --git a/data/textures/sandstone_brick.png b/data/textures/sandstone_brick.png
deleted file mode 100644
index cb63633..0000000
Binary files a/data/textures/sandstone_brick.png and /dev/null differ
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index bdec90b..27fc861 100644
--- a/src/content_mapnode.cpp
+++ b/src/content_mapnode.cpp
@@ -608,48 +608,87 @@ void content_mapnode_init(bool repeat)
 
 	i = CONTENT_SANDSTONE;
 	f = &content_features(i);
-	f->description = gettext("Sand Stone");
+	f->description = gettext("Sandstone");
 	f->setAllTextures("sandstone.png");
 	f->setInventoryTextureCube("sandstone.png", "sandstone.png", "sandstone.png");
 	f->draw_type = CDT_CUBELIKE;
 	f->is_ground_content = true;
-	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAND)+" 4";
-	f->type = CMT_DIRT;
-	f->dig_time = 1.0;
+	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+	f->type = CMT_STONE;
+	f->dig_time = 0.5;
 	crafting::setSoftBlockRecipe(CONTENT_SAND,CONTENT_SANDSTONE);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
-	content_list_add("decrafting",i,1,0);
 
 	i = CONTENT_SANDSTONE_BRICK;
 	f = &content_features(i);
-	f->description = gettext("Sand Stone Bricks");
-	f->setAllTextures("sandstone_brick.png");
-	f->setInventoryTextureCube("sandstone_brick.png", "sandstone_brick.png", "sandstone_brick.png");
+	f->description = gettext("Sandstone Bricks");
+	f->setAllTextures("sandstone.png^overlay_brick.png");
+	f->setInventoryTextureCube("sandstone.png^overlay_brick.png", "sandstone.png^overlay_brick.png", "sandstone.png^overlay_brick.png");
 	f->draw_type = CDT_CUBELIKE;
 	f->is_ground_content = true;
-	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAND)+" 4";
-	f->type = CMT_DIRT;
-	f->dig_time = 1.0;
+	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+	f->type = CMT_STONE;
+	f->dig_time = 0.5;
 	crafting::setBrickRecipe(CONTENT_SANDSTONE,CONTENT_SANDSTONE_BRICK);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
-	content_list_add("decrafting",i,1,0);
 
 	i = CONTENT_SANDSTONE_BLOCK;
 	f = &content_features(i);
-	f->description = gettext("Sand Stone Blocks");
-	f->setAllTextures("sandstone_block.png");
-	f->setInventoryTextureCube("sandstone_block.png", "sandstone_block.png", "sandstone_block.png");
+	f->description = gettext("Sandstone Blocks");
+	f->setAllTextures("sandstone.png^overlay_block.png");
+	f->setInventoryTextureCube("sandstone.png^overlay_block.png", "sandstone.png^overlay_block.png", "sandstone.png^overlay_block.png");
 	f->draw_type = CDT_CUBELIKE;
 	f->is_ground_content = true;
-	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAND)+" 4";
-	f->type = CMT_DIRT;
-	f->dig_time = 1.0;
+	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+	f->type = CMT_STONE;
+	f->dig_time = 0.5;
 	crafting::setBlockRecipe(CONTENT_SANDSTONE,CONTENT_SANDSTONE_BLOCK);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
-	content_list_add("decrafting",i,1,0);
+
+	i = CONTENT_DESERT_SANDSTONE;
+	f = &content_features(i);
+	f->description = gettext("Desert Sandstone");
+	f->setAllTextures("sandstone_desert.png");
+	f->setInventoryTextureCube("sandstone_desert.png", "sandstone_desert.png", "sandstone_desert.png");
+	f->draw_type = CDT_CUBELIKE;
+	f->is_ground_content = true;
+	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+	f->type = CMT_STONE;
+	f->dig_time = 0.5;
+	crafting::setSoftBlockRecipe(CONTENT_DESERT_SAND,CONTENT_DESERT_SANDSTONE);
+	content_list_add("craftguide",i,1,0);
+	content_list_add("creative",i,1,0);
+
+	i = CONTENT_DESERT_SANDSTONE_BRICK;
+	f = &content_features(i);
+	f->description = gettext("Desert Sandstone Bricks");
+	f->setAllTextures("sandstone_desert.png^overlay_brick.png");
+	f->setInventoryTextureCube("sandstone_desert.png^overlay_brick.png", "sandstone_desert.png^overlay_brick.png", "sandstone_desert.png^overlay_brick.png");
+	f->draw_type = CDT_CUBELIKE;
+	f->is_ground_content = true;
+	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+	f->type = CMT_STONE;
+	f->dig_time = 0.5;
+	crafting::setBrickRecipe(CONTENT_DESERT_SANDSTONE,CONTENT_DESERT_SANDSTONE_BRICK);
+	content_list_add("craftguide",i,1,0);
+	content_list_add("creative",i,1,0);
+
+	i = CONTENT_DESERT_SANDSTONE_BLOCK;
+	f = &content_features(i);
+	f->description = gettext("Desert Sandstone Blocks");
+	f->setAllTextures("sandstone_desert.png^overlay_block.png");
+	f->setInventoryTextureCube("sandstone_desert.png^overlay_block.png", "sandstone_desert.png^overlay_block.png", "sandstone_desert.png^overlay_block.png");
+	f->draw_type = CDT_CUBELIKE;
+	f->is_ground_content = true;
+	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+	f->type = CMT_STONE;
+	f->dig_time = 0.5;
+	crafting::setBlockRecipe(CONTENT_DESERT_SANDSTONE,CONTENT_DESERT_SANDSTONE_BLOCK);
+	content_list_add("craftguide",i,1,0);
+	content_list_add("creative",i,1,0);
 
 	i = CONTENT_CLAY;
 	f = &content_features(i);
diff --git a/src/content_mapnode.h b/src/content_mapnode.h
index 681b25e..b77cc0c 100644
--- a/src/content_mapnode.h
+++ b/src/content_mapnode.h
@@ -130,7 +130,10 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
 #define CONTENT_PINE_BARREL_SEALED 0x049
 #define CONTENT_CLAY_VESSEL 0x04A
 #define CONTENT_CLAY_VESSEL_RAW 0x04B
-// FREE 0x04C-0x07C
+#define CONTENT_DESERT_SANDSTONE 0x04C
+#define CONTENT_DESERT_SANDSTONE_BRICK 0x04D
+#define CONTENT_DESERT_SANDSTONE_BLOCK 0x04E
+// FREE 0x04F-0x07C
 // 0x7D-0x7F reserved values, air, ignore, etc
 #define CONTENT_CHAIR_CENTRE 0x080
 #define CONTENT_CHAIR_ENDL 0x081
diff --git a/src/content_mapnode_plants.cpp b/src/content_mapnode_plants.cpp
index a9dd504..f830575 100644
--- a/src/content_mapnode_plants.cpp
+++ b/src/content_mapnode_plants.cpp
@@ -255,7 +255,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
 	f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1";
 	f->extra_dug_item_rarity = 20;
-	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
+	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
 	f->ondig_special_drop = CONTENT_TRIMMED_LEAVES;
 	f->ondig_special_drop_count = 1;
 	f->ondig_special_tool = TT_SHEAR;
@@ -287,7 +287,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
 	f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1";
 	f->extra_dug_item_rarity = 20;
-	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
+	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
 	f->ondig_special_drop = CONTENT_TRIMMED_LEAVES_AUTUMN;
 	f->ondig_special_drop_count = 1;
 	f->ondig_special_tool = TT_SHEAR;
@@ -319,7 +319,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1";
 	f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1";
 	f->extra_dug_item_rarity = 20;
-	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
+	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
 	f->ondig_special_drop = CONTENT_TRIMMED_LEAVES_WINTER;
 	f->ondig_special_drop_count = 1;
 	f->ondig_special_tool = TT_SHEAR;
@@ -351,7 +351,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1";
 	f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1";
 	f->extra_dug_item_rarity = 20;
-	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
+	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
 	f->ondig_special_drop = CONTENT_TRIMMED_LEAVES_WINTER;
 	f->ondig_special_drop_count = 1;
 	f->ondig_special_tool = TT_SHEAR;
@@ -384,7 +384,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
 	f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLE_SAPLING)+" 1";
 	f->extra_dug_item_rarity = 20;
-	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
+	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
 	f->ondig_special_drop = CONTENT_TRIMMED_APPLE_LEAVES;
 	f->ondig_special_drop_count = 1;
 	f->ondig_special_tool = TT_SHEAR;
@@ -416,7 +416,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
 	f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_JUNGLESAPLING)+" 1";
 	f->extra_dug_item_rarity = 20;
-	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
+	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
 	f->ondig_special_drop = CONTENT_TRIMMED_JUNGLE_LEAVES;
 	f->ondig_special_drop_count = 1;
 	f->ondig_special_tool = TT_SHEAR;
@@ -448,7 +448,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
 	f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CONIFER_SAPLING)+" 1";
 	f->extra_dug_item_rarity = 20;
-	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
+	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 2";
 	f->ondig_special_drop = CONTENT_TRIMMED_CONIFER_LEAVES;
 	f->ondig_special_drop_count = 1;
 	f->ondig_special_tool = TT_SHEAR;