diff --git a/mods/rgt_base/init.lua b/mods/rgt_base/init.lua
index fdc23b6..a4a4836 100644
--- a/mods/rgt_base/init.lua
+++ b/mods/rgt_base/init.lua
@@ -36,13 +36,31 @@ function say(msg)
     minetest.chat_send_all("# Server: "..msg)
 end
 
+rgt = {}
+local ns = rgt
+
+function ns.register_node(name, def)
+    local alias
+    if not name:find(":") then
+        alias = name
+        name = "red_glazed_terracotta:"..name
+    end
+    minetest.register_node(":"..name, def)
+    if alias then
+        minetest.register_alias(alias, name)
+    end
+end
+
+
+
 minetest.register_on_joinplayer(function(p)
     if p:get_player_name() == "singleplayer" then
         minetest.change_player_privs(p:get_player_name(), {
             fast = true,
             fly = true,
             noclip = true,
-            server = true
+            server = true,
+            give = true,
         })
     end
 end)
diff --git a/mods/rgt_world/init.lua b/mods/rgt_world/init.lua
index 6b49308..96cee96 100644
--- a/mods/rgt_world/init.lua
+++ b/mods/rgt_world/init.lua
@@ -1,27 +1,26 @@
-rgt_world = {}
-local ns = rgt_world
 
-function ns.register_node()
-    
-end
+rgt.register_node("stone", {
+    tiles = {"rgt_stone.png"},
+    groups = {dig_immediate = 3}
+})
 
-minetest.register_node(":adrift:stone", {
+rgt.register_node("cobble", {
     tiles = {"rgt_cobble.png"},
     groups = {dig_immediate = 3}
 })
 
-minetest.register_node(":adrift:dirt", {
+rgt.register_node("dirt", {
     tiles = {"rgt_dirt.png"},
     groups = {dig_immediate = 3}
 })
 
-minetest.register_node(":adrift:dirt_grass", {
+rgt.register_node("dirt_grass", {
     tiles = {"rgt_grass_top.png", "rgt_dirt.png", "rgt_dirt.png^rgt_grass_side.png"},
 --    tiles = {"[fill:16x16:0,0:#3e7e7b^[fill:14x14:1,1:#326764"},
     groups = {dig_immediate = 3}
 })
 
-minetest.register_node(":adrift:water", {
+rgt.register_node("water", {
     tiles = {"[fill:16x16:0,0:#2d5a7c77^[fill:14x14:1,1:#2d5a7c33"},
     groups = {dig_immediate = 3},
     drawtype = "liquid",
@@ -29,24 +28,60 @@ minetest.register_node(":adrift:water", {
     paramtype = "light",
     walkable = false,
     climbable = true,
-    post_effect_color = "#2d5a7c55"
+    post_effect_color = "#2d5a7c55",
+    
+    liquidtype = "source",
+    -- Minetest pro tip: Do not try to use aliases for these.
+    liquid_alternative_source = "red_glazed_terracotta:water",
+    liquid_alternative_flowing = "red_glazed_terracotta:water_flowing",
+    liquid_viscosity = 1,
+    liquid_range = 5,
 })
 
-minetest.register_alias("mapgen_stone", "adrift:stone")
-minetest.register_alias("mapgen_water_source", "adrift:water")
+rgt.register_node("water_flowing", {
+    tiles = {{name = "[fill:16x16:0,0:#2d5a7c77^[fill:14x14:1,1:#2d5a7c33", backface_culling = false}},
+    special_tiles = {{name = "[fill:16x16:0,0:#2d5a7c77^[fill:14x14:1,1:#2d5a7c33", backface_culling = false}, {name = "[fill:16x16:0,0:#2d5a7c77^[fill:14x14:1,1:#2d5a7c33", backface_culling = false}},
+    groups = {dig_immediate = 3},
+    drawtype = "flowingliquid",
+    use_texture_alpha = "blend",
+    paramtype = "light",
+    paramtype2 = "flowingliquid",
+    walkable = false,
+    climbable = true,
+    post_effect_color = "#2d5a7c55",
+    
+    liquidtype = "flowing",
+    liquid_alternative_source = "red_glazed_terracotta:water",
+    liquid_alternative_flowing = "red_glazed_terracotta:water_flowing",
+    liquid_viscosity = 1,
+    liquid_range = 5,
+})
+
+minetest.register_alias("mapgen_stone", "red_glazed_terracotta:stone")
+minetest.register_alias("mapgen_water_source", "red_glazed_terracotta:water")
+
+
+-- Remove
+minetest.register_alias("adrift:stone", "red_glazed_terracotta:stone")
+minetest.register_alias("adrift:dirt", "red_glazed_terracotta:dirt")
+minetest.register_alias("adrift:dirt_grass", "red_glazed_terracotta:dirt_grass")
+minetest.register_alias("adrift:water", "red_glazed_terracotta:water")
 
 
 minetest.register_biome{
     name = "!",
 
-    node_top = "adrift:dirt_grass",
+    node_top = "dirt_grass",
     depth_top = 1,
 
-    node_filler = "adrift:dirt",
+    node_filler = "dirt",
     depth_filler = 5,
 
-    node_riverbed = "adrift:dirt",
+    node_riverbed = "dirt",
     depth_riverbed = 3,
+    
+    node_dungeon = "cobble",
+    node_dungeon_alt = "stone",
 
     
     y_max = alt_max,
diff --git a/mods/rgt_world/textures/rgt_grass_side.png b/mods/rgt_world/textures/rgt_grass_side.png
index cffed11..5b9ccd1 100644
Binary files a/mods/rgt_world/textures/rgt_grass_side.png and b/mods/rgt_world/textures/rgt_grass_side.png differ
diff --git a/mods/rgt_world/textures/rgt_grass_top.png b/mods/rgt_world/textures/rgt_grass_top.png
index b151966..ff39b7d 100644
Binary files a/mods/rgt_world/textures/rgt_grass_top.png and b/mods/rgt_world/textures/rgt_grass_top.png differ