diff --git a/minetestforfun_game/mods/default/mapgen.lua b/minetestforfun_game/mods/default/mapgen.lua
index 30db5c05..2f3f224f 100644
--- a/minetestforfun_game/mods/default/mapgen.lua
+++ b/minetestforfun_game/mods/default/mapgen.lua
@@ -1,31 +1,34 @@
--- mods/default/mapgen.lua
-
 --
 -- Aliases for map generator outputs
 --
 
+
 minetest.register_alias("mapgen_stone", "default:stone")
+minetest.register_alias("mapgen_dirt", "default:dirt")
+minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
+minetest.register_alias("mapgen_sand", "default:sand")
+minetest.register_alias("mapgen_water_source", "default:water_source")
+minetest.register_alias("mapgen_river_water_source", "default:river_water_source")
+minetest.register_alias("mapgen_lava_source", "default:lava_source")
+minetest.register_alias("mapgen_gravel", "default:gravel")
+minetest.register_alias("mapgen_desert_stone", "default:desert_stone")
+minetest.register_alias("mapgen_desert_sand", "default:desert_sand")
 minetest.register_alias("mapgen_tree", "default:tree")
 minetest.register_alias("mapgen_leaves", "default:leaves")
+minetest.register_alias("mapgen_apple", "default:apple")
 minetest.register_alias("mapgen_jungletree", "default:jungletree")
 minetest.register_alias("mapgen_jungleleaves", "default:jungleleaves")
-minetest.register_alias("mapgen_apple", "default:apple")
-minetest.register_alias("mapgen_water_source", "default:water_source")
-minetest.register_alias("mapgen_dirt", "default:dirt")
-minetest.register_alias("mapgen_sand", "default:sand")
-minetest.register_alias("mapgen_gravel", "default:gravel")
-minetest.register_alias("mapgen_clay", "default:clay")
-minetest.register_alias("mapgen_lava_source", "default:lava_source")
-minetest.register_alias("mapgen_cobble", "default:cobble")
-minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
-minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
 minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
-minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal")
+minetest.register_alias("mapgen_pinetree", "default:pinetree")
+minetest.register_alias("mapgen_pine_needles", "default:pine_needles")
 minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron")
 minetest.register_alias("mapgen_mese", "default:mese")
-minetest.register_alias("mapgen_desert_sand", "default:desert_sand")
-minetest.register_alias("mapgen_desert_stone", "default:desert_stone")
+minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal")
+minetest.register_alias("mapgen_clay", "default:clay")
+minetest.register_alias("mapgen_cobble", "default:cobble")
 minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble")
+minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
+
 
 --
 -- Ore generation
diff --git a/minetestforfun_game/mods/default/nodes.lua b/minetestforfun_game/mods/default/nodes.lua
index 68958fe3..1e8832c8 100644
--- a/minetestforfun_game/mods/default/nodes.lua
+++ b/minetestforfun_game/mods/default/nodes.lua
@@ -1,5 +1,149 @@
 -- mods/default/nodes.lua
 
