diff --git a/init.lua b/init.lua
index 4e26274..fa029e3 100644
--- a/init.lua
+++ b/init.lua
@@ -30,41 +30,6 @@ dofile(minetest.get_modpath("awards").."/unified_inventory.lua")
 dofile(minetest.get_modpath("awards").."/triggers.lua")
 awards.set_intllib(S)
 
--- Light it up
-awards.register_achievement("award_lightitup",{
-	title = S("Light It Up"),
-	description = S("Place 100 torches."),
-	icon = "awards_novicebuilder.png^awards_level1.png",
-	trigger = {
-		type = "place",
-		node = "default:torch",
-		target = 100
-	}
-})
-
--- Light ALL the things!
-awards.register_achievement("award_well_lit",{
-	title = S("Well Lit"),
-	description = S("Place 1,000 torches."),
-	icon = "awards_novicebuilder.png^awards_level2.png",
-	trigger = {
-		type = "place",
-		node = "default:torch",
-		target = 1000
-	}
-})
-
-awards.register_achievement("award_meselamp",{
-	title = S("Really Well Lit"),
-	description = S("Craft 10 mese lamps."),
-	icon = "default_meselamp.png",
-	trigger = {
-		type = "craft",
-		item = "default:meselamp",
-		target = 10
-	}
-})
-
 -- Saint-Maclou
 if minetest.get_modpath("moreblocks") then
 	awards.register_achievement("award_saint_maclou",{
@@ -142,391 +107,596 @@ if minetest.get_modpath("fire") then
 	end
 end
 
-awards.register_achievement("awards_stonebrick", {
-	title = S("Outpost"),
-	description = S("Craft 200 stone bricks."),
-	icon = "default_stone_brick.png^awards_level1.png",
-	trigger = {
-		type = "craft",
-		item = "default:stonebrick",
-		target = 200
-	}
-})
+if minetest.get_modpath("default") then
+	-- Light it up
+	awards.register_achievement("award_lightitup",{
+		title = S("Light It Up"),
+		description = S("Place 100 torches."),
+		icon = "awards_novicebuilder.png^awards_level1.png",
+		trigger = {
+			type = "place",
+			node = "default:torch",
+			target = 100
+		}
+	})
 
-awards.register_achievement("awards_stonebrick2", {
-	title = S("Watchtower"),
-	description = S("Craft 800 stone bricks."),
-	icon = "default_stone_brick.png^awards_level2.png",
-	trigger = {
-		type = "craft",
-		item = "default:stonebrick",
-		target = 800
-	}
-})
+	-- Light ALL the things!
+	awards.register_achievement("award_well_lit",{
+		title = S("Well Lit"),
+		description = S("Place 1,000 torches."),
+		icon = "awards_novicebuilder.png^awards_level2.png",
+		trigger = {
+			type = "place",
+			node = "default:torch",
+			target = 1000
+		}
+	})
 
-awards.register_achievement("awards_stonebrick3", {
-	title = S("Fortress"),
-	description = S("Craft 3,200 stone bricks."),
-	icon = "default_stone_brick.png^awards_level3.png",
-	trigger = {
-		type = "craft",
-		item = "default:stonebrick",
-		target = 3200
-	}
-})
+	awards.register_achievement("award_meselamp",{
+		title = S("Really Well Lit"),
+		description = S("Craft 10 mese lamps."),
+		icon = "default_meselamp.png",
+		trigger = {
+			type = "craft",
+			item = "default:meselamp",
+			target = 10
+		}
+	})
 
-awards.register_achievement("awards_desert_stonebrick", {
-	title = S("Desert Dweller"),
-	description = S("Craft 400 desert stone bricks."),
-	icon = "default_desert_stone_brick.png",
-	trigger = {
-		type = "craft",
-		item = "default:desert_stonebrick",
-		target = 400
-	}
-})
+	awards.register_achievement("awards_stonebrick", {
+		title = S("Outpost"),
+		description = S("Craft 200 stone bricks."),
+		icon = "default_stone_brick.png^awards_level1.png",
+		trigger = {
+			type = "craft",
+			item = "default:stonebrick",
+			target = 200
+		}
+	})
 
-awards.register_achievement("awards_desertstonebrick", {
-	title = S("Pharaoh"),
-	description = S("Craft 100 sandstone bricks."),
-	icon = "default_sandstone_brick.png",
-	trigger = {
-		type = "craft",
-		item = "default:sandstonebrick",
-		target = 100
-	}
-})
+	awards.register_achievement("awards_stonebrick2", {
+		title = S("Watchtower"),
+		description = S("Craft 800 stone bricks."),
+		icon = "default_stone_brick.png^awards_level2.png",
+		trigger = {
+			type = "craft",
+			item = "default:stonebrick",
+			target = 800
+		}
+	})
 
-awards.register_achievement("awards_bookshelf", {
-	title = S("Little Library"),
-	description = S("Craft 7 bookshelves."),
-	icon = "default_bookshelf.png",
-	trigger = {
-		type = "craft",
-		item = "default:bookshelf",
-		target = 7
-	}
-})
+	awards.register_achievement("awards_stonebrick3", {
+		title = S("Fortress"),
+		description = S("Craft 3,200 stone bricks."),
+		icon = "default_stone_brick.png^awards_level3.png",
+		trigger = {
+			type = "craft",
+			item = "default:stonebrick",
+			target = 3200
+		}
+	})
 
-awards.register_achievement("awards_obsidian", {
-	title = S("Lava and Water"),
-	description = S("Mine your first obsidian."),
-	icon = "default_obsidian.png^awards_level1.png",
-	background = "awards_bg_mining.png",
-	trigger = {
-		type = "dig",
-		node = "default:obsidian",
-		target = 1
-	}
-})
+	awards.register_achievement("awards_desert_stonebrick", {
+		title = S("Desert Dweller"),
+		description = S("Craft 400 desert stone bricks."),
+		icon = "default_desert_stone_brick.png",
+		trigger = {
+			type = "craft",
+			item = "default:desert_stonebrick",
+			target = 400
+		}
+	})
 
--- Obsessed with Obsidian
-awards.register_achievement("award_obsessed_with_obsidian",{
-	title = S("Obsessed with Obsidian"),
-	description = S("Mine 50 obsidian."),
-	icon = "default_obsidian.png^awards_level2.png",
-	background = "awards_bg_mining.png",
-	trigger = {
-		type = "dig",
-		node = "default:obsidian",
-		target = 50
-	}
-})
+	awards.register_achievement("awards_desertstonebrick", {
+		title = S("Pharaoh"),
+		description = S("Craft 100 sandstone bricks."),
+		icon = "default_sandstone_brick.png",
+		trigger = {
+			type = "craft",
+			item = "default:sandstonebrick",
+			target = 100
+		}
+	})
 
--- Proof that player has found lava
-awards.register_achievement("award_lavaminer",{
-	title = S("Lava Miner"),
-	description = S("Mine any block while being very close to lava."),
-	background = "awards_bg_mining.png",
-	icon = "default_lava.png",
-})
-awards.register_on_dig(function(player,data)
-	local pos = player:getpos()
-	if pos and (minetest.find_node_near(pos, 1, "default:lava_source") ~= nil or
-	minetest.find_node_near(pos, 1, "default:lava_flowing") ~= nil) then
-		return "award_lavaminer"
-	end
-	return nil
-end)
+	awards.register_achievement("awards_bookshelf", {
+		title = S("Little Library"),
+		description = S("Craft 7 bookshelves."),
+		icon = "default_bookshelf.png",
+		trigger = {
+			type = "craft",
+			item = "default:bookshelf",
+			target = 7
+		}
+	})
 
--- On the way
-awards.register_achievement("award_on_the_way", {
-	title = S("On The Way"),
-	description = S("Place 100 rails."),
-	icon = "default_rail.png",
-	trigger = {
-		type = "place",
-		node = "default:rail",
-		target = 100
-	}
-})
+	awards.register_achievement("awards_obsidian", {
+		title = S("Lava and Water"),
+		description = S("Mine your first obsidian."),
+		icon = "default_obsidian.png^awards_level1.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:obsidian",
+			target = 1
+		}
+	})
 
-awards.register_achievement("award_lumberjack_firstday", {
-	title = S("First Day in the Woods"),
-	description = S("Dig 6 tree blocks."),
-	icon = "default_tree.png^awards_level1.png",
-	trigger = {
-		type = "dig",
-		node = "default:tree",
-		target = 6
-	}
-})
+	-- Obsessed with Obsidian
+	awards.register_achievement("award_obsessed_with_obsidian",{
+		title = S("Obsessed with Obsidian"),
+		description = S("Mine 50 obsidian."),
+		icon = "default_obsidian.png^awards_level2.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:obsidian",
+			target = 50
+		}
+	})
 
