diff --git a/mods/main/mapgen.lua b/mods/main/mapgen.lua
index f59a059..61c9161 100644
--- a/mods/main/mapgen.lua
+++ b/mods/main/mapgen.lua
@@ -182,6 +182,7 @@ minetest.register_biome(
 	  depth_filler = 8,
 	  
 	  node_water = "main:ice_thick",
+	  node_river_water = "main:ice_thin",
 
       y_min = 1,
       y_max = 50,
diff --git a/mods/main/nodes.lua b/mods/main/nodes.lua
index cdfa372..4ee6e59 100644
--- a/mods/main/nodes.lua
+++ b/mods/main/nodes.lua
@@ -40,7 +40,7 @@ minetest.register_node("main:ice_thin", {
 	alpha = 6,
 	description = "Thin Ice",
 	tiles = {"main_ice_thin.png"},
-	groups = {cracky = 3},
+	groups = {cracky = 3, slippery = 3},
 })
 
 minetest.register_node("main:ice_thick", {
@@ -444,77 +444,3 @@ minetest.register_node("main:muddywater_flowing", {
 	liquid_alternative_source = "main:muddywater_source",
 	groups = {liquid = 1, water = 1},
 })
-
---Liquid mud
-minetest.register_node("main:mud_source", {
-	description = "Liquid Mud Source",
-	drawtype = "liquid",
-	paramtype = "light",
-	
-	tiles = {name = "main_mud_source.png"},
-	post_effect_color = {r = 60, g = 40, b = 10},
-	
-	--Behavior
-	walkable = false,
-	pointable = false,
-	buildable_to = true,
-	diggable = false,
-	is_ground_content = false,
-	
-	--Properties
-	liquid_range = 6,
-	liquid_viscosity = 20,
-	drowning = 1,
-	liquidtype = "source",
-	liquid_alternative_flowing = "main:mud_flowing",
-	liquid_alternative_source = "main:mud_source",
-	groups = {liquid = 3},
-})
-
-minetest.register_node("main:mud_flowing", {
-	description = "Flowing Liquid Mud",
-	drawtype = "flowingliquid",
-	paramtype = "light",
-	
-	tiles = {name = "main_mud_flowing.png"},
-	animation = {
-		type = "vertical_frames",
-		aspect_w = 16,
-		aspect_h = 16,
-		length = 1.0
-    },
-	
-	special_tiles = {
-        {
-            name = "main_mud_flowing.png",
-            animation = {type = "vertical_frames", aspect_w = 16,
-            aspect_h = 16, length = 1.0},
-            backface_culling = true,
-        },
-        
-        {
-            name = "main_mud_flowing.png",
-            animation = {type = "vertical_frames", aspect_w = 16,
-            aspect_h = 16, length = 1.0},
-            backface_culling = false,
-        }
-    },
-	
-	post_effect_color = {r = 60, g = 40, b = 10},
-	
-	--Behavior
-	walkable = false,
-	pointable = false,
-	buildable_to = true,
-	diggable = false,
-	is_ground_content = false,
-	
-	--Properties
-	liquid_range = 6,
-	liquid_viscosity = 20,
-	drowning = 1,
-	liquidtype = "flowing",
-	liquid_alternative_flowing = "main:mud_flowing",
-	liquid_alternative_source = "main:mud_source",
-	groups = {liquid = 3},
-})
diff --git a/mods/main/textures/main_quicksand_normal.png b/mods/main/textures/main_quicksand_normal.png
deleted file mode 100644
index 9f8dd35..0000000
Binary files a/mods/main/textures/main_quicksand_normal.png and /dev/null differ
diff --git a/mods/quicksand/init.lua b/mods/quicksand/init.lua
new file mode 100644
index 0000000..b88c783
--- /dev/null
+++ b/mods/quicksand/init.lua
@@ -0,0 +1,229 @@
+-----------------
+--Liquid hard mud
+-----------------
+minetest.register_node("quicksand:mud_hard_source", {
+	description = "Liquid Hard Mud Source",
+	drawtype = "liquid",
+	paramtype = "light",
+	
+	tiles = {name = "quicksand_mud_hard_source.png"},
+	post_effect_color = {r = 60, g = 40, b = 10},
+	
+	--Behavior
+	walkable = false,
+	pointable = false,
+	buildable_to = true,
+	diggable = false,
+	is_ground_content = false,
+	
+	--Properties
+	liquid_range = 6,
+	liquid_viscosity = 20,
+	drowning = 1,
+	liquidtype = "source",
+	liquid_alternative_flowing = "quicksand:mud_hard_flowing",
+	liquid_alternative_source = "quicksand:mud_hard_source",
+	groups = {liquid = 3},
+})
+
+minetest.register_node("quicksand:mud_hard_flowing", {
+	description = "Flowing Liquid Hard Mud",
+	drawtype = "flowingliquid",
+	paramtype = "light",
+	
+	tiles = {name = "quicksand_mud_hard_flowing.png"},
+	animation = {
+		type = "vertical_frames",
+		aspect_w = 16,
+		aspect_h = 16,
+		length = 1.0
+    },
+	
+	special_tiles = {
+        {
+            name = "quicksand_mud_hard_flowing.png",
+            animation = {type = "vertical_frames", aspect_w = 16,
+            aspect_h = 16, length = 1.0},
+            backface_culling = true,
+        },
+        
+        {
+            name = "quicksand_mud_hard_flowing.png",
+            animation = {type = "vertical_frames", aspect_w = 16,
+            aspect_h = 16, length = 1.0},
+            backface_culling = false,
+        }
+    },
+	
+	post_effect_color = {r = 60, g = 40, b = 10},
+	
+	--Behavior
+	walkable = false,
+	pointable = false,
+	buildable_to = true,
+	diggable = false,
+	is_ground_content = false,
+	
+	--Properties
+	liquid_range = 6,
+	liquid_viscosity = 20,
+	drowning = 1,
+	liquidtype = "flowing",
+	liquid_alternative_flowing = "quicksand:mud_hard_flowing",
+	liquid_alternative_source = "quicksand:mud_hard_source",
+	groups = {liquid = 3},
+})
+
+------------
+--Liquid mud
+------------
+minetest.register_node("quicksand:mud_med_source", {
+	description = "Liquid Mud Source",
+	drawtype = "liquid",
+	paramtype = "light",
+	
+	tiles = {name = "quicksand_mud_med_source.png"},
+	post_effect_color = {r = 60, g = 40, b = 10},
+	
+	--Behavior
+	walkable = false,
+	pointable = false,
+	buildable_to = true,
+	diggable = false,
+	is_ground_content = false,
+	
+	--Properties
+	liquid_range = 6,
+	liquid_viscosity = 10,
+	drowning = 1,
+	liquidtype = "source",
+	liquid_alternative_flowing = "quicksand:mud_med_flowing",
+	liquid_alternative_source = "quicksand:mud_med_source",
+	groups = {liquid = 2},
+})
+
+minetest.register_node("quicksand:mud_med_flowing", {
+	description = "Flowing Liquid Mud",
+	drawtype = "flowingliquid",
+	paramtype = "light",
+	
+	tiles = {name = "quicksand_mud_med_flowing.png"},
+	animation = {
+		type = "vertical_frames",
+		aspect_w = 16,
+		aspect_h = 16,
+		length = 1.0
+    },
+	
+	special_tiles = {
+        {
+            name = "quicksand_mud_med_flowing.png",
+            animation = {type = "vertical_frames", aspect_w = 16,
+            aspect_h = 16, length = 1.0},
+            backface_culling = true,
+        },
+        
+        {
+            name = "quicksand_mud_med_flowing.png",
+            animation = {type = "vertical_frames", aspect_w = 16,
+            aspect_h = 16, length = 1.0},
+            backface_culling = false,
+        }
+    },
+	
+	post_effect_color = {r = 60, g = 40, b = 10},
+	
+	--Behavior
+	walkable = false,
+	pointable = false,
+	buildable_to = true,
+	diggable = false,
+	is_ground_content = false,
+	
+	--Properties
+	liquid_range = 7,
+	liquid_viscosity = 10,
+	drowning = 1,
+	liquidtype = "flowing",
+	liquid_alternative_flowing = "quicksand:mud_med_flowing",
+	liquid_alternative_source = "quicksand:mud_med_source",
+	groups = {liquid = 2},
+})
+
+------------
+--Hard quicksand
+------------
+minetest.register_node("quicksand:quicksand_hard", {
+	description = "Hard Quicksand",
+	drawtype = "liquid",
+	paramtype = "light",
+	
+	tiles = {name = "quicksand_quicksand_hard.png"},
+	post_effect_color = {r = 80, g = 50, b = 10},
+	
+	--Behavior
+	walkable = false,
+	pointable = true,
+	buildable_to = false,
+	diggable = true,
+	is_ground_content = false,
+	
+	--Properties
+	liquid_range = 0,
+	liquid_viscosity = 30,
+	liquid_renewable = false,
+	drowning = 1,
+	damage_per_second = 1,
+	liquidtype = "source",
+	liquid_alternative_flowing = "quicksand:quicksand_hard",
+	liquid_alternative_source = "quicksand:quicksand_hard",
+	groups = {quicksandy = 1},
+})
+
+------------
+--Quicksand
+----------
+minetest.register_node("quicksand:quicksand", {
+	description = "Quicksand",
+	drawtype = "liquid",
+	paramtype = "light",
+	
+	tiles = {name = "quicksand_quicksand_normal.png"},
+	post_effect_color = {r = 80, g = 50, b = 10},
+	
+	--Behavior
+	walkable = false,
+	pointable = true,
+	buildable_to = false,
+	diggable = true,
+	is_ground_content = false,
+	
+	--Properties
+	liquid_range = 0,
+	liquid_viscosity = 20,
+	liquid_renewable = false,
+	drowning = 1,
+	damage_per_second = 2,
+	liquidtype = "source",
+	liquid_alternative_flowing = "quicksand:quicksand",
+	liquid_alternative_source = "quicksand:quicksand",
+	groups = {crumbly = 1, quicksandy = 2},
+})
+
+-----------
+--Longstick
+-----------
+minetest.register_item("quicksand:longstick", {
+	type = "none",
+	wield_image = "main_pickaxe_steel.png",
+	inventory_image = "main_pickaxe_steel.png",
+	wield_scale = {x=1, y=4, z=1},
+	range = 2,
+	
+	on_use = function(itemstack, player, pointed_thing)
+			local newpos = pointed_thing.above
+			if newpos ~= nil then
+			player:set_pos(newpos)
+			end
+	end
+})
diff --git a/mods/main/textures/main_mud_flowing.png b/mods/quicksand/textures/quicksand_mud_hard_flowing.png
similarity index 100%
rename from mods/main/textures/main_mud_flowing.png
rename to mods/quicksand/textures/quicksand_mud_hard_flowing.png
diff --git a/mods/main/textures/main_mud_source.png b/mods/quicksand/textures/quicksand_mud_hard_source.png
similarity index 100%
rename from mods/main/textures/main_mud_source.png
rename to mods/quicksand/textures/quicksand_mud_hard_source.png
diff --git a/mods/main/textures/main_quicksand_hard.png b/mods/quicksand/textures/quicksand_quicksand_hard.png
similarity index 100%
rename from mods/main/textures/main_quicksand_hard.png
rename to mods/quicksand/textures/quicksand_quicksand_hard.png
diff --git a/mods/quicksand/textures/quicksand_quicksand_normal.png b/mods/quicksand/textures/quicksand_quicksand_normal.png
new file mode 100644
index 0000000..9d8cc8c
Binary files /dev/null and b/mods/quicksand/textures/quicksand_quicksand_normal.png differ
diff --git a/mods/main/textures/main_quicksand_weak.png b/mods/quicksand/textures/quicksand_quicksand_weak.png
similarity index 100%
rename from mods/main/textures/main_quicksand_weak.png
rename to mods/quicksand/textures/quicksand_quicksand_weak.png