diff --git a/mods/mapgen/ores.lua b/mods/mapgen/ores.lua
index 8d0d1d1c..ebedcb5c 100644
--- a/mods/mapgen/ores.lua
+++ b/mods/mapgen/ores.lua
@@ -8,3 +8,143 @@ minetest.register_ore({
     height_min     = -31000,
     height_max     = 5,
 })
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "moontest:phosphorusore",
+	wherein        = "moontest:stone",
+	clust_scarcity = 8*8*8,
+	clust_num_ores = 8,
+	clust_size     = 3,
+	height_min     = -31000,
+	height_max     = 64,
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "moontest:phosphorusore",
+	wherein        = "moontest:stone",
+	clust_scarcity = 9*9*9,
+	clust_num_ores = 27,
+	clust_size     = 6,
+	height_min     = -31000,
+	height_max     = 0,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_iron",
+	wherein        = "moontest:stone",
+	clust_scarcity = 7*7*7,
+	clust_num_ores = 5,
+	clust_size     = 3,
+	height_min     = -63,
+	height_max     = -16,
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_iron",
+	wherein        = "moontest:stone",
+	clust_scarcity = 6*6*6,
+	clust_num_ores = 5,
+	clust_size     = 3,
+	height_min     = -31000,
+	height_max     = -64,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_iron",
+	wherein        = "moontest:stone",
+	clust_scarcity = 9*9*9,
+	clust_num_ores = 27,
+	clust_size     = 6,
+	height_min     = -31000,
+	height_max     = -64,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_mese",
+	wherein        = "moontest:stone",
+	clust_scarcity = 18*18*18,
+	clust_num_ores = 3,
+	clust_size     = 2,
+	height_min     = -255,
+	height_max     = -64,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_mese",
+	wherein        = "moontest:stone",
+	clust_scarcity = 14*14*14,
+	clust_num_ores = 5,
+	clust_size     = 3,
+	height_min     = -31000,
+	height_max     = -256,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:mese",
+	wherein        = "moontest:stone",
+	clust_scarcity = 36*36*36,
+	clust_num_ores = 3,
+	clust_size     = 2,
+	height_min     = -31000,
+	height_max     = -1024,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "moontest:titaniumore",
+	wherein        = "moontest:stone",
+	clust_scarcity = 12*12*12,
+	clust_num_ores = 4,
+	clust_size     = 3,
+	height_min     = -63,
+	height_max     = -16,
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:titaniumore",
+	wherein        = "moontest:stone",
+	clust_scarcity = 9*9*9,
+	clust_num_ores = 5,
+	clust_size     = 3,
+	height_min     = -31000,
+	height_max     = -64,
+	flags          = "absheight",
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "moontest:siliconore",
+	wherein        = "moontest:stone",
+	clust_scarcity = 11*11*11,
+	clust_num_ores = 4,
+	clust_size     = 3,
+	height_min     = -63,
+	height_max     = -16,
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:siliconore",
+	wherein        = "moontest:stone",
+	clust_scarcity = 10*10*10,
+	clust_num_ores = 5,
+	clust_size     = 3,
+	height_min     = -31000,
+	height_max     = -64,
+	flags          = "absheight",
+})
diff --git a/mods/moontest/crafting.lua b/mods/moontest/crafting.lua
index 1cdb87b2..e497d89a 100644
--- a/mods/moontest/crafting.lua
+++ b/mods/moontest/crafting.lua
@@ -143,8 +143,20 @@ minetest.register_craft({
 	recipe = "moontest:dust",
 })
 
+minetest.register_craft({
+	type = "cooking",
+	output = "moontest:titanium_ingot",
+	recipe = "moontest:titanium_lump",
+})
+
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:mese_crystal",
 	burntime = 50,
 })
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "moontest:phosphorus_lump",
+	burntime = 50,
+})
diff --git a/mods/moontest/nodes.lua b/mods/moontest/nodes.lua
index 90dd1ad3..0f8c1db5 100644
--- a/mods/moontest/nodes.lua
+++ b/mods/moontest/nodes.lua
@@ -298,6 +298,45 @@ minetest.register_node("moontest:lightore", {
 	drop = "moontest:light_crystal",
 })
 