--- Lumberjack
-awards.register_achievement("award_lumberjack", {
-	title = S("Lumberjack"),
-	description = S("Dig 36 tree blocks."),
-	icon = "default_tree.png^awards_level2.png",
-	trigger = {
-		type = "dig",
-		node = "default:tree",
-		target = 36
-	}
-})
+	-- Proof that player has found lava
+	awards.register_achievement("award_lavaminer",{
+		title = S("Lava Miner"),
+		description = S("Mine any block while being very close to lava."),
+		background = "awards_bg_mining.png",
+		icon = "default_lava.png",
+	})
+	awards.register_on_dig(function(player,data)
+		local pos = player:getpos()
+		if pos and (minetest.find_node_near(pos, 1, "default:lava_source") ~= nil or
+		minetest.find_node_near(pos, 1, "default:lava_flowing") ~= nil) then
+			return "award_lavaminer"
+		end
+		return nil
+	end)
 
--- Semi-pro Lumberjack
-awards.register_achievement("award_lumberjack_semipro", {
-	title = S("Semi-pro Lumberjack"),
-	description = S("Dig 216 tree blocks."),
-	icon = "default_tree.png^awards_level3.png",
-	trigger = {
-		type = "dig",
-		node = "default:tree",
-		target = 216
-	}
-})
+	-- On the way
+	awards.register_achievement("award_on_the_way", {
+		title = S("On The Way"),
+		description = S("Place 100 rails."),
+		icon = "default_rail.png",
+		trigger = {
+			type = "place",
+			node = "default:rail",
+			target = 100
+		}
+	})
 