+--[[ Index:
+
+Stone
+-----
+(1. Material 2. Cobble variant 3. Brick variant [4. Modified forms])
+
+default:stone
+default:cobble
+default:stonebrick
+default:mossycobble
+
+default:desert_stone
+default:desert_cobble
+default:desert_stonebrick
+
+default:sandstone
+default:sandstonebrick
+
+default:obsidian
+default:obsidianbrick
+
+Soft / Non-Stone
+----------------
+(1. Material [2. Modified forms])
+
+default:dirt
+default:dirt_with_grass
+default:dirt_with_grass_footsteps
+default:dirt_with_snow
+
+default:sand
+default:desert_sand
+
+default:gravel
+
+default:clay
+
+default:snow
+default:snowblock
+
+default:ice
+
+Trees
+-----
+(1. Trunk 2. Fabricated trunk 3. Leaves 4. Sapling [5. Fruits])
+
+default:tree
+default:wood
+default:leaves
+default:sapling
+default:apple
+
+default:jungletree
+default:junglewood
+default:jungleleaves
+default:junglesapling
+
+default:pinetree
+default:pinewood
+default:pine_needles
+default:pine_sapling
+
+Ores
+----
+(1. In stone 2. Block)
+
+default:stone_with_coal
+default:coalblock
+
+default:stone_with_iron
+default:steelblock
+
+default:stone_with_copper
+default:copperblock
+default:bronzeblock
+
+default:stone_with_gold
+default:goldblock
+
+default:stone_with_mese
+default:mese
+
+default:stone_with_diamond
+default:diamondblock
+
+Plantlife (non-cubic)
+---------------------
+default:cactus
+default:papyrus
+default:dry_shrub
+default:junglegrass
+default:grass_1
+default:grass_2
+default:grass_3
+default:grass_4
+default:grass_5
+
+Liquids
+-------
+(1. Source 2. Flowing)
+
+default:water_source
+default:water_flowing
+
+default:river_water_source
+default:river_water_flowing
+
+default:lava_source
+default:lava_flowing
+
+Tools / "Advanced" crafting / Non-"natural"
+-------------------------------------------
+default:torch
+
+default:chest
+default:chest_locked
+
+default:bookshelf
+
+default:sign_wall
+default:ladder
+default:fence_wood
+
+default:glass
+default:obsidian_glass
+
+default:rail
+
+default:brick
+
+default:meselamp
+
+Misc
+----
+default:cloud
+default:nyancat
+default:nyancat_rainbow
+
+--]]
+
+--
+-- Stone
+--
+
 minetest.register_node("default:stone", {
 	description = "Stone",
 	tiles = {"default_stone.png"},
@@ -451,6 +595,7 @@ minetest.register_node("default:jungleleaves", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
+
 	after_place_node = default.after_place_leaves,
 })
 
@@ -1849,6 +1994,99 @@ minetest.register_node("default:cherry_blossom_leaves", {
 		return ItemStack("default:cherry_blossom_leaves".." "..itemstack:get_count()-(1-ret:get_count()))
 	end,
 })
+minetest.register_node("default:river_water_source", {
+	description = "River Water Source",
+	inventory_image = minetest.inventorycube("default_water.png"),
+	drawtype = "liquid",
+	tiles = {
+		{
+			name = "default_water_source_animated.png",
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 2.0,
+			},
+		},
+	},
+	special_tiles = {
+		{
+			name = "default_water_source_animated.png",
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 2.0,
+			},
+			backface_culling = false,
+		},
+	},
+	alpha = 160,
+	paramtype = "light",
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable_to = true,
+	is_ground_content = false,
+	drop = "",
+	drowning = 1,
+	liquidtype = "source",
+	liquid_alternative_flowing = "default:river_water_flowing",
+	liquid_alternative_source = "default:river_water_source",
+	liquid_viscosity = 1,
+	liquid_renewable = false,
+	liquid_range = 2,
+	post_effect_color = {a=64, r=100, g=100, b=200},
+	groups = {water=3, liquid=3, puts_out_fire=1},
+})
+
+minetest.register_node("default:river_water_flowing", {
+	description = "Flowing River Water",
+	inventory_image = minetest.inventorycube("default_water.png"),
+	drawtype = "flowingliquid",
+	tiles = {"default_water.png"},
+	special_tiles = {
+		{
+			name = "default_water_flowing_animated.png",
+			backface_culling = false,
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 0.8,
+			},
+		},
+		{
+			name = "default_water_flowing_animated.png",
+			backface_culling = true,
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 0.8,
+			},
+		},
+	},
+	alpha = 160,
+	paramtype = "light",
+	paramtype2 = "flowingliquid",
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable_to = true,
+	is_ground_content = false,
+	drop = "",
+	drowning = 1,
+	liquidtype = "flowing",
+	liquid_alternative_flowing = "default:river_water_flowing",
+	liquid_alternative_source = "default:river_water_source",
+	liquid_viscosity = 1,
+	liquid_renewable = false,
+	liquid_range = 2,
+	post_effect_color = {a=64, r=100, g=100, b=200},
+	groups = {water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1},
+})
+
 
 minetest.register_node("default:cherry_leaves_deco", {
 	description = "Cherry Leaves",
diff --git a/worlds/minetestforfun/news.txt b/worlds/minetestforfun/news.txt
index 5ff2fc53..934979f2 100644
--- a/worlds/minetestforfun/news.txt
+++ b/worlds/minetestforfun/news.txt
@@ -7,6 +7,7 @@ MAJ de "whoison" (la commande "/timeonline <pseudo>" peut aussi être utilisé d
 MAJ de "mobs" (ajout des chèvres/goats)
 
 ---??/??/2015--- (Remerciements : Mg)
+MaJ de "default" (ajout de default:river_water_*)
 MaJ de "irc"
 MaJ de "homedecor"
 MaJ de "metatools"