diff --git a/mods/mapgen/init.lua b/mods/mapgen/init.lua
index 9e362858..7b3763d2 100644
--- a/mods/mapgen/init.lua
+++ b/mods/mapgen/init.lua
@@ -1,11 +1,13 @@
 -- Mapgen
 
+dofile(minetest.get_modpath("mapgen").."/ores.lua")
+
 -- Set mapgen mode to v7
 minetest.register_on_mapgen_init(function(params)
 	minetest.set_mapgen_params({
 		mgname = "v7",
 		seed = params.seed,
-		water_level = 0,
+		water_level = -10,
 		flags = "caves",
 	})
 end)
@@ -17,7 +19,7 @@ minetest.register_biome({
 	depth_top = 2,
 	node_bottom = "moontest:stone",
 	node_dust = "air",
-	height_min = -10,
+	height_min = 3,
 	height_max = 30,
 })
 
@@ -30,7 +32,7 @@ minetest.register_biome({
 	depth_filler = 1,
 	node_dust = "air",
 	height_min = -50,
-	height_max = 2,
+	height_max = 5,
 })
 
 -- Lunar Ice Cap Biome
@@ -39,7 +41,7 @@ minetest.register_biome({
 	node_top = "moontest:waterice",
 	depth_top = 4,
 	node_filler = "moontest:dust",
-	depth_filler = 2
+	depth_filler = 2,
 	node_dust = "air",
 	height_min = 25,
 	height_max = 100,
diff --git a/mods/mapgen/ores.lua b/mods/mapgen/ores.lua
new file mode 100644
index 00000000..8d0d1d1c
--- /dev/null
+++ b/mods/mapgen/ores.lua
@@ -0,0 +1,10 @@
+minetest.register_ore({
+    ore_type       = "scatter",
+    ore            = "moontest:lightore",
+    wherein        = "moontest:stone",
+    clust_scarcity = 10*10*10,
+    clust_num_ores = 6,
+    clust_size     = 5,
+    height_min     = -31000,
+    height_max     = 5,
+})
diff --git a/mods/moontest/crafting.lua b/mods/moontest/crafting.lua
index e7df5914..2dc0ff4d 100644
--- a/mods/moontest/crafting.lua
+++ b/mods/moontest/crafting.lua
@@ -9,6 +9,15 @@ minetest.register_craft({
     },
 })
 
+minetest.register_craft({
+    output = "moontest:light",
+    recipe = {
+        {"moontest:light_crystal", "moontest:stone", "moontest:light_crystal"},
+        {"moontest:light_crystal", "default:mese_crystal", "moontest:light_crystal"},
+        {"moontest:light_crystal", "moontest:stone", "moontest:light_crystal"},
+    },
+})
+
 minetest.register_craft({
     output = "moontest:airgen",
     recipe = {
diff --git a/mods/moontest/nodes.lua b/mods/moontest/nodes.lua
index 25d37848..24dc6dc2 100644
--- a/mods/moontest/nodes.lua
+++ b/mods/moontest/nodes.lua
@@ -290,6 +290,24 @@ minetest.register_node("moontest:stonestair", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("moontest:lightore", {
+	description = "Light ore",
+	tiles = {"moontest_stone.png^moontest_light_ore.png"},
+	light_source = 7,
+	groups = {cracky = 3, stone = 1},
+	drop = "moontest:light_crystal",
+})
+
+minetest.register_node("moontest:light", {
+	description = "Light",
+	tiles = {"moontest_light.png"},
+	light_source = 14,
+	groups = {cracky = 3, stone = 1},
+	drop = "moontest:light_crystal",
+})
+
+
+
 -- Items
 
 minetest.register_craftitem("moontest:spacesuit", {
@@ -297,6 +315,11 @@ minetest.register_craftitem("moontest:spacesuit", {
 	inventory_image = "moontest_spacesuit.png",
 })
 
+minetest.register_craftitem("moontest:light_crystal", {
+	description = "Light Cyrstal",
+	inventory_image = "moontest_light_crystal.png",
+})
+
 minetest.register_craftitem("moontest:helmet", {
 	description = "Helmet",
 	inventory_image = "moontest_helmet.png",
diff --git a/mods/moontest/ores.lua b/mods/moontest/ores.lua
new file mode 100644
index 00000000..7854df0b
--- /dev/null
+++ b/mods/moontest/ores.lua
@@ -0,0 +1,9 @@
+minetest.register_node("moontest:lightore", {
+	description = "Lightore",
+	tiles = {"moontest_stone.png^moontest_light_ore.png"},
+	light_source = 7,
+	groups = {cracky = 3, stone = 1},
+	drop = "moontest:light_crystal",
+})
+
+
diff --git a/mods/moontest/readme.md b/mods/moontest/readme.md
new file mode 100644
index 00000000..d156b4ee
--- /dev/null
+++ b/mods/moontest/readme.md
@@ -0,0 +1 @@
+With thanks to Evergreen for the Light Ore texture. (A modified version of the quatz ore from his quatz mod.) CC-BY-SA
diff --git a/mods/moontest/textures/moontest_light.png b/mods/moontest/textures/moontest_light.png
index 43c1444e..847c8154 100644
Binary files a/mods/moontest/textures/moontest_light.png and b/mods/moontest/textures/moontest_light.png differ
diff --git a/mods/moontest/textures/moontest_light_crystal.png b/mods/moontest/textures/moontest_light_crystal.png
new file mode 100644
index 00000000..9a46cc54
Binary files /dev/null and b/mods/moontest/textures/moontest_light_crystal.png differ
diff --git a/mods/moontest/textures/moontest_light_ore.png b/mods/moontest/textures/moontest_light_ore.png
new file mode 100644
index 00000000..faa5bca6
Binary files /dev/null and b/mods/moontest/textures/moontest_light_ore.png differ