diff --git a/mods/lzr_core/mapgen.lua b/mods/lzr_core/mapgen.lua
index e2cff53..01f79f2 100644
--- a/mods/lzr_core/mapgen.lua
+++ b/mods/lzr_core/mapgen.lua
@@ -2,7 +2,7 @@
 -- Aliases for map generators
 --
 
-minetest.register_alias("mapgen_stone", "lzr_core:wood")
-minetest.register_alias("mapgen_water_source", "air")
+minetest.register_alias("mapgen_stone", "lzr_core:stone")
+minetest.register_alias("mapgen_water_source", "lzr_core:water_source")
 minetest.register_alias("mapgen_river_water_source", "air")
 
diff --git a/mods/lzr_core/nodes.lua b/mods/lzr_core/nodes.lua
index f294f72..7d086fb 100644
--- a/mods/lzr_core/nodes.lua
+++ b/mods/lzr_core/nodes.lua
@@ -1,5 +1,13 @@
 local S = minetest.get_translator("lzr_core")
 
+minetest.register_node("lzr_core:stone", {
+	description = S("Stone"),
+	tiles = {"default_stone.png"},
+	groups = {cracky = 3, stone = 1},
+	sounds = lzr_sounds.node_sound_stone_defaults(),
+})
+
+
 minetest.register_node("lzr_core:tree", {
 	description = S("Tree Trunk"),
 	tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
@@ -19,3 +27,45 @@ minetest.register_node("lzr_core:wood", {
 	sounds = lzr_sounds.node_sound_wood_defaults(),
 })
 
+minetest.register_node("lzr_core:water_source", {
+	description = S("Water Source"),
+	drawtype = "liquid",
+	waving = 3,
+	tiles = {
+		{
+			name = "default_water_source_animated.png",
+			backface_culling = false,
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 2.0,
+			},
+		},
+		{
+			name = "default_water_source_animated.png",
+			backface_culling = true,
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 2.0,
+			},
+		},
+	},
+	use_texture_alpha = "blend",
+	paramtype = "light",
+	walkable = false,
+	pointable = false,
+	buildable_to = true,
+	is_ground_content = false,
+	drop = "",
+	liquidtype = "source",
+	liquid_alternative_flowing = "lzr_core:water_source",
+	liquid_alternative_source = "lzr_core:water_source",
+	liquid_viscosity = 1,
+	liquid_range = 0,
+	post_effect_color = {a = 103, r = 30, g = 60, b = 90},
+	groups = {water = 3, liquid = 3, cools_lava = 1},
+})
+
diff --git a/mods/lzr_core/textures/default_stone.png b/mods/lzr_core/textures/default_stone.png
new file mode 100644
index 0000000..40e3b35
Binary files /dev/null and b/mods/lzr_core/textures/default_stone.png differ
diff --git a/mods/lzr_core/textures/default_water.png b/mods/lzr_core/textures/default_water.png
new file mode 100644
index 0000000..89b867a
Binary files /dev/null and b/mods/lzr_core/textures/default_water.png differ
diff --git a/mods/lzr_core/textures/default_water_source_animated.png b/mods/lzr_core/textures/default_water_source_animated.png
new file mode 100644
index 0000000..8d7e322
Binary files /dev/null and b/mods/lzr_core/textures/default_water_source_animated.png differ