diff --git a/bushes_classic/cooking.lua b/bushes_classic/cooking.lua
index 129a46b..2a750f6 100644
--- a/bushes_classic/cooking.lua
+++ b/bushes_classic/cooking.lua
@@ -1,23 +1,15 @@
 -- Basket
-minetest.register_node(":bushes:basket_empty", {
-    description = "Basket",
-    tiles = {
-	"bushes_basket_empty_top.png",
-	"bushes_basket_bottom.png",
-	"bushes_basket_side.png"
-    },
-    groups = { dig_immediate = 3 },
-})
 
 minetest.register_craft({
-    output = ':bushes:basket_empty',
+    output = ":bushes:basket_empty",
     recipe = {
-	{ 'default:stick', 'default:stick', 'default:stick' },
-	{ '', 'default:stick', '' },
+	{ "default:stick", "default:stick", "default:stick" },
+	{ "", "default:stick", "" },
     },
 })
 
 -- Sugar
+
 minetest.register_craftitem(":bushes:sugar", {
     description = "Sugar",
     inventory_image = "bushes_sugar.png",
@@ -25,65 +17,92 @@ minetest.register_craftitem(":bushes:sugar", {
 })
 
 minetest.register_craft({
-    output = 'bushes:sugar 1',
+    output = "bushes:sugar 1",
     recipe = {
-	{ 'default:papyrus', 'default:papyrus' },
+	{ "default:papyrus", "default:papyrus" },
     },
 })
 
--- Raw pie
-minetest.register_craftitem(":bushes:berry_pie_raw", {
-    description = "Raw berry pie",
-    inventory_image = "bushes_berry_pie_raw.png",
-    on_use = minetest.item_eat(3),
+for i, berry in ipairs(bushes_classic.bushes) do
+	local desc = bushes_classic.bushes_descriptions[i]
+
+	minetest.register_craftitem(":bushes:"..berry.."_pie_raw", {
+		description = "Raw "..desc.." pie",
+		inventory_image = "bushes_"..berry.."_pie_raw.png",
+		on_use = minetest.item_eat(3),
+	})
+
+	if berry ~= "mixed_berry" then
+		minetest.register_craftitem(":bushes:"..berry, {
+			description = "Raw "..desc.." pie",
+			inventory_image = "bushes_"..berry..".png",
+			groups = {berry = 1},
+			on_use = minetest.item_eat(3),
+		})
+
+		minetest.register_craft({
+			output = "bushes:"..berry.."_pie_raw 1",
+			recipe = {
+			{ "bushes:sugar", "default:junglegrass", "bushes:sugar" },
+			{ "bushes:"..berry, "bushes:"..berry, "bushes:"..berry },
+			},
+		})
+	end
+
+	-- Cooked pie
+
+	minetest.register_craftitem(":bushes:"..berry.."_pie_cooked", {
+		description = "Cooked "..desc.." pie",
+		inventory_image = "bushes_"..berry.."_pie_cooked.png",
+		on_use = minetest.item_eat(4),
+	})
+
+	minetest.register_craft({
+		type = "cooking",
+		output = "bushes:"..berry.."_pie_cooked",
+		recipe = "bushes:"..berry.."_pie_raw",
+		cooktime = 30,
+	})
+
+	-- slice of pie
+
+	minetest.register_craftitem(":bushes:"..berry.."_pie_slice", {
+		description = "Slice of "..desc.." pie",
+		inventory_image = "bushes_"..berry.."_pie_slice.png",
+		on_use = minetest.item_eat(1),
+	})
+
+	minetest.register_craft({
+		output = "bushes:"..berry.."_pie_slice 4",
+		recipe = {
+		{ "bushes:"..berry.."_pie_cooked" },
+		},
+	})
+
+	-- Basket with pies
+
+	minetest.register_craft({
+		output = "bushes:basket_"..berry.." 1",
+		recipe = {
+		{ "bushes:berry_pie_cooked", "bushes:berry_pie_cooked", "bushes:berry_pie_cooked" },
+		{ "", "bushes:basket_empty", "" },
+		},
+	})
+end
+
+minetest.register_craft({
+	output = "bushes:strawberry_pie_raw 1",
+	recipe = {
+	{ "bushes:sugar", "default:junglegrass", "bushes:sugar" },
+	{ "farming_plus:strawberry_item", "farming_plus:strawberry_item", "farming_plus:strawberry_item" },
+	},
 })
 
 minetest.register_craft({
-    output = 'bushes:berry_pie_raw 1',
-    recipe = {
-	{ 'bushes:sugar', 'default:junglegrass', 'bushes:sugar' },
-	{ 'bushes:strawberry', 'bushes:strawberry', 'bushes:strawberry' },
-    },
-})
-
-minetest.register_craft({
-    output = 'bushes:berry_pie_raw 1',
-    recipe = {
-	{ 'bushes:sugar', 'default:junglegrass', 'bushes:sugar' },
-	{ 'farming_plus:strawberry_item', 'farming_plus:strawberry_item', 'farming_plus:strawberry_item' },
-    },
-})
-
--- Cooked pie
-minetest.register_craftitem(":bushes:berry_pie_cooked", {
-    description = "Cooked berry pie",
-    inventory_image = "bushes_berry_pie_cooked.png",
-    on_use = minetest.item_eat(4),
-})
-
-minetest.register_craft({
-    type = 'cooking',
-    output = 'bushes:berry_pie_cooked',
-    recipe = 'bushes:berry_pie_raw',
-    cooktime = 30,
-})
-
--- Basket with pies
-minetest.register_node(":bushes:basket_pies", {
-    description = "Basket with pies",
-    tiles = {
-	"bushes_basket_full_top.png",
-	"bushes_basket_bottom.png",
-	"bushes_basket_side.png"
-    },
-    on_use = minetest.item_eat(15),
-    groups = { dig_immediate = 3 },
-})
-
-minetest.register_craft({
-    output = 'bushes:basket_pies 1',
-    recipe = {
-	{ 'bushes:berry_pie_cooked', 'bushes:berry_pie_cooked', 'bushes:berry_pie_cooked' },
-	{ '', 'bushes:basket_empty', '' },
-    },
+	output = "bushes:mixed_berry_pie_raw 2",
+	recipe = {
+	{ "bushes:sugar", "default:junglegrass", "bushes:sugar" },
+	{ "group:berry", "group:berry", "group:berry" },
+	{ "group:berry", "group:berry", "group:berry" },
+	},
 })
diff --git a/bushes_classic/image_credits.txt b/bushes_classic/image_credits.txt
new file mode 100644
index 0000000..a4ddc51
--- /dev/null
+++ b/bushes_classic/image_credits.txt
@@ -0,0 +1,5 @@
+strawberry: http://www.clker.com/clipart-4060.html
+blueberry: http://www.clker.com/clipart-cerezafiro12.html
+blackberry:  http://www.clker.com/clipart-blackberry-2.html
+raspberry: http://www.clker.com/clipart-simple-raspberry.html
+gooseberry:  http://www.clker.com/clipart-26281.html
diff --git a/bushes_classic/init.lua b/bushes_classic/init.lua
index a49a72f..b19d539 100644
--- a/bushes_classic/init.lua
+++ b/bushes_classic/init.lua
@@ -1,49 +1,36 @@
-local BUSHES = {
+-- Bushes classic mod originally by unknown
+-- now maintained by VanessaE
+--
+-- License:  WTFPL
+
+bushes_classic = {}
+
+bushes_classic.bushes = {
     "strawberry",
+	"blackberry",
+	"blueberry",
+	"raspberry",
+	"gooseberry",
+	"mixed_berry"
 }
 
-local BUSHES_DESCRIPTIONS = {
+bushes_classic.bushes_descriptions = {
     "Strawberry",
+	"Blackberry",
+	"Blueberry",
+	"Raspberry",
+	"Gooseberry",
+	"Mixed Berry"
 }
 
-local spawn_list = {}
+bushes_classic.spawn_list = {}
 
-for i, bush_name in ipairs(BUSHES) do
-	minetest.register_node(":bushes:" .. bush_name .. "_bush", {
-		description = BUSHES_DESCRIPTIONS[i] .. " bush",
-		drawtype = "plantlike",
-		visual_scale = 1.3,
-		tiles = { "bushes_" .. bush_name .. "_bush.png" },
-		inventory_image = "bushes_" .. bush_name .. "_bush.png",
-		paramtype = "light",
-		sunlight_propagates = true,
-		walkable = false,
-		drop = 'bushes:' .. bush_name .. ' 4',
-		groups = { snappy = 3, bush = 1, flammable = 2},
-		sounds = default.node_sound_leaves_defaults(),
-	})
-
-	minetest.register_craftitem(":bushes:" .. bush_name, {
-		description = BUSHES_DESCRIPTIONS[i],
-		inventory_image = "bushes_" .. bush_name .. ".png",
-		stack_max = 99,
-		on_use = minetest.item_eat(1),
-	})
-
-	minetest.register_craft({
-		output = 'bushes:' .. bush_name .. '_bush',
-		recipe = {
-			{ 'bushes:' .. bush_name, 'bushes:' .. bush_name, 'bushes:' .. bush_name },
-			{ 'bushes:' .. bush_name, 'bushes:' .. bush_name, 'bushes:' .. bush_name },
-		}
-	})
-
-	table.insert(spawn_list, "bushes:"..bush_name.."_bush")
-end
+dofile(minetest.get_modpath('bushes_classic') .. '/cooking.lua')
+dofile(minetest.get_modpath('bushes_classic') .. '/nodes.lua')
 
 plantslib:spawn_on_surfaces({
 	spawn_delay = 3600,
-	spawn_plants = spawn_list,
+	spawn_plants = bushes_classic.spawn_list,
 	avoid_radius = 10,
 	spawn_chance = 100,
 	spawn_surfaces = {
@@ -53,7 +40,7 @@ plantslib:spawn_on_surfaces({
 		"woodsoils:grass_with_leaves_2"
 	},
 	avoid_nodes = {"group:bush"},
-	seed_diff = 545342534, -- guaranteed to be random :P
+	seed_diff = 545342534, -- chosen by a fair mashing of the keyboard - guaranteed to be random :P
 	plantlife_limit = -0.1,
 	light_min = 10,
 	temp_min = 0.15, -- approx 20C
@@ -62,6 +49,6 @@ plantslib:spawn_on_surfaces({
 	humidity_max = -1, -- 100% RH
 })
 
-dofile(minetest.get_modpath('bushes_classic') .. '/cooking.lua')
+minetest.register_alias("bushes:basket_pies", "bushes:basket_strawberry")
 
 print("[Bushes] Loaded.")
diff --git a/bushes_classic/nodes.lua b/bushes_classic/nodes.lua
new file mode 100644
index 0000000..f55bf9d
--- /dev/null
+++ b/bushes_classic/nodes.lua
@@ -0,0 +1,65 @@
+for i, bush_name in ipairs(bushes_classic.bushes) do
+	local desc = bushes_classic.bushes_descriptions[i]
+
+	if bush_name ~= "mixed_berry" then
+		minetest.register_node(":bushes:" .. bush_name .. "_bush", {
+			description = desc.." Bush",
+			drawtype = "plantlike",
+			visual_scale = 1.3,
+			tiles = { "bushes_" .. bush_name .. "_bush.png" },
+			inventory_image = "bushes_" .. bush_name .. "_bush.png",
+			paramtype = "light",
+			sunlight_propagates = true,
+			walkable = false,
+
+			groups = { snappy = 3, bush = 1, flammable = 2},
+			sounds = default.node_sound_leaves_defaults(),
+			drop = {
+				max_items = 2,
+				items = {
+					{items = {"bushes:" .. bush_name .. "_bush"}, rarity = 1 }, -- always get at least one on dig
+					{items = {"bushes:" .. bush_name .. "_bush"}, rarity = 5 }, -- 1/5 chance of getting a second one.
+				}
+			},
+		})
+
+		minetest.register_craft({
+			output = "bushes:"..bush_name.." 4",
+			recipe = {
+				{ "bushes:"..bush_name.."_bush", },
+			}
+		})
+
+		minetest.register_craft({
+			output = "bushes:" .. bush_name .. "_bush",
+			recipe = {
+				{ "bushes:" .. bush_name, "bushes:" .. bush_name, "bushes:" .. bush_name },
+				{ "bushes:" .. bush_name, "bushes:" .. bush_name, "bushes:" .. bush_name },
+			}
+		})
+	end
+
+	minetest.register_node(":bushes:basket_"..bush_name, {
+		description = "Basket with "..desc.." Pies",
+		tiles = {
+		"bushes_basket_"..bush_name.."_top.png",
+		"bushes_basket_bottom.png",
+		"bushes_basket_side.png"
+		},
+		on_use = minetest.item_eat(15),
+		groups = { dig_immediate = 3 },
+	})
+
+	table.insert(bushes_classic.spawn_list, "bushes:"..bush_name.."_bush")
+end
+
+minetest.register_node(":bushes:basket_empty", {
+    description = "Basket",
+    tiles = {
+	"bushes_basket_empty_top.png",
+	"bushes_basket_bottom.png",
+	"bushes_basket_side.png"
+    },
+    groups = { dig_immediate = 3 },
+})
+
diff --git a/bushes_classic/textures/bushes_basket_blackberry_top.png b/bushes_classic/textures/bushes_basket_blackberry_top.png
new file mode 100644
index 0000000..f3fbe2b
Binary files /dev/null and b/bushes_classic/textures/bushes_basket_blackberry_top.png differ
diff --git a/bushes_classic/textures/bushes_basket_blueberry_top.png b/bushes_classic/textures/bushes_basket_blueberry_top.png
new file mode 100644
index 0000000..cdedf35
Binary files /dev/null and b/bushes_classic/textures/bushes_basket_blueberry_top.png differ
diff --git a/bushes_classic/textures/bushes_basket_bottom.png b/bushes_classic/textures/bushes_basket_bottom.png
index 4c84f0f..5e8d40d 100644
Binary files a/bushes_classic/textures/bushes_basket_bottom.png and b/bushes_classic/textures/bushes_basket_bottom.png differ
diff --git a/bushes_classic/textures/bushes_basket_empty_top.png b/bushes_classic/textures/bushes_basket_empty_top.png
index 29ade35..7b75e70 100644
Binary files a/bushes_classic/textures/bushes_basket_empty_top.png and b/bushes_classic/textures/bushes_basket_empty_top.png differ
diff --git a/bushes_classic/textures/bushes_basket_full_top.png b/bushes_classic/textures/bushes_basket_full_top.png
deleted file mode 100644
index 95bb54d..0000000
Binary files a/bushes_classic/textures/bushes_basket_full_top.png and /dev/null differ
diff --git a/bushes_classic/textures/bushes_basket_gooseberry_top.png b/bushes_classic/textures/bushes_basket_gooseberry_top.png
new file mode 100644
index 0000000..be4cda4
Binary files /dev/null and b/bushes_classic/textures/bushes_basket_gooseberry_top.png differ
diff --git a/bushes_classic/textures/bushes_basket_mixed_berry_top.png b/bushes_classic/textures/bushes_basket_mixed_berry_top.png
new file mode 100644
index 0000000..33cc552
Binary files /dev/null and b/bushes_classic/textures/bushes_basket_mixed_berry_top.png differ
diff --git a/bushes_classic/textures/bushes_basket_raspberry_top.png b/bushes_classic/textures/bushes_basket_raspberry_top.png
new file mode 100644
index 0000000..d06896b
Binary files /dev/null and b/bushes_classic/textures/bushes_basket_raspberry_top.png differ
diff --git a/bushes_classic/textures/bushes_basket_side.png b/bushes_classic/textures/bushes_basket_side.png
index 8357893..e6ddc3f 100644
Binary files a/bushes_classic/textures/bushes_basket_side.png and b/bushes_classic/textures/bushes_basket_side.png differ
diff --git a/bushes_classic/textures/bushes_basket_strawberry_top.png b/bushes_classic/textures/bushes_basket_strawberry_top.png
new file mode 100644
index 0000000..cbbc788
Binary files /dev/null and b/bushes_classic/textures/bushes_basket_strawberry_top.png differ
diff --git a/bushes_classic/textures/bushes_berry_pie_cooked.png b/bushes_classic/textures/bushes_berry_pie_cooked.png
deleted file mode 100644
index 6dca983..0000000
Binary files a/bushes_classic/textures/bushes_berry_pie_cooked.png and /dev/null differ
diff --git a/bushes_classic/textures/bushes_berry_pie_raw.png b/bushes_classic/textures/bushes_berry_pie_raw.png
deleted file mode 100644
index add8bdb..0000000
Binary files a/bushes_classic/textures/bushes_berry_pie_raw.png and /dev/null differ
diff --git a/bushes_classic/textures/bushes_blackberry.png b/bushes_classic/textures/bushes_blackberry.png
new file mode 100644
index 0000000..13cf377
Binary files /dev/null and b/bushes_classic/textures/bushes_blackberry.png differ
diff --git a/bushes_classic/textures/bushes_blackberry_bush.png b/bushes_classic/textures/bushes_blackberry_bush.png
new file mode 100644
index 0000000..1b39ff6
Binary files /dev/null and b/bushes_classic/textures/bushes_blackberry_bush.png differ
diff --git a/bushes_classic/textures/bushes_blackberry_pie_cooked.png b/bushes_classic/textures/bushes_blackberry_pie_cooked.png
new file mode 100644
index 0000000..b52bd60
Binary files /dev/null and b/bushes_classic/textures/bushes_blackberry_pie_cooked.png differ
diff --git a/bushes_classic/textures/bushes_blackberry_pie_raw.png b/bushes_classic/textures/bushes_blackberry_pie_raw.png
new file mode 100644
index 0000000..446e683
Binary files /dev/null and b/bushes_classic/textures/bushes_blackberry_pie_raw.png differ
diff --git a/bushes_classic/textures/bushes_blackberry_pie_slice.png b/bushes_classic/textures/bushes_blackberry_pie_slice.png
new file mode 100644
index 0000000..f2eb208
Binary files /dev/null and b/bushes_classic/textures/bushes_blackberry_pie_slice.png differ
diff --git a/bushes_classic/textures/bushes_blueberry.png b/bushes_classic/textures/bushes_blueberry.png
new file mode 100644
index 0000000..a5d2234
Binary files /dev/null and b/bushes_classic/textures/bushes_blueberry.png differ
diff --git a/bushes_classic/textures/bushes_blueberry_bush.png b/bushes_classic/textures/bushes_blueberry_bush.png
new file mode 100644
index 0000000..41f075f
Binary files /dev/null and b/bushes_classic/textures/bushes_blueberry_bush.png differ
diff --git a/bushes_classic/textures/bushes_blueberry_pie_cooked.png b/bushes_classic/textures/bushes_blueberry_pie_cooked.png
new file mode 100644
index 0000000..5385107
Binary files /dev/null and b/bushes_classic/textures/bushes_blueberry_pie_cooked.png differ
diff --git a/bushes_classic/textures/bushes_blueberry_pie_raw.png b/bushes_classic/textures/bushes_blueberry_pie_raw.png
new file mode 100644
index 0000000..b8ea709
Binary files /dev/null and b/bushes_classic/textures/bushes_blueberry_pie_raw.png differ
diff --git a/bushes_classic/textures/bushes_blueberry_pie_slice.png b/bushes_classic/textures/bushes_blueberry_pie_slice.png
new file mode 100644
index 0000000..8e481b2
Binary files /dev/null and b/bushes_classic/textures/bushes_blueberry_pie_slice.png differ
diff --git a/bushes_classic/textures/bushes_gooseberry.png b/bushes_classic/textures/bushes_gooseberry.png
new file mode 100644
index 0000000..cd62a5b
Binary files /dev/null and b/bushes_classic/textures/bushes_gooseberry.png differ
diff --git a/bushes_classic/textures/bushes_gooseberry_bush.png b/bushes_classic/textures/bushes_gooseberry_bush.png
new file mode 100644
index 0000000..fd3fec4
Binary files /dev/null and b/bushes_classic/textures/bushes_gooseberry_bush.png differ
diff --git a/bushes_classic/textures/bushes_gooseberry_pie_cooked.png b/bushes_classic/textures/bushes_gooseberry_pie_cooked.png
new file mode 100644
index 0000000..f96887d
Binary files /dev/null and b/bushes_classic/textures/bushes_gooseberry_pie_cooked.png differ
diff --git a/bushes_classic/textures/bushes_gooseberry_pie_raw.png b/bushes_classic/textures/bushes_gooseberry_pie_raw.png
new file mode 100644
index 0000000..5e1239e
Binary files /dev/null and b/bushes_classic/textures/bushes_gooseberry_pie_raw.png differ
diff --git a/bushes_classic/textures/bushes_gooseberry_pie_slice.png b/bushes_classic/textures/bushes_gooseberry_pie_slice.png
new file mode 100644
index 0000000..c2660a3
Binary files /dev/null and b/bushes_classic/textures/bushes_gooseberry_pie_slice.png differ
diff --git a/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png b/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png
new file mode 100644
index 0000000..19fbcef
Binary files /dev/null and b/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png differ
diff --git a/bushes_classic/textures/bushes_mixed_berry_pie_raw.png b/bushes_classic/textures/bushes_mixed_berry_pie_raw.png
new file mode 100644
index 0000000..aa842c2
Binary files /dev/null and b/bushes_classic/textures/bushes_mixed_berry_pie_raw.png differ
diff --git a/bushes_classic/textures/bushes_mixed_berry_pie_slice.png b/bushes_classic/textures/bushes_mixed_berry_pie_slice.png
new file mode 100644
index 0000000..0568da4
Binary files /dev/null and b/bushes_classic/textures/bushes_mixed_berry_pie_slice.png differ
diff --git a/bushes_classic/textures/bushes_raspberry.png b/bushes_classic/textures/bushes_raspberry.png
new file mode 100644
index 0000000..051c3c7
Binary files /dev/null and b/bushes_classic/textures/bushes_raspberry.png differ
diff --git a/bushes_classic/textures/bushes_raspberry_bush.png b/bushes_classic/textures/bushes_raspberry_bush.png
new file mode 100644
index 0000000..a1be648
Binary files /dev/null and b/bushes_classic/textures/bushes_raspberry_bush.png differ
diff --git a/bushes_classic/textures/bushes_raspberry_pie_cooked.png b/bushes_classic/textures/bushes_raspberry_pie_cooked.png
new file mode 100644
index 0000000..0e4496c
Binary files /dev/null and b/bushes_classic/textures/bushes_raspberry_pie_cooked.png differ
diff --git a/bushes_classic/textures/bushes_raspberry_pie_raw.png b/bushes_classic/textures/bushes_raspberry_pie_raw.png
new file mode 100644
index 0000000..abe6d19
Binary files /dev/null and b/bushes_classic/textures/bushes_raspberry_pie_raw.png differ
diff --git a/bushes_classic/textures/bushes_raspberry_pie_slice.png b/bushes_classic/textures/bushes_raspberry_pie_slice.png
new file mode 100644
index 0000000..859e6ed
Binary files /dev/null and b/bushes_classic/textures/bushes_raspberry_pie_slice.png differ
diff --git a/bushes_classic/textures/bushes_strawberry.png b/bushes_classic/textures/bushes_strawberry.png
index 58282b1..fdf5d44 100644
Binary files a/bushes_classic/textures/bushes_strawberry.png and b/bushes_classic/textures/bushes_strawberry.png differ
diff --git a/bushes_classic/textures/bushes_strawberry_bush.png b/bushes_classic/textures/bushes_strawberry_bush.png
index b0ed963..7aa85cb 100644
Binary files a/bushes_classic/textures/bushes_strawberry_bush.png and b/bushes_classic/textures/bushes_strawberry_bush.png differ
diff --git a/bushes_classic/textures/bushes_strawberry_pie_cooked.png b/bushes_classic/textures/bushes_strawberry_pie_cooked.png
new file mode 100644
index 0000000..e522496
Binary files /dev/null and b/bushes_classic/textures/bushes_strawberry_pie_cooked.png differ
diff --git a/bushes_classic/textures/bushes_strawberry_pie_raw.png b/bushes_classic/textures/bushes_strawberry_pie_raw.png
new file mode 100644
index 0000000..c71d45f
Binary files /dev/null and b/bushes_classic/textures/bushes_strawberry_pie_raw.png differ
diff --git a/bushes_classic/textures/bushes_strawberry_pie_slice.png b/bushes_classic/textures/bushes_strawberry_pie_slice.png
new file mode 100644
index 0000000..a00a884
Binary files /dev/null and b/bushes_classic/textures/bushes_strawberry_pie_slice.png differ