--- Professional Lumberjack
-awards.register_achievement("award_lumberjack_professional", {
-	title = S("Professional Lumberjack"),
-	description = S("Dig 1,296 tree blocks."),
-	icon = "default_tree.png^awards_level4.png",
-	trigger = {
-		type = "dig",
-		node = "default:tree",
-		target = 1296
-	}
-})
+	awards.register_achievement("award_lumberjack_firstday", {
+		title = S("First Day in the Woods"),
+		description = S("Dig 6 tree blocks."),
+		icon = "default_tree.png^awards_level1.png",
+		trigger = {
+			type = "dig",
+			node = "default:tree",
+			target = 6
+		}
+	})
 
--- Junglebaby
-awards.register_achievement("award_junglebaby", {
-	title = S("Junglebaby"),
-	description = S("Dig 100 jungle tree blocks."),
-	icon = "default_jungletree.png^awards_level1.png",
-	trigger = {
-		type = "dig",
-		node = "default:jungletree",
-		target = 100
-	}
-})
+	-- Lumberjack
+	awards.register_achievement("award_lumberjack", {
+		title = S("Lumberjack"),
+		description = S("Dig 36 tree blocks."),
+		icon = "default_tree.png^awards_level2.png",
+		trigger = {
+			type = "dig",
+			node = "default:tree",
+			target = 36
+		}
+	})
 
--- Jungleman
-awards.register_achievement("award_jungleman", {
-	title = S("Jungleman"),
-	description = S("Dig 1,000 jungle tree blocks."),
-	icon = "default_jungletree.png^awards_level2.png",
-	trigger = {
-		type = "dig",
-		node = "default:jungletree",
-		target = 1000
-	}
-})
+	-- Semi-pro Lumberjack
+	awards.register_achievement("award_lumberjack_semipro", {
+		title = S("Semi-pro Lumberjack"),
+		description = S("Dig 216 tree blocks."),
+		icon = "default_tree.png^awards_level3.png",
+		trigger = {
+			type = "dig",
+			node = "default:tree",
+			target = 216
+		}
+	})
 
