diff --git a/data/core/editor/terrain-groups.cfg b/data/core/editor/terrain-groups.cfg
index 0a4aad5b183..52612b0727c 100644
--- a/data/core/editor/terrain-groups.cfg
+++ b/data/core/editor/terrain-groups.cfg
@@ -67,6 +67,13 @@
     core=yes
 [/editor_group]
 
+[editor_group]
+    id=obstacle
+    name= _ "obstacle"
+    icon="group_obstacle"
+    core=yes
+[/editor_group]
+
 [editor_group]
     id=village
     name= _ "village"
@@ -81,6 +88,13 @@
     core=yes
 [/editor_group]
 
+[editor_group]
+    id=bridge
+    name= _ "bridge"
+    icon="group_bridge"
+    core=yes
+[/editor_group]
+
 [editor_group]
     id=special
     name= _ "special"
diff --git a/data/core/terrain.cfg b/data/core/terrain.cfg
index eeefb1607f2..8c2bcc89fd1 100644
--- a/data/core/terrain.cfg
+++ b/data/core/terrain.cfg
@@ -6,35 +6,202 @@
 # each "[terrain] id=some_id" corresponds to "[section] id=terrain_some_id"
 # or "[topic] id=terrain_some_id" identifying its description in [help]
 
+# NOTE: this list is sorted to group things comprehensibly in the editor
+
+
+
+#
+#    ## Water ##
+#
+
 [terrain_type]
-    symbol_image=void
-    editor_image=off-map/offmap-editor
-    id=off_map
-    name= _ "None"
-    string=_off^_usr    # wmllint: ignore
-    editor_group=special
+    symbol_image=water/ocean-A01
+    id=deep_water
+    name= _ "Deep Water"
+    string=Wo
+    submerge=0.5
+    unit_height_adjust=-3
+    editor_group=water
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=void
-    editor_image=shroud-editor
-    id=shroud
-    name= _ "Shroud"
-    string=_s       # wmllint: ignore
-    editor_group=special
+    symbol_image=water/coast-A01
+    id=shallow_water
+    name= _ "Shallow Water"
+    string=Ww
+    submerge=0.4
+    unit_height_adjust=-4
+    editor_group=water
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=fog
-    editor_image=fog-editor
-    id=fog
-    name= _ "Fog"
-    string=_f       # wmllint: ignore
-    editor_group=special
+    symbol_image=water/coast-tropical-A01
+    id=tropical_water
+    name= _ "Tropical Water"
+    string=Wwt
+    aliasof=Ww
+    submerge=0.4
+    unit_height_adjust=-4
+    editor_group=water
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=water/ford-tile
+    id=ford
+    name= _ "Ford"
+    string=Wwf
+    aliasof=Gt, Ww
+    submerge=0.3
+    unit_height_adjust=-4
+    editor_group=water
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=water/reef
+    id=reef
+    name= _ "Coastal Reef"
+    string=Wwr
+    submerge=0.3
+    unit_height_adjust=-3
+    editor_group=water
+[/terrain_type]
+
+#### This one is being depreciated
+[terrain_type]
+    symbol_image=color-hex
+    id=tropical_water_depreciated
+    name= _ "Deprecated. Use 'Wwt'"
+    string=Wt
+    aliasof=Ww
+    submerge=0.4
+    unit_height_adjust=-4
+    editor_group=water
+[/terrain_type]
+
+#    ## Swamp ##
+
+[terrain_type]
+    symbol_image=swamp/water-tile
+    id=swamp_water
+    name= _ "Swamp"
+    string=Ss
+    submerge=0.4
+    unit_height_adjust=-3
+    editor_group=water
+[/terrain_type]
+
+
+#
+#    ## Flat ##
+#
+
+#    ## Grass ##
+
+[terrain_type]
+    symbol_image=flat/grass
+    id=grassland
+    name= _ "Grassland"
+    string=Gg
+    aliasof=Gt
+    editor_group=flat
+[/terrain_type]
+
+# This terrain will soon be obsolete.
+[terrain_type]
+    symbol_image=flat/grass-flowers
+    id=grassland_flowers
+    name= _ "Grassland"
+    string=Ggf
+    aliasof=Gt
+    editor_group=flat
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=flat/savanna
+    id=savanna
+    name= _ "Savanna"
+    string=Gs
+    aliasof=Gt
+    editor_group=flat
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=flat/grass-dry
+    id=grass_dry
+    name= _ "Dry Grass"
+    string=Gd
+    aliasof=Gt
+    editor_group=flat
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=flat/leaf-litter
+    id=leaf_litter
+    name= _ "Grassland"
+    string=Gll
+    aliasof=Gt
+    editor_group=flat
+[/terrain_type]
+
+#    ## Roads ##
+
+[terrain_type]
+    symbol_image=flat/farm-veg-spring-icon
+    id=farm
+    name= _ "Farmland"
+    string=^Gvs
+    default_base=Re
+    aliasof=_bas
+    editor_group=flat
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=flat/dirt-dark
+    id=dirt_dark
+    name= _ "Dirt"
+    string=Rb
+    aliasof=Gt
+    editor_group=flat
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=flat/dirt
+    id=dirt
+    name= _ "Dirt"
+    string=Re
+    aliasof=Gt
+    editor_group=flat
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=flat/desert-road
+    id=road
+    name= _ "Dirt"
+    string=Rd
+    aliasof=Gt
+    editor_group=desert, flat
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=flat/road
+    id=road
+    name= _ "Cobbles"
+    string=Rr
+    aliasof=Gt
+    editor_group=flat
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=flat/stone-path
+    id=stone_path
+    name= _ "Cobbles"
+    string=Rp
+    aliasof=Gt
+    editor_group=flat
 [/terrain_type]
 
 #
-#  Frozen
+#    ## Frozen ##
 #
 
 [terrain_type]
@@ -56,111 +223,510 @@
     editor_group=frozen
 [/terrain_type]
 
+
 #
-#  Bridges
+#    ## Desert ##
+#
+
+#New desert
+[terrain_type]
+    symbol_image=desert-tile
+    id=desert
+    name= _ "Desert"
+    string=Dd
+    aliasof=Ds
+    editor_group=desert
+[/terrain_type]
+
+#Old desert
+[terrain_type]
+    symbol_image=sand
+    id=sand
+    name= _ "Sand"
+    string=Ds
+    editor_group=desert
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=desert-oasis
+    id=oasis
+    name= _ "Oasis"
+    string=Dd^Do
+    aliasof=Ds
+    heals=8
+    #gives_income=true
+    editor_group=desert, forest
+[/terrain_type]
+
+#UtbS sand rubble
+[terrain_type]
+    symbol_image=sand_rubble-tile
+    id=sand_rubble
+    name= _ "Rubble"
+    string=^Dr
+    aliasof=_bas, Hh
+    mvt_alias=-,_bas,Hh
+    editor_group=desert, rough
+[/terrain_type]
+
+#UtbS desert crater
+[terrain_type]
+    symbol_image=desert_crater
+    id=crater
+    name= _ "Crater"
+    string=Dd^Dc
+    aliasof=Ds
+    editor_group=desert
+[/terrain_type]
+
+
+#
+#    ## Embellishments ##
 #
 
 [terrain_type]
