diff --git a/mods/cool_trees/baldcypress/init.lua b/mods/cool_trees/baldcypress/init.lua
index 1883005..89435da 100644
--- a/mods/cool_trees/baldcypress/init.lua
+++ b/mods/cool_trees/baldcypress/init.lua
@@ -54,7 +54,6 @@ end
 minetest.register_node("baldcypress:sapling", {
 	description = S("Bald Cypress Tree Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"baldcypress_sapling.png"},
 	inventory_image = "baldcypress_sapling.png",
 	wield_image = "baldcypress_sapling.png",
@@ -117,7 +116,6 @@ minetest.register_node("baldcypress:wood", {
 minetest.register_node("baldcypress:leaves", {
 	description = S("Bald Cypress Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"baldcypress_leaves.png"},
 	inventory_image = "baldcypress_leaves.png",
 	wield_image = "baldcypress_leaves.png",
diff --git a/mods/cool_trees/bamboo/init.lua b/mods/cool_trees/bamboo/init.lua
index 9eb28db..7eb6134 100644
--- a/mods/cool_trees/bamboo/init.lua
+++ b/mods/cool_trees/bamboo/init.lua
@@ -177,7 +177,6 @@ minetest.register_node("bamboo:wood", {
 minetest.register_node("bamboo:leaves", {
 	description = S("Bamboo Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"bamboo_leaves.png"},
 	inventory_image = "bamboo_leaves.png",
 	wield_image = "bamboo_leaves.png",
@@ -252,7 +251,7 @@ end
 
 --Stairs
 
-if minetest.get_modpath("stairs") ~= nil then	
+if minetest.get_modpath("stairs") ~= nil then
 	stairs.register_stair_and_slab(
 		"bamboo_trunk",
 		"bamboo:trunk",
diff --git a/mods/cool_trees/birch/init.lua b/mods/cool_trees/birch/init.lua
index a1b31f7..dfd712a 100644
--- a/mods/cool_trees/birch/init.lua
+++ b/mods/cool_trees/birch/init.lua
@@ -114,7 +114,6 @@ minetest.register_decoration({
 minetest.register_node("birch:sapling", {
 	description = S("Birch Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"birch_sapling.png"},
 	inventory_image = "birch_sapling.png",
 	wield_image = "birch_sapling.png",
@@ -176,7 +175,6 @@ minetest.register_node("birch:wood", {
 minetest.register_node("birch:leaves", {
 	description = S("Birch Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"birch_leaves.png"},
 	inventory_image = "birch_leaves.png",
 	wield_image = "birch_leaves.png",
@@ -237,7 +235,7 @@ default.register_leafdecay({
 
 --Stairs
 
-if minetest.get_modpath("stairs") ~= nil then	
+if minetest.get_modpath("stairs") ~= nil then
 	stairs.register_stair_and_slab(
 		"birch_trunk",
 		"birch:trunk",
@@ -249,7 +247,7 @@ if minetest.get_modpath("stairs") ~= nil then
 	)
 end
 
-if minetest.get_modpath("bonemeal") ~= nil then	
+if minetest.get_modpath("bonemeal") ~= nil then
 	bonemeal:add_sapling({
 		{"birch:sapling", grow_new_birch_tree, "soil"},
 	})
diff --git a/mods/cool_trees/cherrytree/init.lua b/mods/cool_trees/cherrytree/init.lua
index a866c30..ad6ae71 100644
--- a/mods/cool_trees/cherrytree/init.lua
+++ b/mods/cool_trees/cherrytree/init.lua
@@ -79,7 +79,6 @@ end
 minetest.register_node("cherrytree:sapling", {
 	description = S("Cherrytree Tree Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"cherrytree_sapling.png"},
 	inventory_image = "cherrytree_sapling.png",
 	wield_image = "cherrytree_sapling.png",
@@ -142,7 +141,6 @@ minetest.register_node("cherrytree:wood", {
 minetest.register_node("cherrytree:blossom_leaves", {
 	description = S("Cherrytree Blossom Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"cherrytree_blossom_leaves.png"},
 	inventory_image = "cherrytree_blossom_leaves.png",
 	wield_image = "cherrytree_blossom_leaves.png",
@@ -165,7 +163,6 @@ minetest.register_node("cherrytree:blossom_leaves", {
 minetest.register_node("cherrytree:leaves", {
 	description = S("Cherrytree Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"cherrytree_leaves.png"},
 	inventory_image = "cherrytree_leaves.png",
 	wield_image = "cherrytree_leaves.png",
@@ -227,7 +224,7 @@ default.register_leafdecay({
 
 --Stairs
 
-if minetest.get_modpath("stairs") ~= nil then	
+if minetest.get_modpath("stairs") ~= nil then
 	stairs.register_stair_and_slab(
 		"cherrytree_trunk",
 		"cherrytree:trunk",
@@ -245,7 +242,7 @@ minetest.register_abm({
     neighbors = {},
     interval = 600.0, -- Run every 10 minuts
     chance = 50, -- Select every 1 in 50 nodes
-    action = function(pos, node, active_object_count, active_object_count_wider)		
+    action = function(pos, node, active_object_count, active_object_count_wider)
 		if node.param2 == 1 then -- ignore manually placed leaves
 			return
 		end
diff --git a/mods/cool_trees/chestnuttree/init.lua b/mods/cool_trees/chestnuttree/init.lua
index b5af0aa..14740c3 100644
--- a/mods/cool_trees/chestnuttree/init.lua
+++ b/mods/cool_trees/chestnuttree/init.lua
@@ -38,7 +38,7 @@ minetest.register_node("chestnuttree:bur", {
 
 minetest.register_craftitem("chestnuttree:fruit", {
 	description = S("Chestnut"),
-	inventory_image = "chestnuttree_fruit.png",	
+	inventory_image = "chestnuttree_fruit.png",
 	on_use = minetest.item_eat(2),
 	groups = {flammable = 2, food = 2},
 })
@@ -96,7 +96,6 @@ end
 minetest.register_node("chestnuttree:sapling", {
 	description = S("Chestnut Tree Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"chestnuttree_sapling.png"},
 	inventory_image = "chestnuttree_sapling.png",
 	wield_image = "chestnuttree_sapling.png",
@@ -156,7 +155,6 @@ minetest.register_node("chestnuttree:wood", {
 minetest.register_node("chestnuttree:leaves", {
 	description = S("Chestnut Tree Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"chestnuttree_leaves.png"},
 	inventory_image = "chestnuttree_leaves.png",
 	wield_image = "chestnuttree_leaves.png",
@@ -229,7 +227,7 @@ if minetest.get_modpath("stairs") ~= nil then
 	)
 end
 
-if minetest.get_modpath("bonemeal") ~= nil then	
+if minetest.get_modpath("bonemeal") ~= nil then
 	bonemeal:add_sapling({
 		{"chestnuttree:sapling", grow_new_chestnuttree_tree, "soil"},
 	})
diff --git a/mods/cool_trees/clementinetree/init.lua b/mods/cool_trees/clementinetree/init.lua
index ef68129..3ced94a 100644
--- a/mods/cool_trees/clementinetree/init.lua
+++ b/mods/cool_trees/clementinetree/init.lua
@@ -77,7 +77,6 @@ end
 minetest.register_node("clementinetree:sapling", {
 	description = S("Clementine Tree Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"clementinetree_sapling.png"},
 	inventory_image = "clementinetree_sapling.png",
 	wield_image = "clementinetree_sapling.png",
@@ -137,7 +136,6 @@ minetest.register_node("clementinetree:wood", {
 minetest.register_node("clementinetree:leaves", {
 	description = S("Clementine Tree Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"clementinetree_leaves.png"},
 	inventory_image = "clementinetree_leaves.png",
 	wield_image = "clementinetree_leaves.png",
@@ -210,7 +208,7 @@ if minetest.get_modpath("stairs") ~= nil then
 	)
 end
 
-if minetest.get_modpath("bonemeal") ~= nil then	
+if minetest.get_modpath("bonemeal") ~= nil then
 	bonemeal:add_sapling({
 		{"clementinetree:sapling", grow_new_clementinetree_tree, "soil"},
 	})
diff --git a/mods/cool_trees/ebony/init.lua b/mods/cool_trees/ebony/init.lua
index 3705538..4bdb35c 100644
--- a/mods/cool_trees/ebony/init.lua
+++ b/mods/cool_trees/ebony/init.lua
@@ -55,7 +55,6 @@ end
 minetest.register_node("ebony:sapling", {
 	description = S("Ebony Tree Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"ebony_sapling.png"},
 	inventory_image = "ebony_sapling.png",
 	wield_image = "ebony_sapling.png",
@@ -118,7 +117,6 @@ minetest.register_node("ebony:wood", {
 minetest.register_node("ebony:leaves", {
 	description = S("Ebony Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"ebony_leaves.png"},
 	inventory_image = "ebony_leaves.png",
 	wield_image = "ebony_leaves.png",
diff --git a/mods/cool_trees/jacaranda/init.lua b/mods/cool_trees/jacaranda/init.lua
index a20bad6..81c3fb0 100644
--- a/mods/cool_trees/jacaranda/init.lua
+++ b/mods/cool_trees/jacaranda/init.lua
@@ -53,7 +53,6 @@ end
 minetest.register_node("jacaranda:sapling", {
 	description = S("Jacaranda Tree Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"jacaranda_sapling.png"},
 	inventory_image = "jacaranda_sapling.png",
 	wield_image = "jacaranda_sapling.png",
@@ -116,7 +115,6 @@ minetest.register_node("jacaranda:wood", {
 minetest.register_node("jacaranda:blossom_leaves", {
 	description = S("Jacaranda Blossom Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"jacaranda_blossom_leaves.png"},
 	inventory_image = "jacaranda_blossom_leaves.png",
 	wield_image = "jacaranda_blossom_leaves.png",
@@ -178,7 +176,7 @@ default.register_leafdecay({
 
 --Stairs
 
-if minetest.get_modpath("stairs") ~= nil then	
+if minetest.get_modpath("stairs") ~= nil then
 	stairs.register_stair_and_slab(
 		"jacaranda_trunk",
 		"jacaranda:trunk",
@@ -190,7 +188,7 @@ if minetest.get_modpath("stairs") ~= nil then
 	)
 end
 
-if minetest.get_modpath("bonemeal") ~= nil then	
+if minetest.get_modpath("bonemeal") ~= nil then
 	bonemeal:add_sapling({
 		{"jacaranda:sapling", grow_new_jacaranda_tree, "soil"},
 	})
diff --git a/mods/cool_trees/larch/init.lua b/mods/cool_trees/larch/init.lua
index 78424c2..ad15222 100644
--- a/mods/cool_trees/larch/init.lua
+++ b/mods/cool_trees/larch/init.lua
@@ -54,7 +54,6 @@ end
 minetest.register_node("larch:sapling", {
 	description = S("Larch Tree Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"larch_sapling.png"},
 	inventory_image = "larch_sapling.png",
 	wield_image = "larch_sapling.png",
@@ -117,7 +116,6 @@ minetest.register_node("larch:wood", {
 minetest.register_node("larch:leaves", {
 	description = S("Larch Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"larch_leaves.png"},
 	inventory_image = "larch_leaves.png",
 	wield_image = "larch_leaves.png",
@@ -199,7 +197,7 @@ default.register_leafdecay({
 
 --Stairs
 
-if minetest.get_modpath("stairs") ~= nil then	
+if minetest.get_modpath("stairs") ~= nil then
 	stairs.register_stair_and_slab(
 		"larch_trunk",
 		"larch:trunk",
@@ -211,7 +209,7 @@ if minetest.get_modpath("stairs") ~= nil then
 	)
 end
 
-if minetest.get_modpath("bonemeal") ~= nil then	
+if minetest.get_modpath("bonemeal") ~= nil then
 	bonemeal:add_sapling({
 		{"larch:sapling", grow_new_larch_tree, "soil"},
 	})
diff --git a/mods/cool_trees/lemontree/init.lua b/mods/cool_trees/lemontree/init.lua
index 5c4014f..fb2bc18 100644
--- a/mods/cool_trees/lemontree/init.lua
+++ b/mods/cool_trees/lemontree/init.lua
@@ -79,7 +79,6 @@ end
 minetest.register_node("lemontree:sapling", {
 	description = S("Lemon Tree Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"lemontree_sapling.png"},
 	inventory_image = "lemontree_sapling.png",
 	wield_image = "lemontree_sapling.png",
@@ -141,7 +140,6 @@ minetest.register_node("lemontree:wood", {
 minetest.register_node("lemontree:leaves", {
 	description = S("Lemon Tree Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"lemontree_leaves.png"},
 	inventory_image = "lemontree_leaves.png",
 	wield_image = "lemontree_leaves.png",
@@ -201,7 +199,7 @@ default.register_leafdecay({
 
 --Stairs
 
-if minetest.get_modpath("stairs") ~= nil then	
+if minetest.get_modpath("stairs") ~= nil then
 	stairs.register_stair_and_slab(
 		"lemontree_trunk",
 		"lemontree:trunk",
@@ -213,7 +211,7 @@ if minetest.get_modpath("stairs") ~= nil then
 	)
 end
 
-if minetest.get_modpath("bonemeal") ~= nil then	
+if minetest.get_modpath("bonemeal") ~= nil then
 	bonemeal:add_sapling({
 		{"lemontree:sapling", grow_new_lemontree_tree, "soil"},
 	})
diff --git a/mods/cool_trees/mahogany/init.lua b/mods/cool_trees/mahogany/init.lua
index b057a41..c454fd0 100644
--- a/mods/cool_trees/mahogany/init.lua
+++ b/mods/cool_trees/mahogany/init.lua
@@ -56,7 +56,6 @@ end
 minetest.register_node("mahogany:sapling", {
 	description = S("Mahogany Tree Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"mahogany_sapling.png"},
 	inventory_image = "mahogany_sapling.png",
 	wield_image = "mahogany_sapling.png",
@@ -119,7 +118,6 @@ minetest.register_node("mahogany:wood", {
 minetest.register_node("mahogany:leaves", {
 	description = S("Mahogany Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"mahogany_leaves.png"},
 	inventory_image = "mahogany_leaves.png",
 	wield_image = "mahogany_leaves.png",
@@ -241,7 +239,7 @@ default.register_leafdecay({
 
 --Stairs
 
-if minetest.get_modpath("stairs") ~= nil then	
+if minetest.get_modpath("stairs") ~= nil then
 	stairs.register_stair_and_slab(
 		"mahogany_trunk",
 		"mahogany:trunk",
@@ -255,7 +253,7 @@ end
 
 --Support for bonemeal
 
-if minetest.get_modpath("bonemeal") ~= nil then	
+if minetest.get_modpath("bonemeal") ~= nil then
 	bonemeal:add_sapling({
 		{"mahogany:sapling", grow_new_mahogany_tree, "soil"},
 	})
diff --git a/mods/cool_trees/palm/init.lua b/mods/cool_trees/palm/init.lua
index dcf4063..a861e9a 100644
--- a/mods/cool_trees/palm/init.lua
+++ b/mods/cool_trees/palm/init.lua
@@ -173,7 +173,6 @@ minetest.register_decoration({
 minetest.register_node("palm:sapling", {
 	description = S("Palm Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"palm_sapling.png"},
 	inventory_image = "palm_sapling.png",
 	wield_image = "palm_sapling.png",
@@ -236,7 +235,6 @@ minetest.register_node("palm:wood", {
 minetest.register_node("palm:leaves", {
 	description = S("Palm Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"palm_leaves.png"},
 	inventory_image = "palm_leaves.png",
 	wield_image = "palm_leaves.png",
@@ -405,7 +403,7 @@ default.register_leafdecay({
 
 --Stairs
 
-if minetest.get_modpath("stairs") ~= nil then	
+if minetest.get_modpath("stairs") ~= nil then
 	stairs.register_stair_and_slab(
 		"palm_trunk",
 		"palm:trunk",
@@ -417,7 +415,7 @@ if minetest.get_modpath("stairs") ~= nil then
 	)
 end
 
-if minetest.get_modpath("bonemeal") ~= nil then	
+if minetest.get_modpath("bonemeal") ~= nil then
 	bonemeal:add_sapling({
 		{"palm:sapling", grow_new_palm_tree, "soil"},
 		{"palm:sapling", grow_new_palm_tree, "sand"},
diff --git a/mods/cool_trees/pineapple/init.lua b/mods/cool_trees/pineapple/init.lua
index 052d026..d5e3347 100644
--- a/mods/cool_trees/pineapple/init.lua
+++ b/mods/cool_trees/pineapple/init.lua
@@ -56,7 +56,6 @@ end
 minetest.register_node("pineapple:pineapple", {
 	description = S("Pineapple"),
 	drawtype = "plantlike_rooted",
-	visual_scale = 1.0,
 	tiles = {"pineapple_pineapple.png"},
 	special_tiles = {
 	nil,
@@ -65,7 +64,7 @@ minetest.register_node("pineapple:pineapple", {
 	"pineapple_pineapple_leaves.png",
 	"pineapple_pineapple_leaves.png",
 	"pineapple_pineapple_leaves.png"
-	},	
+	},
 	inventory_image = "pineapple_pineapple_inv.png",
 	wield_image = "pineapple_pineapple_inv.png",
 	paramtype = "light",
@@ -81,7 +80,6 @@ minetest.register_node("pineapple:pineapple", {
 minetest.register_node("pineapple:sapling", {
 	description = S("Pineapple Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"pineapple_pineapple_leaves.png"},
 	inventory_image = "pineapple_pineapple_leaves.png",
 	wield_image = "pineapple_pineapple_leaves.png",
@@ -127,7 +125,7 @@ minetest.register_lbm({
 	end
 })
 
-if minetest.get_modpath("bonemeal") ~= nil then	
+if minetest.get_modpath("bonemeal") ~= nil then
 	bonemeal:add_sapling({
 		{"pineapple:sapling", grow_new_pineapple_tree, "soil"},
 	})
diff --git a/mods/cool_trees/pomegranate/init.lua b/mods/cool_trees/pomegranate/init.lua
index 0cf8d6c..55226f9 100644
--- a/mods/cool_trees/pomegranate/init.lua
+++ b/mods/cool_trees/pomegranate/init.lua
@@ -77,7 +77,6 @@ end
 minetest.register_node("pomegranate:sapling", {
 	description = S("Pomegranate Tree Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"pomegranate_sapling.png"},
 	inventory_image = "pomegranate_sapling.png",
 	wield_image = "pomegranate_sapling.png",
@@ -137,7 +136,6 @@ minetest.register_node("pomegranate:wood", {
 minetest.register_node("pomegranate:leaves", {
 	description = S("Pomegranate Tree Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"pomegranate_leaves.png"},
 	inventory_image = "pomegranate_leaves.png",
 	wield_image = "pomegranate_leaves.png",
diff --git a/mods/cool_trees/willow/init.lua b/mods/cool_trees/willow/init.lua
index ad0e2ab..8a7dab2 100644
--- a/mods/cool_trees/willow/init.lua
+++ b/mods/cool_trees/willow/init.lua
@@ -55,7 +55,6 @@ end
 minetest.register_node("willow:sapling", {
 	description = S("Willow Tree Sapling"),
 	drawtype = "plantlike",
-	visual_scale = 1.0,
 	tiles = {"willow_sapling.png"},
 	inventory_image = "willow_sapling.png",
 	wield_image = "willow_sapling.png",
@@ -118,7 +117,6 @@ minetest.register_node("willow:wood", {
 minetest.register_node("willow:leaves", {
 	description = S("Willow Leaves"),
 	drawtype = "allfaces_optional",
-	visual_scale = 1.2,
 	tiles = {"willow_leaves.png"},
 	inventory_image = "willow_leaves.png",
 	wield_image = "willow_leaves.png",
diff --git a/mods/minetest_game/default/mapgen.lua b/mods/minetest_game/default/mapgen.lua
index bb8f366..e60fa40 100644
--- a/mods/minetest_game/default/mapgen.lua
+++ b/mods/minetest_game/default/mapgen.lua
@@ -1893,7 +1893,7 @@ function default.register_decorations()
 		deco_type = "schematic",
 		place_on = {"default:dirt_with_rainforest_litter"},
 		sidelen = 80,
-		fill_ratio = 0.1,
+		fill_ratio = 0.07,
 		biomes = {"rainforest"},
 		y_max = 31000,
 		y_min = 1,
diff --git a/mods/minetest_game/flowers/init.lua b/mods/minetest_game/flowers/init.lua
index a7c12c8..030cc55 100644
--- a/mods/minetest_game/flowers/init.lua
+++ b/mods/minetest_game/flowers/init.lua
@@ -33,20 +33,25 @@ minetest.register_alias("flowers:flower_dandelion_white", "flowers:dandelion_whi
 
 -- Flower registration
 
-local function add_simple_flower(name, desc, box, f_groups)
+local function add_simple_flower(name, desc, box, f_groups, inv_img)
 	-- Common flowers' groups
 	f_groups.snappy = 3
 	f_groups.flower = 1
 	f_groups.flora = 1
 	f_groups.attached_node = 1
 
+	local inventory_image = "flowers_" .. name
+	if inv_img then
+		inventory_image = inventory_image .. "_inv"
+	end
+
 	minetest.register_node("flowers:" .. name, {
 		description = desc,
 		drawtype = "plantlike",
 		waving = 1,
 		tiles = {"flowers_" .. name .. ".png"},
-		inventory_image = "flowers_" .. name .. ".png",
-		wield_image = "flowers_" .. name .. ".png",
+		inventory_image = inventory_image .. ".png",
+		wield_image =  "flowers_" .. name .. ".png",
 		sunlight_propagates = true,
 		paramtype = "light",
 		walkable = false,
@@ -65,7 +70,8 @@ flowers.datas = {
 		"rose",
 		S("Red Rose"),
 		{-2 / 16, -0.5, -2 / 16, 2 / 16, 5 / 16, 2 / 16},
-		{color_red = 1, flammable = 1}
+		{color_red = 1, flammable = 1},
+		true
 	},
 	{
 		"tulip",
@@ -115,6 +121,24 @@ flowers.datas = {
 		{-2 / 16, -0.5, -2 / 16, 2 / 16, 3 / 16, 2 / 16},
 		{color_white = 1, flammable = 1}
 	},
+	{
+		"gerbera_daisy",
+		S("Gerbera Daisy"),
+		{-2 / 16, -0.5, -2 / 16, 2 / 16, 3 / 16, 2 / 16},
+		{color_orange = 1, flammable = 1}
+	},
+	{
+		"yellow_bell",
+		S("Campanilla Amarilla"),
+		{-2 / 16, -0.5, -2 / 16, 2 / 16, 3 / 16, 2 / 16},
+		{color_yellow = 1, flammable = 1}
+	},
+	{
+		"calendula",
+		S("Pink Calendula"),
+		{-2 / 16, -0.5, -2 / 16, 2 / 16, 3 / 16, 2 / 16},
+		{color_pink = 1, flammable = 1}
+	},
 }
 
 for _,item in pairs(flowers.datas) do
@@ -419,3 +443,71 @@ minetest.register_node("flowers:sunflower", {
 		end
 	end
 })
+
+-- Hedges
+
+flowers.hedges = {
+	{
+		"white_blue",
+		S("White & Blue"),
+		{"flowers:dandelion_white", "flowers:geranium"}
+	},
+	{
+		"violet_blue",
+		S("Violet & Blue"),
+		{"flowers:viola", "flowers:geranium"}
+	},
+	{
+		"red_pink",
+		S("Red & Pink"),
+		{"default:rose_bush", "flowers:geranium"}
+	},
+	{
+		"yellow_orange",
+		S("Yellow & Orange"),
+		{"flowers:dandelion_yellow", "flowers:gerbera_daisy"}
+	}
+}
+
+local function add_hedge(name, desc, recipe_items)
+
+	local node_name = "flowers:" .. name.."".."hedge"
+
+	local drop_items = recipe_items
+
+	recipe_items[#recipe_items+1] = "group:leaves"
+
+	minetest.register_node(node_name, {
+		description = S("@1 Hedge", desc),
+		drawtype = "normal",
+		tiles = {"flowers_" .. name .. "_hedge" .. ".png"},
+		wield_image =  "flowers_" .. name .. "_hedge" .. ".png",
+		sunlight_propagates = true,
+		paramtype = "light",
+		walkable = false,
+		buildable_to = true,
+		groups = {snappy = 3, flammable = 2, flower = 1, flora = 1},
+		sounds = default.node_sound_leaves_defaults(),
+		drop = {
+			max_items = 1,
+			items = {
+					{
+					items = drop_items,
+					rarity = 1,
+					inherit_color = true,
+					}
+			}
+		}
+    })
+
+	minetest.register_craft({
+		output = node_name,
+		type = "shapeless",
+		recipe = recipe_items,
+	})
+
+end
+
+for _,item in pairs(flowers.hedges) do
+	add_hedge(unpack(item))
+end
diff --git a/mods/minetest_game/flowers/locale/flowers.es.tr b/mods/minetest_game/flowers/locale/flowers.es.tr
index 2a21d2e..cdea81d 100644
--- a/mods/minetest_game/flowers/locale/flowers.es.tr
+++ b/mods/minetest_game/flowers/locale/flowers.es.tr
@@ -12,3 +12,12 @@ Brown Mushroom=Champiñón café
 Waterlily=Nenúfar
 Sunflower=Girasol
 (flower)=(flor)
+@1 Hedge=Seto @1
+White & Blue=blanquiazul
+Violet & Blue=violeta azulado
+Yellow & Orange=amarillo anaranjado
+Red & Pink=rojo rosáceo
+Gerbera Daisy=Margarita gerbera
+Yellow Bell=Campanilla amarilla
+Pink Calendula=Caléndula rosa
+
diff --git a/mods/minetest_game/flowers/locale/template.txt b/mods/minetest_game/flowers/locale/template.txt
index a3a687f..cc07aa2 100644
--- a/mods/minetest_game/flowers/locale/template.txt
+++ b/mods/minetest_game/flowers/locale/template.txt
@@ -10,3 +10,11 @@ Black Tulip=
 Red Mushroom=
 Brown Mushroom=
 Waterlily=
+Sunflower=
+(flower)=
+@1 Hedge=
+White & Blue=
+Violet & Blue=
+Gerbera Daisy=
+Yellow Bell=
+Pink Calendula=
diff --git a/mods/minetest_game/flowers/mapgen.lua b/mods/minetest_game/flowers/mapgen.lua
index 4b2ce25..b6004f4 100644
--- a/mods/minetest_game/flowers/mapgen.lua
+++ b/mods/minetest_game/flowers/mapgen.lua
@@ -76,6 +76,7 @@ function flowers.register_mgv6_decorations()
 	register_mgv6_flower("viola")
 	register_mgv6_flower("dandelion_white")
 	register_mgv6_flower("calla")
+	register_mgv6_flower("gerbera_daisy")
 
 	register_mgv6_mushroom("mushroom_brown")
 	register_mgv6_mushroom("mushroom_red")
@@ -165,6 +166,9 @@ function flowers.register_decorations()
 	register_flower(73133,   "dandelion_white")
 	register_flower(42,      "tulip_black")
 	register_flower(34563,      "calla")
+	register_flower(126,      "gerbera_daisy")
+	register_flower(23456,      "yellow_bell")
+	register_flower(548,      "calendula")
 
 	register_mushroom("mushroom_brown")
 	register_mushroom("mushroom_red")
diff --git a/mods/minetest_game/flowers/textures/flowers_calendula.png b/mods/minetest_game/flowers/textures/flowers_calendula.png
new file mode 100644
index 0000000..b88a20c
Binary files /dev/null and b/mods/minetest_game/flowers/textures/flowers_calendula.png differ
diff --git a/mods/minetest_game/flowers/textures/flowers_gerbera_daisy.png b/mods/minetest_game/flowers/textures/flowers_gerbera_daisy.png
new file mode 100644
index 0000000..27b05f7
Binary files /dev/null and b/mods/minetest_game/flowers/textures/flowers_gerbera_daisy.png differ
diff --git a/mods/minetest_game/flowers/textures/flowers_red_pink_hedge.png b/mods/minetest_game/flowers/textures/flowers_red_pink_hedge.png
new file mode 100644
index 0000000..4f97ae1
Binary files /dev/null and b/mods/minetest_game/flowers/textures/flowers_red_pink_hedge.png differ
diff --git a/mods/minetest_game/flowers/textures/flowers_violet_blue_hedge.png b/mods/minetest_game/flowers/textures/flowers_violet_blue_hedge.png
new file mode 100644
index 0000000..48290b9
Binary files /dev/null and b/mods/minetest_game/flowers/textures/flowers_violet_blue_hedge.png differ
diff --git a/mods/minetest_game/flowers/textures/flowers_white_blue_hedge.png b/mods/minetest_game/flowers/textures/flowers_white_blue_hedge.png
new file mode 100644
index 0000000..d8e2def
Binary files /dev/null and b/mods/minetest_game/flowers/textures/flowers_white_blue_hedge.png differ
diff --git a/mods/minetest_game/flowers/textures/flowers_yellow_bell.png b/mods/minetest_game/flowers/textures/flowers_yellow_bell.png
new file mode 100644
index 0000000..c65a041
Binary files /dev/null and b/mods/minetest_game/flowers/textures/flowers_yellow_bell.png differ
diff --git a/mods/minetest_game/flowers/textures/flowers_yellow_orange_hedge.png b/mods/minetest_game/flowers/textures/flowers_yellow_orange_hedge.png
new file mode 100644
index 0000000..e265126
Binary files /dev/null and b/mods/minetest_game/flowers/textures/flowers_yellow_orange_hedge.png differ
diff --git a/mods/minetest_game/vessels/init.lua b/mods/minetest_game/vessels/init.lua
index 71a0689..d15efb5 100644
--- a/mods/minetest_game/vessels/init.lua
+++ b/mods/minetest_game/vessels/init.lua
@@ -235,3 +235,40 @@ if minetest.global_exists("dungeon_loot") then
 		name = "vessels:glass_fragments", chance = 0.35, count = {1, 4}
 	})
 end
+
+-- Rose Vase
+
+if minetest.get_modpath("flowers") ~= nil then
+
+	minetest.register_node("vessels:rose_vase", {
+		description = S("Rose on a vase"),
+		drawtype = "plantlike",
+		tiles = {"vessels_rose_vase.png"},
+		walkable = false,
+		groups = {cracky = 2, attached_node = 1},
+		drop = "vessels:rose_vase",
+		--paramtype = "light",
+		sunlight_propagates = false,
+		--light_source = LIGHT_MAX - 1,
+		sounds = default.node_sound_glass_defaults(),
+		inventory_image = "vessels_rose_vase.png",
+		selection_box = {
+			type = "fixed",
+			fixed = { -0.25, -0.5, -0.25, 0.25, 0.4, 0.25 },
+		},
+
+		after_place_node = function(pos, placer, itemstack)
+			minetest.set_node(pos, {name = "vessels:rose_vase", param2 = 1})
+		end,
+	})
+
+	minetest.register_craft({
+		type = "shaped",
+		output = "vessels:rose_vase",
+		recipe = {
+			{"", "", ""},
+			{"", "flowers:rose", ""},
+			{"", "vessels:glass_bottle", ""},
+		}
+	})
+end
diff --git a/mods/minetest_game/vessels/locale/vessels.es.tr b/mods/minetest_game/vessels/locale/vessels.es.tr
index 859ea40..585b921 100644
--- a/mods/minetest_game/vessels/locale/vessels.es.tr
+++ b/mods/minetest_game/vessels/locale/vessels.es.tr
@@ -6,3 +6,4 @@ Empty Heavy Steel Bottle=Botella de acero vacía
 Glass Fragments=Fragmentos de vidrio
 Empty Vessels Shelf=Estante de vasijas vacío
 Vessels Shelf (@1 items)=Estante de vasijas (@1 objetos)
+Rose on a vase=Rosa en jarrón
diff --git a/mods/minetest_game/vessels/textures/vessels_rose_vase.png b/mods/minetest_game/vessels/textures/vessels_rose_vase.png
new file mode 100644
index 0000000..30691a5
Binary files /dev/null and b/mods/minetest_game/vessels/textures/vessels_rose_vase.png differ
diff --git a/textures/juanchi/farming_cotton.png b/textures/juanchi/farming_cotton.png
index 45fd83b..40d58d1 100755
Binary files a/textures/juanchi/farming_cotton.png and b/textures/juanchi/farming_cotton.png differ
diff --git a/textures/juanchi/flowers_rose.png b/textures/juanchi/flowers_rose.png
index b47f7ac..f4aed09 100755
Binary files a/textures/juanchi/flowers_rose.png and b/textures/juanchi/flowers_rose.png differ
diff --git a/textures/juanchi/flowers_rose_inv.png b/textures/juanchi/flowers_rose_inv.png
new file mode 100644
index 0000000..4c8fa2e
Binary files /dev/null and b/textures/juanchi/flowers_rose_inv.png differ
diff --git a/textures/juanchi/flowers_waterlily.png b/textures/juanchi/flowers_waterlily.png
index f383169..3a2646b 100755
Binary files a/textures/juanchi/flowers_waterlily.png and b/textures/juanchi/flowers_waterlily.png differ
diff --git a/textures/juanchi/flowers_waterlily_bottom.png b/textures/juanchi/flowers_waterlily_bottom.png
new file mode 100644
index 0000000..dce93e0
Binary files /dev/null and b/textures/juanchi/flowers_waterlily_bottom.png differ