diff --git a/binaries/data/mods/official/entities/gaia/template_gaia_flora_bush.xml b/binaries/data/mods/official/entities/gaia/template_gaia_flora_bush.xml
new file mode 100644
index 0000000000..ecdabd3944
--- /dev/null
+++ b/binaries/data/mods/official/entities/gaia/template_gaia_flora_bush.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Parent="template_gaia_flora">
+	<Traits>
+		<Id
+			generic="Bush"
+			class3="Bush"
+
+			rollover="Bushes sometimes bear fruit."
+		/>
+	</Traits>
+</Entity>
diff --git a/binaries/data/mods/official/entities/gaia/template_gaia_flora_bush_berry.xml b/binaries/data/mods/official/entities/gaia/template_gaia_flora_bush_berry.xml
new file mode 100644
index 0000000000..7e831f2374
--- /dev/null
+++ b/binaries/data/mods/official/entities/gaia/template_gaia_flora_bush_berry.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Parent="template_gaia_flora_bush" Corpse="template_dead_tree">
+	<Traits>
+		<Id
+			generic="Berry Bush"
+			specific="Berry Bush"
+
+			icon="flora_deciduotree"
+
+			type.gaia.group.resource="true"
+
+			rollover="Foragers can gather the fruit from these bushes to accumulate Food."
+
+			history="Berries are tasty, fruity, and scrunchiously crunchable."
+		/>
+		<Health
+			max="100"
+			curr="100"
+		/>
+		<MiniMap
+			type="Food"
+			red="0"
+			green="50"
+			blue="0"
+		/>
+		<Supply
+			curr="100"
+			max="100"
+			type="food"
+			subtype="fruit"
+		/>
+	</Traits>
+</Entity>
diff --git a/binaries/data/mods/official/entities/gaia/template_gaia_flora_tree_oak.xml b/binaries/data/mods/official/entities/gaia/template_gaia_flora_tree_oak.xml
new file mode 100644
index 0000000000..112644b65c
--- /dev/null
+++ b/binaries/data/mods/official/entities/gaia/template_gaia_flora_tree_oak.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Parent="template_gaia_flora_tree">
+	<Traits>
+		<Id
+			generic="Tree"
+			specific="Oak Tree"
+
+			icon="flora_deciduotree"
+
+			history="A deciduous tree of the genus Quercus; has acorns and lobed leaves."
+		/>
+	</Traits>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/gaia/wrld_flora_berrybush.xml b/binaries/data/mods/official/entities/gaia/wrld_flora_berrybush.xml
new file mode 100644
index 0000000000..fdf2d491fd
--- /dev/null
+++ b/binaries/data/mods/official/entities/gaia/wrld_flora_berrybush.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Parent="template_gaia_flora_bush_berry">
+	<Traits>
+		<Id
+			internal_only="false"
+		/>
+	</Traits>
+	<Actor>foliage/wrld_foliagebush.xml</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/gaia/wrld_flora_oak.xml b/binaries/data/mods/official/entities/gaia/wrld_flora_oak.xml
new file mode 100644
index 0000000000..c1b3f0253f
--- /dev/null
+++ b/binaries/data/mods/official/entities/gaia/wrld_flora_oak.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Parent="template_gaia_flora_tree_oak">
+	<Traits>
+		<Id
+			internal_only="false"
+		/>
+	</Traits>
+	<Actor>flora/wrld_flora_oak.xml</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/gaia/wrld_rock_light.xml b/binaries/data/mods/official/entities/gaia/wrld_rock_light.xml
new file mode 100644
index 0000000000..8f9c836e67
--- /dev/null
+++ b/binaries/data/mods/official/entities/gaia/wrld_rock_light.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Parent="template_gaia_geo_rock">
+	<Traits>
+		<Id
+			internal_only="false"
+		/>
+	</Traits>
+	<Actor>geology/rock_light.xml</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/maps/scenarios/gathertest.xml b/binaries/data/mods/official/maps/scenarios/gathertest.xml
index b6f4de733b..aefe41a47f 100644
--- a/binaries/data/mods/official/maps/scenarios/gathertest.xml
+++ b/binaries/data/mods/official/maps/scenarios/gathertest.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4988762855b3289495375912fb8207c02698737b0b83298379b1b3caa75e53ee
-size 5464
+oid sha256:2c230cd7ff9a99067c05fb3f881be044be9ccba67314614265c8afca78e31406
+size 6692