-    symbol_image=bridge/wood-n-s
-    id=bridge
-    name= _ "Bridge"
-    string=^Bw|
-    aliasof=_bas, Gt
-    submerge=0
-    unit_height_adjust=22
-    editor_group=bridge, water
+    symbol_image=embellishments/stones-small7
+    id=stones_small
+    name= _ "Stones"
+    string=^Es
+    aliasof=_bas
+    editor_group=embellishments
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=bridge/wood-ne-sw
-    id=bridgediag1
-    name= _ "Bridge"
-    string=^Bw/
-    aliasof=_bas, Gt
-    editor_group=bridge, water
-    submerge=0
-    unit_height_adjust=22
+    symbol_image=embellishments/mushroom
+    id=mushrooms_small
+    name= _ "Mushrooms"
+    string=^Em
+    aliasof=_bas
+    editor_group=embellishments
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=bridge/wood-se-nw
-    id=bridgediag2
-    name= _ "Bridge"
-    string=^Bw\
-    aliasof=_bas, Gt
-    editor_group=bridge, water
-    submerge=0
-    unit_height_adjust=22
-[/terrain_type]
-
-#  >>>>>>>> Chasm Bridge
-
-[terrain_type]
-    symbol_image=cave/chasm-stone-bridge-s-n-tile
-    id=bridgechasm
-    name= _ "Bridge"
-    string=Qxu^Bs|
-    aliasof=Uu,Qt
-    editor_group=bridge, cave
+    symbol_image=embellishments/desert-plant
+    id=desert_plants
+    name= _ "Desert Plants"
+    string=^Edp
+    aliasof=_bas
+    editor_group=embellishments, desert
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=cave/chasm-stone-bridge-sw-ne-tile
-    id=bridgechasmdiag1
-    name= _ "Bridge"
-    unit_height_adjust=22
-    string=Qxu^Bs/
-    aliasof=Uu,Qt
-    editor_group=bridge, cave
+    symbol_image=windmill-tile
+    id=windmill
+    name= _ "Windmill"
+    string=^Wm
+    aliasof=_bas
+    editor_group=embellishments
+[/terrain_type]
+
+
+#
+#    ## Forests ##
+#
+
+[terrain_type]
+    symbol_image=forest/great-tree-tile
+    id=great_tree
+    name= _ "Great Tree"
+    string=^Fet
+    default_base=Gg
+    aliasof=^Fp
+    editor_group=forest
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=cave/chasm-stone-bridge-se-nw-tile
-    id=bridgechasmdiag2
-    name= _ "Bridge"
-    unit_height_adjust=22
-    string=Qxu^Bs\
-    aliasof=Uu,Qt
-    editor_group=bridge, cave
+    symbol_image=forest/tropical-tile
+    id=tropical_forest
+    name= _ "Tropical Forest"
+    string=^Ft
+    default_base=Gs
+    aliasof=^Fp
+    editor_group=forest
 [/terrain_type]
 
-#  >>>>>>>> Lava Bridge
+[terrain_type]
+    symbol_image=forest/pine-tile
+    id=forest
+    name= _ "Forest"
+    description=_ "Pine Forest"
+    string=^Fp
+    default_base=Gll
+    editor_group=forest
+[/terrain_type]
 
 [terrain_type]
-    symbol_image=cave/chasm-lava-stone-bridge-s-n-tile
-    id=bridgelava
-    name= _ "Bridge"
-    string=Ql^Bs|
-    aliasof=Uu,Qt
+    symbol_image=forest/snow-forest-tile
+    id=snow_forest
+    name= _ "Snow Forest"
+    description=_ "Snowy Pine Forest"
+    string=^Fpa
+    default_base=Aa
+    aliasof=At,^Fp
+    mvt_alias=-,At,^Fp
+    editor_group=frozen, forest
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/deciduous-summer-tile
+    id=deciduous_forest_summer
+    name=_ "Forest"
+    description=_ "Summer Deciduous Forest"
+    string=^Fds
+    default_base=Gs
+    aliasof=^Fp
+    editor_group=forest
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/deciduous-fall-tile
+    id=deciduous_forest_fall
+    name=_ "Forest"
+    description=_ "Fall Deciduous Forest"
+    string=^Fdf
+    default_base=Gd
+    aliasof=^Fp
+    editor_group=forest
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/deciduous-winter-tile
+    id=deciduous_forest_winter
+    name=_ "Forest"
+    description=_ "Winter Deciduous Forest"
+    string=^Fdw
+    default_base=Gs
+    aliasof=^Fp
+    editor_group=forest
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/deciduous-winter-snow-tile
+    id=deciduous_forest_winter_snow
+    name=_ "Snow Forest"
+    description=_ "Snowy Deciduous Forest"
+    string=^Fda
+    default_base=Aa
+    aliasof=At,^Fp
+    mvt_alias=-,At,^Fp
+    editor_group=frozen, forest
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/mixed-summer-tile
+    id=mixed_forest_summer
+    name=_ "Forest"
+    description=_ "Summer Mixed Forest"
+    string=^Fms
+    default_base=Gs
+    aliasof=^Fp
+    editor_group=forest
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/mixed-fall-tile
+    id=mixed_forest_fall
+    name=_ "Forest"
+    description=_ "Fall Mixed Forest"
+    string=^Fmf
+    default_base=Gll
+    aliasof=^Fp
+    editor_group=forest
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/mixed-winter-tile
+    id=mixed_forest_winter
+    name=_ "Forest"
+    description=_ "Winter Mixed Forest"
+    string=^Fmw
+    default_base=Gd
+    aliasof=^Fp
+    editor_group=forest
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/mixed-winter-snow-tile
+    id=mixed_forest_winter_snow
+    name=_ "Snow Forest"
+    description=_ "Snowy Mixed Forest"
+    string=^Fma
+    default_base=Aa
+    aliasof=At,^Fp
+    mvt_alias=-,At,^Fp
+    editor_group=frozen, forest
+[/terrain_type]
+
+
+#
+#    ## Hills ##
+#
+
+[terrain_type]
+    symbol_image=hills/regular
+    id=hills
+    name= _ "Hills"
+    string=Hh
+    editor_group=rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=hills/dry
+    id=hills_dry
+    name= _ "Hills"
+    string=Hhd
+    aliasof=Hh
+    editor_group=rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=desert-hills
+    id=desert_hills
+    name= _ "Dunes"
+    string=Hd
+    aliasof=Ds, Hh
+    mvt_alias=-,Ds,Hh
+    editor_group=desert, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=snow-hills
+    id=snow_hills
+    name= _ "Snow Hills"
+    string=Ha
+    aliasof=At, Hh
+    mvt_alias=-,At, Hh
+    editor_group=frozen, rough
+[/terrain_type]
+
+#
+#    ## Mountain ##
+#
+
+[terrain_type]
+    symbol_image=mountain-tile
+    id=mountains
+    name= _ "Mountains"
+    string=Mm
+    editor_group=rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=desert-mountains
+    id=desert_mountains
+    name= _ "Mountains"
+    description=_ "Desert Mountains"
+    string=Md
+    aliasof=Mm
+    editor_group=rough, desert
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=snow-mountain-tile
+    id=snow_mountains
+    name= _ "Mountains"
+    description = _"Snowy Mountains"
+    string=Ms
+    aliasof=At, Mm
+    mvt_alias=-,At, Mm
+    editor_group=rough, frozen
+[/terrain_type]
+
+#
+#    ## Mixed ##
+#
+
+[terrain_type]
+    symbol_image=forest/forested-hills-tile
+    id=forested_hills
+    name= _ "Forested Hills"
+    string=Hh^Fp
+    aliasof=Hh,^Fp
+    mvt_alias=-,Hh,^Fp
+    editor_group=forest, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/forested-snow-hills-tile
+    id=forested_snow_hills
+    name= _ "Forested Snow Hills"
+    string=Ha^Fpa
+    aliasof=Ha,^Fp
+    mvt_alias=-,Ha,^Fp
+    editor_group=forest, rough, frozen
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/forested-deciduous-summer-hills-tile
+    id=deciduous_forest_summer_hills
+    name=_ "Forested Hills"
+    description=_ "Summer Deciduous Forested Hills"
+    string=Hh^Fds
+    aliasof=Hh,^Fp
+    mvt_alias=-,Hh,^Fp
+    editor_group=forest, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/forested-deciduous-fall-hills-tile
+    id=deciduous_forest_fall_hills
+    name=_ "Forested Hills"
+    description=_ "Fall Deciduous Forested Hills"
+    string=Hh^Fdf
+    aliasof=Hh,^Fp
+    mvt_alias=-,Hh,^Fp
+    editor_group=forest, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/forested-deciduous-winter-hills-tile
+    id=deciduous_forest_winter_hills
+    name=_ "Forested Hills"
+    description=_ "Winter Deciduous Forested Hills"
+    string=Hh^Fdw
+    aliasof=Hh,^Fp
+    mvt_alias=-,Hh,^Fp
+    editor_group=forest, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/forested-deciduous-winter-snow-hills-tile
+    id=deciduous_forest_winter_snow_hills
+    name=_ "Forested Snow Hills"
+    description=_ "Snowy Deciduous Forested Hills"
+    string=Ha^Fda
+    aliasof=Ha,^Fp
+    mvt_alias=-,Ha,^Fp
+    editor_group=frozen, forest, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/forested-mixed-summer-hills-tile
+    id=mixed_forest_summer_hills
+    name=_ "Forested Hills"
+    description=_ "Summer Mixed Forested Hills"
+    string=Hh^Fms
+    aliasof=Hh,^Fp
+    mvt_alias=-,Hh,^Fp
+    editor_group=forest, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/forested-mixed-fall-hills-tile
+    id=mixed_forest_fall_hills
+    name=_ "Forested Hills"
+    string=Hh^Fmf
+    aliasof=Hh,^Fp
+    mvt_alias=-,Hh,^Fp
+    editor_group=forest, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/forested-mixed-winter-hills-tile
+    id=mixed_forest_winter_hills
+    name=_ "Forested Hills"
+    description=_ "Winter Mixed Forested Hills"
+    string=Hh^Fmw
+    aliasof=Hh,^Fp
+    mvt_alias=-,Hh,^Fp
+    editor_group=forest, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/forested-mixed-winter-snow-hills-tile
+    id=mixed_forest_winter_snow_hills
+    name=_ "Forested Snow Hills"
+    description=_ "Snowy Mixed Forested Hills"
+    string=Ha^Fma
+    aliasof=Ha,^Fp
+    mvt_alias=-,Ha,^Fp
+    editor_group=frozen, forest, rough
+[/terrain_type]
+
+
+#
+#    ## Underground ##
+#
+
+[terrain_type]
+    symbol_image=cave/beam-tile
+    id=lit
+    name= _ "Lit"
+    string=^Ii
+    aliasof=_bas
     light=25
