diff --git a/data/json/furniture_and_terrain/furniture-flora.json b/data/json/furniture_and_terrain/furniture-flora.json
index afb23d342d625..15a818826aa11 100644
--- a/data/json/furniture_and_terrain/furniture-flora.json
+++ b/data/json/furniture_and_terrain/furniture-flora.json
@@ -49,7 +49,7 @@
     "description": "A bright, colorful flower with petals forming a small cup at its top.",
     "symbol": "f",
     "looks_like": "f_mutpoppy",
-    "color": "magenta",
+    "color": "light_blue",
     "move_cost_mod": 0,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
@@ -109,7 +109,7 @@
     "description": "A yellow flower that has a dark ball in the middle.  Sometimes known as an oxe-eye daisy.",
     "looks_like": "f_dandelion",
     "symbol": "f",
-    "color": "yellow",
+    "color": "light_green",
     "move_cost_mod": 0,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
@@ -130,7 +130,7 @@
     "description": "A pretty flower that comes in a variety of colors.",
     "looks_like": "f_flower_tulip",
     "symbol": "f",
-    "color": "magenta",
+    "color": "pink",
     "move_cost_mod": 0,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "ORGANIC" ],
diff --git a/data/json/furniture_and_terrain/terrain-flora.json b/data/json/furniture_and_terrain/terrain-flora.json
index 67d0cc09ba6d6..509d7c62eefce 100644
--- a/data/json/furniture_and_terrain/terrain-flora.json
+++ b/data/json/furniture_and_terrain/terrain-flora.json
@@ -5,7 +5,7 @@
     "name": "walnut tree",
     "description": "A massive tree belonging to the 'Juglans' genus.  If you look closely you can see some unharvested walnuts.  You could cut it down with the right tools.",
     "symbol": "7",
-    "color": [ "green", "green", "brown_green", "brown" ],
+    "color": [ "green", "green", "yellow_yellow", "brown" ],
     "move_cost": 0,
     "coverage": 80,
     "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT" ],
@@ -75,7 +75,7 @@
     "description": "A deciduous tree of the genus 'Quercus', with bark cracked into rectangular black plates split by narrow orange fissures.  All usable bark has been stripped off.  You could cut it down with the right tools.",
     "name": "blackjack oak",
     "symbol": "7",
-    "color": "brown",
+    "color": "green",
     "move_cost": 0,
     "coverage": 80,
     "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT" ],
@@ -95,7 +95,7 @@
     "name": "chestnut tree",
     "description": "A massive tree belonging to the 'Castanea' genus.  If you look closely you can see some unharvested chestnuts.  You could cut it down with the right tools.",
     "symbol": "7",
-    "color": [ "green", "green", "brown_green", "brown" ],
+    "color": [ "green", "green", "green_yellow", "brown" ],
     "move_cost": 0,
     "coverage": 80,
     "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT" ],
@@ -139,7 +139,7 @@
     "name": "beech tree",
     "description": "A massive tree belonging to the 'Fagus' genus.  If you look closely you can see some unharvested beech nuts.  You could cut it down with the right tools.",
     "symbol": "7",
-    "color": [ "green", "green", "brown_green", "brown" ],
+    "color": [ "green", "green", "black_green", "brown" ],
     "move_cost": 0,
     "coverage": 80,
     "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT" ],
@@ -183,7 +183,7 @@
     "name": "hazelnut tree",
     "description": "A stubby tree belonging to the 'Corylus' genus.  If you look closely you can see some unharvested hazelnuts.  You could cut it down with the right tools.",
     "symbol": "7",
-    "color": [ "green", "green", "brown_green", "brown" ],
+    "color": [ "green", "green", "light_green_yellow", "brown" ],
     "move_cost": 0,
     "coverage": 80,
     "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT" ],
@@ -272,7 +272,7 @@
     "looks_like": "t_tree",
     "description": "A large tree belonging to the 'Populus' genus, commonly found throughout New England region.  You could cut it down with the right tools.",
     "symbol": "7",
-    "color": [ "green", "green", "brown_green", "brown" ],
+    "color": [ "green", "green", "green", "brown" ],
     "//": "Do something cool with this and have it spread cotton around the area or something.",
     "move_cost": 0,
     "coverage": 80,
