diff --git a/mods/default/functions.lua b/mods/default/functions.lua
index 9c26c990f..d6072a756 100644
--- a/mods/default/functions.lua
+++ b/mods/default/functions.lua
@@ -898,11 +898,11 @@ minetest.register_abm({
 ------------------------
 function AddGlass(desc, recipeitem, color)
 
-	minetest.register_node("default:glass"..color, {
+	minetest.register_node("default:glass_"..color, {
 		description = desc,
 		drawtype = "glasslike",
-		tile_images = {"xpanes_pane_glass"..color..".png"},
-		inventory_image = minetest.inventorycube("xpanes_pane_glass"..color..".png"),
+		tile_images = {"xpanes_pane_glass_"..color..".png"},
+		inventory_image = minetest.inventorycube("xpanes_pane_glass_"..color..".png"),
 		paramtype = "light",
 		use_texture_alpha = true,
 		stack_max = 64,
@@ -912,9 +912,11 @@ function AddGlass(desc, recipeitem, color)
 	})
 	
 	minetest.register_craft({
-		output = 'default:glass_'..color..'',
+		output = 'default:glass_'..color..' 8',
 		recipe = {
-			{'default:glass', 'group:dye,'..recipeitem}
+			{'default:glass','default:glass','default:glass'},
+			{'default:glass','group:dye,'..recipeitem,'default:glass'},
+			{'default:glass','default:glass','default:glass'},
 		}
 	})
 end
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 7f6520eda..807a03fbf 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -818,22 +818,22 @@ minetest.register_node("default:glass", {
 })
 
 ---- colored glass
-AddGlass( "Red Glass",  "basecolor_red", "_red")
-AddGlass( "Green Glass",  "unicolor_dark_green", "_green")
-AddGlass( "Blue Glass",  "basecolor_blue", "_blue")
-AddGlass( "Light Blue Glass",  "basecolor_cyan", "_light_blue")
-AddGlass( "Black Glass",  "basecolor_black", "_black")
-AddGlass( "White Glass",  "basecolor_white", "_white")
-AddGlass( "Yellow Glass",  "basecolor_yellow", "_yellow")
-AddGlass( "Brown Glass",  "unicolor_dark_orange", "_brown")
-AddGlass( "Orange Glass",  "excolor_orange", "_orange")
-AddGlass( "Pink Glass",  "unicolor_light_red", "_pink")
-AddGlass( "Gray Glass",  "unicolor_darkgrey", "_gray")
-AddGlass( "Lime Glass",  "basecolor_green", "_lime")
-AddGlass( "Light Gray Glass",  "basecolor_grey", "_silver")
-AddGlass( "Magenta Glass",  "basecolor_magenta", "_magenta")
-AddGlass( "Purple Glass",  "excolor_violet", "_purple")
-AddGlass( "Cyan Glass",  "basecolor_cyan", "_cyan")
+AddGlass( "Red Stained Glass",  "basecolor_red", "red")
+AddGlass( "Green Stained Glass",  "unicolor_dark_green", "green")
+AddGlass( "Blue Stained Glass",  "basecolor_blue", "blue")
+AddGlass( "Light Blue Stained Glass",  "basecolor_cyan", "light_blue")
+AddGlass( "Black Stained Glass",  "basecolor_black", "black")
+AddGlass( "White Stained Glass",  "basecolor_white", "white")
+AddGlass( "Yellow Stained Glass",  "basecolor_yellow", "yellow")
+AddGlass( "Brown Stained Glass",  "unicolor_dark_orange", "brown")
+AddGlass( "Orange Stained Glass",  "excolor_orange", "orange")
+AddGlass( "Pink Stained Glass",  "unicolor_light_red", "pink")
+AddGlass( "Gray Stained Glass",  "unicolor_darkgrey", "gray")
+AddGlass( "Lime Stained Glass",  "basecolor_green", "lime")
+AddGlass( "Light Gray Stained Glass",  "basecolor_grey", "silver")
+AddGlass( "Magenta Stained Glass",  "basecolor_magenta", "magenta")
+AddGlass( "Purple Stained Glass",  "excolor_violet", "purple")
+AddGlass( "Cyan Stained Glass",  "basecolor_cyan", "cyan")
 
 minetest.register_node("default:rail", {
 	description = "Rail",