-    editor_group=bridge, cave
+    editor_group=cave
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=cave/chasm-lava-stone-bridge-sw-ne-tile
-    id=bridgelavadiag1
-    name= _ "Bridge"
-    unit_height_adjust=22
-    string=Ql^Bs/
-    aliasof=Uu,Qt
-    light=25
-    editor_group=bridge, cave
+    symbol_image=cave/floor6
+    id=cave
+    name= _ "Cave"
+    string=Uu
+    editor_group=cave
+[/terrain_type]
+
+# [terrain]
+#     symbol_image=cave/beam-tile
+#     id=cave_beam
+#     name= _ "Cave Lit"
+#     string=Uu^Ii
+#     aliasof=Uu
+#     light=25
+#     editor_group=cave
+# [/terrain]
+
+[terrain_type]
+    symbol_image=cave/path
+    id=cave_path
+    name= _ "Cave path"
+    string=Ur
+    aliasof=Gt
+    editor_group=cave
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=cave/chasm-lava-stone-bridge-se-nw-tile
-    id=bridglavadiag2
-    name= _ "Bridge"
-    unit_height_adjust=22
-    string=Ql^Bs\
-    aliasof=Uu,Qt
-    light=25
-    editor_group=bridge, cave
+    symbol_image=forest/mushrooms-tile
+    id=fungus
+    name= _ "Mushroom Grove"
+    string=^Uf
+    default_base=Uu
+    editor_group=cave, forest
 [/terrain_type]
 
-#
-#  Mine rail tracks
-#
+[terrain_type]
+    symbol_image=forest/mushrooms-beam-tile
+    id=fungus_beam
+    name= _ "Mushroom Grove Lit"
+    string=^Ufi
+    default_base=Uu
+    aliasof=^Uf
+    light=25
+    editor_group=cave
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=cave/hills-variation
+    id=rocky_cave
+    name= _ "Rockbound Cave"
+    string=Uh
+    aliasof=Uu, Hh
+    mvt_alias=-,Uu, Hh
+    editor_group=cave, rough
+[/terrain_type]
+
+# [terrain]
+#     symbol_image=cave/hills-beam-tile
+#     id=rocky_cave_beam
+#     name= _ "Rockbound Cave Lit"
+#     string=Uh^Ii
+#     aliasof=Uu, Hh
+#     mvt_alias=-,Uu, Hh
+#     light=25
+#     editor_group=cave, rough
+# [/terrain]
+
+#    ## Mine rail tracks ##
 
 [terrain_type]
     symbol_image=cave/rails-n-s
@@ -198,6 +764,497 @@
     editor_group=cave
 [/terrain_type]
 