--- Found some Mese!
-awards.register_achievement("award_mesefind", {
-	title = S("First Mese Find"),
-	description = S("Mine your first mese ore."),
-	icon = "default_stone.png^default_mineral_mese.png",
-	background = "awards_bg_mining.png",
-	trigger = {
-		type = "dig",
-		node = "default:stone_with_mese",
-		target = 1
-	}
-})
+	-- Professional Lumberjack
+	awards.register_achievement("award_lumberjack_professional", {
+		title = S("Professional Lumberjack"),
+		description = S("Dig 1,296 tree blocks."),
+		icon = "default_tree.png^awards_level4.png",
+		trigger = {
+			type = "dig",
+			node = "default:tree",
+			target = 1296
+		}
+	})
 
--- Mese Block
-awards.register_achievement("award_meseblock", {
-	secret = true,
-	title = S("Mese Mastery"),
-	description = S("Mine a mese block."),
-	icon = "default_mese_block.png",
-	background = "awards_bg_mining.png",
-	trigger = {
-		type = "dig",
-		node = "default:mese",
-		target = 1
-	}
-})
+	-- Junglebaby
+	awards.register_achievement("award_junglebaby", {
+		title = S("Junglebaby"),
+		description = S("Dig 100 jungle tree blocks."),
+		icon = "default_jungletree.png^awards_level1.png",
+		trigger = {
+			type = "dig",
+			node = "default:jungletree",
+			target = 100
+		}
+	})
 
+	-- Jungleman
+	awards.register_achievement("award_jungleman", {
+		title = S("Jungleman"),
+		description = S("Dig 1,000 jungle tree blocks."),
+		icon = "default_jungletree.png^awards_level2.png",
+		trigger = {
+			type = "dig",
+			node = "default:jungletree",
+			target = 1000
+		}
+	})
 
+	-- Found some Mese!
+	awards.register_achievement("award_mesefind", {
+		title = S("First Mese Find"),
+		description = S("Mine your first mese ore."),
+		icon = "default_stone.png^default_mineral_mese.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone_with_mese",
+			target = 1
+		}
+	})
 
--- You're a copper
-awards.register_achievement("award_youre_a_copper", {
-	title = S("You’re a copper"),
-	description = S("Dig 1,000 copper ores."),
-	icon = "default_stone.png^default_mineral_copper.png",
-	background = "awards_bg_mining.png",
-	trigger = {
-		type = "dig",
-		node = "default:stone_with_copper",
-		target = 1000
-	}
-})
+	-- Mese Block
+	awards.register_achievement("award_meseblock", {
+		secret = true,
+		title = S("Mese Mastery"),
+		description = S("Mine a mese block."),
+		icon = "default_mese_block.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:mese",
+			target = 1
+		}
+	})
 
--- Found a Nyan cat!
-awards.register_achievement("award_nyanfind", {
-	secret = true,
-	title = S("A Cat in a Pop-Tart?!"),
-	description = S("Mine a nyan cat."),
-	icon = "nyancat_front.png",
-	trigger = {
-		type = "dig",
-		node = "default:nyancat",
-		target = 1
-	}
-})
+	-- You're a copper
+	awards.register_achievement("award_youre_a_copper", {
+		title = S("You’re a copper"),
+		description = S("Dig 1,000 copper ores."),
+		icon = "default_stone.png^default_mineral_copper.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone_with_copper",
+			target = 1000
+		}
+	})
 
--- Mini Miner
-awards.register_achievement("award_mine2", {
-	title = S("Mini Miner"),
-	description = S("Dig 100 stone blocks."),
-	icon = "awards_miniminer.png^awards_level1.png",
-	background = "awards_bg_mining.png",
-	trigger = {
-		type = "dig",
-		node = "default:stone",
-		target = 100
-	}
-})
+	-- Found a Nyan cat!
+	awards.register_achievement("award_nyanfind", {
+		secret = true,
+		title = S("A Cat in a Pop-Tart?!"),
+		description = S("Mine a nyan cat."),
+		icon = "nyancat_front.png",
+		trigger = {
+			type = "dig",
+			node = "default:nyancat",
+			target = 1
+		}
+	})
 