@@ -293,7 +293,7 @@
     "looks_like": "t_tree_cottonwood",
     "description": "A large tree belonging to the 'Ulmus' genus, commonly found throughout New England region.  You could cut it down with the right tools.",
     "symbol": "7",
-    "color": [ "green", "green", "brown_green", "brown" ],
+    "color": [ "green", "green", "green", "brown" ],
     "move_cost": 0,
     "coverage": 80,
     "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT" ],
@@ -549,7 +549,7 @@
     "looks_like": "t_tree_pine",
     "description": "One of the species of 'Juniperus' that grows in New England, juniper berries grow over two to three years, first flowering.  On the second year producing a green berry, the last, they produce their more famed blue varieties.  If you examined the foliage more closely, you could probably find some viable clusters.  You could also cut it down with the right tools.",
     "symbol": "7",
-    "color": [ "light_green", "blue_green", "light_green", "brown" ],
+    "color": [ "light_green", "light_green", "blue_green", "brown" ],
     "//": "Can be picked at any point in the third year assuming the berries have turned blue. But it takes a long time to regrow.",
     "move_cost": 0,
     "coverage": 80,
@@ -736,7 +736,7 @@
     "name": "mulberry tree",
     "description": "This tree is a member of the 'Morus' genus, producing fruit commonly known as mulberries.  In the summer many berries can be picked.  You could also cut it down with the right tools.",
     "symbol": "7",
-    "color": [ "light_green", "light_green", "red_green", "brown" ],
+    "color": [ "light_green", "red_green", "light_green", "brown" ],
     "//": "barren in winter, fruits in summer",
     "move_cost": 0,
     "coverage": 80,
@@ -791,7 +791,7 @@
     "name": "elderberry tree",
     "description": "This tree is a member of the 'Sambucus' genus, producing fruit commonly known as elderberries.  In the summer many berries can be picked.  You could also cut it down with the right tools.",
     "symbol": "7",
-    "color": [ "light_green", "light_green", "red_green", "brown" ],
+    "color": [ "light_green", "red_green", "light_green", "brown" ],
     "//": "barren in winter, fruits in summer",
     "move_cost": 0,
     "coverage": 80,
@@ -874,7 +874,7 @@
     "name": "pine tree",
     "description": "A towering coniferous tree that belongs to the 'Pinus' genus, with the New England species varying from 'P. strobus', 'P. resinosa' and 'P. rigida'.  Some of the branches have been stripped away and many of the pinecones aren't developed fully yet, but given a season, it could be harvestable again.  Also, you could cut it down with the right tools.",
     "symbol": "4",
-    "color": "green",
+    "color": "brown",
     "copy-from": "t_tree_pine",
     "looks_like": "t_tree_deadpine",
     "transforms_into": "t_tree_pine",
@@ -907,7 +907,7 @@
     "looks_like": "t_tree",
     "description": "A tall deciduous tree of the 'Betula' genus, with the characteristic peeling bark.  Species like 'B. alleghaniensis', 'B. papyrifera', and 'B. populifolia' are the most common in the New England region.  You could tear off some strips of bark if you examined the tree more closely.  You could cut it down with the right tools.",
     "symbol": "7",
-    "color": [ "light_green", "light_green", "light_green", "brown" ],
+    "color": "white",
     "//": "barren in winter, harvestable all year round",
     "move_cost": 0,
     "coverage": 80,
@@ -1043,7 +1043,7 @@
     "looks_like": "t_tree",
     "description": "A tall deciduous tree of the 'Carya' genus.  You could look for hickory nuts if you examined the tree more closely.  You could cut it down with the right tools.",
     "symbol": "7",
-    "color": [ "light_green", "light_green", "brown_green", "brown" ],
+    "color": [ "light_green", "light_green", "i_light_green", "brown" ],
     "//": "barren in winter, harvestable in autum",
     "move_cost": 0,
     "coverage": 80,
@@ -1230,7 +1230,7 @@
     "looks_like": "t_tree_dead",
     "description": "The dead remnants of a tall deciduous tree of the 'Carya' genus.  Nothing useful can be foraged from this poor, dead tree.  You could cut it down with the right tools.",
     "symbol": "7",
-    "color": "green",
+    "color": "brown",
     "//": "dead, not usable at all",
     "move_cost": 0,
     "coverage": 80,