+
+#
+#    ## Unwalkable ##
+#
+
+[terrain_type]
+    symbol_image=unwalkable/chasm-tile
+    id=canyon
+    name= _ "Chasm"
+    string=Qxu
+    aliasof=Qt
+    editor_group=cave, obstacle
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=unwalkable/lava-chasm-tile
+    id=lava_chasm
+    name= _ "Lava chasm"
+    string=Ql
+    aliasof=Qt
+    light=25
+    editor_group=cave, obstacle
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=unwalkable/lava
+    id=lava
+    name= _ "Lava"
+    string=Qlf
+    aliasof=Qt
+    light=25
+    editor_group=cave, obstacle
+[/terrain_type]
+
+
+#
+# Impassable
+#
+
+[terrain_type]
+    symbol_image=cloud-tile
+    id=cloud
+    name= _ "Impassable Mountains"
+    string=Mm^Xm
+    aliasof=Xt
+    editor_group=rough,obstacle
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=cloud-desert-tile
+    id=clouddesert
+    name= _ "Impassable Desert Mountains"
+    string=Md^Xm
+    aliasof=Xt
+    editor_group=rough,obstacle,desert
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=cloud-snow-tile
+    id=cloud_snow
+    name= _ "Impassable Mountains"
+    string=Ms^Xm
+    aliasof=Xt
+    editor_group=rough,obstacle,frozen
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=cave/wall-rough-tile
+    id=cavewall
+    name= _ "Cave Wall"
+    string=Xu
+    aliasof=Xt
+    editor_group=cave,obstacle
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=walls/wall-stone-tile
+    id=wall_stone
+    name= _ "Wall"
+    string=Xos
+    aliasof=Xu
+    editor_group=cave,obstacle
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=walls/wall-stone-tile
+    id=wall_stone_lit
+    name= _ "Wall"
+    string=Xol
+    aliasof=Xu
+    editor_group=cave,obstacle
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=void
+    editor_image=impassable-editor
+    id=impassable_overlay
+    name= _ "Impassable"
+    string=^Xo
+    aliasof=_bas,Xt
+    mvt_alias=Xt
+    editor_group=special
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=void
+    editor_image=void-editor
+    id=void
+    name= _ "Void"
+    string=Xv
+    aliasof=Xt
+    editor_group=obstacle,special
+[/terrain_type]
+
+
+#
+# Villages
+#
+
+#    ## Desert
+
+[terrain_type]
+    symbol_image=village/desert-tile
+    id=desert_village
+    name= _ "Village"
+    string=^Vda
+    aliasof=Vi, Ds
+    default_base=Dd
+    heals=8
+    gives_income=true
+    editor_group=village, desert
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/desert-camp-tile
+    id=desert_village
+    name= _ "Village"
+    string=^Vdt
+    aliasof=Vi, Ds
+    default_base=Dd
+    heals=8
+    gives_income=true
+    editor_group=village, desert
+[/terrain_type]
+
+#    ## Orcish
+
+[terrain_type]
+    symbol_image=village/orc-snow-tile
+    id=orcish_snow_village
+    name= _ "Village"
+    string=^Voa
+    aliasof=Vi, Aa
+    default_base=Aa
+    heals=8
+    gives_income=true
+    editor_group=village, frozen
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/orc-tile
+    id=orcish_village
+    name= _ "Village"
+    string=^Vo
+    aliasof=Vi
+    default_base=Gd
+    heals=8
+    gives_income=true
+    editor_group=village
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/orc-snow-hills-tile
+    id=orcish_snow_hills_village
+    name= _ "Village"
+    string=^Voha
+    aliasof=Vi, Hh
+    default_base=Ha
+    heals=8
+    gives_income=true
+    editor_group=village, frozen, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/orc-hills-tile
+    id=orcish_hill_village
+    name= _ "Village"
+    string=^Voh
+    aliasof=Vi, Hh
+    default_base=Hh
+    heals=8
+    gives_income=true
+    editor_group=village, rough
+[/terrain_type]
+
+#    ## Elven
+
+[terrain_type]
+    symbol_image=village/elven-snow-tile
+    id=elven_snow_village
+    name= _ "Village"
+    string=^Vea
+    aliasof=Vi, Aa
+    default_base=Aa
+    heals=8
+    gives_income=true
+    editor_group=village, frozen
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/elven-tile
+    id=elven_village
+    name= _ "Village"
+    string=^Ve
+    aliasof=Vi
+    default_base=Gg
+    heals=8
+    gives_income=true
+    editor_group=village
+[/terrain_type]
+
+#    ## Human
+
+[terrain_type]
+    symbol_image=village/snow-tile
+    id=snow_village
+    name= _ "Village"
+    string=^Vha
+    aliasof=Vi, Aa
+    default_base=Aa
+    heals=8
+    gives_income=true
+    editor_group=village, frozen
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/human-tile
+    id=human_village
+    name= _ "Village"
+    string=^Vh
+    aliasof=Vi
+    default_base=Gs
+    heals=8
+    gives_income=true
+    editor_group=village
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/human-city-tile
+    id=city_village
+    name= _ "Village"
+    string=^Vhc
+    aliasof=Vi
+    default_base=Rp
+    heals=8
+    gives_income=true
+    editor_group=village
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/human-hills-tile
+    id=hill_village
+    name= _ "Village"
+    string=^Vhh
+    aliasof=Vi, Hh
+    default_base=Hh
+    heals=8
+    gives_income=true
+    editor_group=village, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/human-snow-hills-tile
+    id=snow-hill_village
+    name= _ "Village"
+    string=^Vhha
+    aliasof=Vi, Ha
+    default_base=Ha
+    heals=8
+    gives_income=true
+    editor_group=village, frozen, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/human-snow-mountain-tile
+    id=snow-mountain_village
+    name= _ "Village"
+    string=^Vhha
+    aliasof=Vi, Ms
+    default_base=Ms
+    heals=8
+    gives_income=true
+    editor_group=village, frozen, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/human-mountain-tile
+    id=mountain_village
+    name= _ "Village"
+    string=^Vhm
+    aliasof=Vi, Mm
+    default_base=Mm
+    heals=8
+    gives_income=true
+    editor_group=village, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/tropical-tile
+    id=tropical_forest_village
+    name= _ "Village"
+    string=^Vht
+    aliasof=Vi
+    default_base=Gs
+    heals=8
+    gives_income=true
+    editor_group=village
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/camp-tile
+    id=camp_village
+    name= _ "Village"
+    string=^Vct
+    aliasof=Vi
+    default_base=Re
+    heals=8
+    gives_income=true
+    editor_group=village
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/drake-tile
+    id=drake_village
+    name= _ "Village"
+    string=^Vd
+    aliasof=Vi
+    default_base=Rr
+    heals=8
+    gives_income=true
+    editor_group=village
+[/terrain_type]
+
+#    ## Underground
+
+[terrain_type]
+    symbol_image=village/cave-tile
+    id=underground_village
+    name= _ "Village"
+    string=^Vu
+    aliasof=Vi, Uu
+    default_base=Uu
+    heals=8
+    gives_income=true
+    editor_group=village, cave
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/dwarven-tile
+    id=dwarven_village
+    name= _ "Village"
+    string=^Vud
+    aliasof=Vi, Uu
+    default_base=Uu
+    heals=8
+    gives_income=true
+    editor_group=village, cave
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/hut-tile
+    id=hut_village
+    name= _ "Village"
+    string=^Vc
+    aliasof=Vi
+    default_base=Gs
+    heals=8
+    gives_income=true
+    editor_group=village
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/hut-snow-tile
+    id=hut_snow_village
+    name= _ "Village"
+    string=^Vca
+    aliasof=Vi, Aa
+    default_base=Aa
+    heals=8
+    gives_income=true
+    editor_group=village, frozen
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/hut-hills-tile
+    id=hut_hills_village
+    name= _ "Village"
+    string=^Vch
+    aliasof=Vi, Hh
+    default_base=Hh
+    heals=8
+    gives_income=true
+    editor_group=village
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/hut-snow-hills-tile
+    id=hut_snow_hills_village
+    name= _ "Village"
+    string=^Vcha
+    aliasof=Vi, Ha
+    default_base=Ha
+    heals=8
+    gives_income=true
+    editor_group=village, frozen, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/hut-mountains-tile
+    id=hut_mountains_village
+    name= _ "Village"
+    string=^Vcm
+    aliasof=Vi, Mm
+    default_base=Mm
+    heals=8
+    gives_income=true
+    editor_group=village, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/log-cabin-tile
+    id=logcabin_village
+    name= _ "Village"
+    string=^Vl
+    aliasof=Vi
+    default_base=Gs
+    heals=8
+    gives_income=true
+    editor_group=village
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/log-cabin-snow-tile
+    id=logcabin_snow_village
+    name= _ "Village"
+    string=^Vla
+    aliasof=Vi, Aa
+    default_base=Aa
+    heals=8
+    gives_income=true
+    editor_group=village, frozen
+[/terrain_type]
+
+#    ## Water Village
+
+[terrain_type]
+    symbol_image=village/swampwater-tile
+    id=swamp_village
+    name= _ "Village"
+    string=Ss^Vhs
+    aliasof=Vi, Ss
+    heals=8
+    gives_income=true
+    editor_group=water, village
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/coast-tile
+    id=mermen_village
+    name= _ "Village"
+    string=Ww^Vm
+    aliasof=Ww
+    submerge=0.4
+    unit_height_adjust=-4
+    heals=8
+    gives_income=true
+    editor_group=water, village
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=village/swamp-merfolk-tile
+    id=swamp_merfolk-village
+    name= _ "Village"
+    string=Ss^Vm
+    aliasof=Ss
+    heals=8
+    gives_income=true
+    editor_group=water, village
+[/terrain_type]
+
+
 #
 # Castles
 #
@@ -323,6 +1380,7 @@
     editor_group=castle
 [/terrain_type]
 
+
 #
 # Keeps
 #
@@ -492,1192 +1550,146 @@
 [/terrain_type]
 
 