+minetest.register_node("moontest:phosphorusore", {
+	description = "Phosphorus Ore",
+	tiles = {"moontest_stone.png^moontest_mineral_phosphorus.png"},
+	groups = {cracky = 3, stone = 1},
+	drop = "moontest:phosphorus_lump",
+})
+
+minetest.register_node("moontest:siliconore", {
+	description = "Silicon ore",
+	tiles = {"moontest_stone.png^moontest_mineral_silicon.png"},
+	groups = {cracky = 3, stone = 1},
+	drop = "mesecons_materials:silicon",
+})
+
+minetest.register_node("moontest:titaniumore", {
+	description = "Titanium ore",
+	tiles = {"moontest_stone.png^moontest_mineral_titanium.png"},
+	groups = {cracky = 2, stone = 1},
+	drop = "moontest:titanium_lump",
+})
+
+minetest.register_node(":default:stone_with_iron", {
+	description = "Iron Ore",
+	tiles = {"moontest_stone.png^default_mineral_iron.png"},
+	is_ground_content = true,
+	groups = {cracky=2, stone = 1},
+	drop = 'default:iron_lump',
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node(":default:stone_with_mese", {
+	description = "Mese Ore",
+	tiles = {"moontest_stone.png^default_mineral_mese.png"},
+	is_ground_content = true,
+	groups = {cracky=1, stone = 1},
+	drop = "default:mese_crystal",
+	sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("moontest:light", {
 	description = "Light",
 	tiles = {"moontest_light.png"},
@@ -348,6 +387,21 @@ minetest.register_craftitem("moontest:light_crystal", {
 	inventory_image = "moontest_light_crystal.png",
 })
 
+minetest.register_craftitem("moontest:phosphorus_lump", {
+	description = "Phosphorus Lump",
+	inventory_image = "moontest_phosphorus_lump.png",
+})
+
+minetest.register_craftitem("moontest:titanium_lump", {
+	description = "Titanium Lump",
+	inventory_image = "moontest_titanium_lump.png",
+})
+
+minetest.register_craftitem("moontest:titanium_ingot", {
+	description = "Titanium Ingot",
+	inventory_image = "moontest_titanium_ingot.png",
+})
+
 minetest.register_craftitem("moontest:helmet", {
 	description = "Helmet",
 	inventory_image = "moontest_helmet.png",
diff --git a/mods/moontest/textures/default_torch_animated.png b/mods/moontest/textures/default_torch_animated.png
deleted file mode 100644
index 1622eec0..00000000
Binary files a/mods/moontest/textures/default_torch_animated.png and /dev/null differ
diff --git a/mods/moontest/textures/default_torch_on_ceiling_animated.png b/mods/moontest/textures/default_torch_on_ceiling_animated.png
deleted file mode 100644
index 76b25f4b..00000000
Binary files a/mods/moontest/textures/default_torch_on_ceiling_animated.png and /dev/null differ
diff --git a/mods/moontest/textures/default_torch_on_floor_animated.png b/mods/moontest/textures/default_torch_on_floor_animated.png
deleted file mode 100644
index 1a66bcd1..00000000
Binary files a/mods/moontest/textures/default_torch_on_floor_animated.png and /dev/null differ
diff --git a/mods/moontest/textures/moontest_mineral_phosphorus.png b/mods/moontest/textures/moontest_mineral_phosphorus.png
new file mode 100644
index 00000000..537d2a81
Binary files /dev/null and b/mods/moontest/textures/moontest_mineral_phosphorus.png differ
diff --git a/mods/moontest/textures/moontest_mineral_silicon.png b/mods/moontest/textures/moontest_mineral_silicon.png
new file mode 100644
index 00000000..920e5d6d
Binary files /dev/null and b/mods/moontest/textures/moontest_mineral_silicon.png differ
diff --git a/mods/moontest/textures/moontest_mineral_titanium.png b/mods/moontest/textures/moontest_mineral_titanium.png
new file mode 100644
index 00000000..5ba82ee5
Binary files /dev/null and b/mods/moontest/textures/moontest_mineral_titanium.png differ
diff --git a/mods/moontest/textures/moontest_phosphorus_lump.png b/mods/moontest/textures/moontest_phosphorus_lump.png
new file mode 100644
index 00000000..cb3e093d
Binary files /dev/null and b/mods/moontest/textures/moontest_phosphorus_lump.png differ
diff --git a/mods/moontest/textures/moontest_titanium_ingot.png b/mods/moontest/textures/moontest_titanium_ingot.png
new file mode 100644
index 00000000..220c1a9f
Binary files /dev/null and b/mods/moontest/textures/moontest_titanium_ingot.png differ
diff --git a/mods/moontest/textures/moontest_titanium_lump.png b/mods/moontest/textures/moontest_titanium_lump.png
new file mode 100644
index 00000000..21f5a596
Binary files /dev/null and b/mods/moontest/textures/moontest_titanium_lump.png differ