--- Hardened Miner
-awards.register_achievement("award_mine3", {
-	title = S("Hardened Miner"),
-	description = S("Dig 1,000 stone blocks."),
-	icon = "awards_miniminer.png^awards_level2.png",
-	background = "awards_bg_mining.png",
-	trigger = {
-		type = "dig",
-		node = "default:stone",
-		target = 1000
-	}
-})
+	-- Mini Miner
+	awards.register_achievement("award_mine2", {
+		title = S("Mini Miner"),
+		description = S("Dig 100 stone blocks."),
+		icon = "awards_miniminer.png^awards_level1.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone",
+			target = 100
+		}
+	})
 
--- Master Miner
-awards.register_achievement("award_mine4", {
-	title = S("Master Miner"),
-	description = S("Dig 10,000 stone blocks."),
-	icon = "awards_miniminer.png^awards_level3.png",
-	background = "awards_bg_mining.png",
-	trigger = {
-		type = "dig",
-		node = "default:stone",
-		target = 10000
-	}
-})
+	-- Hardened Miner
+	awards.register_achievement("award_mine3", {
+		title = S("Hardened Miner"),
+		description = S("Dig 1,000 stone blocks."),
+		icon = "awards_miniminer.png^awards_level2.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone",
+			target = 1000
+		}
+	})
 
--- Marchand de sable
-awards.register_achievement("award_marchand_de_sable", {
-	title = S("Marchand De Sable"),
-	description = S("Dig 1,000 sand."),
-	icon = "default_sand.png",
-	background = "awards_bg_mining.png",
-	trigger = {
-		type = "dig",
-		node = "default:sand",
-		target = 1000
-	}
-})
+	-- Master Miner
+	awards.register_achievement("award_mine4", {
+		title = S("Master Miner"),
+		description = S("Dig 10,000 stone blocks."),
+		icon = "awards_miniminer.png^awards_level3.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone",
+			target = 10000
+		}
+	})
 
-awards.register_achievement("awards_crafter_of_sticks", {
-	title = S("Crafter of Sticks"),
-	description = S("Craft 100 sticks."),
-	icon = "default_stick.png",
-	trigger = {
-		type = "craft",
-		item = "default:stick",
-		target = 100
-	}
-})
+	-- Marchand de sable
+	awards.register_achievement("award_marchand_de_sable", {
+		title = S("Marchand De Sable"),
+		description = S("Dig 1,000 sand."),
+		icon = "default_sand.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:sand",
+			target = 1000
+		}
+	})
 
-awards.register_achievement("awards_junglegrass", {
-	title = S("Jungle Discoverer"),
-	description = S("Mine your first jungle grass."),
-	icon = "default_junglegrass.png",
-	trigger = {
-		type = "dig",
-		node = "default:junglegrass",
-		target = 1
-	}
-})
+	awards.register_achievement("awards_crafter_of_sticks", {
+		title = S("Crafter of Sticks"),
+		description = S("Craft 100 sticks."),
+		icon = "default_stick.png",
+		trigger = {
+			type = "craft",
+			item = "default:stick",
+			target = 100
+		}
+	})
 
-awards.register_achievement("awards_grass", {
-	title = S("Grasslands Discoverer"),
-	description = S("Mine some grass."),
-	icon = "default_grass_3.png",
-	trigger = {
-		type = "dig",
-		node = "default:grass_1",
-		target = 1
-	}
-})
+	awards.register_achievement("awards_junglegrass", {
+		title = S("Jungle Discoverer"),
+		description = S("Mine your first jungle grass."),
+		icon = "default_junglegrass.png",
+		trigger = {
+			type = "dig",
+			node = "default:junglegrass",
+			target = 1
+		}
+	})
 
-awards.register_achievement("awards_dry_grass", {
-	title = S("Savannah Discoverer"),
-	description = S("Mine some dry grass."),
-	icon = "default_dry_grass_3.png",
-	trigger = {
-		type = "dig",
-		node = "default:dry_grass_3",
-		target = 1
-	}
-})
+	awards.register_achievement("awards_grass", {
+		title = S("Grasslands Discoverer"),
+		description = S("Mine some grass."),
+		icon = "default_grass_3.png",
+		trigger = {
+			type = "dig",
+			node = "default:grass_1",
+			target = 1
+		}
+	})
 