-
 #
-# Desert
-#
-
-#New desert
-[terrain_type]
-    symbol_image=desert-tile
-    id=desert
-    name= _ "Desert"
-    string=Dd
-    aliasof=Ds
-    editor_group=desert
-[/terrain_type]
-
-#Old desert
-[terrain_type]
-    symbol_image=sand
-    id=sand
-    name= _ "Sand"
-    string=Ds
-    editor_group=desert
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=desert-oasis
-    id=oasis
-    name= _ "Oasis"
-    string=Dd^Do
-    aliasof=Ds
-    heals=8
-    #gives_income=true
-    editor_group=desert, forest
-[/terrain_type]
-
-#UtbS sand rubble
-[terrain_type]
-    symbol_image=sand_rubble-tile
-    id=sand_rubble
-    name= _ "Rubble"
-    string=^Dr
-    aliasof=_bas, Hh
-    mvt_alias=-,_bas,Hh
-    editor_group=desert, rough
-[/terrain_type]
-
-#UtbS desert crater
-[terrain_type]
-    symbol_image=desert_crater
-    id=crater
-    name= _ "Crater"
-    string=Dd^Dc
-    aliasof=Ds
-    editor_group=desert
-[/terrain_type]
-
-
-#
-# Embellishments
+#  Bridges
 #
 
 [terrain_type]
-    symbol_image=embellishments/stones-small7
-    id=stones_small
-    name= _ "Stones"
-    string=^Es
-    aliasof=_bas
-    editor_group=embellishments
+    symbol_image=bridge/wood-n-s
+    id=bridge
+    name= _ "Bridge"
+    string=^Bw|
+    aliasof=_bas, Gt
+    submerge=0
+    unit_height_adjust=22
+    editor_group=bridge, water
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=embellishments/mushroom
-    id=mushrooms_small
-    name= _ "Mushrooms"
-    string=^Em
-    aliasof=_bas
-    editor_group=embellishments
+    symbol_image=bridge/wood-ne-sw
+    id=bridgediag1
+    name= _ "Bridge"
+    string=^Bw/
+    aliasof=_bas, Gt
+    editor_group=bridge, water
+    submerge=0
+    unit_height_adjust=22
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=embellishments/desert-plant
-    id=desert_plants
-    name= _ "Desert Plants"
-    string=^Edp
-    aliasof=_bas
-    editor_group=embellishments, desert
+    symbol_image=bridge/wood-se-nw
+    id=bridgediag2
+    name= _ "Bridge"
+    string=^Bw\
+    aliasof=_bas, Gt
+    editor_group=bridge, water
+    submerge=0
+    unit_height_adjust=22
+[/terrain_type]
+
+#  ######## Chasm Bridge
+
+[terrain_type]
+    symbol_image=cave/chasm-stone-bridge-s-n-tile
+    id=bridgechasm
+    name= _ "Bridge"
+    string=Qxu^Bs|
+    aliasof=Uu,Qt
+    editor_group=bridge, cave
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=windmill-tile
-    id=windmill
-    name= _ "Windmill"
-    string=^Wm
-    aliasof=_bas
-    editor_group=embellishments
-[/terrain_type]
-
-
-#
-# Forests
-#
-
-[terrain_type]
-    symbol_image=forest/great-tree-tile
-    id=great_tree
-    name= _ "Great Tree"
-    string=^Fet
-    default_base=Gg
-    aliasof=^Fp
-    editor_group=forest
+    symbol_image=cave/chasm-stone-bridge-sw-ne-tile
+    id=bridgechasmdiag1
+    name= _ "Bridge"
+    unit_height_adjust=22
+    string=Qxu^Bs/
+    aliasof=Uu,Qt
+    editor_group=bridge, cave
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=forest/tropical-tile
-    id=tropical_forest
-    name= _ "Tropical Forest"
-    string=^Ft
-    default_base=Gs
-    aliasof=^Fp
-    editor_group=forest
+    symbol_image=cave/chasm-stone-bridge-se-nw-tile
+    id=bridgechasmdiag2
+    name= _ "Bridge"
+    unit_height_adjust=22
+    string=Qxu^Bs\
+    aliasof=Uu,Qt
+    editor_group=bridge, cave
 [/terrain_type]
 
-[terrain_type]
-    symbol_image=forest/pine-tile
-    id=forest
-    name= _ "Forest"
-    description=_ "Pine Forest"
-    string=^Fp
-    default_base=Gll
-    editor_group=forest
-[/terrain_type]
+#  ######## Lava Bridge
 
 [terrain_type]
