diff --git a/README.md b/README.md
index 8e0f725b5c5fbd0b828b502a5ab09fab42009bea..1d6fa0ec494e34ee9f7d19a8b525f0f150e300a9 100644
--- a/README.md
+++ b/README.md
@@ -1,323 +1 @@
 # This is not the original ethereal mod. Things may be broken on your setup. Please use [the original](https://github.com/tenplus1/ethereal) ethereal mod!
-
-# ethereal
-
-Ethereal Mapgen mod for Minetest (works on all except v6)
-
-## Forum Topic
-- https://forum.minetest.net/viewtopic.php?f=11&t=14638
-
-## Changelog
-
-### 1.21
-
- - Saplings need clear space above to grow (depending on height of tree)
- - Bonemeal changes to suit new sapling growth
- - Fixes and tweaks
- - Added default Abm overrides
-
-### 1.20
-
-- Tweaked Ethereal to work with new features and nodes in Minetest 0.4.14
-- Added bones found in dirt and bonemeal to make tree's and crops grow quicker
-- Tree's follow default rules where saplings need light to grow
-- Using default schematics for apple, pine, acacia and jungle tree's
-- Tidied and split code into separate files
-- Redid coloured grass spread function to run better
-- Added support for moreblock's stairsplus feature
-
-### 1.19
-
-- Added new biome routine to help restructure biomes
-- Tweaked biome values so that they are more spread out (no more huge bamboo biome)
-- Tweaked biome plant and tree decorations
-- Fixed farming compatibility when using hoe on ethereal dirt
-- Dirt with dry grass turns into green grass when near water
-- Ice or snow above sea level melts into river water
-- Disabling ethereal biomes no longer shows error messages
-- Fire Flowers re-generate, can also be made into Fire Dust and both are fuel
-- Optimize and tidy code
-
-### 1.18
-
-- Added Birch tree, also stairs; fence and gate
-- Added Fire flower to fiery biomes (careful, it hurts)
-- Tweaked biomes and decoration slightly
-- Added tree_tool for admin to quickly grow tree's
-- Cobble to Mossycobble when near water has been toned down a bit
-
-### 1.17
-
-- Added new Glacier biome filled with snow and ice
-- Changed Mesa biome to have more coloured clay patterns
-- Changed Bamboo biome to have tall tree-like stalks with leaves that give
-- Bamboo sprouts are now saplings to grow new stalks
-- Removed farmed mushrooms and replaced with default game mushrooms with spores
-
-### 1.16
-
-- Added new tree schematics that change when placed with random leaves, fruit and height
-- Changed frost dirt so that it no longer freezes water (saves lag)
-- Torches cannot be placed next to water, otherwise they drop as items
-- Added latest farming redo Bean Bushes to mapgen
-- Code tidy (thanks HybridDog) and bug fix
-- Banana, Orange and Apple fruits now drop when tree has been removed.
-
-### 1.15
-
-- Added Staff of Light (thanks Xanthin), crafted from illumishrooms and can turn stone into glostone and back again
-- Changed how Crystal Spikes reproduce
-- Crystal Ingots now require 2x mese crystal and 2x crystal spikes to craft
-- Removed obsidian brick & stairs now they are in default game, also removed pine wood stairs for same reason
-- Tidied code and optimized a few routines
-
-
-### 1.14
-
-- Changed Ethereal to work with Minetest 0.4.11 update and new mapgen features
-- Changed Pine tree's to use default pine wood
-- Added pine wood fence, gate and stairs
-- Crystal Spikes now re-generate in crystal biomes
-- Removed layer mapgen, keeping spread as default
-
-
-### 1.13
-
-- Changed melting feature to work with 0.4.11 pre-release now that group:hot and group:melt have been removed
-
-
-### 1.12
-
-- Added ability to disable biomes in the init.lua file by setting to 1 (enable) or 0 (disable)
-- Supports Framing Redo 1.10 foods
-
-
-### 1.11
-
-- Added Stairs for Ethereal wood types, mushroom, dry dirt, obsidian brick and clay
-- Added Green Coral which can be used as green dye
-- Craft 5x Ice in X pattern to give 5x Snow
-- Added Snow and Ice Bricks with their own stairs and slabs which melt when near heat
-
-
-### 1.10
-
-- Added Stone Ladders (another use for cobble)
-- Craft 5x Gravel in X pattern to give 5 dirt, and 5x dirt in X pattern for 5 sand
-- Added Acacia tree's to desert biome (a nice pink wood to build with, thanks to VanessaE for textures)
-- Added Acacia fences and gates
-- Added Vines, craftable with 2x3 leaves
-
-
-### 1.09
-
-- Fixed Quicksand bug where player see's only black when sinking instead of yellow effect, note this will only work on new maps or newly generated areas of map containing quicksand
-- Hot nodes will melt ice and snow in a better way
-- Few spelling errors sorted for sapling and wood names
-
-
-### 1.08
-
-- Saplings produce better placed tree's when grown, routines have been redone
-- Orange tree's now spawn in prairie biomes
-- The usual code tidy and few bug fixes along the way
-
-### 1.07
-
-- If Farming Redo mod detected then it's growing routines will be used for Ethereal plantlife instead of default
-Leaftype and Mapstyle settings can be changed within init.lua file, new layered style maps are being tested
-Changed crafting recipe for Fences, they tie in with Gates a little better
-
-### 1.06
-
-- Added support for Farming Redo mod, all plants spawn on newly generated areas:
- - https://forum.minetest.net/viewtopic.php?id=9019
-
-### 1.05b
-
-- Added Gates for each of the fence types (thanks to Blockmen for gate model)
-- Players can no longer jump over fences unless they wear crystal boots < REMOVED
-
-### 1.04
-
-- Farming of Mushrooms, Wild Onions and Strawberries now use minetest 0.4.10 functions
-- Strawberries can be grown by using actual fruit, seeds no longer needed
-- Tree leaves are no longer walkable, player can go through them
-- Saplings now fall if block underneath disturbed
-
-### 1.03
-
-- Changed Fence recipe's so it doesn't interfere with 3d armor's wooden boots
-- Tweaked textures to bring down file sizes
-- Flowers, Sprouts and Ferns now spread over ALL grassland
-
-### 1.02
-
-- Fences added for each type of wood in Ethereal
-- Changes to biome settings, less artifacts
-
-### 1.01
-
-- Quicksand generates throughout world near sandy water
-- Bamboo as well as Papyrus now grow on dirt near water
-- Fixed Coral textures and light
-
-### 1.00
-
-- Seaweed now spawns in deep water and can grow up to 10 high
-- Coral also spawns in deep water and glows slightly (orange, pink and blue)
-- Above items can be crafted into dye, also Seaweed is edible
-- So long as sand isn't disturbed under the ocean, sealife will re-generate
-- Fixed Leaves inventory images and Mushroom selection box (thanks Wuzzy)
-
-### 0.0.9
-#### 0.0.9p
-
-- Willow Trees now spawn in grey biome instead of tiny grey trees (model by Phiwari123)
-- Redwood Trees now spawn in Mesa biome (model by Wes42033)
-- BakedClay mod no longer required for Mesa biome but used if found
-- Paper Wall added
-
-#### 0.0.9o
-
-- Added Obsidian Brick craft for building
-- Changed Illumishroom cave levels
-- Changed *is_ground_content* to false for ethereal dirt so mapgen doesn't carve it up with caves
-
-#### 0.0.9n
-
-- New textures for farming mushrooms and spores
-- Illumi-shrooms spawn in caves to brighten things up a little
-- Crafting a wooden sign now gives 4 instead of 1
-
-#### 0.0.9m
-
-- Changed Bamboo biome slightly, Bamboo Sprout has new image
-- Abm timings changed and a few bugs fixed
-- Crystal Gilly Staff has to be used (left-click) to replenish air while underwater
-- Crystal Shovel now works with protection mods
-- Tidied code and changed ladder recipe's to double output
-
-#### 0.0.9L
-
-- Scorched Tree's are now different sizes
-- Crystal Shovel with soft touch can now be used to dig up sand and gravel
-- Bamboo and Papyrus drop entire stalk when bottom node dug
-- Crystal Spikes require steel pick or better to dig and fall when dirt below is removed
-- Few changes to mapgen and water functions
-
-#### 0.0.9k
-
-- Fixed bug in charcoal lumps (no more placing as unknown nodes)
-- Added Crystal Shovel with soft touch, can be used to dig up dirt with grass intact
-- Fixed bug in Crystal Shovel, now works with dirt_with_snow and has sounds
-- Tweaked Fiery Biomes slightly, smaller craters on outside, large in hotter areas
-
-#### 0.0.9i
-
-- Cleaned up mapgen_v7.lua file, maps now generate a little faster
-- Removed cactus.mts, no longer required
-- Removed mushroomtwo.mts, no longer required
-- Removed bamboo.mts, no longer required
-- Removed deadtree.mts, no longer required
-- Few new textures added
-- Papyrus also spawns on jungle dirt near water
-- Replaced dead tree's with scorched tree's
-- Each scorched tree trunk crafts into 2x charcoal Lumps (fixed)
-- Torches can also be crafted from Charcoal
-
-#### 0.0.9h
-
-- Added Strawberry farming, Strawberry Seeds and new Textures
-- Tidied up mapgen_v7.lua for better spawning of plants and trees
-- Player can no longer walk through Bamboo Stalks
-
-#### 0.0.9g
-
-- Changed Ethereal's growing routine for Saplings, it now uses 1 single abm to grow all tree's
-
-#### 0.0.9f
-
-- Added Fishing to Ethereal, Fishing Rod, Worms, Fish and Cooked Fish (Left-click the water with a Baited Rod in the hope of landing your prize)
-
-#### 0.0.9e
-
-- Changed textures for Bowl, Mushroom Soup, Crystal Spike, Banana Loaf, Strawberry & Bush
-- Added Hearty Stew Recipes
-- If BakedClay mod is installed, Mesa Biome will be added to the mix
-
-#### 0.0.9d
-
-- Added Bamboo Grove and Bamboo Sprouts )
-- Craft Bamboo into Paper and Bamboo Flooring
-- Cactus is now edible when crafted beside empty bucket
-
-#### 0.0.9c
-
-- Code re-worked so mod now uses sections for each function (easier to read and edit)
-- New textures for Strawberry Bush and Crystal Spikes
-
-#### 0.0.9b
-
-- Pine Tree Leaves have new texture and sometimes give Pine Nuts
-- Jungle Tree's now use default Jungle Wood as texture
-
-#### 0.0.9
-
-- Prairie, Grove, Jungle and Snowy biomes have their own dirt
-- Saplings will only grow in the biomes they were taken from
-- Mapgen tweaks and code changes for new dirt added
-
-### 0.0.8 Changes
-#### 0.0.8m
-
-- Added Banana Trunk and Wood
-- Added Boston Ferns to Grove biome
-- Added edible Fern Tubers
-- Mushroom Biome now has different sized mushrooms
-- Changed Pine Needles texture
-
-#### 0.0.8k
-
-- Added Desert Sand biome
-- Added Alpine biome with Pine Trees and Snow
-- Added Grove biome with Banana Tree's (saplings only grow in that temperate area)
-- Added Bananas, Banana Dough and Banana Bread
-- Changed biome generation to be more like real-world environs (e.g. shrooms like hot & humid so that's where they spawn)
-- Tidied up code and removed redundant lines
-
-#### 0.0.8e
-
-- New Plains biome added between Fiery and Green areas to hopefully stop forest fires, these have dry dirt and dead trees
-- Placing water near Dry Dirt turns it into normal dirt, cooking normal dirt changes it into Dry Dirt
-
-Note: if your Ethereal world does have a few forest fires appearing you can always add this line to your minetest.conf file:
-
-disable_fire = true
-
-#### 0.0.8
-
-- Healing Tree (grows on high snowy peaks, leaves are edible and golden apples heal all hearts)
-- Added some new images for Cooked Mushroom Soup, Mushroom Spores and Palm Trees
-- 2D leaves or 3D leaves option, both wave in wind if enabled
-- All new saplings can grow on their native dirt, and palm tree's on sand
-- Crystal Spike or Crystal Dirt freezes nearby water, Heat can also melt ice
-- Wild Mushrooms now give Spores, plant these to grow edible mushrooms
-- Cobble in water turns mossy
-- Palm Leaves can be cooked into Palm Wax and made into Candles
-
-### 0.0.7c
-
-- Gravel can be found under lake biomes (or craft 5 cobble in X pattern)
-- Papyrus is found and grows on dirt near water (also craft 2x3 string for paper)
-- Mushroom Heads have a chance of giving Mushroom Sapling (craft 1 head = 4x Mushrooms ready for Planting)
-- Trees and Mushrooms have a chance of giving Saplings
-- Frost Trunk and Mushroom Trunk are rotatable (craft 1 Mushroom Trunk = 4x White Dye)
-- Desert areas have Dry Shrubs added
-- Crystal Spikes added to Crystal Biome (watch out they hurt)
-- Crystal Ingots added to make Sword and Pick
-- New Pine Tree model added to snowy biome which adds Pine leaves and drops Pine Saplings
-- Fixed GrassyTwo biome so that BigTree now spawns and grows from sapling
-- Added Crystal Gilly Staff to allow breathing underwater (so long as it's in hand)
-- Added Palm Trees, Trunk, Wood, Sapling, Coconuts, Coconut Slice (to eat)
-- Thanks to VanessaE's for the Palm textures
diff --git a/init.lua b/init.lua
index 467e0b188d9c0c004a6493b0cf87852dc60eb6dc..e1f88cf4de8968d9b151be328d9975d9cdb5768e 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,6 @@
 --[[
 
-	Minetest Ethereal Mod (9th August 2016)
+	Minetest Ethereal Mod (24th November 2016)
 
 	Created by ChinChow
 
@@ -37,6 +37,7 @@ ethereal.plains    = 1 -- Dry dirt with scorched trees
 ethereal.savannah  = 1 -- Dry yellow grass with acacia tree's
 ethereal.fiery     = 1 -- Red grass with lava craters
 ethereal.sandclay  = 1 -- Sand areas with clay underneath
+ethereal.swamp     = 1 -- Swamp areas with vines on tree's, mushrooms, lilly's and clay sand
 
 -- Intllib
 local S
diff --git a/luac.out b/luac.out
new file mode 100644
index 0000000000000000000000000000000000000000..e6992e6dfaf2eb312a20a70d78acad5114f67360
Binary files /dev/null and b/luac.out differ
diff --git a/mapgen.lua b/mapgen.lua
index 844666301a8c3deb77dab201cd23aec12e9a4ab5..eb35fd19f39df0a037823431f7b8a293e36e16e1 100644
--- a/mapgen.lua
+++ b/mapgen.lua
@@ -171,6 +171,12 @@ add_biome("fiery_ocean", nil, "default:sand", 1, "default:sand", 2,
 add_biome("sandclay", nil, "default:sand", 3, "default:clay", 2,
 	nil, nil, nil, nil, nil, 1, 11, 65, 2, ethereal.sandclay)
 
+add_biome("swamp", nil, "ethereal:green_dirt", 1, "default:dirt", 3,
+	nil, nil, nil, nil, nil, 1, 7, 90, 90, ethereal.swamp)
+
+add_biome("swamp_ocean", nil, "default:sand", 2, "default:clay", 2,
+	nil, nil, nil, nil, nil, -192, 1, 90, 90, ethereal.swamp)
+
 --= schematic decorations
 
 local add_schem = function(a, b, c, d, e, f, g)
@@ -289,6 +295,9 @@ add_schem({"ethereal:bamboo_dirt"}, 0.025, {"bamboo"}, 1, 100, ethereal.bambootr
 -- bush
 add_schem({"ethereal:bamboo_dirt"}, 0.08, {"bamboo"}, 1, 100, ethereal.bush, ethereal.bamboo)
 
+-- vine tree
+add_schem({"ethereal:green_dirt"}, 0.02, {"swamp"}, 1, 100, path .. "vinetree.mts", ethereal.swamp)
+
 --= simple decorations
 
 local add_node = function(a, b, c, d, e, f, g, h, i, j)
@@ -371,7 +380,8 @@ local list = {
 	{"grassy", "ethereal:green_dirt", ethereal.grassy},
 	{"grassytwo", "ethereal:green_dirt", ethereal.grassytwo},
 	{"prairie", "ethereal:prairie_dirt", ethereal.prairie},
-	{"mushroom", "ethereal:mushroom_dirt", ethereal.mushroom}
+	{"mushroom", "ethereal:mushroom_dirt", ethereal.mushroom},
+	{"swamp", "ethereal:green_dirt", ethereal.swamp},
 }
 
 -- wild red and brown mushrooms
@@ -403,6 +413,7 @@ end
 add_node({"ethereal:jungle_dirt"}, 0.10, {"junglee"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.junglee)
 add_node({"ethereal:green_dirt"}, 0.15, {"jumble"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.jumble)
 add_node({"ethereal:mesa_dirt"}, 0.10, {"mesa"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.mesa)
+add_node({"ethereal:green_dirt"}, 0.25, {"swamp"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.swamp)
 
 -- grass
 add_node({"ethereal:green_dirt"}, 0.35, {"grassy"}, 1, 100, {"default:grass_2", "default:grass_3",
@@ -419,15 +430,15 @@ add_node({"ethereal:grove_dirt"}, 0.35, {"grove"}, 1, 100, {"default:grass_2", "
 	"default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.grove)
 add_node({"ethereal:bamboo_dirt"}, 0.35, {"bamboo"}, 1, 100, {"default:grass_2", "default:grass_3",
 	"default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.bamboo)
-add_node({"ethereal:green_dirt"}, 0.25, {"clearing"}, 1, 100, {"default:grass_2", "default:grass_3",
+add_node({"ethereal:green_dirt"}, 0.35, {"clearing", "swamp"}, 1, 100, {"default:grass_3",
 	"default:grass_4"}, nil, nil, nil, 1)
 
 -- grass on sand
-add_node({"default:sand"}, 0.25, {"sandclay"}, 3, 3, {"default:grass_2", "default:grass_3"}, nil, nil, nil, ethereal.sandclay)
+add_node({"default:sand"}, 0.25, {"sandclay"}, 3, 4, {"default:grass_2", "default:grass_3"}, nil, nil, nil, ethereal.sandclay)
 
 -- ferns
 add_node({"ethereal:grove_dirt","ethereal:jungle_dirt","ethereal:mesa_dirt"}, 0.2, {"grove","junglee","mesa"}, 1, 100, {"ethereal:fern"}, nil, nil, nil, ethereal.grove)
-
+add_node({"ethereal:green_dirt"}, 0.1, {"swamp"}, 1, 100, {"ethereal:fern"}, nil, nil, nil, ethereal.swamp)
 
 -- snow
 add_node({"ethereal:cold_dirt"}, 0.8, {"snowy"}, 4, 40, {"default:snow"}, nil, nil, nil, ethereal.snowy)
@@ -441,12 +452,8 @@ add_node({"ethereal:prairie_dirt"}, 0.25, {"prairie"}, 1, 100, {"ethereal:onion_
 
 -- papyrus
 add_node({"ethereal:green_dirt"}, 0.1, {"grassy"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.grassy)
-add_node({"ethereal:jungle_dirt"}, 0.1, {"jungle"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.junglee)
-
---= illuna stuff
-
---add_node({"default:snow_block"}, 0.1, {"mountain"}, 1, 30000, {"caverealms:icicle_up"}, 1, "default:stone", 1, ethereal.mountain)
---add_node({"default:stone"}, 0.8, {"mountain"}, 140, 30000, {"default:water_source"}, 4, "default:stone", 1, ethereal.mountain)
+add_node({"ethereal:jungle_dirt"}, 0.1, {"junglee"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.junglee)
+add_node({"ethereal:green_dirt"}, 0.1, {"swamp"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.swamp)
 
 --= Farming Redo plants
 
@@ -496,6 +503,7 @@ local list = {
 	{"mesa_ocean", ethereal.mesa},
 	{"grove_ocean", ethereal.grove},
 	{"grassy_ocean", ethereal.grassy},
+	{"swamp_ocean", ethereal.swamp},
 }
 
 for _, row in pairs(list) do
diff --git a/plantpack.lua b/plantpack.lua
index c323e457f2d68f62b36475c6a807879f099af1d1..266f3aa680d22192f8f8329d5e5e1a54c1beedc8 100644
--- a/plantpack.lua
+++ b/plantpack.lua
@@ -147,7 +147,7 @@ minetest.register_decoration({
 	place_on = {"default:sand", "default:green_dirt"},
 	sidelen = 16,
 	fill_ratio = 0.015,
-	biomes = {"sandclay", "grassy_ocean", "grassy", "grassytwo", "jumble"},
+	biomes = {"sandclay", "grassy_ocean", "grassy", "grassytwo", "jumble", "swamp"},
 	decoration = {
 		"xanadu:wetlands_cattails", "xanadu:wetlands_pickerel",
 		"xanadu:wetlands_mannagrass", "xanadu:wetlands_turtle"
diff --git a/schematics/vinetree.mts b/schematics/vinetree.mts
new file mode 100644
index 0000000000000000000000000000000000000000..e978e40d29013a5f97063bae0bb56feda2264ae9
Binary files /dev/null and b/schematics/vinetree.mts differ