-awards.register_achievement("awards_cactus", {
-	title = S("Desert Discoverer"),
-	description = S("Mine your first cactus."),
-	icon = "default_cactus_side.png",
-	trigger = {
-		type = "dig",
-		node = "default:cactus",
-		target = 1
-	}
-})
+	awards.register_achievement("awards_dry_grass", {
+		title = S("Savannah Discoverer"),
+		description = S("Mine some dry grass."),
+		icon = "default_dry_grass_3.png",
+		trigger = {
+			type = "dig",
+			node = "default:dry_grass_3",
+			target = 1
+		}
+	})
 
-awards.register_achievement("awards_dry_shrub", {
-	title = S("Far Lands"),
-	description = S("Mine your first dry shrub."),
-	icon = "default_dry_shrub.png",
-	trigger = {
-		type = "dig",
-		node = "default:dry_shrub",
-		target = 1
-	}
-})
+	awards.register_achievement("awards_cactus", {
+		title = S("Desert Discoverer"),
+		description = S("Mine your first cactus."),
+		icon = "default_cactus_side.png",
+		trigger = {
+			type = "dig",
+			node = "default:cactus",
+			target = 1
+		}
+	})
 
-awards.register_achievement("awards_ice", {
-	title = S("Glacier Discoverer"),
-	description = S("Mine your first ice."),
-	icon = "default_ice.png",
-	trigger = {
-		type = "dig",
-		node = "default:ice",
-		target = 1
-	}
-})
+	awards.register_achievement("awards_dry_shrub", {
+		title = S("Far Lands"),
+		description = S("Mine your first dry shrub."),
+		icon = "default_dry_shrub.png",
+		trigger = {
+			type = "dig",
+			node = "default:dry_shrub",
+			target = 1
+		}
+	})
 