-    symbol_image=forest/snow-forest-tile
-    id=snow_forest
-    name= _ "Snow Forest"
-    description=_ "Snowy Pine Forest"
-    string=^Fpa
-    default_base=Aa
-    aliasof=At,^Fp
-    mvt_alias=-,At,^Fp
-    editor_group=frozen, forest
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/deciduous-summer-tile
-    id=deciduous_forest_summer
-    name=_ "Forest"
-    description=_ "Summer Deciduous Forest"
-    string=^Fds
-    default_base=Gs
-    aliasof=^Fp
-    editor_group=forest
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/deciduous-fall-tile
-    id=deciduous_forest_fall
-    name=_ "Forest"
-    description=_ "Fall Deciduous Forest"
-    string=^Fdf
-    default_base=Gd
-    aliasof=^Fp
-    editor_group=forest
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/deciduous-winter-tile
-    id=deciduous_forest_winter
-    name=_ "Forest"
-    description=_ "Winter Deciduous Forest"
-    string=^Fdw
-    default_base=Gs
-    aliasof=^Fp
-    editor_group=forest
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/deciduous-winter-snow-tile
-    id=deciduous_forest_winter_snow
-    name=_ "Snow Forest"
-    description=_ "Snowy Deciduous Forest"
-    string=^Fda
-    default_base=Aa
-    aliasof=At,^Fp
-    mvt_alias=-,At,^Fp
-    editor_group=frozen, forest
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/mixed-summer-tile
-    id=mixed_forest_summer
-    name=_ "Forest"
-    description=_ "Summer Mixed Forest"
-    string=^Fms
-    default_base=Gs
-    aliasof=^Fp
-    editor_group=forest
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/mixed-fall-tile
-    id=mixed_forest_fall
-    name=_ "Forest"
-    description=_ "Fall Mixed Forest"
-    string=^Fmf
-    default_base=Gll
-    aliasof=^Fp
-    editor_group=forest
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/mixed-winter-tile
-    id=mixed_forest_winter
-    name=_ "Forest"
-    description=_ "Winter Mixed Forest"
-    string=^Fmw
-    default_base=Gd
-    aliasof=^Fp
-    editor_group=forest
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/mixed-winter-snow-tile
-    id=mixed_forest_winter_snow
-    name=_ "Snow Forest"
-    description=_ "Snowy Mixed Forest"
-    string=^Fma
-    default_base=Aa
-    aliasof=At,^Fp
-    mvt_alias=-,At,^Fp
-    editor_group=frozen, forest
-[/terrain_type]
-
-#
-# Mixed
-#
-
-[terrain_type]
-    symbol_image=forest/forested-hills-tile
-    id=forested_hills
-    name= _ "Forested Hills"
-    string=Hh^Fp
-    aliasof=Hh,^Fp
-    mvt_alias=-,Hh,^Fp
-    editor_group=forest, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/forested-snow-hills-tile
-    id=forested_snow_hills
-    name= _ "Forested Snow Hills"
-    string=Ha^Fpa
-    aliasof=Ha,^Fp
-    mvt_alias=-,Ha,^Fp
-    editor_group=forest, rough, frozen
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/forested-deciduous-summer-hills-tile
-    id=deciduous_forest_summer_hills
-    name=_ "Forested Hills"
-    description=_ "Summer Deciduous Forested Hills"
-    string=Hh^Fds
-    aliasof=Hh,^Fp
-    mvt_alias=-,Hh,^Fp
-    editor_group=forest, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/forested-deciduous-fall-hills-tile
-    id=deciduous_forest_fall_hills
-    name=_ "Forested Hills"
-    description=_ "Fall Deciduous Forested Hills"
-    string=Hh^Fdf
-    aliasof=Hh,^Fp
-    mvt_alias=-,Hh,^Fp
-    editor_group=forest, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/forested-deciduous-winter-hills-tile
-    id=deciduous_forest_winter_hills
-    name=_ "Forested Hills"
-    description=_ "Winter Deciduous Forested Hills"
-    string=Hh^Fdw
-    aliasof=Hh,^Fp
-    mvt_alias=-,Hh,^Fp
-    editor_group=forest, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/forested-deciduous-winter-snow-hills-tile
-    id=deciduous_forest_winter_snow_hills
-    name=_ "Forested Snow Hills"
-    description=_ "Snowy Deciduous Forested Hills"
-    string=Ha^Fda
-    aliasof=Ha,^Fp
-    mvt_alias=-,Ha,^Fp
-    editor_group=frozen, forest, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/forested-mixed-summer-hills-tile
-    id=mixed_forest_summer_hills
-    name=_ "Forested Hills"
-    description=_ "Summer Mixed Forested Hills"
-    string=Hh^Fms
-    aliasof=Hh,^Fp
-    mvt_alias=-,Hh,^Fp
-    editor_group=forest, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/forested-mixed-fall-hills-tile
-    id=mixed_forest_fall_hills
-    name=_ "Forested Hills"
-    string=Hh^Fmf
-    aliasof=Hh,^Fp
-    mvt_alias=-,Hh,^Fp
-    editor_group=forest, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/forested-mixed-winter-hills-tile
-    id=mixed_forest_winter_hills
-    name=_ "Forested Hills"
-    description=_ "Winter Mixed Forested Hills"
-    string=Hh^Fmw
-    aliasof=Hh,^Fp
-    mvt_alias=-,Hh,^Fp
-    editor_group=forest, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/forested-mixed-winter-snow-hills-tile
-    id=mixed_forest_winter_snow_hills
-    name=_ "Forested Snow Hills"
-    description=_ "Snowy Mixed Forested Hills"
-    string=Ha^Fma
-    aliasof=Ha,^Fp
-    mvt_alias=-,Ha,^Fp
-    editor_group=frozen, forest, rough
-[/terrain_type]
-
-#
-# Grass
-#
-
-[terrain_type]
-    symbol_image=flat/grass
-    id=grassland
-    name= _ "Grassland"
-    string=Gg
-    aliasof=Gt
-    editor_group=flat
-[/terrain_type]
-
-# This terrain will soon be obsolete.
-[terrain_type]
-    symbol_image=flat/grass-flowers
-    id=grassland_flowers
-    name= _ "Grassland"
-    string=Ggf
-    aliasof=Gt
-    editor_group=flat
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=flat/savanna
-    id=savanna
-    name= _ "Savanna"
-    string=Gs
-    aliasof=Gt
-    editor_group=flat
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=flat/grass-dry
-    id=grass_dry
-    name= _ "Dry Grass"
-    string=Gd
-    aliasof=Gt
-    editor_group=flat
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=flat/leaf-litter
-    id=leaf_litter
-    name= _ "Grassland"
-    string=Gll
-    aliasof=Gt
-    editor_group=flat
-[/terrain_type]
-
-
-#
-# Hills
-#
-
-[terrain_type]
-    symbol_image=hills/regular
-    id=hills
-    name= _ "Hills"
-    string=Hh
-    editor_group=rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=hills/dry
-    id=hills_dry
-    name= _ "Hills"
-    string=Hhd
-    aliasof=Hh
-    editor_group=rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=desert-hills
-    id=desert_hills
-    name= _ "Dunes"
-    string=Hd
-    aliasof=Ds, Hh
-    mvt_alias=-,Ds,Hh
-    editor_group=desert, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=snow-hills
-    id=snow_hills
-    name= _ "Snow Hills"
-    string=Ha
-    aliasof=At, Hh
-    mvt_alias=-,At, Hh
-    editor_group=frozen, rough
-[/terrain_type]
-
-#
-# Mountain
-#
-
-[terrain_type]
-    symbol_image=mountain-tile
-    id=mountains
-    name= _ "Mountains"
-    string=Mm
-    editor_group=rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=desert-mountains
-    id=desert_mountains
-    name= _ "Mountains"
-    description=_ "Desert Mountains"
-    string=Md
-    aliasof=Mm
-    editor_group=rough, desert
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=snow-mountain-tile
-    id=snow_mountains
-    name= _ "Mountains"
-    description = _"Snowy Mountains"
-    string=Ms
-    aliasof=At, Mm
-    mvt_alias=-,At, Mm
-    editor_group=rough, frozen
-[/terrain_type]
-
-#
-# Unwalkable
-#
-
-[terrain_type]
-    symbol_image=unwalkable/chasm-tile
-    id=canyon
-    name= _ "Chasm"
-    string=Qxu
-    aliasof=Qt
-    editor_group=cave
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=unwalkable/lava-chasm-tile
-    id=lava_chasm
-    name= _ "Lava chasm"
-    string=Ql
-    aliasof=Qt
+    symbol_image=cave/chasm-lava-stone-bridge-s-n-tile
+    id=bridgelava
+    name= _ "Bridge"
+    string=Ql^Bs|
+    aliasof=Uu,Qt
     light=25
-    editor_group=cave
+    editor_group=bridge, cave
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=unwalkable/lava
-    id=lava
-    name= _ "Lava"
-    string=Qlf
-    aliasof=Qt
+    symbol_image=cave/chasm-lava-stone-bridge-sw-ne-tile
+    id=bridgelavadiag1
+    name= _ "Bridge"
+    unit_height_adjust=22
+    string=Ql^Bs/
+    aliasof=Uu,Qt
     light=25
-    editor_group=cave
-[/terrain_type]
-
-#
-# Roads
-#
-
-[terrain_type]
-    symbol_image=flat/farm-veg-spring-icon
-    id=farm
-    name= _ "Farmland"
-    string=^Gvs
-    default_base=Re
-    aliasof=_bas
-    editor_group=flat
+    editor_group=bridge, cave
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=flat/dirt-dark
-    id=dirt_dark
-    name= _ "Dirt"
-    string=Rb
-    aliasof=Gt
-    editor_group=flat
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=flat/dirt
-    id=dirt
-    name= _ "Dirt"
-    string=Re
-    aliasof=Gt
-    editor_group=flat
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=flat/desert-road
-    id=road
-    name= _ "Dirt"
-    string=Rd
-    aliasof=Gt
-    editor_group=desert, flat
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=flat/road
-    id=road
-    name= _ "Cobbles"
-    string=Rr
-    aliasof=Gt
-    editor_group=flat
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=flat/stone-path
-    id=stone_path
-    name= _ "Cobbles"
-    string=Rp
-    aliasof=Gt
-    editor_group=flat
-[/terrain_type]
-
-#
-# Swamp
-#
-
-[terrain_type]
-    symbol_image=swamp/water-tile
-    id=swamp_water
-    name= _ "Swamp"
-    string=Ss
-    submerge=0.4
-    unit_height_adjust=-3
-    editor_group=water
-[/terrain_type]
-
-#
-# Underground
-#
-
-[terrain_type]
-    symbol_image=cave/beam-tile
-    id=lit
-    name= _ "Lit"
-    string=^Ii
-    aliasof=_bas
+    symbol_image=cave/chasm-lava-stone-bridge-se-nw-tile
+    id=bridglavadiag2
+    name= _ "Bridge"
+    unit_height_adjust=22
+    string=Ql^Bs\
+    aliasof=Uu,Qt
     light=25