@@ -1434,7 +1434,7 @@
     "looks_like": "t_shrub",
     "description": "A small peanut bush that's fruitless.",
     "symbol": "#",
-    "color": "brown_green",
+    "color": "light_gray_green",
     "move_cost": 8,
     "coverage": 40,
     "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "SHRUB", "SHORT", "HARVESTED" ],
@@ -1592,7 +1592,7 @@
     "name": "blackberry bush",
     "description": "A small blackberry bush that's fruitless.  Watch out for its thorns!",
     "symbol": "#",
-    "color": "black_green",
+    "color": "white_green",
     "move_cost": 8,
     "coverage": 40,
     "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "SHRUB", "SHORT", "SHARP", "HARVESTED" ],
@@ -1819,13 +1819,13 @@
     "name": "hydrangea bush",
     "description": "A fat, bush of fragrant blue hydrangeas.",
     "symbol": "#",
-    "color": "light_blue_green",
+    "color": "light_blue",
     "move_cost": 8,
     "coverage": 40,
     "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "SHRUB", "SHORT" ],
     "transforms_into": "t_shrub_hydrangea_harvested",
     "examine_action": "harvest_ter_nectar",
-    "looks_like": "t_shrub_blueberry",
+    "looks_like": "t_shrub",
     "//": "Insert hydrangea harvest in autumn once flowers have a use (same for other generic flowers).",
     "bash": {
       "str_min": 4,
@@ -1848,7 +1848,7 @@
     "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "SHRUB", "SHORT", "HARVESTED" ],
     "transforms_into": "t_shrub_hydrangea",
     "examine_action": "harvested_plant",
-    "looks_like": "t_shrub_blueberry_harvested",
+    "looks_like": "t_shrub",
     "bash": {
       "str_min": 4,
       "str_max": 60,
@@ -1864,13 +1864,13 @@
     "name": "lilac bush",
     "description": "A wide, bush of bright pinkish purple lilacs.",
     "symbol": "#",
-    "color": "magenta_green",
+    "color": "magenta",
     "move_cost": 8,
     "coverage": 40,
     "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "SHRUB", "SHORT" ],
     "transforms_into": "t_shrub_lilac_harvested",
     "examine_action": "harvest_ter_nectar",
-    "looks_like": "t_shrub_hydrangea",
+    "looks_like": "t_shrub",
     "//": "Insert lilac harvest once flowers have a use (same for other generic flowers).",
     "bash": {
       "str_min": 4,
@@ -1893,7 +1893,7 @@
     "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "SHRUB", "SHORT", "HARVESTED" ],
     "transforms_into": "t_shrub_lilac",
     "examine_action": "harvested_plant",
-    "looks_like": "t_shrub_hydrangea_harvested",
+    "looks_like": "t_shrub",
     "bash": {
       "str_min": 4,
       "str_max": 60,
@@ -2007,8 +2007,8 @@
     "name": "tall grass",
     "description": "Tall grass about head high.",
     "looks_like": "t_shrub",
-    "symbol": ",",
-    "color": "brown_green",
+    "symbol": "'",
+    "color": "green",
     "move_cost": 5,
     "coverage": 50,
     "flags": [ "TRANSPARENT", "DIGGABLE", "PLOWABLE" ],
@@ -2055,9 +2055,9 @@
     "id": "t_fern",
     "name": "fern",
     "description": "A short plant with thousands of leaves which grow in a fractal pattern from the stem.",
-    "symbol": "#",
+    "symbol": ",",
     "looks_like": "t_underbrush",
-    "color": [ "green", "brown_green", "brown", "brown" ],
+    "color": [ "brown_green", "green", "green", "green" ],
     "move_cost": 3,
     "coverage": 20,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "DIGGABLE", "FLAT", "THIN_OBSTACLE", "SHRUB" ],
@@ -2078,9 +2078,9 @@
     "id": "t_fern_harvested",
     "name": "fern",
     "description": "A short plant with thousands leaves which grow in a fractal pattern, without any curled shoots.",
-    "symbol": "#",
-    "looks_like": "t_underbrush_harvested_spring",
-    "color": [ "green", "brown_green", "brown", "brown" ],
+    "symbol": ",",
+    "looks_like": "t_grass_long",
+    "color": "green",
     "move_cost": 3,
     "coverage": 20,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "DIGGABLE", "FLAT", "THIN_OBSTACLE", "SHRUB" ],