--- Proof that player visited snowy lands
-awards.register_achievement("awards_snowblock", {
-	title = S("Very Simple Snow Man"),
-	description = S("Place two snow blocks."),
-	icon = "default_snow.png",
-	trigger = {
-		type = "place",
-		node = "default:snowblock",
-		target = 2
-	}
-})
+	awards.register_achievement("awards_ice", {
+		title = S("Glacier Discoverer"),
+		description = S("Mine your first ice."),
+		icon = "default_ice.png",
+		trigger = {
+			type = "dig",
+			node = "default:ice",
+			target = 1
+		}
+	})
+
+	-- Proof that player visited snowy lands
+	awards.register_achievement("awards_snowblock", {
+		title = S("Very Simple Snow Man"),
+		description = S("Place two snow blocks."),
+		icon = "default_snow.png",
+		trigger = {
+			type = "place",
+			node = "default:snowblock",
+			target = 2
+		}
+	})
+
+	awards.register_achievement("awards_gold_ore", {
+		title = S("First Gold Find"),
+		description = S("Mine your first gold ore."),
+		icon = "default_stone.png^default_mineral_gold.png^awards_level1.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone_with_gold",
+			target = 1
+		}
+	})
+
+	awards.register_achievement("awards_gold_rush", {
+		title = S("Gold Rush"),
+		description = S("Mine 45 gold ores."),
+		icon = "default_stone.png^default_mineral_gold.png^awards_level2.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone_with_gold",
+			target = 45
+		}
+	})
+
+	awards.register_achievement("awards_diamond_ore", {
+		title = S("Wow, I am Diamonds!"),
+		description = S("Mine your first diamond ore."),
+		icon = "default_stone.png^default_mineral_diamond.png^awards_level1.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone_with_diamond",
+			target = 1
+		}
+	})
+
+	awards.register_achievement("awards_diamond_rush", {
+		title = S("Girl's Best Friend"),
+		description = S("Mine 18 diamond ores."),
+		icon = "default_stone.png^default_mineral_diamond.png^awards_level2.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone_with_diamond",
+			target = 18
+		}
+	})
+
+	awards.register_achievement("awards_diamondblock", {
+		title = S("Hardest Block on Earth"),
+		description = S("Craft a diamond block."),
+		icon = "default_diamond_block.png",
+		trigger = {
+			type = "craft",
+			item = "default:diamondblock",
+			target = 1
+		}
+	})
+
+	awards.register_achievement("awards_mossycobble", {
+		title = S("In the Dungeon"),
+		description = S("Mine a mossy cobblestone."),
+		icon = "default_mossycobble.png",
+		trigger = {
+			type = "dig",
+			node = "default:mossycobble",
+			target = 1
+		}
+	})
+
+	awards.register_achievement("award_furnace", {
+		title = S("Smelter"),
+		description = S("Craft 10 furnaces."),
+		icon = "default_furnace_front.png",
+		trigger = {
+			type = "craft",
+			item= "default:furnace",
+			target = 10
+		}
+	})
+
+	awards.register_achievement("award_chest", {
+		title = S("Treasurer"),
+		description = S("Craft 15 chests."),
+		icon = "default_chest_front.png",
+		trigger = {
+			type = "craft",
+			item= "default:chest",
+			target = 15
+		}
+	})
+
+	awards.register_achievement("award_chest2", {
+		title = S("Bankier"),
+		description = S("Craft 30 locked chests."),
+		icon = "default_chest_lock.png",
+		trigger = {
+			type = "craft",
+			item= "default:chest_locked",
+			target = 30
+		}
+	})
+
+	awards.register_achievement("award_brick", {
+		title = S("Bricker"),
+		description = S("Craft 200 brick blocks."),
+		icon = "default_brick.png",
+		trigger = {
+			type = "craft",
+			item= "default:brick",
+			target = 200
+		}
+	})
+
+	awards.register_achievement("award_obsidianbrick", {
+		title = S("House of Obsidian"),
+		description = S("Craft 100 obsidian bricks."),
+		icon = "default_obsidian_brick.png",
+		trigger = {
+			type = "craft",
+			item= "default:obsidianbrick",
+			target = 100
+		}
+	})
+
+	awards.register_achievement("award_placestone", {
+		title = S("Build a Cave"),
+		description = S("Place 100 stone."),
+		icon = "default_stone.png",
+		trigger = {
+			type = "place",
+			node = "default:stone",
+			target = 100
+		}
+	})
+
+	awards.register_achievement("award_woodladder", {
+		title = S("Long Ladder"),
+		description = S("Place 400 wooden ladders."),
+		icon = "default_ladder_wood.png",
+		trigger = {
+			type = "place",
+			node = "default:ladder_wood",
+			target = 400
+		}
+	})
+
+	awards.register_achievement("award_steelladder", {
+		title = S("Industrial Age"),
+		description = S("Place 40 steel ladders."),
+		icon = "default_ladder_steel.png",
+		trigger = {
+			type = "place",
+			node = "default:ladder_steel",
+			target = 40
+		}
+	})
+end
+
+if minetest.get_modpath("vessels") then
+	awards.register_achievement("award_vessels_shelf", {
+		title = S("Glasser"),
+		icon = "vessels_shelf.png",
+		description = S("Craft 14 vessels shelves."),
+		trigger = {
+			type = "craft",
+			item= "vessels:shelf",
+			target = 14
+		}
+	})
+end
 
 if minetest.get_modpath("farming") then
 	awards.register_achievement("awards_farmer", {
@@ -587,176 +757,6 @@ if minetest.get_modpath("wool") and minetest.get_modpath("farming") then
 	})
 end
 