-    editor_group=cave
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=cave/floor6
-    id=cave
-    name= _ "Cave"
-    string=Uu
-    editor_group=cave
-[/terrain_type]
-
-# [terrain]
-#     symbol_image=cave/beam-tile
-#     id=cave_beam
-#     name= _ "Cave Lit"
-#     string=Uu^Ii
-#     aliasof=Uu
-#     light=25
-#     editor_group=cave
-# [/terrain]
-
-[terrain_type]
-    symbol_image=cave/path
-    id=cave_path
-    name= _ "Cave path"
-    string=Ur
-    aliasof=Gt
-    editor_group=cave
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/mushrooms-tile
-    id=fungus
-    name= _ "Mushroom Grove"
-    string=^Uf
-    default_base=Uu
-    editor_group=cave, forest
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=forest/mushrooms-beam-tile
-    id=fungus_beam
-    name= _ "Mushroom Grove Lit"
-    string=^Ufi
-    default_base=Uu
-    aliasof=^Uf
-    light=25
-    editor_group=cave
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=cave/hills-variation
-    id=rocky_cave
-    name= _ "Rockbound Cave"
-    string=Uh
-    aliasof=Uu, Hh
-    mvt_alias=-,Uu, Hh
-    editor_group=cave, rough
-[/terrain_type]
-
-# [terrain]
-#     symbol_image=cave/hills-beam-tile
-#     id=rocky_cave_beam
-#     name= _ "Rockbound Cave Lit"
-#     string=Uh^Ii
-#     aliasof=Uu, Hh
-#     mvt_alias=-,Uu, Hh
-#     light=25
-#     editor_group=cave, rough
-# [/terrain]
-
-#
-# Villages
-#
-
-# Desert
-
-[terrain_type]
-    symbol_image=village/desert-tile
-    id=desert_village
-    name= _ "Village"
-    string=^Vda
-    aliasof=Vi, Ds
-    default_base=Dd
-    heals=8
-    gives_income=true
-    editor_group=village, desert
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/desert-camp-tile
-    id=desert_village
-    name= _ "Village"
-    string=^Vdt
-    aliasof=Vi, Ds
-    default_base=Dd
-    heals=8
-    gives_income=true
-    editor_group=village, desert
-[/terrain_type]
-
-# Orcish
-
-[terrain_type]
-    symbol_image=village/orc-snow-tile
-    id=orcish_snow_village
-    name= _ "Village"
-    string=^Voa
-    aliasof=Vi, Aa
-    default_base=Aa
-    heals=8
-    gives_income=true
-    editor_group=village, frozen
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/orc-tile
-    id=orcish_village
-    name= _ "Village"
-    string=^Vo
-    aliasof=Vi
-    default_base=Gd
-    heals=8
-    gives_income=true
-    editor_group=village
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/orc-snow-hills-tile
-    id=orcish_snow_hills_village
-    name= _ "Village"
-    string=^Voha
-    aliasof=Vi, Hh
-    default_base=Ha
-    heals=8
-    gives_income=true
-    editor_group=village, frozen, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/orc-hills-tile
-    id=orcish_hill_village
-    name= _ "Village"
-    string=^Voh
-    aliasof=Vi, Hh
-    default_base=Hh
-    heals=8
-    gives_income=true
-    editor_group=village, rough
-[/terrain_type]
-
-# Elven
-
-[terrain_type]
-    symbol_image=village/elven-snow-tile
-    id=elven_snow_village
-    name= _ "Village"
-    string=^Vea
-    aliasof=Vi, Aa
-    default_base=Aa
-    heals=8
-    gives_income=true
-    editor_group=village, frozen
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/elven-tile
-    id=elven_village
-    name= _ "Village"
-    string=^Ve
-    aliasof=Vi
-    default_base=Gg
-    heals=8
-    gives_income=true
-    editor_group=village
-[/terrain_type]
-
-# Human
-
-[terrain_type]
-    symbol_image=village/snow-tile
-    id=snow_village
-    name= _ "Village"
-    string=^Vha
-    aliasof=Vi, Aa
-    default_base=Aa
-    heals=8
-    gives_income=true
-    editor_group=village, frozen
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/human-tile
-    id=human_village
-    name= _ "Village"
-    string=^Vh
-    aliasof=Vi
-    default_base=Gs
-    heals=8
-    gives_income=true
-    editor_group=village
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/human-city-tile
-    id=city_village
-    name= _ "Village"
-    string=^Vhc
-    aliasof=Vi
-    default_base=Rp
-    heals=8
-    gives_income=true
-    editor_group=village
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/human-hills-tile
-    id=hill_village
-    name= _ "Village"
-    string=^Vhh
-    aliasof=Vi, Hh
-    default_base=Hh
-    heals=8
-    gives_income=true
-    editor_group=village, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/human-snow-hills-tile
-    id=snow-hill_village
-    name= _ "Village"
-    string=^Vhha
-    aliasof=Vi, Ha
-    default_base=Ha
-    heals=8
-    gives_income=true
-    editor_group=village, frozen, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/human-snow-mountain-tile
-    id=snow-mountain_village
-    name= _ "Village"
-    string=^Vhha
-    aliasof=Vi, Ms
-    default_base=Ms
-    heals=8
-    gives_income=true
-    editor_group=village, frozen, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/human-mountain-tile
-    id=mountain_village
-    name= _ "Village"
-    string=^Vhm
-    aliasof=Vi, Mm
-    default_base=Mm
-    heals=8
-    gives_income=true
-    editor_group=village, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/tropical-tile
-    id=tropical_forest_village
-    name= _ "Village"
-    string=^Vht
-    aliasof=Vi
-    default_base=Gs
-    heals=8
-    gives_income=true
-    editor_group=village
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/camp-tile
-    id=camp_village
-    name= _ "Village"
-    string=^Vct
-    aliasof=Vi
-    default_base=Re
-    heals=8
-    gives_income=true
-    editor_group=village
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/drake-tile
-    id=drake_village
-    name= _ "Village"
-    string=^Vd
-    aliasof=Vi
-    default_base=Rr
-    heals=8
-    gives_income=true
-    editor_group=village
-[/terrain_type]
-
-# Underground
-
-[terrain_type]
-    symbol_image=village/cave-tile
-    id=underground_village
-    name= _ "Village"
-    string=^Vu
-    aliasof=Vi, Uu
-    default_base=Uu
-    heals=8
-    gives_income=true
-    editor_group=village, cave
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/dwarven-tile
-    id=dwarven_village
-    name= _ "Village"
-    string=^Vud
-    aliasof=Vi, Uu
-    default_base=Uu
-    heals=8
-    gives_income=true
-    editor_group=village, cave
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/hut-tile
-    id=hut_village
-    name= _ "Village"
-    string=^Vc
-    aliasof=Vi
-    default_base=Gs
-    heals=8
-    gives_income=true
-    editor_group=village
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/hut-snow-tile
-    id=hut_snow_village
-    name= _ "Village"
-    string=^Vca
-    aliasof=Vi, Aa
-    default_base=Aa
-    heals=8
-    gives_income=true
-    editor_group=village, frozen
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/hut-hills-tile
-    id=hut_hills_village
-    name= _ "Village"
-    string=^Vch
-    aliasof=Vi, Hh
-    default_base=Hh
-    heals=8
-    gives_income=true
-    editor_group=village
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/hut-snow-hills-tile
-    id=hut_snow_hills_village
-    name= _ "Village"
-    string=^Vcha
-    aliasof=Vi, Ha
-    default_base=Ha
-    heals=8
-    gives_income=true
-    editor_group=village, frozen, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/hut-mountains-tile
-    id=hut_mountains_village
-    name= _ "Village"
-    string=^Vcm
-    aliasof=Vi, Mm
-    default_base=Mm
-    heals=8
-    gives_income=true
-    editor_group=village, rough
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/log-cabin-tile
-    id=logcabin_village
-    name= _ "Village"
-    string=^Vl
-    aliasof=Vi
-    default_base=Gs
-    heals=8
-    gives_income=true
-    editor_group=village
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/log-cabin-snow-tile
-    id=logcabin_snow_village
-    name= _ "Village"
-    string=^Vla
-    aliasof=Vi, Aa
-    default_base=Aa
-    heals=8
-    gives_income=true
-    editor_group=village, frozen
-[/terrain_type]
-
-# Water Village
-
-[terrain_type]
-    symbol_image=village/coast-tile
-    id=mermen_village
-    name= _ "Village"
-    string=Ww^Vm
-    aliasof=Ww
-    submerge=0.4
-    unit_height_adjust=-4
-    heals=8
-    gives_income=true
-    editor_group=water, village
-[/terrain_type]
-
-# Swamp
-
-[terrain_type]
-    symbol_image=village/swampwater-tile
-    id=swamp_village
-    name= _ "Village"
-    string=Ss^Vhs
-    aliasof=Vi, Ss
-    heals=8
-    gives_income=true
-    editor_group=water, village
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/swamp-merfolk-tile
-    id=swamp_merfolk-village
-    name= _ "Village"
-    string=Ss^Vm
-    aliasof=Ss
-    heals=8
-    gives_income=true
-    editor_group=water, village
-[/terrain_type]
-
-#
-# Water
-#
-
-[terrain_type]
-    symbol_image=water/ocean-A01
-    id=deep_water
-    name= _ "Deep Water"
-    string=Wo
-    submerge=0.5
-    unit_height_adjust=-3
-    editor_group=water
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=water/coast-A01
-    id=shallow_water
-    name= _ "Shallow Water"
-    string=Ww
-    submerge=0.4
-    unit_height_adjust=-4
-    editor_group=water
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=water/coast-tropical-A01
-    id=tropical_water
-    name= _ "Tropical Water"
-    string=Wwt
-    aliasof=Ww
-    submerge=0.4
-    unit_height_adjust=-4
-    editor_group=water
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=water/ford-tile
-    id=ford
-    name= _ "Ford"
-    string=Wwf
-    aliasof=Gt, Ww
-    submerge=0.3
-    unit_height_adjust=-4
-    editor_group=water
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=water/reef
-    id=reef
-    name= _ "Coastal Reef"
-    string=Wwr
-    submerge=0.3
-    unit_height_adjust=-3
-    editor_group=water
-[/terrain_type]
-
-#### This one is being depreciated
-[terrain_type]
-    symbol_image=color-hex
-    id=tropical_water_depreciated
-    name= _ "Deprecated. Use 'Wwt'"
-    string=Wt
-    aliasof=Ww
-    submerge=0.4
-    unit_height_adjust=-4
-    editor_group=water
+    editor_group=bridge, cave
 [/terrain_type]
 
 
 #
-# Impassable
+#    ## Special ##
 #
 
-[terrain_type]
-    symbol_image=cloud-tile
-    id=cloud
-    name= _ "Impassable Mountains"
-    string=Mm^Xm
-    aliasof=Xt
-    editor_group=rough,wall
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=cloud-desert-tile
-    id=clouddesert
-    name= _ "Impassable Desert Mountains"
-    string=Md^Xm
-    aliasof=Xt
-    editor_group=rough,wall,desert
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=cloud-snow-tile
-    id=cloud_snow
-    name= _ "Impassable Mountains"
-    string=Ms^Xm
-    aliasof=Xt
-    editor_group=rough,wall,frozen
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=cave/wall-rough-tile
-    id=cavewall
-    name= _ "Cave Wall"
-    string=Xu
-    aliasof=Xt
-    editor_group=cave,wall
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=walls/wall-stone-tile
-    id=wall_stone
-    name= _ "Wall"
-    string=Xos
-    aliasof=Xu
-    editor_group=cave,wall
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=walls/wall-stone-tile
-    id=wall_stone_lit
-    name= _ "Wall"
-    string=Xol
-    aliasof=Xu
-    editor_group=cave,wall
-[/terrain_type]
 
 [terrain_type]
     symbol_image=void
-    editor_image=impassable-editor
-    id=impassable_overlay
-    name= _ "Impassable"
-    string=^Xo
-    aliasof=_bas,Xt
-    mvt_alias=Xt
+    editor_image=off-map/offmap-editor
+    id=off_map
+    name= _ "None"
+    string=_off^_usr    # wmllint: ignore
     editor_group=special
 [/terrain_type]
 
 [terrain_type]
     symbol_image=void
-    editor_image=void-editor
-    id=void
-    name= _ "Void"
-    string=Xv
-    aliasof=Xt
-    editor_group=flat,wall,special
+    editor_image=shroud-editor
+    id=shroud
+    name= _ "Shroud"
+    string=_s       # wmllint: ignore
+    editor_group=special
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=fog
+    editor_image=fog-editor
+    id=fog
+    name= _ "Fog"
+    string=_f       # wmllint: ignore
+    editor_group=special
+[/terrain_type]
+
+
 #
-#  Terrain archetypes
+#    ## Terrain Archetypes ##
 #
+
 # these are "virtual" terrain
 [terrain_type]
     symbol_image=void
diff --git a/images/buttons/group_bridge-active-pressed.png b/images/buttons/group_bridge-active-pressed.png
index 32ea6c44076..4add1abe4f8 100644
Binary files a/images/buttons/group_bridge-active-pressed.png and b/images/buttons/group_bridge-active-pressed.png differ
diff --git a/images/buttons/group_bridge-active.png b/images/buttons/group_bridge-active.png
index 32ea6c44076..f166f653211 100644
Binary files a/images/buttons/group_bridge-active.png and b/images/buttons/group_bridge-active.png differ
diff --git a/images/buttons/group_bridge-pressed.png b/images/buttons/group_bridge-pressed.png
index 32ea6c44076..70cc2bf164f 100644
Binary files a/images/buttons/group_bridge-pressed.png and b/images/buttons/group_bridge-pressed.png differ
diff --git a/images/buttons/group_bridge.png b/images/buttons/group_bridge.png
index 32ea6c44076..3516093bbec 100644
Binary files a/images/buttons/group_bridge.png and b/images/buttons/group_bridge.png differ
diff --git a/images/buttons/group_obstacle-active-pressed.png b/images/buttons/group_obstacle-active-pressed.png
new file mode 100644
index 00000000000..01aaf3fdef7
Binary files /dev/null and b/images/buttons/group_obstacle-active-pressed.png differ
diff --git a/images/buttons/group_obstacle-active.png b/images/buttons/group_obstacle-active.png
new file mode 100644
index 00000000000..299077f2385
Binary files /dev/null and b/images/buttons/group_obstacle-active.png differ
diff --git a/images/buttons/group_obstacle-pressed.png b/images/buttons/group_obstacle-pressed.png
new file mode 100644
index 00000000000..ec510b5dba0
Binary files /dev/null and b/images/buttons/group_obstacle-pressed.png differ
diff --git a/images/buttons/group_obstacle.png b/images/buttons/group_obstacle.png
new file mode 100644
index 00000000000..e4fb6df6424
Binary files /dev/null and b/images/buttons/group_obstacle.png differ