-awards.register_achievement("awards_gold_ore", {
-	title = S("First Gold Find"),
-	description = S("Mine your first gold ore."),
-	icon = "default_stone.png^default_mineral_gold.png^awards_level1.png",
-	background = "awards_bg_mining.png",
-	trigger = {
-		type = "dig",
-		node = "default:stone_with_gold",
-		target = 1
-	}
-})
-
-awards.register_achievement("awards_gold_rush", {
-	title = S("Gold Rush"),
-	description = S("Mine 45 gold ores."),
-	icon = "default_stone.png^default_mineral_gold.png^awards_level2.png",
-	background = "awards_bg_mining.png",
-	trigger = {
-		type = "dig",
-		node = "default:stone_with_gold",
-		target = 45
-	}
-})
-
-awards.register_achievement("awards_diamond_ore", {
-	title = S("Wow, I am Diamonds!"),
-	description = S("Mine your first diamond ore."),
-	icon = "default_stone.png^default_mineral_diamond.png^awards_level1.png",
-	trigger = {
-		type = "dig",
-		node = "default:stone_with_diamond",
-		target = 1
-	}
-})
-
-awards.register_achievement("awards_diamond_rush", {
-	title = S("Girl's Best Friend"),
-	description = S("Mine 18 diamond ores."),
-	icon = "default_stone.png^default_mineral_diamond.png^awards_level2.png",
-	background = "awards_bg_mining.png",
-	trigger = {
-		type = "dig",
-		node = "default:stone_with_diamond",
-		target = 18
-	}
-})
-
-awards.register_achievement("awards_diamondblock", {
-	title = S("Hardest Block on Earth"),
-	description = S("Craft a diamond block."),
-	icon = "default_diamond_block.png",
-	trigger = {
-		type = "craft",
-		item = "default:diamondblock",
-		target = 1
-	}
-})
-
-awards.register_achievement("awards_mossycobble", {
-	title = S("In the Dungeon"),
-	description = S("Mine a mossy cobblestone."),
-	icon = "default_mossycobble.png",
-	trigger = {
-		type = "dig",
-		node = "default:mossycobble",
-		target = 1
-	}
-})
-
-if minetest.get_modpath("vessels") then
-	awards.register_achievement("award_vessels_shelf", {
-		title = S("Glasser"),
-		icon = "vessels_shelf.png",
-		description = S("Craft 14 vessels shelves."),
-		trigger = {
-			type = "craft",
-			item= "vessels:shelf",
-			target = 14
-		}
-	})
-end
-
-awards.register_achievement("award_furnace", {
-	title = S("Smelter"),
-	description = S("Craft 10 furnaces."),
-	icon = "default_furnace_front.png",
-	trigger = {
-		type = "craft",
-		item= "default:furnace",
-		target = 10
-	}
-})
-
-awards.register_achievement("award_chest", {
-	title = S("Treasurer"),
-	description = S("Craft 15 chests."),
-	icon = "default_chest_front.png",
-	trigger = {
-		type = "craft",
-		item= "default:chest",
-		target = 15
-	}
-})
-
-awards.register_achievement("award_chest2", {
-	title = S("Bankier"),
-	description = S("Craft 30 locked chests."),
-	icon = "default_chest_lock.png",
-	trigger = {
-		type = "craft",
-		item= "default:chest_locked",
-		target = 30
-	}
-})
-
-awards.register_achievement("award_brick", {
-	title = S("Bricker"),
-	description = S("Craft 200 brick blocks."),
-	icon = "default_brick.png",
-	trigger = {
-		type = "craft",
-		item= "default:brick",
-		target = 200
-	}
-})
-
-awards.register_achievement("award_obsidianbrick", {
-	title = S("House of Obsidian"),
-	description = S("Craft 100 obsidian bricks."),
-	icon = "default_obsidian_brick.png",
-	trigger = {
-		type = "craft",
-		item= "default:obsidianbrick",
-		target = 100
-	}
-})
-
-awards.register_achievement("award_placestone", {
-	title = S("Build a Cave"),
-	description = S("Place 100 stone."),
-	icon = "default_stone.png",
-	trigger = {
-		type = "place",
-		node = "default:stone",
-		target = 100
-	}
-})
-
-awards.register_achievement("award_woodladder", {
-	title = S("Long Ladder"),
-	description = S("Place 400 wooden ladders."),
-	icon = "default_ladder_wood.png",
-	trigger = {
-		type = "place",
-		node = "default:ladder_wood",
-		target = 400
-	}
-})
-
-awards.register_achievement("award_steelladder", {
-	title = S("Industrial Age"),
-	description = S("Place 40 steel ladders."),
-	icon = "default_ladder_steel.png",
-	trigger = {
-		type = "place",
-		node = "default:ladder_steel",
-		target = 40
-	}
-})
-
 if minetest.get_modpath("beds") then
 	awards.register_achievement("award_bed", {
 		title = S("Hotelier"),